X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=configure.in;h=981fb9b53750773b8b18ef7b05788001edd8e041;hb=1a6ea5cd117f81f6156877fcc462b06181ad94ac;hp=8835f81bab0f68dc4b17127337531e49705a2357;hpb=0c09ece6cb12fe06ab88015a9f9de34d0cedb307;p=privoxy.git diff --git a/configure.in b/configure.in index 8835f81b..981fb9b5 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.27 2002/01/10 12:35:18 oes Exp $ +dnl $Id: configure.in,v 1.39 2002/03/08 16:46:13 oes Exp $ dnl dnl Written by and Copyright (C) 2001 the SourceForge dnl IJBSWA team. http://ijbswa.sourceforge.net @@ -28,6 +28,45 @@ 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.39 2002/03/08 16:46:13 oes +dnl Added --enable-no-gifs +dnl +dnl Revision 1.38 2002/03/08 14:13:50 morcego +dnl Fixing configure, to remove a command not found error. +dnl +dnl Revision 1.37 2002/03/08 12:58:21 oes +dnl Tiny bugfix in AC_ARG_WITH(debug) +dnl +dnl Revision 1.36 2002/03/06 23:50:36 morcego +dnl Will not test for a text browser if we are not using docbook. +dnl +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 +dnl Revision 1.30 2002/03/04 17:58:01 oes +dnl Deleted _DEBUG and PID_FILE_PATH +dnl +dnl Revision 1.29 2002/02/28 14:20:53 oes +dnl Fixed detection of gethost*_r functions on Solaris +dnl +dnl Revision 1.28 2002/02/27 15:02:38 oes +dnl Incremented version number +dnl dnl Revision 1.27 2002/01/10 12:35:18 oes dnl Added cross-compile defaults to the AC_CHECK_SIZEOF macros dnl to silence autoconf warnings. Numbers are for Intel/Linux. @@ -228,11 +267,26 @@ dnl ================================================================= dnl AutoConf Initialization dnl ================================================================= -AC_REVISION($Revision: 1.27 $) +AC_REVISION($Revision: 1.39 $) 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 @@ -262,12 +316,6 @@ AC_DEFINE_UNQUOTED(VERSION_POINT,${VERSION_POINT}) AC_DEFINE_UNQUOTED(VERSION,"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_POINT}") AC_DEFINE_UNQUOTED(CODE_STATUS,"${CODE_STATUS}") -dnl ================================================================= -dnl pid file only for unix -dnl ================================================================= -dnl -PID_FILE_PATH="\"/etc/junkbuster"\" - dnl ================================================================= dnl Checks for programs needed to build. dnl ================================================================= @@ -289,7 +337,7 @@ dnl ================================================================= AC_ARG_WITH(debug, [ --with-debug Enable debug mode], [ - if test "x$withval" != "$xno" ; then + if test "x$withval" != "xno" ; then if test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then if test "$GDB"; then @@ -302,7 +350,6 @@ AC_ARG_WITH(debug, CFLAGS="-g" fi fi - CFLAGS="$CFLAGS -D_DEBUG" fi ], [ @@ -351,6 +398,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. @@ -379,6 +437,44 @@ 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 +fi +AC_SUBST(WDUMP) + +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 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 + for i in /usr/share/sgml/docbook/dsssl-stylesheets /usr/share/sgml/docbkdsl; do + echo -n "checking for $i/html/docbook.dsl..." + if test -f $i/html/docbook.dsl; then + echo "yes" + DKPREFIX=$i + else + echo "no" + fi + done + fi +fi +AC_SUBST(DKPREFIX) dnl Save old CFLAGS so we can restore them later, then add SPECIAL_CFLAGS old_CFLAGS_nospecial=$CFLAGS @@ -431,6 +527,9 @@ dnl Support for thread-safe versions of gethostbyaddr, gethostbyname, dnl gmtime and localtime dnl ================================================================= +dnl Next line needed to find the gethost*_r functions on Solaris +AC_CHECK_LIB(nsl, gethostbyname) + AC_CHECK_FUNC(gethostbyaddr_r, [ AC_MSG_CHECKING([signature of gethostbyaddr_r]) AC_TRY_COMPILE([ @@ -725,6 +824,14 @@ AC_ARG_ENABLE(editor, fi], AC_DEFINE(FEATURE_CGI_EDIT_ACTIONS)) +AC_ARG_ENABLE(no-gifs, +[ --enable-no-gifs Use politically correct PNG format instead of GIF + for built-in images. May not work with all browsers.], +[if test $enableval = yes; then + AC_DEFINE(FEATURE_NO_GIFS) +fi]) + + dnl pcre/pcrs is needed for CGI anyway, so dnl the choice is only between static and dnl dynamic: @@ -825,9 +932,6 @@ dnl in the Makefile CFLAGS=$old_CFLAGS_nospecial AC_SUBST(SPECIAL_CFLAGS) -AC_SUBST(PID_FILE_PATH) -AC_DEFINE_UNQUOTED(PID_FILE_PATH,${PID_FILE_PATH}) - AC_SUBST(PTHREAD_LIB) AC_OUTPUT(GNUmakefile)