Fix the longstanding bug that errors (returned by src/Configure)

would not be noticed by the top level configure script.
That was bad for automated production environments, as errors would
go thru unnoticed, and caused havoc much later in the production.

Reviewed by:	Jim Jagielski

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@93219 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/configure b/configure
index 957860dbd2ef315bc480b7cfba5836523cab3948..05b624feeaa2242d41e092545381a0f980db6c37 100755 (executable)
--- a/configure
+++ b/configure
@@ -1582,14 +1582,15 @@ rm -f $tplconf 2>/dev/null
 if [ "x$verbose" = "xyes" ]; then
     vflag="-v";
 fi
-if [ "x$quiet" = "xyes" ]; then
-    (cd $src; ./Configure ${vflag} -file Configuration.apaci >/dev/null);
+rc=`if [ "x$quiet" = "xyes" ]; then
+    (cd $src; ./Configure ${vflag} -file Configuration.apaci >/dev/null; echo $? >&3; );
 else
-    (cd $src; ./Configure ${vflag} -file Configuration.apaci |\
+    (cd $src; ( ./Configure ${vflag} -file Configuration.apaci; echo $? >&3; ) |\
      sed -e '/^Using config file:.*/d' \
          -e "s:Makefile in :Makefile in $src\\/:" \
          -e "s:Makefile\$:Makefile in $src:")
-fi
+fi 3>&1 1>&2`
+[ $rc = 0 ] || exit 1
 
 ##
 ##  final hints

diff --git a/src/CHANGES b/src/CHANGES
index c337098c0e5ad73ac01cffbb7965190d5d8457c5..bc2ad330bd7a599a7f2da9c6bf1e47624233e2ad 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 1.3.24
 
+  *) Fix the longstanding bug that errors (returned by src/Configure)
+     would not be noticed by the top level configure script.
+     That was bad for automated configurations. [Martin Kraemer]
+
   *) Link with -lpthread on Solaris since we reference pthread
      functions for the accept mutex.  Previously, the link step
      would succeed but we would link to bogus versions of the

diff --git a/src/Configure b/src/Configure
index 8d7bd8c55f787be4f166fbb14c2d619b200b42d0..620cd13317bf10f2266ef52bb970cfe51226f9c9 100755 (executable)
--- a/src/Configure
+++ b/src/Configure
@@ -2398,7 +2398,7 @@ else
       echo "** Apache requires an ANSI C Compiler, such as gcc. "
       echo ""
       echo "======== Error Output for sanity check ========"
-      (./helpers/TestCompile -v sanity)
+      (./helpers/TestCompile -v sanity) 2>&1
       echo "============= End of Error Report ============="
       echo ""
       echo " Aborting!"