Fix prefix handling. Before this patch, when using --prefix on the

configure line, the binary ignored it when setting HTTPD_ROOT.  This
patch fixes that problem.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84595 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/configure.in b/configure.in
index 47b6dc4d25cdfbf19e05c57edf59a36fdfc0a7bb..e8818d26caf4887c39dba54ed7660a89bfb30e2e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -147,7 +147,9 @@ if test "$apache_need_shared" = "yes"; then
   $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh
 fi
 
-APACHE_FAST_OUTPUT(Makefile ap/Makefile lib/Makefile main/Makefile
+CFLAGS="$CFLAGS \`\$(abs_srcdir)/apaci\`"
+
+APACHE_FAST_OUTPUT(apaci Makefile ap/Makefile lib/Makefile main/Makefile
            modules/Makefile os/Makefile)
 APACHE_FAST_GENERATE
        
@@ -155,4 +157,7 @@ dnl ## Build modules.c
 rm -f $srcdir/modules.c
 echo $MODLIST | $AWK -f $srcdir/helpers/build-modules-c.awk > $srcdir/modules.c
 
-AC_OUTPUT($APACHE_OUTPUT_FILES)
+AC_SUBST(prefix)
+
+AC_OUTPUT($APACHE_OUTPUT_FILES apaci)
+chmod 744 apaci