Resyncing HEAD with v_3_0_branch for two OSX fixes:

[privoxy.git] / configure.in

diff --git a/configure.in b/configure.in
index 2f16841..e36526a 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.86 2002/12/13 23:47:10 hal9 Exp $
+dnl $Id: configure.in,v 1.88 2003/03/23 02:15:51 hal9 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.88  2003/03/23 02:15:51  hal9
+dnl Apply Docbook/FreeBSD patch from a.go at tiscali.nl. Thanks!
+dnl
+dnl Revision 1.87  2002/12/28 04:10:22  david__schmidt
+dnl Initial drop of dashboard instrumentation - enabled with
+dnl --enable-activity-console
+dnl
 dnl Revision 1.86  2002/12/13 23:47:10  hal9
 dnl Add openbsd special flags per gunner at styx2002.no-ip.org
 dnl
@@ -436,7 +443,7 @@ dnl =================================================================
 dnl AutoConf Initialization
 dnl =================================================================
 
-AC_REVISION($Revision: 1.86 $)
+AC_REVISION($Revision: 1.88 $)
 AC_INIT(src/jcc.c)
 if test ! -f src/config.h.in; then
    echo "You need to run autoheader first. "
@@ -921,19 +928,10 @@ dnl Mac OSX specific
 dnl =================================================================
     
 case "$host" in
-*-apple-darwin*) SPECIAL_CFLAGS="-Dunix"
+*-apple-darwin*) SPECIAL_CFLAGS="-Dunix -DOSX_DARWIN"
 ;;  
 esac
 
-dnl =================================================================
-dnl Mac OSX specific
-dnl =================================================================
-
-case "$host" in
-*-apple-darwin*) SPECIAL_CFLAGS="-Dunix"
-;;
-esac
-
 dnl =================================================================
 dnl OpenBSD specific
 dnl =================================================================
@@ -1276,7 +1274,7 @@ 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
+        /usr/share/sgml/docbook-dsssl /usr/local/share/sgml/docbook/dsssl/modular; do
 dnl  echo -n does not fly with /bin/sh.
 dnl      echo -n "checking for $i/html/docbook.dsl..."
       AC_MSG_CHECKING([for $i])
@@ -1293,7 +1291,10 @@ AC_SUBST(DKPREFIX)
 JADECAT=""
 dnl where are the catalogs?
 for i in /usr/share/sgml/CATALOG.docbk30 \
-         /usr/share/sgml/CATALOG.docbk31; do
+         /usr/share/sgml/CATALOG.docbk31 \
+        /usr/local/share/sgml/docbook/3.0/docbook.cat \
+        /usr/local/share/sgml/docbook/3.1/docbook.cat \
+        ; do
 dnl     echo -n "checking for $i..."
       AC_MSG_CHECKING([for $i])
         if test -f $i; then