- Fixing stylesheet checking on configure. If it is found, no further checks

[privoxy.git] / configure.in

diff --git a/configure.in b/configure.in
index f7a0447..45c9028 100644 (file)
--- 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.37 2002/03/08 12:58:21 oes Exp $
+dnl $Id: configure.in,v 1.40 2002/03/09 14:33:30 oes Exp $
 dnl 
 dnl Written by and Copyright (C) 2001 the SourceForge
 dnl IJBSWA team.  http://ijbswa.sourceforge.net
@@ -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.40  2002/03/09 14:33:30  oes
+dnl Fixing the (harmless) AC_CHECK_FILE warnings
+dnl
+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
@@ -261,7 +270,7 @@ dnl =================================================================
 dnl AutoConf Initialization
 dnl =================================================================
 
-AC_REVISION($Revision: 1.37 $)
+AC_REVISION($Revision: 1.40 $)
 AC_INIT(jcc.c)
 AC_CONFIG_HEADER(config.h)
 AC_CANONICAL_HOST
@@ -281,6 +290,13 @@ no) dodk=no;;
        ;;
 esac
 ])
+DB2HTML=false
+AC_ARG_WITH(db2html, dnl
+  --with-db2html=<path/executable>
+                          Set the location of the docbook to html converter
+                          (default = search),[dnl
+DB2HTML=$withval
+])
 
 dnl =================================================================
 dnl Application version number
@@ -437,8 +453,15 @@ if test $dodk != no; then
        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
 AC_SUBST(WDUMP)
+AC_SUBST(DB2HTML)
 
 dnl If we use rpm, we need to check where %_topdir is
 AC_CHECK_PROGS(RPMBIN,rpm,false)
@@ -455,12 +478,19 @@ AC_CHECK_PROGS(JADEBIN,jade openjade,false)
 AC_SUBST(JADEBIN)
 
 dnl Checking for the docbook.dsl stylesheet file
+dnl It is still not portable (directory slash)
 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))
+    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
+       break
+      else
+        echo "no"
+      fi
+    done
   fi
 fi
 AC_SUBST(DKPREFIX)
@@ -813,6 +843,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: