rse 98/04/17 11:49:38
Modified: . STATUS
src CHANGES Configure
Log:
Make sure some AWK's don't fail in src/Configure with "string too long" errors
when generating the MODULES entry for src/Makefile
Submitted by: Ralf S. Engelschall
Reviewed by: Ben Hyde, Ralf S. Engelschall
Revision Changes Path
1.300 +1 -0 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- STATUS 1998/04/16 17:30:45 1.299
+++ STATUS 1998/04/17 18:49:34 1.300
@@ -58,6 +58,7 @@
Committed Code Changes:
* Lars' Configure fix to avoid confusing message under APACI control
+ * Ralf's Configure fix for AWK's failing with "string to long" error
Available Patches:
1.771 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.770
retrieving revision 1.771
diff -u -r1.770 -r1.771
--- CHANGES 1998/04/16 17:30:46 1.770
+++ CHANGES 1998/04/17 18:49:35 1.771
@@ -1,5 +1,9 @@
Changes with Apache 1.3b7
+ *) PORT: Make sure some AWK's don't fail in src/Configure with "string too
+ long" errors when generating the MODULES entry for src/Makefile
+ [Ben Hyde, Ralf S. Engelschall]
+
*) Make sure src/Configure doesn't complain about the old directory
/usr/local/etc/httpd/ when APACI is used. [Lars Eilebrecht]
1.240 +4 -6 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- Configure 1998/04/16 17:30:47 1.239
+++ Configure 1998/04/17 18:49:36 1.240
@@ -1362,12 +1362,10 @@
## Now add the auto-generated library targets. Need to use awk so we
## don't hang a continuation on the last line.
##
-$CAT > $awkfile <<EOF3
- BEGIN {
- split ("$AUTOLIBS", libs)
-EOF3
-$CAT >> $awkfile <<'EOF4'
+$CAT > $awkfile <<'EOF4'
+ {
z = 0
+ split ($0, libs)
for ( lib in libs ) {
if (z != 0)
printf (" \\\n")
@@ -1379,7 +1377,7 @@
printf ("\n")
}
EOF4
-awk -f $awkfile >>Makefile </dev/null
+echo "$AUTOLIBS" | awk -f $awkfile >>Makefile
echo "" >>Makefile
####################################################################
