diff options
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | lib/Makefile.am | 7 | ||||
| -rw-r--r-- | lib/Makefile.in | 1 | ||||
| -rw-r--r-- | libidu/Makefile.am | 1 | ||||
| -rw-r--r-- | libidu/Makefile.in | 1 | ||||
| -rw-r--r-- | m4/gettext.m4 | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/Makefile.in | 3 |
8 files changed, 18 insertions, 10 deletions
@@ -10999,11 +10999,9 @@ echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6 if test "$nls_cv_use_gnu_gettext" = "yes"; then BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes - INTLDIR="\${top_builddir}/intl" - LIBINTL="${INTLDIR}/libintl.a $LIBICONV" - LTLIBINTL="${INTLDIR}/libintl.a $LTLIBICONV" + LIBINTL="\${top_builddir}/intl/libintl.a $LIBICONV" + LTLIBINTL="\${top_builddir}/intl/libintl.a $LTLIBICONV" LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` - CPPFLAGS="$CPPFLAGS -I${INTLDIR}" fi CATOBJEXT= diff --git a/lib/Makefile.am b/lib/Makefile.am index 9c1f30e..1b346fd 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -16,6 +16,7 @@ noinst_LIBRARIES = libgnu.a libgnu_a_SOURCES = libgnu_a_LIBADD = @LIBOBJS@ +AM_CPPFLAGS = noinst_HEADERS = EXTRA_DIST = BUILT_SOURCES = @@ -85,6 +86,12 @@ MOSTLYCLEANFILES += getopt.h getopt.h-t ## end gnulib module getopt +## begin gnulib module gettext + +AM_CPPFLAGS += -I$(top_builddir)/intl + +## end gnulib module gettext + ## begin gnulib module gettext-h libgnu_a_SOURCES += gettext.h diff --git a/lib/Makefile.in b/lib/Makefile.in index 06fd304..5b554f9 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -257,6 +257,7 @@ libgnu_a_SOURCES = basename.c stripslash.c exit.h gettext.h mbchar.h \ mbuiter.h strcase.h strnlen1.h strnlen1.c strpbrk.h strsep.h \ strstr.h verify.h xalloc-die.c libgnu_a_LIBADD = @LIBOBJS@ @ALLOCA@ +AM_CPPFLAGS = -I$(top_builddir)/intl noinst_HEADERS = EXTRA_DIST = alloca_.h fnmatch_.h fnmatch_loop.c getopt_.h \ getopt_int.h inttostr.c stdbool_.h diff --git a/libidu/Makefile.am b/libidu/Makefile.am index fb3ed6c..7666e41 100644 --- a/libidu/Makefile.am +++ b/libidu/Makefile.am @@ -15,6 +15,7 @@ libidu_a_SOURCES = dynvec.c dynvec.h \ xnls.h AM_CPPFLAGS = -I$(top_srcdir)/lib \ + -I$(top_builddir)/intl \ -DDATADIR=\"$(datadir)\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DLANGUAGE_MAP_FILE=\"$(datadir)/id-lang.map\" diff --git a/libidu/Makefile.in b/libidu/Makefile.in index 4d359d1..3c51e59 100644 --- a/libidu/Makefile.in +++ b/libidu/Makefile.in @@ -252,6 +252,7 @@ libidu_a_SOURCES = dynvec.c dynvec.h \ xnls.h AM_CPPFLAGS = -I$(top_srcdir)/lib \ + -I$(top_builddir)/intl \ -DDATADIR=\"$(datadir)\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DLANGUAGE_MAP_FILE=\"$(datadir)/id-lang.map\" diff --git a/m4/gettext.m4 b/m4/gettext.m4 index f6b4f16..624a807 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -234,11 +234,9 @@ return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], dnl Mark actions used to generate GNU NLS library. BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes - INTLDIR="ifelse([$3],[],\${top_builddir}/intl,[$3])" - LIBINTL="${INTLDIR}/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" - LTLIBINTL="${INTLDIR}/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" + LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" + LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` - CPPFLAGS="$CPPFLAGS -I${INTLDIR}" fi CATOBJEXT= diff --git a/src/Makefile.am b/src/Makefile.am index 18c72d5..0ee6be4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,8 +2,9 @@ bin_PROGRAMS = mkid lid fid fnid xtokid dist_bin_SCRIPTS = eid aid gid defid -AM_CPPFLAGS = -I$(top_srcdir)/libidu \ +AM_CPPFLAGS = -I$(top_builddir)/intl \ -I$(top_srcdir)/lib \ + -I$(top_srcdir)/libidu \ -DDATADIR=\"$(datadir)\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DLANGUAGE_MAP_FILE=\"$(datadir)/id-lang.map\" diff --git a/src/Makefile.in b/src/Makefile.in index fc7f007..1c84beb 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -255,8 +255,9 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ dist_bin_SCRIPTS = eid aid gid defid -AM_CPPFLAGS = -I$(top_srcdir)/libidu \ +AM_CPPFLAGS = -I$(top_builddir)/intl \ -I$(top_srcdir)/lib \ + -I$(top_srcdir)/libidu \ -DDATADIR=\"$(datadir)\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DLANGUAGE_MAP_FILE=\"$(datadir)/id-lang.map\" |