From 4f7d1ea6a5fc46b833b997267903019d2345364a Mon Sep 17 00:00:00 2001
From: Christian Engwer <christi@dune-project.org>
Date: Tue, 27 May 2008 11:48:09 +0000
Subject: [PATCH] merge configure variable ACLOCAL_AMFLAGS into Makefile

[[Imported from SVN: r5216]]
---
 am/top-rules   | 2 +-
 m4/dune_all.m4 | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/am/top-rules b/am/top-rules
index dc0f2ea8f..5ff377971 100644
--- a/am/top-rules
+++ b/am/top-rules
@@ -1,6 +1,6 @@
 # -*-makefile-*-
 
-ACLOCAL_AMFLAGS=-I .
+ACLOCAL_AMFLAGS=@ACLOCAL_AMFLAGS@
 DUNECONTROL=@DUNE_COMMON_ROOT@/bin/dunecontrol
 
 all-am: dependencies.m4
diff --git a/m4/dune_all.m4 b/m4/dune_all.m4
index c9fa72f6e..15764e3f4 100644
--- a/m4/dune_all.m4
+++ b/m4/dune_all.m4
@@ -1,4 +1,4 @@
-# $Id: dune_all.m4 5164 2008-04-21 14:08:28Z christi $
+# $Id$
 
 # this meta-check calls everything needed for Dune to work and all
 # possible components. Applications should use this so that
@@ -41,6 +41,8 @@ AC_DEFUN([DUNE_CHECK_ALL],[
   AC_SUBST(ALL_PKG_LDFLAGS, "$LDFLAGS $DUNE_PKG_LDFLAGS")
   AC_SUBST(ALL_PKG_CPPFLAGS, "$CPPFLAGS $DUNE_PKG_CPPFLAGS")
 
+  AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_AMFLAGS")
+
   AC_SUBST(am_dir, $DUNE_COMMON_ROOT/am)
 ])
 
-- 
GitLab