Summary: Use SQUID_C[XX]FLAGS throughout configure.

Keywords:

Where we are setting defines etc. that are required to build squid correctly, set them via SQUID_C[XX]FLAGS, not C[XX]FLAGS, so that the user can override the user-related flags (i.e. optimisation / profiling / debugging) without breaking the squid build.

diff --git a/configure.in b/configure.in
index 89a535ec5e02b70ab7b3796db3eb2075c357756f..09004e073d641000a7dda97f0037331c5b83b252 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.344 2003/08/14 14:36:59 robertc Exp $
+dnl  $Id: configure.in,v 1.345 2003/08/16 00:19:55 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-PRE2-CVS)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.344 $)dnl
+AC_REVISION($Revision: 1.345 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -939,8 +939,8 @@ AC_ARG_ENABLE(large-files,
                           experimental.],
 [ if test "$enableval" = "yes" ; then
        echo "Large file support enabled"
-       CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64"
-       CXXFLAGS="$CXXFLAGS -D_FILE_OFFSET_BITS=64"
+       SQUID_CFLAGS="$SQUID_CFLAGS -D_FILE_OFFSET_BITS=64"
+       SQUID_CXXFLAGS="$SQUID_CXXFLAGS -D_FILE_OFFSET_BITS=64"
   fi
 ])
 
@@ -1773,8 +1773,8 @@ 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"
+    SQUID_CFLAGS="$SQUID_CFLAGS -D_REENTRANT"
+    SQUID_CXXFLAGS="$SQUID_CXXFLAGS -D_REENTRANT"
     case "$host" in
     i386-unknown-freebsd*)
         if test "$GCC" = "yes" ; then
@@ -1785,11 +1785,11 @@ if test "$with_pthreads" = "yes"; then
     ;;
     *-solaris2.*)
         if test "$GCC" = "yes" ; then
-           CFLAGS="$CFLAGS -pthreads"
-           CXXFLAGS="$CXXFLAGS -pthreads"
+           SQUID_CFLAGS="$SQUID_CFLAGS -pthreads"
+           SQUID_CXXFLAGS="$SQUID_CXXFLAGS -pthreads"
        else
-           CFLAGS="$CFLAGS -mt"
-           CXXFLAGS="$CXXFLAGS -mt"
+           SQUID_CFLAGS="$SQUID_CFLAGS -mt"
+           SQUID_CXXFLAGS="$SQUID_CXXFLAGS -mt"
         fi
     ;;
     esac
@@ -1848,8 +1848,8 @@ dnl during compile.
                esac
                ;;
        *m88k*)
-               CFLAGS="$CFLAGS -D_SQUID_MOTOROLA_"
-               CXXFLAGS="$CXXFLAGS -D_SQUID_MOTOROLA_"
+               SQUID_CFLAGS="$SQUID_CFLAGS -D_SQUID_MOTOROLA_"
+               SQUID_CXXFLAGS="$SQUID_CXXFLAGS -D_SQUID_MOTOROLA_"
                AC_DEFINE(GETTIMEOFDAY_NO_TZP,1,[If gettimeofday is known to take only one argument])
                ;;
        [*-*-solaris2.[0-4]])

diff --git a/snmplib/Makefile.am b/snmplib/Makefile.am
index f7c4949d86f1aed773442c09b7880a1d7e3bedf0..b86226c51e8689720efc47081230be45992b76eb 100644 (file)
--- a/snmplib/Makefile.am
+++ b/snmplib/Makefile.am
@@ -2,6 +2,8 @@
 ##
 ## Makefile for libsnmp.
 ## 
+AM_CFLAGS = @SQUID_CFLAGS@
+AM_CXXFLAGS = @SQUID_CXXFLAGS@
 noinst_LIBRARIES = libsnmp.a
 libsnmp_a_SOURCES  = asn1.c parse.c snmp_vars.c \
        coexistance.c snmp_api.c snmp_error.c  \