Add/enable autofoo magic for translations.

Original commit message from CVS:
* Makefile.am:
* autogen.sh:
* configure.ac:
* po/POTFILES.in:
Add/enable autofoo magic for translations.

diff --git a/ChangeLog b/ChangeLog
index 86c7a262e9621a01120d9b8fc57baf46699ecde3..8d62805619e0a3a4217d4eb7859baf6d8b8edeae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-07-28  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * Makefile.am:
+       * autogen.sh:
+       * configure.ac:
+       * po/POTFILES.in:
+         Add/enable autofoo magic for translations.
+
 2006-07-28  Tim-Philipp Müller  <tim at centricular dot net>
 
        * gst/realmedia/rmdemux.c: (gst_rmdemux_reset),

diff --git a/Makefile.am b/Makefile.am
index 795cc6e34ef3b05bd85a0feb58d7713302000415..5b9a97fa02563675a9fe42d5db2bf34cbde04c47 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
 
 SUBDIRS = \
-       gst ext docs m4 tests common
+       gst ext docs m4 tests common po
 
 EXTRA_DIST = \
        gst-plugins-ugly.spec depcomp \

diff --git a/autogen.sh b/autogen.sh
index 14ee5d43957632ea786ad7e676dfa90e85f13caa..a889103ff13b31852887c399625e60a9f7b2fabc 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -35,8 +35,8 @@ version_check "autoconf" "$AUTOCONF autoconf autoconf-2.54 autoconf-2.53 autocon
               "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 52 || DIE=1
 version_check "automake" "$AUTOMAKE automake automake-1.9 automake-1.7 automake-1.6 automake-1.5" \
               "ftp://ftp.gnu.org/pub/gnu/automake/" 1 7 || DIE=1
-#version_check "autopoint" "autopoint" \
-#              "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 11 5 || DIE=1
+version_check "autopoint" "autopoint" \
+              "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 11 5 || DIE=1
 version_check "libtoolize" "$LIBTOOLIZE libtoolize glibtoolize" \
               "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1
 version_check "pkg-config" "" \
@@ -63,14 +63,14 @@ toplevel_check $srcfile
 
 # autopoint
 #    older autopoint (< 0.12) has a tendency to complain about mkinstalldirs
-# if test -x mkinstalldirs; then rm mkinstalldirs; fi
+if test -x mkinstalldirs; then rm mkinstalldirs; fi
 #    first remove patch if necessary, then run autopoint, then reapply
-# if test -f po/Makefile.in.in;
-# then
-#   patch -p0 -R < common/gettext.patch
-# fi
-# tool_run "$autopoint --force"
-# patch -p0 < common/gettext.patch
+if test -f po/Makefile.in.in;
+then
+  patch -p0 -R < common/gettext.patch
+fi
+tool_run "$autopoint --force"
+patch -p0 < common/gettext.patch
 
 tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS"
 tool_run "$libtoolize" "--copy --force"

diff --git a/configure.ac b/configure.ac
index b5d4dcc9d5ba8944d59dc3eddb8563cac74be7aa..7025376c8dc67f565ee3f202b37ed0971b69b33e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -56,9 +56,10 @@ dnl Add parameters for aclocal
 AC_SUBST(ACLOCAL_AMFLAGS, "-I m4 -I common/m4")
 
 dnl set up gettext
-dnl AM_GNU_GETTEXT_VERSION(0.11.5)
-dnl AM_GNU_GETTEXT([external])
-dnl GST_GETTEXT([gst-plugins-ugly-$GST_MAJOR_MINOR])
+dnl the version check needs to stay here because autopoint greps for it
+AM_GNU_GETTEXT_VERSION(0.11.5)
+AM_GNU_GETTEXT([external])
+GST_GETTEXT([gst-plugins-ugly-$GST_MAJORMINOR])
 
 dnl *** check for arguments to configure ***
 
@@ -408,8 +409,6 @@ AC_SUBST(GST_PLUGIN_LDFLAGS)
 
 dnl *** output files ***
 
-dnl po/Makefile.in
-
 AC_CONFIG_FILES(
 Makefile
 gst/Makefile
@@ -437,6 +436,7 @@ tests/check/Makefile
 common/Makefile
 common/m4/Makefile
 m4/Makefile
+po/Makefile.in
 gst-plugins-ugly.spec
 )
 AC_OUTPUT

diff --git a/po/POTFILES.in b/po/POTFILES.in
index f24d052e132ccf5b3fef724953e98ae75f11c99c..d46424900a71a7064aaeac594874be1a6e0ecbb0 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,4 @@
 # not activated yet:
-# ext/dvdread/stream_labels.c
 # ext/dvdnav/dvdnavsrc.c
 
-# not activated yet:
-# gst/asfdemux/gstasfdemux.c
+gst/asfdemux/gstasfdemux.c