From 3a52547ed93a2561bb7c2525f9c7d24af6a7773b Mon Sep 17 00:00:00 2001 From: Richard Boulton Date: Mon, 4 Feb 2002 22:42:22 +0000 Subject: [PATCH] Revert aclocal invocation to do cat m4/*.m4 > acinclude.m4 beforehand, rather than adding m4/ to aclocal search path.... Original commit message from CVS: Revert aclocal invocation to do cat m4/*.m4 > acinclude.m4 beforehand, rather than adding m4/ to aclocal search path. Shouldn't cause errors when macros are already present on system, because macros in acinclude.m4 are used in preference. --- autogen.sh | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index 81218a40ae..69d574adad 100755 --- a/autogen.sh +++ b/autogen.sh @@ -138,7 +138,7 @@ if test -z "$*"; then fi echo "+ running aclocal ..." -aclocal -I m4 $ACLOCAL_FLAGS || { +cat m4/*.m4 >acinclude.m4;aclocal $ACLOCAL_FLAGS || { echo echo "aclocal failed - check that all needed development files are present on system" exit 1 diff --git a/configure.ac b/configure.ac index d5e947ffef..7ed488bb71 100644 --- a/configure.ac +++ b/configure.ac @@ -38,7 +38,7 @@ GST_LIBVERSION=$GST_CURRENT:$GST_REVISION:$GST_AGE AM_INIT_AUTOMAKE($PACKAGE, $VERSION) dnl Add parameters for aclocal dnl (This must come after AM_INIT_AUTOMAKE, since it modifies ACLOCAL) -ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" +ACLOCAL="cat m4/*.m4 >acinclude.m4;$ACLOCAL $ACLOCAL_FLAGS" AC_SUBST(GST_VERSION_MAJOR) AC_SUBST(GST_VERSION_MINOR)