Rejigger gettext stuff for 0.11.5

Author: jgg
Date: 2003-01-11 07:17:58 GMT
Rejigger gettext stuff for 0.11.5

diff --git a/buildlib/apti18n.h.in b/buildlib/apti18n.h.in
index 4c32e585ea418baf3c4d3cce79ebc51bf302d49d..8124576430b2fa8e9de213517d5f57d86d9dec4b 100644 (file)
--- a/buildlib/apti18n.h.in
+++ b/buildlib/apti18n.h.in
@@ -1,13 +1,12 @@
 // -*- mode: cpp; mode: fold -*-
-// $Id: apti18n.h.in,v 1.5 2002/11/11 07:00:16 doogie Exp $
+// $Id: apti18n.h.in,v 1.6 2003/01/11 07:18:18 jgg Exp $
 /* Internationalization macros for apt. This header should be included last
    in each C file. */
 
 // Set by autoconf
 #undef USE_NLS
-#undef USE_INCLUDED_LIBINTL
 
-#if USE_NLS==yes && USE_INCLUDED_LIBINTL==no
+#ifdef USE_NLS
 // apt will use the gettext implementation of the C library
 # include <libintl.h>
 # ifdef APT_DOMAIN

diff --git a/configure.in b/configure.in
index a0ade1c2896ff1aa23741cc48af41cb3c7c8baf6..f38c5e5634ddf5e182928490e6c7acd9d9c0fca5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -169,13 +169,15 @@ rc_GLIBC_VER
 rc_LIBSTDCPP_VER
 ah_GCC3DEP
 
-dnl FIXME: There is no reason for this bit to do all the configure tests it
-dnl ends up doing. Maybe replace it with a simple AC_CHECK_HEADER and 
-dnl AC_PATH_PROG.
+dnl It used to be that the user could select translations and that could get
+dnl passed to the makefiles, but now that can only work if you use special
+dnl gettext approved makefiles, so this feature is unsupported by this.
 ALL_LINGUAS="da de en_GB es fr hu it nl no_NO pl pt_BR ru sv zh_TW"
-AM_GNU_GETTEXT
-AC_DEFINE_UNQUOTED(USE_NLS, $USE_NLS)
-AC_DEFINE_UNQUOTED(USE_INCLUDED_LIBINTL, $USE_INCLUDED_LIBINTL)
+AM_GNU_GETTEXT(external)
+if test x"$USE_NLS" = "xyes"; then
+   AC_DEFINE(USE_NLS)
+fi
+AC_SUBST(USE_NLS)
 AC_PATH_PROG(BASH, bash)
 
 AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in,make -s dirs)

diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644 (file)
index 0000000..e066f70
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1 @@
+da de en_GB es fr hu it nl no_NO pl pt_BR ru sv zh_TW

diff --git a/po/makefile b/po/makefile
index d50b84da82a2d8f80ce67f28256b454d9967e9f6..54f40d5efa70f1b48ba6e76d8abd9dfc762035cc 100644 (file)
--- a/po/makefile
+++ b/po/makefile
@@ -14,6 +14,7 @@ SUBDIR=po
 # Bring in the default rules
 include ../buildlib/defaults.mak
 
+CATALOGS := $(addsuffix .gmo,$(shell cat LINGUAS))
 DOMAINS = $(notdir $(wildcard $(PO_DOMAINS)/*))
 POTFILES := $(addsuffix .pot,$(addprefix $(PO)/,$(DOMAINS)))