From: Sascha Schumann Date: Sun, 11 Jun 2000 11:44:50 +0000 (+0000) Subject: Split generating Makefiles and creating config_vars.mk. X-Git-Tag: APACHE_2_0_ALPHA_5~377 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1825b9845d7f684302b10ecb58689ed835b8453b;p=apache Split generating Makefiles and creating config_vars.mk. The Makefiles are now rebuilt, when you run config.status. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85512 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/acinclude.m4 b/acinclude.m4 index b5c8359d90..bff59b5d94 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -49,9 +49,9 @@ AC_DEFUN(APACHE_MKDIR_P_CHECK,[ ]) ]) -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 @@ AC_DEFUN(APACHE_FAST_GENERATE,[ 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 ]) diff --git a/configure.in b/configure.in index 445dfae559..7ca6019e43 100644 --- a/configure.in +++ b/configure.in @@ -175,10 +175,10 @@ AC_ARG_WITH(program-name, 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 @@ AC_TYPE_RLIM_T 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 +])