X-Git-Url: http://www.privoxy.org/gitweb/-%22http:/sourceforge.net/sflogo.php?a=blobdiff_plain;f=configure.in;h=1fe8d993c19e002d32a644b43c1f16d851ead39e;hb=f4a0489fe1d7df03faddb0a0bf83bf7e867ec1b4;hp=2045238929f87af88843d28b1a6d85e6e11b102a;hpb=b3ee70e4ee07171ad5cc5050748d53db7228f232;p=privoxy.git

diff --git a/configure.in b/configure.in
index 20452389..1fe8d993 100644
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl 
-dnl $Id: configure.in,v 1.43 2002/03/24 12:56:21 swa Exp $
+dnl $Id: configure.in,v 1.49 2002/03/27 02:19:52 david__schmidt Exp $
 dnl 
-dnl Written by and Copyright (C) 2001 the SourceForge
-dnl Privoxy team.  http://ijbswa.sourceforge.net
+dnl Written by and Copyright (C) 2001, 2002 the SourceForge
+dnl Privoxy team. http://www.privoxy.org/
 dnl
 dnl Based on the Internet Junkbuster originally written
 dnl by and Copyright (C) 1997 Anonymous Coders and 
@@ -28,6 +28,26 @@ 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.49  2002/03/27 02:19:52  david__schmidt
+dnl More Mac OSX support:
+dnl - Get rid of extraneous, noisy -pthread warnings
+dnl - Define unix so we get oes' unix-tagged changes
+dnl
+dnl Revision 1.48  2002/03/26 22:29:54  swa
+dnl we have a new homepage!
+dnl
+dnl Revision 1.47  2002/03/26 16:41:00  hal9
+dnl Upped RPM Release to 3 (need to build new RH packages)
+dnl
+dnl Revision 1.46  2002/03/24 18:55:06  jongfoster
+dnl Making Docbook work under Windows
+dnl
+dnl Revision 1.45  2002/03/24 14:19:55  swa
+dnl set rpm package release in configure.in. nowhere else.
+dnl
+dnl Revision 1.44  2002/03/24 13:25:43  swa
+dnl name change related issues
+dnl
 dnl Revision 1.43  2002/03/24 12:56:21  swa
 dnl name change related issues.
 dnl
@@ -283,7 +303,7 @@ dnl =================================================================
 dnl AutoConf Initialization
 dnl =================================================================
 
-AC_REVISION($Revision: 1.43 $)
+AC_REVISION($Revision: 1.49 $)
 AC_INIT(jcc.c)
 AC_CONFIG_HEADER(config.h)
 AC_CANONICAL_HOST
@@ -318,6 +338,7 @@ dnl =================================================================
 VERSION_MAJOR=2
 VERSION_MINOR=9
 VERSION_POINT=13
+VERSION_RPM_PACKAGE=3
 CODE_STATUS="beta"
 
 dnl CODE_STATUS can be "alpha", "beta", or "stable", and will be
@@ -330,12 +351,14 @@ dnl =================================================================
 AC_SUBST(VERSION_MAJOR)
 AC_SUBST(VERSION_MINOR)
 AC_SUBST(VERSION_POINT)
+AC_SUBST(VERSION_RPM_PACKAGE)
 AC_SUBST(CODE_STATUS)
 
 dnl
 AC_DEFINE_UNQUOTED(VERSION_MAJOR,${VERSION_MAJOR})
 AC_DEFINE_UNQUOTED(VERSION_MINOR,${VERSION_MINOR})
 AC_DEFINE_UNQUOTED(VERSION_POINT,${VERSION_POINT})
+AC_DEFINE_UNQUOTED(VERSION_RPM_PACKAGE,${VERSION_RPM_PACKAGE})
 AC_DEFINE_UNQUOTED(VERSION,"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_POINT}")
 AC_DEFINE_UNQUOTED(CODE_STATUS,"${CODE_STATUS}")
 
@@ -490,16 +513,20 @@ dnl Check for jade, so we can build the documentation
 AC_CHECK_PROGS(JADEBIN,jade openjade,false)
 AC_SUBST(JADEBIN)
 
+dnl Check for man2html for docs.
+AC_CHECK_PROGS(MAN2HTML,man2html,false)
+AC_SUBST(MAN2HTML)
+
 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
-    for i in /usr/share/sgml/docbook/dsssl-stylesheets /usr/share/sgml/docbkdsl; do
+    for i in /usr/share/sgml/docbook/dsssl-stylesheets /usr/share/sgml/docbkdsl /usr/share/sgml/docbook-dsssl; do
       echo -n "checking for $i/html/docbook.dsl..."
       if test -f $i/html/docbook.dsl; then
         echo "yes"
         DKPREFIX=$i
-	break
+        break
       else
         echo "no"
       fi
@@ -721,6 +748,15 @@ esac
 
 AC_SUBST(SOCKET_LIB)
 
+dnl =================================================================
+dnl Mac OSX specific
+dnl =================================================================
+    
+case "$host" in
+*-apple-darwin*) SPECIAL_CFLAGS="-Dunix"
+;;  
+esac
+
 dnl =================================================================
 dnl AmigaOS specific
 dnl =================================================================