diff options
| author | Roy T. Fielding <fielding@apache.org> | 2001-02-17 12:21:59 +0100 |
|---|---|---|
| committer | Roy T. Fielding <fielding@apache.org> | 2001-02-17 12:21:59 +0100 |
| commit | d1fdcb979030464f6905346c5cb0579d7c14a6ce (patch) | |
| tree | ff6f2863a053e9190d05c3b256334ddcb68daadc | |
| parent | Add urlmapping.html document. (diff) | |
| download | apache2-d1fdcb979030464f6905346c5cb0579d7c14a6ce.tar.xz apache2-d1fdcb979030464f6905346c5cb0579d7c14a6ce.zip | |
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
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rw-r--r-- | build/build.mk | 2 | ||||
| -rw-r--r-- | build/build2.mk | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 536cee2533..0179b38583 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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,[ diff --git a/build/build.mk b/build/build.mk index 3d2a0cd91a..8f01148f5e 100644 --- a/build/build.mk +++ b/build/build.mk @@ -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 "" ; \ diff --git a/build/build2.mk b/build/build2.mk index a49205e60d..13c7bfc48d 100644 --- a/build/build2.mk +++ b/build/build2.mk @@ -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) |