summaryrefslogtreecommitdiff
path: root/aclocal.m4
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-10-05 10:37:02 +0100
committerColin Watson <cjwatson@debian.org>2010-10-05 10:37:02 +0100
commit44b09a483a2206527c803222567c60fc6a37b7df (patch)
tree1724bdea92b652fe6c48bf65f9fdcbd9c5feab2c /aclocal.m4
parent00ab8261d9824d7838bac936930fbb70e0bc22f1 (diff)
It turns out that AM_GNU_GETTEXT([use-libtool]) is unsupported.
Switch to external libintl instead. * configure.ac (AM_GNU_GETTEXT): Set external. (AC_CONFIG_FILES): Remove intl/Makefile. * Makefile.am (SUBDIRS): Remove intl. (EXTRA_DIST): Add gnulib/m4/glibc2.m4, gnulib/m4/intdiv0.m4, gnulib/m4/intl.m4, gnulib/m4/intmax.m4, gnulib/m4/inttypes-pri.m4, gnulib/m4/lcmessage.m4, gnulib/m4/printf-posix.m4, gnulib/m4/uintmax_t.m4, and gnulib/m4/visibility.m4. * intl: Remove. * lib/Makefile.am (libman_la_CPPFLAGS): Remove -I$(top_builddir)/intl. * libdb/Makefile.am (libmandb_la_CPPFLAGS): Likewise. * src/Makefile.am (AM_CPPFLAGS): Likewise. * .bzrignore: Remove intl/Makefile, intl/charset.alias, intl/libgnuintl.h, intl/libintl.h, intl/ref-add.sed, and intl/ref-del.sed. * NEWS: Document this.
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m49
1 files changed, 0 insertions, 9 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 12504ed3..9cec2950 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1100,7 +1100,6 @@ m4_include([gnulib/m4/getlogin_r.m4])
m4_include([gnulib/m4/getopt.m4])
m4_include([gnulib/m4/gettext.m4])
m4_include([gnulib/m4/gettimeofday.m4])
-m4_include([gnulib/m4/glibc2.m4])
m4_include([gnulib/m4/glibc21.m4])
m4_include([gnulib/m4/glob.m4])
m4_include([gnulib/m4/gnulib-common.m4])
@@ -1109,16 +1108,11 @@ m4_include([gnulib/m4/hash.m4])
m4_include([gnulib/m4/iconv.m4])
m4_include([gnulib/m4/include_next.m4])
m4_include([gnulib/m4/inline.m4])
-m4_include([gnulib/m4/intdiv0.m4])
-m4_include([gnulib/m4/intl.m4])
m4_include([gnulib/m4/intlmacosx.m4])
-m4_include([gnulib/m4/intmax.m4])
m4_include([gnulib/m4/intmax_t.m4])
-m4_include([gnulib/m4/inttypes-pri.m4])
m4_include([gnulib/m4/inttypes_h.m4])
m4_include([gnulib/m4/langinfo_h.m4])
m4_include([gnulib/m4/lchown.m4])
-m4_include([gnulib/m4/lcmessage.m4])
m4_include([gnulib/m4/lib-ignore.m4])
m4_include([gnulib/m4/lib-ld.m4])
m4_include([gnulib/m4/lib-link.m4])
@@ -1158,7 +1152,6 @@ m4_include([gnulib/m4/open.m4])
m4_include([gnulib/m4/openat.m4])
m4_include([gnulib/m4/pathmax.m4])
m4_include([gnulib/m4/po.m4])
-m4_include([gnulib/m4/printf-posix.m4])
m4_include([gnulib/m4/printf.m4])
m4_include([gnulib/m4/progtest.m4])
m4_include([gnulib/m4/rawmemchr.m4])
@@ -1204,13 +1197,11 @@ m4_include([gnulib/m4/tempname.m4])
m4_include([gnulib/m4/threadlib.m4])
m4_include([gnulib/m4/time_h.m4])
m4_include([gnulib/m4/tls.m4])
-m4_include([gnulib/m4/uintmax_t.m4])
m4_include([gnulib/m4/unistd-safer.m4])
m4_include([gnulib/m4/unistd_h.m4])
m4_include([gnulib/m4/unlink.m4])
m4_include([gnulib/m4/vasnprintf.m4])
m4_include([gnulib/m4/vasprintf.m4])
-m4_include([gnulib/m4/visibility.m4])
m4_include([gnulib/m4/vsnprintf.m4])
m4_include([gnulib/m4/warn-on-use.m4])
m4_include([gnulib/m4/wchar_h.m4])