glib2: Prevent translations from being installed

pkg-config isn't translated, so we don't need the bundled library to be
tranlated, either. The glib gettext m4 macros need to be hacked up a bit
to keep the po/ directory from being distributed.

3 files changed, 2 insertions, 34 deletions

diff --git a/glib2/Makefile.am b/glib2/Makefile.am
index e650e75..0944ac3 100644
--- a/glib2/Makefile.am
+++ b/glib2/Makefile.am
@@ -3,11 +3,9 @@ include $(top_srcdir)/Makefile.decl
 
 AUTOMAKE_OPTIONS = 1.7
 
-SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po
+SUBDIRS = . m4macros glib gmodule gthread gobject gio tests
 DIST_SUBDIRS = $(SUBDIRS) build
 
-bin_SCRIPTS = glib-gettextize
-
 AM_CPPFLAGS = 					\
 	-DG_LOG_DOMAIN=g_log_domain_glib 	\
 	@GLIB_DEBUG_FLAGS@ 			\
@@ -44,7 +42,6 @@ EXTRA_DIST += 			\
 	glibconfig.h.win32.in	\
 	msvc_recommended_pragmas.h \
 	config.h.win32.in	\
-        po/po2tbl.sed.in        \
 	glib-2.0.pc.in 		\
 	gobject-2.0.pc.in 	\
 	gmodule-2.0.pc.in	\
@@ -109,10 +106,6 @@ endif
 
 $(pkgconfig_DATA): config.status
 
-# install mkinstalldirs for glib-gettextize's benefit
-gettextdir = $(datadir)/glib-2.0/gettext
-gettext_SCRIPTS = mkinstalldirs
-
 # build documentation when doing distcheck
 DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-gtk-doc --enable-man
 
diff --git a/glib2/configure.in b/glib2/configure.in
index 98b646a..b64340a 100644
--- a/glib2/configure.in
+++ b/glib2/configure.in
@@ -472,8 +472,7 @@ dnl
 dnl gettext support
 dnl
 
-ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
-AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
+ALL_LINGUAS=
 GLIB_GNU_GETTEXT
 
 if test "$gt_cv_have_gettext" != "yes" ; then
@@ -3484,7 +3483,6 @@ gio-unix-2.0.pc
 gio-2.0-uninstalled.pc
 gio-unix-2.0-uninstalled.pc
 glib-zip
-glib-gettextize
 Makefile
 build/Makefile
 build/win32/Makefile
@@ -3511,7 +3509,6 @@ gio/fen/Makefile
 gio/fam/Makefile
 gio/win32/Makefile
 gio/tests/Makefile
-po/Makefile.in
 tests/Makefile
 tests/gobject/Makefile
 tests/refcount/Makefile
@@ -3520,7 +3517,6 @@ m4macros/Makefile
 
 AC_CONFIG_COMMANDS([chmod-scripts],
 [chmod 0755 glib-zip
-chmod 0755 glib-gettextize
 chmod 0755 gobject/glib-mkenums])
 
 # we want to invoke this macro solely so that the config.status script
diff --git a/glib2/m4macros/glib-gettext.m4 b/glib2/m4macros/glib-gettext.m4
index 68b08b3..18c3c1e 100644
--- a/glib2/m4macros/glib-gettext.m4
+++ b/glib2/m4macros/glib-gettext.m4
@@ -273,11 +273,6 @@ msgstr ""
     # We need to process the po/ directory.
     POSUB=po
 
-    AC_OUTPUT_COMMANDS(
-      [case "$CONFIG_FILES" in *po/Makefile.in*)
-        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-      esac])
-
     dnl These rules are solely for the distribution goal.  While doing this
     dnl we only have to keep exactly one list of the available catalogs
     dnl in configure.in.
@@ -364,22 +359,6 @@ glib_DEFUN([GLIB_GNU_GETTEXT],
      MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
    fi
    AC_SUBST(MKINSTALLDIRS)
-
-   dnl Generate list of files to be processed by xgettext which will
-   dnl be included in po/Makefile.
-   test -d po || mkdir po
-   if test "x$srcdir" != "x."; then
-     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-       posrcprefix="$srcdir/"
-     else
-       posrcprefix="../$srcdir/"
-     fi
-   else
-     posrcprefix="../"
-   fi
-   rm -f po/POTFILES
-   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-	< $srcdir/po/POTFILES.in > po/POTFILES
   ])
 
 # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)