Replaced GNU gettext by the simplified GLib gettext

 - http://lists.gnome.org/archives/gtk-devel-list/2003-April/msg00066.html

diff --git a/Makefile.am b/Makefile.am
index c567854..b4a709f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,8 +19,7 @@
 include $(top_srcdir)/Makefile-head.am
 
 AUTOMAKE_OPTIONS=gnu
-ACLOCAL_AMFLAGS=-I m4
-SUBDIRS=intl m4 macros src doc po
+SUBDIRS=macros src doc po
 ## to automatically rebuild aclocal.m4 if any of the macros in
 ## `macros/' change
 @MAINT@include macros/macros.dep

diff --git a/configure.in b/configure.in
index 6796bed..0cfb94b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -30,9 +30,11 @@ AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
 
 dnl gettext localization.
-dnl FIXME: should we use AM_GLIB_GNU_GETTEXT of glib-gettext.m4 ?
+dnl Use simpler AM_GLIB_GNU_GETTEXT instead of AM_GNU_GETTEXT
+dnl as we depend on glib and glib requires system installed gettext anyway.
+dnl http://lists.gnome.org/archives/gtk-devel-list/2003-April/msg00066.html
 ALL_LINGUAS="cs"
-AM_GNU_GETTEXT
+AM_GLIB_GNU_GETTEXT
 
 GTK_DOC_CHECK
 dnl AM_CONDITIONAL needs to be here explicitely for doc/apiref/Makefile rebuild
@@ -183,8 +185,6 @@ captive.spec
 Makefile
 ./macros/Makefile
 ./po/Makefile.in
-./intl/Makefile
-./m4/Makefile
 ./src/Makefile
 ./src/libcaptive/Makefile
 ./src/libcaptive/include/Makefile
@@ -244,6 +244,6 @@ Makefile
 dnl FIXME: Why is "po/POTFILES" being substituted?
 make -C src distfiles DISTFILES_PRINT=1 \
                |sed -n 's/^:DISTFILES: *\(.*\)$/\1/p'|tr ' ' '\n'|grep . >po/POTFILES.in
-cat po/POTFILES.in >po/POTFILES
+make -C po Makefile
 
 echo done.