Summary: Fix bug #562, bootstrap when no $SHELL set.

Keywords:

* Move AM_C[XX]FLAGS definitions into configure.in as SQUID_C[XX]FLAGS
* Remove $SHELL usage from bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 0063602f6aeef238ce663713bfd9a90dd4c1766f..59c63a5cc7a62d0f8926a4f761a05a9162d4bec4 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -70,5 +70,5 @@ bootstrap autoconf$acver
 
 echo "Autotool bootstrapping complete."
 echo "bootstrapping sub projects."
-cd lib/libTrie && $SHELL ./bootstrap.sh
+cd lib/libTrie && ./bootstrap.sh
 

diff --git a/configure.in b/configure.in
index 6c97bee8b1a2ca40a7ab836c5d8a4076fcdcd7ad..d87a99c25365dcf975cfcae7d49bbddf48466ff6 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.328 2003/03/10 04:55:33 robertc Exp $
+dnl  $Id: configure.in,v 1.329 2003/03/11 22:11:37 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.328 $)dnl
+AC_REVISION($Revision: 1.329 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -122,6 +122,17 @@ if test -z "$PRESET_CFLAGS"; then
     fi
 fi
 
+dnl set squid required flags
+if test "$GCC" = "yes"; then
+  SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
+  SQUID_CXXFLAGS="$SQUID_CFLAGS"
+else
+  SQUID_CFLAGS=
+  SQUID_CXXFLAGS=
+fi
+AC_SUBST(SQUID_CFLAGS)
+AC_SUBST(SQUID_CXXFLAGS)
+
 dnl Set LDFLAGS
 if test -z "$PRESET_LDFLAGS"; then
     if test "$GCC" = "yes"; then

diff --git a/src/Makefile.am b/src/Makefile.am
index 0239761640d3c848d295f06c65b3b214451b8114..4a667fec49478a82dc3777ab711b9358a176cb56 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.65 2003/03/10 04:56:36 robertc Exp $
+#  $Id: Makefile.am,v 1.66 2003/03/11 22:11:38 robertc Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -134,8 +134,8 @@ else
 ARP_ACL_SOURCE =
 endif
 
-AM_CFLAGS = -Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments
-AM_CXXFLAGS = -Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments
+AM_CFLAGS = @SQUID_CFLAGS@
+AM_CXXFLAGS = @SQUID_CXXFLAGS@
 
 SUBDIRS                = fs repl auth
 

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index 7f691e89dd6b714967952c634d9706a0c88b202e..8b1e084008ab13bb28587bfc8308ba324e565448 100644 (file)
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -1,9 +1,10 @@
 #  Makefile for authentication modules in the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.3 2003/01/23 00:37:50 robertc Exp $
+#  $Id: Makefile.am,v 1.4 2003/03/11 22:11:39 robertc Exp $
 #
 AUTOMAKE_OPTIONS = subdir-objects
-AM_CXXFLAGS = -Werror -Wall
+AM_CFLAGS = @SQUID_CFLAGS@
+AM_CXXFLAGS = @SQUID_CXXFLAGS@
 
 ##DIST_SUBDIRS = basic digest ntlm
 ##SUBDIRS              = @AUTH_MODULES@

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 5e9342685fa3472861f0b15ca5639765f3026bb4..c01b8717c45b0eea6c212bbbfa61280335cc7100 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -1,11 +1,11 @@
 #  Makefile for storage modules in the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.6 2003/02/02 12:55:27 robertc Exp $
+#  $Id: Makefile.am,v 1.7 2003/03/11 22:11:39 robertc Exp $
 #
 
 AUTOMAKE_OPTIONS = subdir-objects
-AM_CFLAGS = -Werror -Wall
-AM_CXXFLAGS = -Werror -Wall
+AM_CFLAGS = @SQUID_CFLAGS@
+AM_CXXFLAGS = @SQUID_CXXFLAGS@
 
 DIST_SUBDIRS   = aufs coss diskd null ufs
 

diff --git a/src/repl/Makefile.am b/src/repl/Makefile.am
index 8021f84023a487d22398302b3d6e154fc23c4948..4d4eadfdc0458beb94a4890187febb07662d36e3 100644 (file)
--- a/src/repl/Makefile.am
+++ b/src/repl/Makefile.am
@@ -1,11 +1,11 @@
 #  Makefile for storage modules in the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.5 2003/01/23 00:38:25 robertc Exp $
+#  $Id: Makefile.am,v 1.6 2003/03/11 22:11:40 robertc Exp $
 #
 
 AUTOMAKE_OPTIONS = subdir-objects
-AM_CFLAGS = -Werror -Wall
-AM_CXXFLAGS = -Werror -Wall
+AM_CFLAGS = @SQUID_CFLAGS@
+AM_CXXFLAGS = @SQUID_CXXFLAGS@
 
 # No recursion is needed for the subdirs, we build from here. // @REPL_POLICIES@