Commit e0d19fbe authored by Robert Ricci's avatar Robert Ricci
Browse files

Added our apache config file to CVS, in a continuing attempt to put everything

needed to build an emulab boss node in one convenient package.

The config file gets run through autoconf to get the DocumentRoot, log, and
other directories. There is an install target for it, but this is as yet
unused by anything else. There is also a new configure option specifiying where
the config file should go.
parent a5e7951a
#
# For installation only.
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ..
SUBDIR = apache
include $(OBJDIR)/Makeconf
CONFIG_FILES = apache.conf
#
# Force dependencies to make sure configure regenerates if the .in file
# is changed.
#
all: $(CONFIG_FILES)
include $(TESTBED_SRCDIR)/GNUmakerules
# Like the INSTALL_ETCDIR target
$(INSTALL_APACHE_CONFIG)/%: %
@echo "Installing $<"
-mkdir -p $(INSTALL_ETCDIR)
$(INSTALL_DATA) $< $@
install: $(addprefix $(INSTALL_APACHE_CONFIG)/, $(CONFIG_FILES))
clean:
This diff is collapsed.
...@@ -20,6 +20,8 @@ ac_help="$ac_help ...@@ -20,6 +20,8 @@ ac_help="$ac_help
--with-ssh-args Specify ssh arguments when running from testbed scripts " --with-ssh-args Specify ssh arguments when running from testbed scripts "
ac_help="$ac_help ac_help="$ac_help
--with-rcdir Specify path to install rc.d scripts (/usr/local/etc/rc.d default)" --with-rcdir Specify path to install rc.d scripts (/usr/local/etc/rc.d default)"
ac_help="$ac_help
--with-apache-config Specify path to install apache config files (/usr/local/etc/apache default)"
ac_help="$ac_help ac_help="$ac_help
--enable-debug Build with debug flags (-g -DDEBUG) --enable-debug Build with debug flags (-g -DDEBUG)
--disable-debug Build with optimization flags (-O2 -DNDEBUG -UDEBUG)" --disable-debug Build with optimization flags (-O2 -DNDEBUG -UDEBUG)"
...@@ -564,7 +566,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } ...@@ -564,7 +566,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi fi
echo $ac_n "checking host system type""... $ac_c" 1>&6 echo $ac_n "checking host system type""... $ac_c" 1>&6
echo "configure:568: checking host system type" >&5 echo "configure:570: checking host system type" >&5
host_alias=$host host_alias=$host
case "$host_alias" in case "$host_alias" in
...@@ -585,7 +587,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` ...@@ -585,7 +587,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$host" 1>&6 echo "$ac_t""$host" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6
echo "configure:589: checking build system type" >&5 echo "configure:591: checking build system type" >&5
build_alias=$build build_alias=$build
case "$build_alias" in case "$build_alias" in
...@@ -611,7 +613,7 @@ fi ...@@ -611,7 +613,7 @@ fi
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2 set dummy ${ac_tool_prefix}gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:615: checking for $ac_word" >&5 echo "configure:617: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -643,7 +645,7 @@ fi ...@@ -643,7 +645,7 @@ fi
# Extract the first word of "${ac_tool_prefix}g++", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}g++", so it can be a program name with args.
set dummy ${ac_tool_prefix}g++; ac_word=$2 set dummy ${ac_tool_prefix}g++; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:647: checking for $ac_word" >&5 echo "configure:649: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -675,7 +677,7 @@ fi ...@@ -675,7 +677,7 @@ fi
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2 set dummy ${ac_tool_prefix}ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:679: checking for $ac_word" >&5 echo "configure:681: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -707,7 +709,7 @@ fi ...@@ -707,7 +709,7 @@ fi
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:711: checking for $ac_word" >&5 echo "configure:713: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -739,7 +741,7 @@ fi ...@@ -739,7 +741,7 @@ fi
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2 set dummy ${ac_tool_prefix}strip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:743: checking for $ac_word" >&5 echo "configure:745: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -771,7 +773,7 @@ fi ...@@ -771,7 +773,7 @@ fi
# Extract the first word of "${ac_tool_prefix}ssh", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}ssh", so it can be a program name with args.
set dummy ${ac_tool_prefix}ssh; ac_word=$2 set dummy ${ac_tool_prefix}ssh; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:775: checking for $ac_word" >&5 echo "configure:777: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_SSH'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_SSH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -903,6 +905,24 @@ fi ...@@ -903,6 +905,24 @@ fi
#
# Path to install apache config files in
#
# Check whether --with-apache-config-dir or --without-apache-config-dir was given.
if test "${with_apache_config_dir+set}" = set; then
withval="$with_apache_config_dir"
INSTALL_APACHE_CONFIG="$withval"
else
INSTALL_APACHE_CONFIG="/usr/local/etc/apache"
fi
# #
# Optionally build with optimization or aggressive non-optimization # Optionally build with optimization or aggressive non-optimization
# (Actually three options: on, off or default.) # (Actually three options: on, off or default.)
...@@ -959,7 +979,7 @@ fi ...@@ -959,7 +979,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh. # ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:963: checking for a BSD compatible install" >&5 echo "configure:983: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -1063,7 +1083,8 @@ outfiles="$outfiles Makeconf GNUmakefile \ ...@@ -1063,7 +1083,8 @@ outfiles="$outfiles Makeconf GNUmakefile \
www/GNUmakefile www/defs.php3 www/dbdefs.php3 \ www/GNUmakefile www/defs.php3 www/dbdefs.php3 \
vis/GNUmakefile vis/vistopology vis/webvistopology vis/top2gif \ vis/GNUmakefile vis/vistopology vis/webvistopology vis/top2gif \
rc.d/GNUmakefile rc.d/2.mysql-server.sh rc.d/3.testbed.sh \ rc.d/GNUmakefile rc.d/2.mysql-server.sh rc.d/3.testbed.sh \
rc.d/cvsupd.sh" rc.d/cvsupd.sh \
apache/GNUmakefile apache/apache.conf "
# #
# Do this for easy distclean. # Do this for easy distclean.
...@@ -1244,6 +1265,7 @@ s%@OURDOMAIN@%$OURDOMAIN%g ...@@ -1244,6 +1265,7 @@ s%@OURDOMAIN@%$OURDOMAIN%g
s%@LEDA@%$LEDA%g s%@LEDA@%$LEDA%g
s%@SSH_ARGS@%$SSH_ARGS%g s%@SSH_ARGS@%$SSH_ARGS%g
s%@INSTALL_RCDIR@%$INSTALL_RCDIR%g s%@INSTALL_RCDIR@%$INSTALL_RCDIR%g
s%@INSTALL_APACHE_CONFIG@%$INSTALL_APACHE_CONFIG%g
s%@OPT_CFLAGS@%$OPT_CFLAGS%g s%@OPT_CFLAGS@%$OPT_CFLAGS%g
s%@TESTMODE@%$TESTMODE%g s%@TESTMODE@%$TESTMODE%g
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
......
...@@ -94,6 +94,19 @@ AC_ARG_WITH(rcdir, ...@@ -94,6 +94,19 @@ AC_ARG_WITH(rcdir,
]) ])
AC_SUBST(INSTALL_RCDIR) AC_SUBST(INSTALL_RCDIR)
#
# Path to install apache config files in
#
AC_ARG_WITH(apache-config-dir,
[ --with-apache-config Specify path to install apache config files (/usr/local/etc/apache default)],
[
INSTALL_APACHE_CONFIG="$withval"
],[
INSTALL_APACHE_CONFIG="/usr/local/etc/apache"
])
AC_SUBST(INSTALL_APACHE_CONFIG)
# #
# Optionally build with optimization or aggressive non-optimization # Optionally build with optimization or aggressive non-optimization
# (Actually three options: on, off or default.) # (Actually three options: on, off or default.)
...@@ -185,7 +198,8 @@ outfiles="$outfiles Makeconf GNUmakefile \ ...@@ -185,7 +198,8 @@ outfiles="$outfiles Makeconf GNUmakefile \
www/GNUmakefile www/defs.php3 www/dbdefs.php3 \ www/GNUmakefile www/defs.php3 www/dbdefs.php3 \
vis/GNUmakefile vis/vistopology vis/webvistopology vis/top2gif \ vis/GNUmakefile vis/vistopology vis/webvistopology vis/top2gif \
rc.d/GNUmakefile rc.d/2.mysql-server.sh rc.d/3.testbed.sh \ rc.d/GNUmakefile rc.d/2.mysql-server.sh rc.d/3.testbed.sh \
rc.d/cvsupd.sh" rc.d/cvsupd.sh \
apache/GNUmakefile apache/apache.conf "
# #
# Do this for easy distclean. # Do this for easy distclean.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment