You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sa...@locus.apache.org on 2000/06/11 13:44:51 UTC
cvs commit: apache-2.0/src acinclude.m4 configure.in
sascha 00/06/11 04:44:51
Modified: src acinclude.m4 configure.in
Log:
Split generating Makefiles and creating config_vars.mk.
The Makefiles are now rebuilt, when you run config.status.
Revision Changes Path
1.33 +8 -3 apache-2.0/src/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -u -r1.32 -r1.33
--- acinclude.m4 2000/06/10 12:02:26 1.32
+++ acinclude.m4 2000/06/11 11:44:50 1.33
@@ -49,9 +49,9 @@
])
])
-dnl APACHE_FAST_GENERATE
-dnl Creates Makefiles and config_vars.mk
-AC_DEFUN(APACHE_FAST_GENERATE,[
+dnl APACHE_GEN_CONFIG_VARS
+dnl Creates config_vars.mk
+AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
APACHE_SUBST(abs_srcdir)
APACHE_SUBST(bindir)
APACHE_SUBST(cgidir)
@@ -82,6 +82,11 @@
for i in $APACHE_VAR_SUBST; do
eval echo "$i = \$$i" >> config_vars.mk
done
+])
+
+dnl APACHE_GEN_MAKEFILES
+dnl Creates Makefiles
+AC_DEFUN(APACHE_GEN_MAKEFILES,[
$SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $APACHE_FAST_OUTPUT_FILES
])
1.54 +6 -4 apache-2.0/src/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/configure.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -u -r1.53 -r1.54
--- configure.in 2000/06/11 10:46:59 1.53
+++ configure.in 2000/06/11 11:44:50 1.54
@@ -175,10 +175,10 @@
progname="$withval" ], [
progname="httpd"] )
-APACHE_FAST_OUTPUT(Makefile ap/Makefile lib/Makefile main/Makefile
- modules/Makefile os/Makefile support/Makefile)
+APACHE_FAST_OUTPUT(Makefile ap/Makefile lib/Makefile main/Makefile)
+APACHE_FAST_OUTPUT(modules/Makefile os/Makefile support/Makefile)
-APACHE_FAST_GENERATE
+APACHE_GEN_CONFIG_VARS
dnl There needs to be a .deps file in the top build directory.
dnl All others are created dynamically by rules.mk.
@@ -216,6 +216,8 @@
perlbin=`$srcdir/helpers/PrintPath perl`
AC_SUBST(perlbin)
-AC_OUTPUT($APACHE_OUTPUT_FILES support/apxs)
+AC_OUTPUT($APACHE_OUTPUT_FILES support/apxs,,[
+ APACHE_GEN_MAKEFILES
+])