[gst-cvs] CVS: gstreamer configure.ac,1.117,1.118 autogen.sh,1.58,1.59

[Richard B. <ric...@us...>]

Update of /cvsroot/gstreamer/gstreamer
In directory usw-pr-cvs1:/tmp/cvs-serv16006

Modified Files:
	configure.ac autogen.sh 
Log Message:
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.


Index: configure.ac
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/configure.ac,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- configure.ac	2002/02/04 17:41:42	1.117
+++ configure.ac	2002/02/04 21:24:08	1.118
@@ -37,7 +37,7 @@
 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)

Index: autogen.sh
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/autogen.sh,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- autogen.sh	2002/02/04 17:41:41	1.58
+++ autogen.sh	2002/02/04 21:24:08	1.59
@@ -143,7 +143,7 @@
 }
 
 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