rse 99/09/27 00:25:08
Modified: src Makefile.tmpl Configure
Log:
Cleanup build environment:
1. As I said in the past, the extra apr step-down in src/Makefile.tmpl
is not needed, because APR is build automatically from src/lib/Makefile.
2. the SUBDIRS="$SUBDIRS" in src/Configure seems useless to me
and it at least didn't make a difference after removing, of course.
3. make sure we stop if APR failed to configure.
4. Let APR and the libs build before the src/main/ stuff, i.e. bundle the os
and libs stuff together and let them build first. This way we build bottom
up: lib+os, main, modules, etc. It also gives APR a chance to setup
more stuff before it is used by other parts.
5. While I'm here, fix the optic of the MPM config step:
| + checking for system header files
| + adding selected modules
| - using MPM method: prefork
| o rewrite_module uses ConfigStart/End
| enabling DBM support for mod_rewrite
| o dbm_auth_module uses ConfigStart/End
| + configuring Apache Portable Runtime (APR)
| + checking sizeof various data types
Revision Changes Path
1.9 +1 -4 apache-2.0/src/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /home/cvs/apache-2.0/src/Makefile.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.tmpl 1999/09/23 19:07:53 1.8
+++ Makefile.tmpl 1999/09/27 07:25:06 1.9
@@ -28,10 +28,7 @@
@echo "++ If not, you will at least have to touch '@@Configuration@@'."
@false
-apr:
- cd lib/apr; make
-
-$(TARGET): apr $(EXTRA_DEPS) $(SUBTARGET)
+$(TARGET): $(EXTRA_DEPS) $(SUBTARGET)
target_static: subdirs modules.o
$(CC) -c $(INCLUDES) $(CFLAGS) buildmark.c
1.5 +9 -7 apache-2.0/src/Configure
Index: Configure
===================================================================
RCS file: /home/cvs/apache-2.0/src/Configure,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Configure 1999/09/10 16:06:53 1.4
+++ Configure 1999/09/27 07:25:07 1.5
@@ -1592,7 +1592,7 @@
# First, add the shadow MPM method module
echo "AddModule modules/mpm/$MPM_METHOD/lib$MPM_METHOD.a" >> $tmpfile
-echo " - using MPM method: $MPM_METHOD "
+echo " o using MPM method: $MPM_METHOD "
MODFILES=`awk <$tmpfile '($1 == "AddModule" || $1 == "SharedModule") {
printf "%s ", $2 }'`
MODDIRS=`awk < $tmpfile '
@@ -1722,15 +1722,17 @@
fi
####################################################################
-
-SUBDIRS="$SUBDIRS"
-
-####################################################################
## Add in the APR library.
##
if [ -d ./lib/apr ]; then
echo " + configuring Apache Portable Runtime (APR)"
- (cd lib/apr && CC="$CC" CFLAGS="$EXTRA_CFLAGS" ./configure >/dev/null)
+ cd lib/apr
+ CC="$CC" CFLAGS="$EXTRA_CFLAGS" ./configure >/dev/null
+ if [ $? -ne 0 ]; then
+ echo "** FAILED to configure APR"
+ exit 1
+ fi
+ cd ../..
APRLIB=""
for lib in apr file network lock misc sig threadproc time; do
APRLIB="$APRLIB \$(SRCDIR)/lib/apr/libs/lib${lib}.a"
@@ -1981,7 +1983,7 @@
####################################################################
## Now add the target for the main Makefile
##
-echo "SUBDIRS=$SUBDIRS lib modules" >> Makefile
+echo "SUBDIRS=lib $SUBDIRS modules" >> Makefile
echo "SUBTARGET=$SUBTARGET" >> Makefile
echo "SHLIB_SUFFIX_NAME=$SHLIB_SUFFIX_NAME" >> Makefile
echo "SHLIB_SUFFIX_LIST=$SHLIB_SUFFIX_LIST" >> Makefile
