mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-20 04:56:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert aclocal invocation to do cat m4/*.m4 > acinclude.m4 beforehand, rather than adding m4/ to aclocal search path....

Browse source 
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.
This commit is contained in:
Richard Boulton 2002-02-04 22:42:22 +00:00
parent 1ec6f74697
commit 3a52547ed9
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
autogen.sh
View file

@ -138,7 +138,7 @@ if test -z "$*"; then
fi fi
echo "+ running aclocal ..." echo "+ running aclocal ..."
aclocal -I m4 $ACLOCAL_FLAGS || { cat m4/*.m4 >acinclude.m4;aclocal $ACLOCAL_FLAGS || {
echo echo
echo "aclocal failed - check that all needed development files are present on system" echo "aclocal failed - check that all needed development files are present on system"
exit 1 exit 1

2
configure.ac
View file

@ -38,7 +38,7 @@ GST_LIBVERSION=$GST_CURRENT:$GST_REVISION:$GST_AGE
AM_INIT_AUTOMAKE($PACKAGE, $VERSION) AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
dnl Add parameters for aclocal dnl Add parameters for aclocal
dnl (This must come after AM_INIT_AUTOMAKE, since it modifies 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_MAJOR)
AC_SUBST(GST_VERSION_MINOR) AC_SUBST(GST_VERSION_MINOR)