From 5f648db8981d64866ed9e3ab35340f5b3fd862cb Mon Sep 17 00:00:00 2001 From: brectanus Date: Fri, 8 Aug 2008 22:50:47 +0000 Subject: [PATCH] Updated regression suite to use full path to LoadModule. --- apache2/configure | 8 ++++++-- apache2/configure.in | 2 ++ apache2/t/regression/server_root/conf/httpd.conf.in | 8 ++++---- apache2/t/run-regression-tests.pl.in | 3 +++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/apache2/configure b/apache2/configure index eb397c48..b968cea6 100755 --- a/apache2/configure +++ b/apache2/configure @@ -696,6 +696,7 @@ APXS_LIBDIR APXS_BINDIR APXS_SBINDIR APXS_PROGNAME +APXS_LIBEXECDIR APXS_HTTPD PCRE_LIBS PCRE_CFLAGS @@ -5107,6 +5108,7 @@ rm -f conftest* APXS_BINDIR="`$APXS -q BINDIR`" APXS_SBINDIR="`$APXS -q SBINDIR`" APXS_PROGNAME="`$APXS -q PROGNAME`" + APXS_LIBEXECDIR="`$APXS -q LIBEXECDIR`" if test "$APXS_SBINDIR" = "/"; then APXS_HTTPD="$APXS_SBINDIR/$APXS_PROGNAME" else @@ -5354,6 +5356,7 @@ LDFLAGS="$APXS_LDFLAGS $LDFLAGS" + # Check whether --with-pcre was given. @@ -6520,6 +6523,7 @@ APXS_LIBDIR!$APXS_LIBDIR$ac_delim APXS_BINDIR!$APXS_BINDIR$ac_delim APXS_SBINDIR!$APXS_SBINDIR$ac_delim APXS_PROGNAME!$APXS_PROGNAME$ac_delim +APXS_LIBEXECDIR!$APXS_LIBEXECDIR$ac_delim APXS_HTTPD!$APXS_HTTPD$ac_delim PCRE_LIBS!$PCRE_LIBS$ac_delim PCRE_CFLAGS!$PCRE_CFLAGS$ac_delim @@ -6533,7 +6537,6 @@ APU_LDFLAGS!$APU_LDFLAGS$ac_delim APU_LINK_LD!$APU_LINK_LD$ac_delim LIBXML_LIBS!$LIBXML_LIBS$ac_delim LIBXML_CFLAGS!$LIBXML_CFLAGS$ac_delim -LUA_LIBS!$LUA_LIBS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -6575,13 +6578,14 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +LUA_LIBS!$LUA_LIBS$ac_delim LUA_CFLAGS!$LUA_CFLAGS$ac_delim CURL_LIBS!$CURL_LIBS$ac_delim CURL_CFLAGS!$CURL_CFLAGS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/apache2/configure.in b/apache2/configure.in index 2825c8b4..353e0da9 100644 --- a/apache2/configure.in +++ b/apache2/configure.in @@ -129,6 +129,7 @@ VERSION_OK APXS_BINDIR="`$APXS -q BINDIR`" APXS_SBINDIR="`$APXS -q SBINDIR`" APXS_PROGNAME="`$APXS -q PROGNAME`" + APXS_LIBEXECDIR="`$APXS -q LIBEXECDIR`" if test "$APXS_SBINDIR" = "/"; then APXS_HTTPD="$APXS_SBINDIR/$APXS_PROGNAME" else @@ -313,6 +314,7 @@ AC_SUBST(APXS_LIBDIR) AC_SUBST(APXS_BINDIR) AC_SUBST(APXS_SBINDIR) AC_SUBST(APXS_PROGNAME) +AC_SUBST(APXS_LIBEXECDIR) AC_SUBST(APXS_HTTPD) CHECK_PCRE() diff --git a/apache2/t/regression/server_root/conf/httpd.conf.in b/apache2/t/regression/server_root/conf/httpd.conf.in index 6e6109b7..c24399ea 100644 --- a/apache2/t/regression/server_root/conf/httpd.conf.in +++ b/apache2/t/regression/server_root/conf/httpd.conf.in @@ -7,18 +7,18 @@ - LoadModule proxy_module modules/mod_proxy.so - LoadModule proxy_http_module modules/mod_proxy_http.so + LoadModule proxy_module @APXS_LIBEXECDIR@/mod_proxy.so + LoadModule proxy_http_module @APXS_LIBEXECDIR@/mod_proxy_http.so - LoadModule unique_id_module modules/mod_unique_id.so + LoadModule unique_id_module @APXS_LIBEXECDIR@/mod_unique_id.so # TODO: Need to have these configurable LoadFile /usr/lib/libxml2.so LoadFile /usr/lib/liblua5.1.so - LoadModule security2_module modules/mod_security2.so + LoadModule security2_module @APXS_LIBEXECDIR@/mod_security2.so ServerName localhost diff --git a/apache2/t/run-regression-tests.pl.in b/apache2/t/run-regression-tests.pl.in index 69243227..f41d2b62 100755 --- a/apache2/t/run-regression-tests.pl.in +++ b/apache2/t/run-regression-tests.pl.in @@ -30,6 +30,7 @@ my $DATA_DIR = "$SROOT_DIR/data"; my $TEMP_DIR = "$SROOT_DIR/tmp"; my $UPLOAD_DIR = "$SROOT_DIR/upload"; my $CONF_DIR = "$SROOT_DIR/conf"; +my $MODULES_DIR = q(@APXS_LIBEXECDIR@); my $FILES_DIR = "$SROOT_DIR/logs"; my $PID_FILE = "$FILES_DIR/httpd.pid"; my $HTTPD = q(@APXS_HTTPD@); @@ -45,6 +46,7 @@ $UA->agent($UA_NAME); # Hack for testing the script w/o configure if ($HTTPD eq "\@APXS_HTTPD\@") { $HTTPD = "/usr/local/apache2/bin/httpd"; + $MODULES_DIR = "/usr/local/apache2/modules"; } $SIG{TERM} = $SIG{INT} = \&handle_interrupt; @@ -117,6 +119,7 @@ unless (defined $opt{S}) { TEMP_DIR => $TEMP_DIR, UPLOAD_DIR => $UPLOAD_DIR, CONF_DIR => $CONF_DIR, + MODULES_DIR => $MODULES_DIR, LOGS_DIR => $FILES_DIR, SCRIPT_DIR => $SCRIPT_DIR, REGRESSION_DIR => $REG_DIR,