Fix distcheck.

Original commit message from CVS:
* Makefile.am:
* configure.ac:
Fix distcheck.

diff --git a/ChangeLog b/ChangeLog
index d211c21..1ffc163 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-12  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * Makefile.am:
+       * configure.ac:
+         Fix distcheck.
+
 2006-03-12  Edward Hervey  <edward@fluendo.com>
 
        * sys/v4l2/v4l2src_calls.c: (gst_v4l2src_capture_init),

diff --git a/Makefile.am b/Makefile.am
index 94d77d4..d98da6e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,12 +7,12 @@ SUBDIRS_EXAMPLES =
 endif
 
 SUBDIRS = \
-       gst sys ext \
+       gst gst-libs sys ext \
        m4 common docs \
        $(SUBDIRS_EXAMPLES)
 
 DIST_SUBDIRS = \
-       gst sys ext m4 common docs examples
+       gst gst-libs sys ext m4 common docs examples
 
 EXTRA_DIST = \
        gst-plugins-bad.spec depcomp \

diff --git a/configure.ac b/configure.ac
index 6d6f1a3..287c855 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -40,14 +40,11 @@ AM_PROG_AS
 AS="${CC}"
 AS_PROG_OBJC
 
-dnl the gettext stuff needed
-AM_GNU_GETTEXT_VERSION(0.11.5)
+dnl set up gettext
+dnl the version check needs to stay here because autopoint greps for it
+AM_GNU_GETTEXT_VERSION([0.11.5])
 AM_GNU_GETTEXT([external])
-                                                                            
-GETTEXT_PACKAGE=gst-plugins-bad-$GST_MAJORMINOR
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE",
-                  [gettext package name])
+GST_GETTEXT([gst-plugins-bad-$GST_MAJORMINOR])
 
 GST_ARG_EXAMPLES
 
@@ -804,6 +801,8 @@ gst/speed/Makefile
 gst/qtdemux/Makefile
 gst/tta/Makefile
 gst/xingheader/Makefile
+gst-libs/Makefile
+gst-libs/gst/Makefile
 sys/Makefile
 sys/glsink/Makefile
 sys/ximagesrc/Makefile