From: hno <>
Date: Tue, 22 Oct 2002 14:14:45 +0000 (+0000)
Subject: Even more pthreads fixes. We have too much magics in pthreads detection.
X-Git-Tag: SQUID_3_0_PRE1~585
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e685e3c6b0173448107e025a0fa6c184d2c715e4;p=thirdparty%2Fsquid.git

Even more pthreads fixes. We have too much magics in pthreads detection.
---

diff --git a/configure.in b/configure.in
index 0d94992a6e..f59e1afab1 100644
--- a/configure.in
+++ b/configure.in
@@ -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.300 2002/10/22 08:07:03 hno Exp $
+dnl  $Id: configure.in,v 1.301 2002/10/22 08:14:45 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.300 $)dnl
+AC_REVISION($Revision: 1.301 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -311,26 +311,6 @@ 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
-            if test -z "$PRESET_LDFLAGS"; then
-                LDFLAGS="$LDFLAGS -pthread"
-            fi
-        fi
-    ;;
-    *-solaris2.*)
-        if test "$GCC" = "yes" ; then
-	    CFLAGS="$CFLAGS -pthreads"
-	    CXXFLAGS="$CXXFLAGS -pthreads"
-	else
-	    CFLAGS="$CFLAGS -mt"
-	    CXXFLAGS="$CXXFLAGS -mt"
-        fi
-    ;;
-    esac
 fi
 
 AC_ARG_WITH(aio,
@@ -1593,6 +1573,26 @@ fi
 dnl Check for pthreads
 dnl We use pthreads when doing ASYNC I/O
 if test "$with_pthreads" = "yes"; then
+    CFLAGS="$CFLAGS -D_REENTRANT"
+    CXXFLAGS="$CXXFLAGS -D_REENTRANT"
+    case "$host" in
+    i386-unknown-freebsd*)
+        if test "$GCC" = "yes" ; then
+            if test -z "$PRESET_LDFLAGS"; then
+                LDFLAGS="$LDFLAGS -pthread"
+            fi
+        fi
+    ;;
+    *-solaris2.*)
+        if test "$GCC" = "yes" ; then
+	    CFLAGS="$CFLAGS -pthreads"
+	    CXXFLAGS="$CXXFLAGS -pthreads"
+	else
+	    CFLAGS="$CFLAGS -mt"
+	    CXXFLAGS="$CXXFLAGS -mt"
+        fi
+    ;;
+    esac
     AC_CHECK_LIB(pthread, main)
 fi