diff options
| author | Manoj Kasichainula <manoj@apache.org> | 2000-03-31 04:38:33 +0200 |
|---|---|---|
| committer | Manoj Kasichainula <manoj@apache.org> | 2000-03-31 04:38:33 +0200 |
| commit | 98ebd36301807a8b08e3b08564b2d763889df683 (patch) | |
| tree | 1e406db0540d3617e2abb253ec708a51b0166762 /configure.in | |
| parent | Remove a trailing slash from library.mk. This slash was causing problems (diff) | |
| download | apache2-98ebd36301807a8b08e3b08564b2d763889df683.tar.xz apache2-98ebd36301807a8b08e3b08564b2d763889df683.zip | |
Eliminate src/apaci, and replace with a header file containing paths:
include/ap_config_path.h.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84871 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 8c15a74653..fdc678f6dd 100644 --- a/configure.in +++ b/configure.in @@ -147,18 +147,34 @@ if test "$apache_need_shared" = "yes"; then $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh fi -EXTRA_CFLAGS="$EXTRA_CFLAGS \`\$(abs_srcdir)/apaci\`" - -APACHE_FAST_OUTPUT(apaci Makefile ap/Makefile lib/Makefile main/Makefile - modules/Makefile os/Makefile) +APACHE_FAST_OUTPUT(Makefile ap/Makefile lib/Makefile main/Makefile + modules/Makefile os/Makefile) APACHE_FAST_GENERATE dnl ## Build modules.c rm -f $srcdir/modules.c echo $MODLIST | $AWK -f $srcdir/helpers/build-modules-c.awk > $srcdir/modules.c -AC_SUBST(prefix) +AC_OUTPUT_COMMANDS([ +echo '/* Generated by configure */' > ${path_h}.new +echo "#define HTTPD_ROOT \"$prefix\"" >> ${path_h}.new +echo "#define SUEXEC_BIN \"$bindir/suexec\"" >> ${path_h}.new + +cmp ${path_h}.new ${path_h} >/dev/null 2>&1 +if test $? -ne 0 ; then + rm -f ${path_h} && mv ${path_h}.new ${path_h} && \ + echo "Updated ${path_h}" +else + rm -f ${path_h}.new && \ + echo "${path_h} unchanged" +fi +],[ +path_h=./include/ap_config_path.h +prefix=$prefix +exec_prefix=$exec_prefix +bindir=$bindir +]) -AC_OUTPUT($APACHE_OUTPUT_FILES apaci, chmod 744 apaci) +AC_OUTPUT($APACHE_OUTPUT_FILES) |