From: Tim-Philipp Müller <tim@centricular.net>
Date: Fri, 28 Jul 2006 15:11:42 +0000 (+0000)
Subject: Add/enable autofoo magic for translations.
X-Git-Tag: RELEASE-0_10_4~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=287c94dcb0c8f3e8aebd8a579ea4783bcb6733c4;p=platform%2Fupstream%2Fgst-plugins-ugly.git

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 86c7a262..8d628056 100644
--- 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 795cc6e3..5b9a97fa 100644
--- 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 14ee5d43..a889103f 100755
--- 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 b5d4dcc9..7025376c 100644
--- 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 f24d052e..d4642490 100644
--- 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