Remove dependency on automake's aclocal. We continue to use acinclude.m4,

because aclocal.m4 needs to contain libtool's m4 macros.

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

diff --git a/build/build.mk b/build/build.mk
index 59f1a505ba1a4182f5d33ad846ab2c30a0aa18d7..1233474e62852208c6bee9a8f63822f70c4ffac5 100644 (file)
--- a/build/build.mk
+++ b/build/build.mk
@@ -21,7 +21,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 ##############################################################################
-# $Id: build.mk,v 1.2 2000/01/12 16:55:58 sascha Exp $ 
+# $Id: build.mk,v 1.3 2000/01/16 17:18:13 sascha Exp $ 
 #
 # Makefile to generate build tools
 #
@@ -33,6 +33,7 @@ all: $(STAMP) generated_lists
 
 generated_lists:
        @echo config_m4_files = `find . -name config.m4` > $@
+       @n=`which libtool`; echo libtool_prefix = `dirname $$n`/.. >> $@
 
 $(STAMP): build/buildcheck.sh
        @build/buildcheck.sh && touch $(STAMP)

diff --git a/build/build2.mk b/build/build2.mk
index 8330c00e2adf1dae79ce7bb7a092d6b523c3b793..26178a4a182157db84450602bb47fd2c5b652838 100644 (file)
--- a/build/build2.mk
+++ b/build/build2.mk
@@ -21,7 +21,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 ##############################################################################
-# $Id: build2.mk,v 1.1 2000/01/11 13:10:58 sascha Exp $
+# $Id: build2.mk,v 1.2 2000/01/16 17:18:13 sascha Exp $
 
 include generated_lists
 
@@ -37,17 +37,19 @@ APACHE_TARGETS = $(TOUCH_FILES) $(LT_TARGETS) configure $(config_h_in)
 
 APR_TARGETS = $(apr_configure) $(apr_config_h_in)
 
-targets = .deps $(APACHE_TARGETS) $(APR_TARGETS)
+targets = .deps aclocal.m4 $(APACHE_TARGETS) $(APR_TARGETS)
 
 all: $(targets)
 
 .deps:
        touch $@
 
-aclocal.m4: configure.in acinclude.m4
+libtool_m4 = $(libtool_prefix)/share/aclocal/libtool.m4
+       
+aclocal.m4: acinclude.m4 $(libtool_m4)
        @echo rebuilding $@
-       aclocal
-
+       @cat acinclude.m4 $(libtool_m4) > $@
+       
 $(LT_TARGETS):
        libtoolize $(AMFLAGS) --force