X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=configure.in;h=c9f844145370a06fbf2f347303ce7f81fca454ac;hp=2b697f1a6414428886bae023c9afed4f891efa40;hb=6936b62866a15b4f9da85854060f5d81c986631c;hpb=ac7378391d85bb2e42b3b97b4d2737c1c140aed5 diff --git a/configure.in b/configure.in index 2b697f1a..c9f84414 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.67 2002/05/03 14:33:59 oes Exp $ +dnl $Id: configure.in,v 1.69 2002/05/25 18:11:49 jongfoster Exp $ dnl dnl Written by and Copyright (C) 2001, 2002 the SourceForge dnl Privoxy team. http://www.privoxy.org/ @@ -28,6 +28,15 @@ 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.69 2002/05/25 18:11:49 jongfoster +dnl Wahay!!! 3.0.x has branched! +dnl New development version is 3.1.1 alpha +dnl +dnl Revision 1.68 2002/05/25 16:54:54 jongfoster +dnl Detect if the compiler supports -pthread. +dnl Hopefully this will fix bug 560442. (I don't have a HP PA-RISC +dnl machine to test this!) +dnl dnl Revision 1.67 2002/05/03 14:33:59 oes dnl Generate doc/soucre/ldp.dsl dnl @@ -365,7 +374,7 @@ dnl ================================================================= dnl AutoConf Initialization dnl ================================================================= -AC_REVISION($Revision: 1.67 $) +AC_REVISION($Revision: 1.69 $) AC_INIT(jcc.c) if test ! -f config.h.in; then @@ -382,37 +391,34 @@ fi 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 -]) -DB2HTML=false -AC_ARG_WITH(db2html, dnl - --with-db2html= - Set the location of the docbook to html converter - (default = search),[dnl -DB2HTML=$withval + --with-docbook= + Set the location of the dsssl stylesheet + (default = search),[dnl +DKPREFIX=$withval ]) +dnl NOT USED? +dnl DB2HTML=false +dnl AC_ARG_WITH(db2html, dnl +dnl --with-db2html= +dnl Set the location of the docbook to html converter +dnl (default = search),[dnl +dnl DB2HTML=$withval +dnl ]) +dnl if ! test -x $DB2HTML; then +dnl DB2HTML="" +dnl fi + + dnl ================================================================= dnl Application version number dnl ================================================================= -VERSION_MAJOR=2 -VERSION_MINOR=9 -VERSION_POINT=15 -CODE_STATUS="beta" +VERSION_MAJOR=3 +VERSION_MINOR=1 +VERSION_POINT=1 +CODE_STATUS="alpha" dnl CODE_STATUS can be "alpha", "beta", or "stable", and will be dnl used for CGI output @@ -541,17 +547,6 @@ 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. @@ -580,33 +575,18 @@ else fi AC_SUBST(WIN_ONLY) -dnl Checking which text html browser we have avaliable -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\)) - fi - if test $DB2HTML = false; then - dnl We need to clean the variable, otherwise AC_CHECK_PROGS - dnl will fail - DB2HTML="" - AC_CHECK_PROGS(DB2HTML,db2html docbook2html,false) - fi -fi +dnl Check for a text browser that supports -dump +AC_CHECK_PROGS(WDUMP,w3m lynx links,false) AC_SUBST(WDUMP) -AC_SUBST(DB2HTML) -dnl If we use rpm, we need to check where %_topdir is -AC_CHECK_PROGS(RPMBIN,rpm,false) -if test $RPMBIN != false; then - RPM_BASE=`rpm --eval "%{_topdir}"` - if test "$RPM_BASE" = ""; then - RPM_BASE=/usr/src/redhat - fi -fi -AC_SUBST(RPM_BASE) +dnl NOT USED? +dnl Check for a docbook -> HTML converter +dnl AC_CHECK_PROGS(DB2HTML,db2html docbook2html,false) +dnl AC_SUBST(DB2HTML) dnl Check for jade, so we can build the documentation +dnl Openjade is preferred according to docs, but jade +dnl is *much* faster. AC_CHECK_PROGS(JADEBIN,jade openjade,false) AC_SUBST(JADEBIN) @@ -616,33 +596,45 @@ AC_SUBST(MAN2HTML) dnl Checking for the docbook.dsl stylesheet file dnl It is still not portable (directory slash) +DKPREFIXCOPY=$DKPREFIX +DKPREFIX=false +for i in $DKPREFIXCOPY /usr/share/sgml/docbook/stylesheet/dsssl/modular \ + /usr/share/sgml/docbook/dsssl-stylesheets /usr/share/sgml/docbkdsl \ + /usr/share/sgml/docbook-dsssl; do + echo -n "checking for $i/html/docbook.dsl..." + if test -f $i/html/docbook.dsl; then + echo "yes" + DKPREFIX=$i + break + else + echo "no" + fi +done +AC_SUBST(DKPREFIX) + JADECAT="" -if test $dodk = yes; then - if test $DKPREFIX = none; then - for i in /usr/share/sgml/docbook/dsssl-stylesheets /usr/share/sgml/docbkdsl /usr/share/sgml/docbook-dsssl; do - echo -n "checking for $i/html/docbook.dsl..." - if test -f $i/html/docbook.dsl; then - echo "yes" - DKPREFIX=$i - break - else - echo "no" - fi - done -# where are the catalogs? - for i in /usr/share/sgml/CATALOG.docbk30 /usr/share/sgml/CATALOG.docbk31; do - echo -n "checking for $i..." - if test -f $i; then - echo "yes" - JADECAT="$JADECAT -c $i" - else - echo "no" - fi - done - fi -fi +dnl where are the catalogs? +for i in /usr/share/sgml/CATALOG.docbk30 \ + /usr/share/sgml/CATALOG.docbk31; do + echo -n "checking for $i..." + if test -f $i; then + echo "yes" + JADECAT="$JADECAT -c $i" + else + echo "no" + fi +done AC_SUBST(JADECAT) -AC_SUBST(DKPREFIX) + +dnl If we use rpm, we need to check where %_topdir is +AC_CHECK_PROGS(RPMBIN,rpm,false) +if test $RPMBIN != false; then + RPM_BASE=`rpm --eval "%{_topdir}"` + if test "$RPM_BASE" = ""; then + RPM_BASE=/usr/src/redhat + fi +fi +AC_SUBST(RPM_BASE) dnl Save old CFLAGS so we can restore them later, then add SPECIAL_CFLAGS old_CFLAGS_nospecial=$CFLAGS