set REENTRANT for pthreads, and do so for CXXFLAGS as well

diff --git a/configure.in b/configure.in
index 19dda0e3cfcd38bb2c51d8f3e513519bd6b5eae5..9770d2219cbed7d958f28f2fde04e51daa7b0867 100644 (file)
--- 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.298 2002/10/19 01:23:22 robertc Exp $
+dnl  $Id: configure.in,v 1.299 2002/10/21 23:53:22 robertc 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.298 $)dnl
+AC_REVISION($Revision: 1.299 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -309,7 +309,6 @@ AC_ARG_WITH(pthreads,
 [  --with-pthreads         Use POSIX Threads])
 if test "$with_pthreads" = "yes"; then
     echo "With pthreads"
-    CFLAGS="$CFLAGS -D_REENTRANT"
     case "$host" in
     i386-unknown-freebsd*)
         if test "$GCC" = "yes" ; then
@@ -321,8 +320,10 @@ if test "$with_pthreads" = "yes"; then
     *-solaris2.*)
         if test "$GCC" = "yes" ; then
            CFLAGS="$CFLAGS -pthreads"
+           CXXFLAGS="$CXXFLAGS -pthreads"
        else
            CFLAGS="$CFLAGS -mt"
+           CXXFLAGS="$CXXFLAGS -mt"
         fi
     ;;
     esac
@@ -395,6 +396,10 @@ 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,
@@ -806,6 +811,7 @@ AC_ARG_ENABLE(large-files,
 [ if test "$enableval" = "yes" ; then
        echo "Large file support enabled"
        CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64"
+       CXXFLAGS="$CXXFLAGS -D_FILE_OFFSET_BITS=64"
   fi
 ])
 
@@ -1640,6 +1646,7 @@ dnl during compile.
                ;;
        *m88k*)
                CFLAGS="$CFLAGS -D_SQUID_MOTOROLA_"
+               CXXFLAGS="$CXXFLAGS -D_SQUID_MOTOROLA_"
                AC_DEFINE(GETTIMEOFDAY_NO_TZP,1,[If gettimeofday is known to take only one argument])
                ;;
        [*-*-solaris2.[0-4]])