Migrate PCRE_H_IN_SUBDIR from 3.0 branch for pcre/pcre.h on RH, etc.

[privoxy.git] / configure.in

diff --git a/configure.in b/configure.in
index 227e2ed..0b3ba97 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.75 2002/09/04 12:19:33 oes Exp $
+dnl $Id: configure.in,v 1.77 2002/09/06 13:23:03 oes 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.77  2002/09/06 13:23:03  oes
+dnl Removed non-functional test for gcc support for -pthread
+dnl
+dnl Revision 1.76  2002/09/05 14:52:17  oes
+dnl Synced in some changes fromm the stable branch:
+dnl Fixed detection/inclusion of pcre.h, which is in a pcre subdir on RH
+dnl
 dnl Revision 1.75  2002/09/04 12:19:33  oes
 dnl Resurrected acconfig.h and removed double quotes from AC_DEFINE params to enable build on older systems
 dnl
@@ -400,7 +407,7 @@ dnl =================================================================
 dnl AutoConf Initialization
 dnl =================================================================
 
-AC_REVISION($Revision: 1.75 $)
+AC_REVISION($Revision: 1.77 $)
 AC_INIT(src/jcc.c)
 
 if test ! -f src/config.h.in; then
@@ -438,6 +445,7 @@ AC_SUBST(VERSION_MAJOR)
 AC_SUBST(VERSION_MINOR)
 AC_SUBST(VERSION_POINT)
 AC_SUBST(CODE_STATUS)
+AC_SUBST(SYSCONFDIR)
 
 dnl
 AC_DEFINE_UNQUOTED(VERSION_MAJOR,${VERSION_MAJOR},
@@ -625,17 +633,10 @@ if test $have_pthread = yes; then
   if test "$GCC" = "yes"; then
     # Set a GCC specific switch:
     if test "$target_type" = "unix"; then
-      ac_jgf_save_CFLAGS=$CFLAGS
-      CFLAGS="$CFLAGS -pthread"
-      AC_TRY_LINK([#include <pthread.h>],
-        [void *p = pthread_create;],
-        [
-          # This compiler switch makes GCC on Linux thread-safe
-          # However, it's not supported on most other OS.
-          PTHREAD_LIB=
-          SPECIAL_CFLAGS="-pthread"
-        ])
-      CFLAGS=$ac_jgf_save_CFLAGS
+      # This compiler switch makes GCC on Linux thread-safe
+      # However, it's not supported on most other OS.
+      PTHREAD_LIB=
+      SPECIAL_CFLAGS="-pthread"
     fi
   fi
 else
@@ -1160,7 +1161,7 @@ dnl Checking for the docbook.dsl stylesheet file
 dnl It is still not portable (directory slash)
 dnl   ^ Why not?  All systems use / don't they?
 dnl   Windows certainly can.  Is this a Mac or
-dnl   Amiga issue?  -- Jon
+dnl   Amiga issue?  -- Jon  /dsssl/docbook/html/docbook.dsl
 DKPREFIXCOPY=$DKPREFIX
 DKPREFIX=false
 for i in $DKPREFIXCOPY /usr/share/sgml/docbook/stylesheet/dsssl/modular \
@@ -1170,7 +1171,7 @@ for i in $DKPREFIXCOPY /usr/share/sgml/docbook/stylesheet/dsssl/modular \
         if test -f $i/html/docbook.dsl; then
                 echo "yes"
                 DKPREFIX=$i
-                break
+                break 
         else
                 echo "no"
         fi
@@ -1256,3 +1257,14 @@ AC_SUBST(SPECIAL_CFLAGS)
 AC_SUBST(PTHREAD_LIB)
 
 AC_OUTPUT(GNUmakefile doc/source/ldp.dsl doc/source/GNUmakefile)
+
+dnl hb:
+echo $prefix
+echo $exec_prefix
+echo $bindir
+echo $sbindir
+echo $sysconfdir
+echo $datadir
+echo $mandir
+echo $localstatedir
+echo host: $host