Commit 2f52871d authored by Roy T. Fielding's avatar Roy T. Fielding
Browse files

Use new locations for APR autoconf macros and remove unneeded dependencies. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88207 13f79535-47bb-0310-9956-ffa450edef68
parent a8cff0ea

acinclude.m4

+4 −2
Original line number Diff line number Diff line
@@ -180,8 +180,10 @@ AC_DEFUN(APACHE_ONCE,[ 
  fi

])



sinclude(srclib/apr/apr_common.m4)

sinclude(srclib/apr/hints.m4)

sinclude(srclib/apr/build/apr_common.m4)

sinclude(srclib/apr/build/apr_network.m4)

sinclude(srclib/apr/build/apr_threads.m4)

sinclude(srclib/apr/build/apr_hints.m4)

sinclude(hints.m4)



AC_DEFUN(APACHE_CHECK_SIGWAIT_ONE_ARG,[

build/build.mk

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
STAMP = buildmk.stamp



all: $(STAMP) generated_lists

	@if [ ! -d srclib/apr -o ! -f srclib/apr/apr_common.m4 ]; then \

	@if [ ! -d srclib/apr -o ! -f srclib/apr/build/apr_common.m4 ]; then \

	    echo "" ; \

	    echo "You don't have a srclib/apr/ subdirectory.  Please get one:" ; \

	    echo "" ; \

build/build2.mk

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ all: $(targets) 


libtool_m4 = $(libtool_prefix)/share/aclocal/libtool.m4



aclocal.m4: acinclude.m4 srclib/apr/apr_common.m4 srclib/apr/hints.m4 $(libtool_m4)

aclocal.m4: acinclude.m4 $(libtool_m4)

	@echo rebuilding $@

	@echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf" >$@

	@echo "dnl edits here will be lost" >>$@
@@ -122,7 +122,7 @@ $(aprutil_configure): srclib/apr-util/configure.in 
	(cd srclib/apr-util && ./buildconf.sh)



### we shouldn't (have to) know what goes into the configure script!

$(apr_configure): srclib/apr/helpers/apr-conf.m4 srclib/apr/configure.in srclib/apr/apr_common.m4 srclib/apr/hints.m4

$(apr_configure): srclib/apr/configure.in

	@echo rebuilding $@

	(cd srclib/apr && ./buildconf)