bootstrap

diff --git a/configure b/configure
index 613a3e8045e802d8ecd5f74972d709fb87a97f3a..be688cb7a2e51194fb531f7f530aaceda2aad23a 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.298 .
+# From configure.in Revision: 1.299 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53.
 #
@@ -4123,7 +4123,6 @@ if test "${with_pthreads+set}" = set; then
 fi;
 if test "$with_pthreads" = "yes"; then
     echo "With pthreads"
-    CFLAGS="$CFLAGS -D_REENTRANT"
     case "$host" in
     i386-unknown-freebsd*)
         if test "$GCC" = "yes" ; then
@@ -4135,8 +4134,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
@@ -4213,6 +4214,10 @@ done
 
 
 
+if test "$with_pthreads"; then
+  CFLAGS="$CFLAGS -D_REENTRANT"
+  CXXFLAGS="$CXXFLAGS -D_REENTRANT"
+fi
 
 # Check whether --enable-heap-replacement or --disable-heap-replacement was given.
 if test "${enable_heap_replacement+set}" = set; then
@@ -4796,6 +4801,7 @@ if test "${enable_large_files+set}" = set; then
    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
 
 fi;
@@ -14359,6 +14365,7 @@ case "$host" in
                ;;
        *m88k*)
                CFLAGS="$CFLAGS -D_SQUID_MOTOROLA_"
+               CXXFLAGS="$CXXFLAGS -D_SQUID_MOTOROLA_"
 
 cat >>confdefs.h <<\_ACEOF
 #define GETTIMEOFDAY_NO_TZP 1