build: make autotools put .m4 files into m4/ instead of common/m4/

We don't want generated/copied files in common.

diff --git a/.gitignore b/.gitignore
index 93af60b..c69f12f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,8 @@ aclocal.m4
 INSTALL
 gst-ffmpeg.spec
 -
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4

diff --git a/Makefile.am b/Makefile.am
index 120f7e9..b19b38f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ EXTRA_DIST = \
        AUTHORS COPYING NEWS README ChangeLog gst-ffmpeg.doap \
        $(win32)
 
-ACLOCAL_AMFLAGS = -I common/m4
+ACLOCAL_AMFLAGS = -I m4 -I common/m4
 
 include $(top_srcdir)/common/release.mak
 
@@ -24,7 +24,12 @@ check-torture:
 
 CRUFT_FILES = \
        $(top_builddir)/common/shave \
-       $(top_builddir)/common/shave-libtool
+       $(top_builddir)/common/shave-libtool \
+       $(top_builddir)/common/m4/libtool.m4 \
+       $(top_builddir)/common/m4/ltoptions.m4 \
+       $(top_builddir)/common/m4/ltsugar.m4 \
+       $(top_builddir)/common/m4/ltversion.m4 \
+       $(top_builddir)/common/m4/lt~obsolete.m4
 
 include $(top_srcdir)/common/cruft.mak
 

diff --git a/autogen.sh b/autogen.sh
index 60e3c5b..cb3bacf 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -97,7 +97,7 @@ fi
 toplevel_check $srcfile
 
 tool_run "$libtoolize" "--copy --force"
-tool_run "$aclocal" "-I common/m4 $ACLOCAL_FLAGS"
+tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS"
 tool_run "$autoheader"
 
 # touch the stamp-h.in build stamp so we don't re-run autoheader in maintainer mode -- wingo