You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@hyperreal.org on 2000/02/09 02:33:29 UTC
cvs commit: apache-2.0/src apaci.in configure.in
rbb 00/02/08 17:33:28
Modified: src configure.in
Added: src apaci.in
Log:
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.
Revision Changes Path
1.22 +7 -2 apache-2.0/src/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/configure.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- configure.in 2000/01/17 20:34:41 1.21
+++ configure.in 2000/02/09 01:33:24 1.22
@@ -147,12 +147,17 @@
$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
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($APACHE_OUTPUT_FILES)
+AC_OUTPUT($APACHE_OUTPUT_FILES apaci)
+chmod 744 apaci
1.1 apache-2.0/src/apaci.in
Index: apaci.in
===================================================================
#!/bin/sh
## USED AS A COMMAND LINE EXPANDER TO OVERRIDE PATHS
## WITHOUT DISTURBING THE KNOWN MAKE BUILD PROCESS DISPLAY
echo '-DHTTPD_ROOT="@prefix@"'
echo '-DSUEXEC_BIN="@prefix@/bin/suexec"'
echo '-DSHARED_CORE_DIR="@prefix@/libexec"'
echo '-DDEFAULT_PIDLOG="logs/httpd.pid"'
echo '-DDEFAULT_SCOREBOARD="logs/httpd.scoreboard"'
echo '-DDEFAULT_LOCKFILE="logs/httpd.lock"'
echo '-DDEFAULT_XFERLOG="logs/access_log"'
echo '-DDEFAULT_ERRORLOG="logs/error_log"'
echo '-DTYPES_CONFIG_FILE="conf/mime.types"'
echo '-DSERVER_CONFIG_FILE="conf/httpd.conf"'
echo '-DACCESS_CONFIG_FILE="conf/access.conf"'
echo '-DRESOURCE_CONFIG_FILE="conf/srm.conf"'