You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ma...@locus.apache.org on 2000/03/31 04:38:34 UTC
cvs commit: apache-2.0/src/include .cvsignore ap_ac_config.h
manoj 00/03/30 18:38:34
Modified: . STATUS
src .cvsignore apaci.in configure.in
src/include .cvsignore ap_ac_config.h
Log:
Eliminate src/apaci, and replace with a header file containing paths:
include/ap_config_path.h.
Revision Changes Path
1.37 +1 -9 apache-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/apache-2.0/STATUS,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- STATUS 2000/03/21 19:28:56 1.36
+++ STATUS 2000/03/31 02:38:32 1.37
@@ -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:
@@ -83,14 +83,6 @@
modules/.deps
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
1.5 +0 -1 apache-2.0/src/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apache-2.0/src/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 2000/01/11 13:03:54 1.4
+++ .cvsignore 2000/03/31 02:38:32 1.5
@@ -38,5 +38,4 @@
Makefile
Makefile.config
modules.c
-apaci
.apaci.*
1.3 +0 -13 apache-2.0/src/apaci.in
<<Binary file>>
1.27 +22 -6 apache-2.0/src/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/configure.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- configure.in 2000/03/30 21:50:20 1.26
+++ configure.in 2000/03/31 02:38:32 1.27
@@ -147,18 +147,34 @@
$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_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
-AC_SUBST(prefix)
+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)
1.3 +1 -0 apache-2.0/src/include/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1999/12/24 18:35:06 1.2
+++ .cvsignore 2000/03/31 02:38:33 1.3
@@ -1,2 +1,3 @@
stamp-h*
ap_config_auto.h*
+ap_config_path.h
1.10 +1 -0 apache-2.0/src/include/ap_ac_config.h
Index: ap_ac_config.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/ap_ac_config.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ap_ac_config.h 2000/03/10 00:05:50 1.9
+++ ap_ac_config.h 2000/03/31 02:38:33 1.10
@@ -70,6 +70,7 @@
#include "apr_win.h"
#else
#include "ap_config_auto.h"
+#include "ap_config_path.h"
#include "os.h"
#include "apr.h"
#endif /* WIN32 */