summaryrefslogtreecommitdiff
path: root/gnulib
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 /gnulib
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 'gnulib')
-rw-r--r--gnulib/lib/Makefile.in32
1 files changed, 0 insertions, 32 deletions
diff --git a/gnulib/lib/Makefile.in b/gnulib/lib/Makefile.in
index e2d39948..7625edd8 100644
--- a/gnulib/lib/Makefile.in
+++ b/gnulib/lib/Makefile.in
@@ -99,7 +99,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \
$(top_srcdir)/gnulib/m4/getopt.m4 \
$(top_srcdir)/gnulib/m4/gettext.m4 \
$(top_srcdir)/gnulib/m4/gettimeofday.m4 \
- $(top_srcdir)/gnulib/m4/glibc2.m4 \
$(top_srcdir)/gnulib/m4/glibc21.m4 \
$(top_srcdir)/gnulib/m4/glob.m4 \
$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
@@ -108,16 +107,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \
$(top_srcdir)/gnulib/m4/iconv.m4 \
$(top_srcdir)/gnulib/m4/include_next.m4 \
$(top_srcdir)/gnulib/m4/inline.m4 \
- $(top_srcdir)/gnulib/m4/intdiv0.m4 \
- $(top_srcdir)/gnulib/m4/intl.m4 \
$(top_srcdir)/gnulib/m4/intlmacosx.m4 \
- $(top_srcdir)/gnulib/m4/intmax.m4 \
$(top_srcdir)/gnulib/m4/intmax_t.m4 \
- $(top_srcdir)/gnulib/m4/inttypes-pri.m4 \
$(top_srcdir)/gnulib/m4/inttypes_h.m4 \
$(top_srcdir)/gnulib/m4/langinfo_h.m4 \
$(top_srcdir)/gnulib/m4/lchown.m4 \
- $(top_srcdir)/gnulib/m4/lcmessage.m4 \
$(top_srcdir)/gnulib/m4/lib-ignore.m4 \
$(top_srcdir)/gnulib/m4/lib-ld.m4 \
$(top_srcdir)/gnulib/m4/lib-link.m4 \
@@ -157,7 +151,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \
$(top_srcdir)/gnulib/m4/openat.m4 \
$(top_srcdir)/gnulib/m4/pathmax.m4 \
$(top_srcdir)/gnulib/m4/po.m4 \
- $(top_srcdir)/gnulib/m4/printf-posix.m4 \
$(top_srcdir)/gnulib/m4/printf.m4 \
$(top_srcdir)/gnulib/m4/progtest.m4 \
$(top_srcdir)/gnulib/m4/rawmemchr.m4 \
@@ -203,13 +196,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \
$(top_srcdir)/gnulib/m4/threadlib.m4 \
$(top_srcdir)/gnulib/m4/time_h.m4 \
$(top_srcdir)/gnulib/m4/tls.m4 \
- $(top_srcdir)/gnulib/m4/uintmax_t.m4 \
$(top_srcdir)/gnulib/m4/unistd-safer.m4 \
$(top_srcdir)/gnulib/m4/unistd_h.m4 \
$(top_srcdir)/gnulib/m4/unlink.m4 \
$(top_srcdir)/gnulib/m4/vasnprintf.m4 \
$(top_srcdir)/gnulib/m4/vasprintf.m4 \
- $(top_srcdir)/gnulib/m4/visibility.m4 \
$(top_srcdir)/gnulib/m4/vsnprintf.m4 \
$(top_srcdir)/gnulib/m4/warn-on-use.m4 \
$(top_srcdir)/gnulib/m4/wchar_h.m4 \
@@ -334,16 +325,12 @@ BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DBLIBS = @DBLIBS@
DBTYPE = @DBTYPE@
DEFS = @DEFS@
@@ -365,10 +352,8 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
FLOAT_H = @FLOAT_H@
FNMATCH_H = @FNMATCH_H@
-GENCAT = @GENCAT@
GETOPT_H = @GETOPT_H@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
GLIBC21 = @GLIBC21@
GLOB_H = @GLOB_H@
GMSGFMT = @GMSGFMT@
@@ -571,7 +556,6 @@ GNULIB_WRITE = @GNULIB_WRITE@
GREP = @GREP@
HAVE_ACCEPT4 = @HAVE_ACCEPT4@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
@@ -659,12 +643,10 @@ HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
HAVE_MKSTEMP = @HAVE_MKSTEMP@
HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
-HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
HAVE_OPENAT = @HAVE_OPENAT@
HAVE_OS_H = @HAVE_OS_H@
HAVE_PIPE2 = @HAVE_PIPE2@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
HAVE_PREAD = @HAVE_PREAD@
HAVE_PTSNAME = @HAVE_PTSNAME@
@@ -688,7 +670,6 @@ HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
HAVE_SIGSET_T = @HAVE_SIGSET_T@
HAVE_SLEEP = @HAVE_SLEEP@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
HAVE_STDINT_H = @HAVE_STDINT_H@
HAVE_STPCPY = @HAVE_STPCPY@
HAVE_STPNCPY = @HAVE_STPNCPY@
@@ -730,7 +711,6 @@ HAVE_USLEEP = @HAVE_USLEEP@
HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
HAVE_VASPRINTF = @HAVE_VASPRINTF@
HAVE_VDPRINTF = @HAVE_VDPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WCHAR_H = @HAVE_WCHAR_H@
HAVE_WCHAR_T = @HAVE_WCHAR_T@
HAVE_WCRTOMB = @HAVE_WCRTOMB@
@@ -739,7 +719,6 @@ HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
HAVE_WINT_T = @HAVE_WINT_T@
-HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@
HAVE__BOOL = @HAVE__BOOL@
IGNORE_UNUSED_LIBRARIES_CFLAGS = @IGNORE_UNUSED_LIBRARIES_CFLAGS@
@@ -750,12 +729,7 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
@@ -781,7 +755,6 @@ LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
LOCALE_JA = @LOCALE_JA@
LOCALE_ZH_CN = @LOCALE_ZH_CN@
LTALLOCA = @LTALLOCA@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
@@ -858,7 +831,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PO4A = @PO4A@
POSUB = @POSUB@
PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
RANLIB = @RANLIB@
@@ -1005,14 +977,10 @@ TROFF = @TROFF@
UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WINDRES = @WINDRES@
WINT_T_SUFFIX = @WINT_T_SUFFIX@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@