randy 98/12/13 17:03:32
Modified: . Makefile.tmpl configure
Log:
Pattern matches changed to allow --enable-shared=blah_blah.module
Revision Changes Path
1.55 +1 -1 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- Makefile.tmpl 1998/12/13 02:08:58 1.54
+++ Makefile.tmpl 1998/12/14 01:03:31 1.55
@@ -286,7 +286,7 @@
sed -e 's:SharedModule:AddModule:' \
-e 's:modules/[^/]*/::' \
-e 's:[ ]lib: mod_:' \
- -e 's:\.[soa]*$$:.c:' >>$(SRC)/.apaci.install.conf; \
+ -e 's:\.[soam].*$$:.c:' >>$(SRC)/.apaci.install.conf; \
fi
@echo "<=== [programs]"
1.61 +3 -4 apache-1.3/configure
Index: configure
===================================================================
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- configure 1998/12/13 22:43:07 1.60
+++ configure 1998/12/14 01:03:31 1.61
@@ -234,8 +234,7 @@
fi
module=`echo "$module" |\
sed -e 's%^.*/\(.*\)$%\1%' \
- -e 's/\.[oa]$//' \
- -e 's/\.module$//' \
+ -e 's/\.[oam].*$//' \
-e 's/^mod_//' \
-e 's/^lib//'`
eval "module_$module=$add"
@@ -1161,7 +1160,7 @@
for line in `cat src/Configuration.tmpl $addconf | egrep '^[#
]*(Add|Shared)Module'`; do
name=`echo "$line" |\
sed -e 's%^.*/\(.*\)$%\1%' \
- -e 's/\.[oa]$//' \
+ -e 's/\.[oam].*$//' \
-e 's/^mod_//' \
-e 's/^lib//'`
echo "${name}:${line}"
@@ -1239,7 +1238,7 @@
fi
eval "share=\$shared_$module"
if [ $share = yes ]; then
- echo $SEO
"s%^\\(.*\\)AddModule\\(.*[_b/]$module\\.\\)[oa]\\(.*\\)%\\1SharedModule\\2so\\3%g"
>>$sedsubst
+ echo $SEO
"s%^\\(.*\\)AddModule\\(.*[_b/]$module\\.\\)[oam].*\\(.*\\)%\\1SharedModule\\2so\\3%g"
>>$sedsubst
m="yes [shared]"
fi
if [ $verbose = yes ]; then
