From: Sascha Schumann <sascha@apache.org>
Date: Sun, 16 Jan 2000 17:18:13 +0000 (+0000)
Subject: Remove dependency on automake's aclocal. We continue to use acinclude.m4,
X-Git-Tag: 1.3.10~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=312bc880295618023df307c811e6dceaea7a7028;p=apache

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 59f1a505ba..1233474e62 100644
--- 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 8330c00e2a..26178a4a18 100644
--- 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