Use external gettext intl library

When porting to other systems without gettext functionality, other
applications might need it as well, so either use --with-libintl-prefix
for a global library, or disable NLS support.

diff --git a/.gitignore b/.gitignore
index 86afc80579be5fc86f5d750ec9d140066e770844..3134a007cdd58b5b825c638db7c0488bcc2c7e36 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 build-tree
 config
-intl
 ABOUT-NLS
 INSTALL
 Makefile

diff --git a/ChangeLog b/ChangeLog
index bcfeabfe54a686656ee2f4697a4af721e3f46b63..970889a4a29fc50680638974d1378b4647a8ef84 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2008-01-21  Guillem Jover  <guillem@debian.org>
+
+       * configure.ac (AM_GNU_GETTEXT): Add external.
+       (AC_CHECK_FUNCS): Add strtoul.
+       (AC_CONFIG_FILES): Remove 'intl/Makefile'.
+       * .gitignore: Remove intl.
+       * Makefile.am (SUBDIRS): Likewise.
+       * dpkg-deb/Makefile.am (INCLUDES): Remove '-I$(top_srcdir)/intl'.
+       * dpkg-split/Makefile.am (INCLUDES): Likewise.
+       * dselect/Makefile.am (INCLUDES): Likewise.
+       * getopt/Makefile.am (INCLUDES): Likewise.
+       * lib/Makefile.am (INCLUDES): Likewise.
+       * src/Makefile.am (INCLUDES): Likewise.
+       * utils/Makefile.am (INCLUDES): Likewise.
+
 2008-01-21  Guillem Jover  <guillem@debian.org>
 
        * configure.ac (AC_CHECK_FUNCS): Add getdtablesize.

diff --git a/Makefile.am b/Makefile.am
index 6efc557b0b32d59d87bb2995788b05262ae39ee0..38bb1e6281fe5f461ee2c866eb41c53df0b54149 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,6 @@ if WITH_DSELECT
 endif
 
 SUBDIRS = \
-       intl \
        getopt \
        lib \
        src \

diff --git a/configure.ac b/configure.ac
index 40774c94a427abe1fb9f2d3a90b4aef7818cb4c2..1386376f04ae640f7cf474afe28f11043337de58 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ DPKG_ARCHITECTURE
 AM_INIT_AUTOMAKE([1.8 gnu])
 
 AM_GNU_GETTEXT_VERSION([0.16.1])
-AM_GNU_GETTEXT()
+AM_GNU_GETTEXT([external])
 
 # Allow compilation without dselect
 AC_ARG_WITH(dselect,
@@ -92,7 +92,8 @@ DPKG_C_ATTRIBUTE
 
 # Checks for library functions.
 DPKG_FUNC_VA_COPY
-AC_CHECK_FUNCS([vsnprintf snprintf strerror strsignal scandir alphasort])
+AC_CHECK_FUNCS([vsnprintf snprintf strtoul strerror strsignal alphasort
+                scandir])
 AC_CHECK_FUNCS([unsetenv lchown setsid bcopy isascii memcpy getdtablesize])
 
 SJR_COMPILER_WARNINGS
@@ -106,7 +107,6 @@ AC_CONFIG_FILES([ Makefile
                  dselect/methods/Makefile
                  dselect/po/Makefile.in
                  getopt/Makefile
-                 intl/Makefile
                  lib/Makefile
                  man/Makefile
                  origins/Makefile

diff --git a/dpkg-deb/Makefile.am b/dpkg-deb/Makefile.am
index bde41483f818f2f83c29ee2204eb7104394b7c6c..6574dc877f2385f50d301533f880cfea748e8425 100644 (file)
--- a/dpkg-deb/Makefile.am
+++ b/dpkg-deb/Makefile.am
@@ -2,7 +2,8 @@
 
 localedir = $(datadir)/locale
 INCLUDES = \
-       -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl -I$(top_srcdir)/lib
+       -DLOCALEDIR=\"$(localedir)\" \
+       -I$(top_srcdir)/lib
 
 
 bin_PROGRAMS = dpkg-deb

diff --git a/dpkg-split/Makefile.am b/dpkg-split/Makefile.am
index 09a700ca4ff1b051ce91a12b841b1f2729d9a629..ff6c34b42c008f37d670fe6c97317a04ca8756c5 100644 (file)
--- a/dpkg-split/Makefile.am
+++ b/dpkg-split/Makefile.am
@@ -2,7 +2,7 @@
 
 localedir = $(datadir)/locale
 INCLUDES = \
-       -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \
+       -DLOCALEDIR=\"$(localedir)\" \
        -DADMINDIR=\"$(admindir)\" -DMKSPLITSCRIPT=\"$(pkglibdir)/mksplit\" \
        -I$(top_srcdir)/lib
 

diff --git a/dselect/Makefile.am b/dselect/Makefile.am
index 35ee7366245a9ec3fe1a1de07d423530ff69b066..241124cb346dc8c1b32bf15607dc3de2fe399eb7 100644 (file)
--- a/dselect/Makefile.am
+++ b/dselect/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = methods po
 
 localedir = $(datadir)/locale
 INCLUDES = \
-       -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \
+       -DLOCALEDIR=\"$(localedir)\" \
        -DADMINDIR=\"$(admindir)\" -DLIBDIR=\"$(pkglibdir)\" \
        -I$(top_srcdir)/lib
 

diff --git a/getopt/Makefile.am b/getopt/Makefile.am
index f169faf48f0b6dfdb1e7597ee01047e5e45c5ec9..9201a267913b6e1ea1e65d225c678c8bd9ad1f53 100644 (file)
--- a/getopt/Makefile.am
+++ b/getopt/Makefile.am
@@ -2,7 +2,7 @@
 
 localedir = $(datadir)/locale
 INCLUDES = \
-       -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \
+       -DLOCALEDIR=\"$(localedir)\" \
        -I$(top_srcdir)/lib
 
 

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7fd423b464b8bc2e0f231d4b42bd59d15a056ffe..184b9c9cb2360ff9e11bf97965d5c4188f8c1f32 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -3,7 +3,7 @@
 localedir = $(datadir)/locale
 pkgconfdir = $(sysconfdir)/@PACKAGE@
 INCLUDES = \
-       -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \
+       -DLOCALEDIR=\"$(localedir)\" \
        -DCONFIGDIR=\"$(pkgconfdir)\" \
        -DCOPYINGFILE=\"$(datadir)/common-licenses/GPL-2\"
 

diff --git a/src/Makefile.am b/src/Makefile.am
index cbc0628258ecae863f441b05a6e48dd9ff5405a2..78adf862153fb809caeaf30b49313e34f27a8570 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
 
 localedir = $(datadir)/locale
 INCLUDES = \
-       -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \
+       -DLOCALEDIR=\"$(localedir)\" \
        -DADMINDIR=\"$(admindir)\" \
        -I$(top_srcdir)/lib
 

diff --git a/utils/Makefile.am b/utils/Makefile.am
index e78f3ddaa9bd10ef12f25a76877111117fdab263..ef4563578336b33c8c9cd97e7aa7508aa5c26e73 100644 (file)
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -2,7 +2,7 @@
 
 localedir = $(datadir)/locale
 INCLUDES = \
-       -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \
+       -DLOCALEDIR=\"$(localedir)\" \
        -I$(top_srcdir)/getopt \
        -I$(top_srcdir)/lib