Mailing List Archive

rse 98/04/16 10:30:49

Modified: . STATUS
src CHANGES Configure
Log:
Make sure src/Configure only complains about old paths when
not running under APACI's control.

Submitted by: Lars Eilebrecht
Reviewed by: Ralf S. Engelschall

Revision Changes Path
1.299 +2 -0 apache-1.3/STATUS

Index: STATUS
===================================================================
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- STATUS 1998/04/16 00:33:45 1.298
+++ STATUS 1998/04/16 17:30:45 1.299
@@ -57,6 +57,8 @@

Committed Code Changes:

+ * Lars' Configure fix to avoid confusing message under APACI control
+
Available Patches:

* Arnt Gulbrandsen <agulbra@troll.no> 03 Apr 1998 21:28:17 +0200



1.770 +5 -0 apache-1.3/src/CHANGES

Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.769
retrieving revision 1.770
diff -u -r1.769 -r1.770
--- CHANGES 1998/04/15 17:10:17 1.769
+++ CHANGES 1998/04/16 17:30:46 1.770
@@ -1,3 +1,8 @@
+Changes with Apache 1.3b7
+
+ *) Make sure src/Configure doesn't complain about the old directory
+ /usr/local/etc/httpd/ when APACI is used. [Lars Eilebrecht]
+
Changes with Apache 1.3b6

*) PORT: Clean up warnings on Ultrix and HPUX. [Ben Hyde]



1.239 +4 -1 apache-1.3/src/Configure

Index: Configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- Configure 1998/04/15 17:10:18 1.238
+++ Configure 1998/04/16 17:30:47 1.239
@@ -186,8 +186,10 @@
## that the user was using the old default root directory
## and issue a notice about it.
##
-if [ -d /usr/local/etc/httpd/ ]
+if [ $file != "Configuration.apaci" ]
then
+ if [ -d /usr/local/etc/httpd/ ]
+ then
if egrep '^EXTRA_CFLAGS.*HTTPD_ROOT' $file >/dev/null
then
:
@@ -199,6 +201,7 @@
echo " | httpd with the option '-d /usr/local/etc/httpd' if you still"
echo " | want to use the old root directory for your server."
fi
+ fi
fi

####################################################################