X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=configure.in;h=83d3019774692a373b97cf6853d7b0a9090c6b9b;hb=94aced1534cfb8424ab8f09fa29871883cdca1c3;hp=d225683e2c6ad35eb7117f6b00d851c005e01133;hpb=4b3c9b925e5be187be35cb31f797dcd34ee2d255;p=privoxy.git

diff --git a/configure.in b/configure.in
index d225683e..83d30197 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.56 2002/04/03 22:28:03 gliptak Exp $
+dnl $Id: configure.in,v 1.58 2002/04/04 20:49:20 swa Exp $
 dnl 
 dnl Written by and Copyright (C) 2001, 2002 the SourceForge
 dnl Privoxy team. http://www.privoxy.org/
@@ -28,6 +28,13 @@ 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.58  2002/04/04 20:49:20  swa
+dnl attempt to consolidate the
+dnl different dokbook versions.
+dnl
+dnl Revision 1.57  2002/04/04 00:36:36  gliptak
+dnl always use pcre for matching
+dnl
 dnl Revision 1.56  2002/04/03 22:28:03  gliptak
 dnl Removed references to gnu_regex
 dnl
@@ -324,7 +331,7 @@ dnl =================================================================
 dnl AutoConf Initialization
 dnl =================================================================
 
-AC_REVISION($Revision: 1.56 $)
+AC_REVISION($Revision: 1.58 $)
 AC_INIT(jcc.c)
 AC_CONFIG_HEADER([config.h])
 AC_CANONICAL_HOST
@@ -388,12 +395,9 @@ dnl Checks for programs needed to build.
 dnl =================================================================
 AC_PROG_CC
 AC_PROG_CPP
-AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-dnl RANLIB is for PCRE:
-AC_PROG_RANLIB
 
 AC_CHECK_PROG(GDB,gdb,yes,no)
 
@@ -569,6 +573,7 @@ AC_SUBST(MAN2HTML)
 
 dnl Checking for the docbook.dsl stylesheet file
 dnl It is still not portable (directory slash)
+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
@@ -581,8 +586,19 @@ if test $dodk = yes; then
         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
+AC_SUBST(JADECAT)
 AC_SUBST(DKPREFIX)
 
 dnl Save old CFLAGS so we can restore them later, then add SPECIAL_CFLAGS