summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Boulton <richard@tartarus.org>2002-02-04 22:42:22 +0000
committerRichard Boulton <richard@tartarus.org>2002-02-04 22:42:22 +0000
commitc1a0beea7cb6578e5a04af6bed638ebdfe47a2ea (patch)
tree65b4424df926aff610765838e330da45cf2eddc5
parent631a33bfdbb5cd77bf6e334ee7444c63b9cd31de (diff)
downloadgst-plugins-bad-c1a0beea7cb6578e5a04af6bed638ebdfe47a2ea.tar.gz
gst-plugins-bad-c1a0beea7cb6578e5a04af6bed638ebdfe47a2ea.tar.bz2
gst-plugins-bad-c1a0beea7cb6578e5a04af6bed638ebdfe47a2ea.zip
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.
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac2
2 files changed, 2 insertions, 2 deletions
diff --git a/autogen.sh b/autogen.sh
index 81218a40..69d574ad 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 d5e947ff..7ed488bb 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)