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.

11 files changed, 26 insertions, 12 deletions

diff --git a/.gitignore b/.gitignore
index 86afc8057..3134a007c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 build-tree
 config
-intl
 ABOUT-NLS
 INSTALL
 Makefile
diff --git a/ChangeLog b/ChangeLog
index bcfeabfe5..970889a4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 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.
 	* utils/start-stop-daemon.c (get_open_fd_max): New function.
 	(main) [OShpux]: Remove.
diff --git a/Makefile.am b/Makefile.am
index 6efc557b0..38bb1e628 100644
--- 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 40774c94a..1386376f0 100644
--- 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 bde41483f..6574dc877 100644
--- 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 09a700ca4..ff6c34b42 100644
--- 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 35ee73662..241124cb3 100644
--- 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 f169faf48..9201a2679 100644
--- 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 7fd423b46..184b9c9cb 100644
--- 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 cbc062825..78adf8621 100644
--- 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 e78f3ddaa..ef4563578 100644
--- 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