Commit 5121b317 authored by Richard Boulton's avatar Richard Boulton

Revert aclocal invocation to do cat m4/*.m4 > acinclude.m4 beforehand, rather...

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.
parent 911f9b4d
......@@ -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
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment