]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Minor fix of the _REENTRANT issue on --enable-async-io. --enable-async-io
authorhno <>
Tue, 22 Oct 2002 14:07:03 +0000 (14:07 +0000)
committerhno <>
Tue, 22 Oct 2002 14:07:03 +0000 (14:07 +0000)
needs to trigger a --enable-pthreads, not just -D_REENTRANT.

configure.in

index 9770d2219cbed7d958f28f2fde04e51daa7b0867..0d94992a6e0cbd64348cdb174c954651e7f2c54c 100644 (file)
@@ -3,7 +3,7 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.299 2002/10/21 23:53:22 robertc Exp $
+dnl  $Id: configure.in,v 1.300 2002/10/22 08:07:03 hno Exp $
 dnl
 dnl
 dnl
@@ -13,7 +13,7 @@ AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 3.0-DEVEL)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.299 $)dnl
+AC_REVISION($Revision: 1.300 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -283,12 +283,14 @@ AC_ARG_ENABLE(async-io,
                           --enable-storeio=ufs,aufs],
 [ case $enableval in
   yes)
+       with_pthreads="yes"
        STORE_MODULES="ufs aufs"
     ;;
   no)
     ;;
   *)
        aufs_io_threads=$enableval
+       with_pthreads="yes"
        STORE_MODULES="ufs aufs"
     ;;
   esac
@@ -309,6 +311,8 @@ AC_ARG_WITH(pthreads,
 [  --with-pthreads         Use POSIX Threads])
 if test "$with_pthreads" = "yes"; then
     echo "With pthreads"
+    CFLAGS="$CFLAGS -D_REENTRANT"
+    CXXFLAGS="$CXXFLAGS -D_REENTRANT"
     case "$host" in
     i386-unknown-freebsd*)
         if test "$GCC" = "yes" ; then
@@ -396,11 +400,6 @@ done
 AC_SUBST(STORE_MODULES)
 AC_SUBST(STORE_MODULE_SUBDIRS)
 
-if test "$with_pthreads"; then
-  CFLAGS="$CFLAGS -D_REENTRANT"
-  CXXFLAGS="$CXXFLAGS -D_REENTRANT"
-fi
-
 dnl --enable-heap-replacement compability option
 AC_ARG_ENABLE(heap-replacement,
 [  --enable-heap-replacement