Eliminate src/apaci, and replace with a header file containing paths: (f77f9219) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

STATUS

+1 −9

Changes for STATUS: 1 added line, 9 removed lines.
Original line number	Diff line number	Diff line
		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

+21 −5

Changes for configure.in: 21 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -147,9 +147,7 @@ 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
		APACHE_FAST_OUTPUT(Makefile ap/Makefile lib/Makefile main/Makefile
		modules/Makefile os/Makefile)
		APACHE_FAST_GENERATE

		@@ -157,8 +155,26 @@ 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)

+1 −0