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

diff --git a/STATUS b/STATUS
index 106750d165dc9713170c766c4bc1f8587fa346c0..767321c2d1120ed1d775c67d63c7b6653aa9a14d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 Apache 2.0 STATUS:
-Last modified at [$Date: 2000/03/21 19:28:56 $]
+Last modified at [$Date: 2000/03/31 02:38:32 $]
 
 Release:
 
@@ -84,14 +84,6 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
        modules/mpm/.deps
        os/.deps
 
-    * apaci permissions problem:
-       cvs checkout apache-2.0
-       cd apache-2.0/src
-       ./configure
-       edit some Makefile.in
-       ./config.status
-       now apaci is no longer executable and future makes fail
-
     * the top-level configure.in appears to use $USE_MAINTAINER_MODE = yes
        to set -Wall/etc. flags, and the APR configure.in appears to use
        --with-debug.  both seem like more of a hardwired pain compaired

diff --git a/configure.in b/configure.in
index 8c15a7465348b9b456f87192f8ee00c05882bc11..fdc678f6dd369ab905bb5a9df046117d4f6b3f0f 100644 (file)
--- 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)
 
 

diff --git a/include/.cvsignore b/include/.cvsignore
index 8132c4f7e9ae5b115193a32ac3c985ad0f84a9be..a81f2315256e4a5c01e22f44e95d2800eadbf01e 100644 (file)
--- a/include/.cvsignore
+++ b/include/.cvsignore
@@ -1,2 +1,3 @@
 stamp-h*
 ap_config_auto.h*
+ap_config_path.h