Resyncing HEAD with v_3_0_branch for two OSX fixes:

[privoxy.git] / configure.in

diff --git a/configure.in b/configure.in
index 4af07a2..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.84 2002/10/24 22:24:57 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,19 @@ 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
+dnl Revision 1.85  2002/11/27 12:40:54  oes
+dnl Fixed broken handling of pre-set CFLAGS
+dnl
 dnl Revision 1.84  2002/10/24 22:24:57  hal9
 dnl Make install: Minor clean up for variable handling.
 dnl
@@ -430,7 +443,7 @@ dnl =================================================================
 dnl AutoConf Initialization
 dnl =================================================================
 
-AC_REVISION($Revision: 1.84 $)
+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. "
@@ -548,7 +561,7 @@ AC_ARG_WITH(user,
         [
                 if test "x$withval" != "xyes"; then
                   if test $ID = no ; then
-                    AC_MSG_ERROR(There is no 'id' program on this system)
+                    AC_MSG_WARN(There is no 'id' program on this system)
                   else
                     AC_MSG_RESULT($with_user)
                     $ID $with_user 2>/dev/null >/dev/null
@@ -564,7 +577,7 @@ AC_ARG_WITH(user,
         ],
         [
           if test $ID = no ; then
-            AC_MSG_ERROR(There is no 'id' programm on this system)
+            AC_MSG_WARN(There is no 'id' program on this system)
           else
             AC_MSG_RESULT(none specified)
             USER=$with_user
@@ -601,7 +614,7 @@ AC_ARG_WITH(group,
         ],
         [
           if test $BGROUPS = no ; then
-            AC_MSG_ERROR(There is no 'groups' programm on this system)
+            AC_MSG_WARN(There is no 'groups' program on this system)
           else
             AC_MSG_RESULT(none specified)
             GROUP=$with_group;
@@ -915,10 +928,19 @@ dnl Mac OSX specific
 dnl =================================================================
     
 case "$host" in
-*-apple-darwin*) SPECIAL_CFLAGS="-Dunix"
+*-apple-darwin*) SPECIAL_CFLAGS="-Dunix -DOSX_DARWIN"
 ;;  
 esac
 
+dnl =================================================================
+dnl OpenBSD specific
+dnl =================================================================
+
+case "$host" in
+*-openbsd*) SPECIAL_CFLAGS="$SPECIAL_CFLAGS -Dunix"
+;;
+esac
+
 dnl =================================================================
 dnl AmigaOS specific
 dnl =================================================================
@@ -1058,6 +1080,20 @@ if test $enableval2 = yes; then
     [ Enables statistics function. ])
 fi
 
+AC_ARG_ENABLE(activity-console,
+[  --enable-activity-console    Gather and send extended statistics to the activity console],
+[enableval2=$enableval],
+[enableval2=no])
+if test $enableval2 = yes; then
+  ACTIVITY_ONLY=
+  AC_DEFINE(FEATURE_ACTIVITY_CONSOLE,1,
+    [ Enables sending statistics to the activity console. This is currently
+      experimental, and will require some porting work for a few more platforms. ])
+  else
+    ACTIVITY_ONLY=#
+fi
+AC_SUBST(ACTIVITY_ONLY)
+
 AC_ARG_ENABLE(ie-images,
 [  --enable-ie-images      Don't auto-detect whether a request from MS Internet
                            Explorer is for an image or HTML.],
@@ -1151,10 +1187,9 @@ AC_ARG_ENABLE(no-gifs,
 [enableval2=no])
 if test $enableval2 = yes; then
   AC_DEFINE(FEATURE_NO_GIFS,1,
-    [ Deine to 1 to use PNG instead of GIF for built-in images. ])
+    [ Define to 1 to use PNG instead of GIF for built-in images. ])
 fi
 
-
 dnl pcre/pcrs is needed for CGI anyway, so
 dnl the choice is only between static and
 dnl dynamic:
@@ -1239,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])
@@ -1256,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