X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=configure.in;h=9ead0560fc33ece2a29b252609a4e5ef7acfd46a;hp=f378cbffb19b212a22fe9d35f37a0aefddbc75b3;hb=6484fffbf977dbc3945ac7c53b6acd3d4db79266;hpb=8eee84ac9966f874b14ad7bf34de3f9e9bff947b diff --git a/configure.in b/configure.in index f378cbff..9ead0560 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl $Id: configure.in,v 1.31 2002/03/05 13:43:28 morcego Exp $ +dnl $Id: configure.in,v 1.35 2002/03/06 21:55:52 morcego Exp $ dnl dnl Written by and Copyright (C) 2001 the SourceForge dnl IJBSWA team. http://ijbswa.sourceforge.net @@ -28,6 +28,21 @@ dnl or write to the Free Software Foundation, Inc., 59 dnl Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl dnl $Log: configure.in,v $ +dnl Revision 1.35 2002/03/06 21:55:52 morcego +dnl New configure option: --with-docbook=(yes|no|directory) +dnl Preliminary new platform detection code included. Will work with the +dnl old one for now. No use just trowing it away +dnl +dnl Revision 1.34 2002/03/06 20:57:00 morcego +dnl Fixing detection of stylesheets on SuSe. +dnl +dnl Revision 1.33 2002/03/05 17:31:11 morcego +dnl Search for docbook.dsl. Should solve portability problems for SuSe. +dnl +dnl Revision 1.32 2002/03/05 14:07:43 morcego +dnl configure now detects rpm topdir, and change GNUmakefile acordingly +dnl (based on sugestion by Sarantis Paskalis) +dnl dnl Revision 1.31 2002/03/05 13:43:28 morcego dnl Checking for text browser, so redhat-dok can work. dnl @@ -240,11 +255,26 @@ dnl ================================================================= dnl AutoConf Initialization dnl ================================================================= -AC_REVISION($Revision: 1.31 $) +AC_REVISION($Revision: 1.35 $) AC_INIT(jcc.c) AC_CONFIG_HEADER(config.h) AC_CANONICAL_HOST +dodk=auto +DKPREFIX=none +AC_ARG_WITH(docbook, dnl + --with-docbook=[[yes|no|directory]] + Enable docbook documentation creation + (default = yes, for gnu and linux),[dnl +case "$with_docbook" in +yes) dodk=yes;; +no) dodk=no;; +*) + dodk=no + DKPREFIX=$withval + ;; +esac +]) dnl ================================================================= dnl Application version number @@ -356,6 +386,17 @@ else fi fi +if test $dodk = auto; then + dodk = no + if test $target_type = unix; then + case "$host_os" in + linux* | gnu*) + dodk=yes + ;; + esac + fi +fi + dnl Decide what to do based on target_type dnl Note: PTHREAD_LIB is always set, even if pthread is disabled. dnl This is because we don't know yet whether pthread is enabled. @@ -385,7 +426,7 @@ fi AC_SUBST(WIN_ONLY) dnl Checking which text html browser we have avaliable -if test $target_type = unix; then +if test $dodk != no; then AC_CHECK_PROGS(WDUMP,w3m lynx links,false) if test "$WDUMP" = false; then AC_MSG_ERROR(You need some kind of text browser to continue \(w3m, lynx and links are supported\)) @@ -403,6 +444,18 @@ if test $RPMBIN != false; then fi AC_SUBST(RPM_BASE) +dnl Check for jade, so we can build the documentation +AC_CHECK_PROGS(JADEBIN,jade openjade,false) +AC_SUBST(JADEBIN) + +dnl Checking for the docbook.dsl stylesheet file +if test $dodk = yes; then + if test $DKPREFIX = none; then + AC_CHECK_FILE(/usr/share/sgml/docbook/dsssl-stylesheets/html/docbook.dsl,DKPREFIX=/usr/share/sgml/docbook/dsssl-stylesheets,AC_CHECK_FILE(/usr/share/sgml/docbkdsl/html/docbook.dsl,DKPREFIX=/usr/share/sgml/docbkdsl)) + fi +fi +AC_SUBST(DKPREFIX) + dnl Save old CFLAGS so we can restore them later, then add SPECIAL_CFLAGS old_CFLAGS_nospecial=$CFLAGS CFLAGS="$CFLAGS $SPECIAL_CFLAGS"