rse 00/02/05 06:29:00
Modified: src CHANGES
. configure
Log:
Avoid infinite looping in APACI's configure script
inside Ultrix' /bin/sh5 upgrade step.
Submitted by: Jan Gallo <[EMAIL PROTECTED]>, Ralf S. Engelschall
Reviewed by: Ralf S. Engelschall
PR: 4940
Revision Changes Path
1.1511 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1510
retrieving revision 1.1511
diff -u -r1.1510 -r1.1511
--- CHANGES 2000/02/05 14:15:41 1.1510
+++ CHANGES 2000/02/05 14:28:54 1.1511
@@ -1,5 +1,9 @@
Changes with Apache 1.3.12
+ *) Avoid infinite looping in APACI's configure script
+ inside Ultrix' /bin/sh5 upgrade step.
+ [Jan Gallo <[EMAIL PROTECTED]>, Ralf S. Engelschall] PR#4940
+
*) PORT: Add support for Amdahl UTS 4.3 and later.
[Dave Dykstra <[EMAIL PROTECTED]>] PR#5654
1.119 +7 -1 apache-1.3/configure
Index: configure
===================================================================
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- configure 2000/02/05 09:57:15 1.118
+++ configure 2000/02/05 14:28:59 1.119
@@ -68,7 +68,13 @@
##
## avoid brain dead shells on Ultrix and friends
##
-test -f /bin/sh5 && exec /bin/sh5 $0 "$@"
+if [ -f /bin/sh5 ]; then
+ if [ ".$APACI_SH5_UPGRADE_STEP" != .done ]; then
+ APACI_SH5_UPGRADE_STEP=done
+ export APACI_SH5_UPGRADE_STEP
+ exec /bin/sh5 $0 "$@"
+ fi
+fi
##
## the paths to the Apache source tree