libextractor

commit be4ec29f4d4fac62d8463a288dc4e6481cd20bad
parent 1572a6bd61712ef5c89de6eaab0eb4d6ad2c1172
Author: Heikki Lindholm <holin@iki.fi>
Date:   Wed, 21 May 2008 12:34:56 +0000

fixups for 'gettextize --intl': makes ./bootstrap and building work


Diffstat:
M
configure.ac
 | 
9
++++++++-
M
intl/Makefile.in
 | 
4
++--

2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -23,6 +23,7 @@ AC_PROG_CPP
 AC_PROG_CXX
 AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no)
 AM_CONDITIONAL(HAVE_CXX, test "x$HAVE_CXX" = "xyes")
+AC_GNU_SOURCE
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
@@ -238,7 +239,13 @@ AC_FUNC_ERROR_AT_LINE
 AC_CHECK_FUNCS([mkstemp strndup munmap strcasecmp strdup strncasecmp memmove memset strtoul floor getcwd pow setenv sqrt strchr strcspn strrchr strnlen strndup ftruncate])
 
 AM_GNU_GETTEXT_VERSION([0.16.1])
-AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT()
+if test "x$USE_INCLUDED_LIBINTL" == "xyes"
+then
+  CPPFLAGS='-I$(top_srcdir)/intl '"$CPPFLAGS" 
+else
+  CPPFLAGS="FOOBAR $CPPFLAGS"
+fi 
 
 # check for GNU LD
 AC_LIB_PROG_LD_GNU
diff --git a/intl/Makefile.in b/intl/Makefile.in
@@ -275,7 +275,7 @@ ref-del.sed: $(srcdir)/ref-del.sin
 	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed
 	mv t-ref-del.sed ref-del.sed
 
-INCLUDES = -I. -I$(srcdir) -I..
+INCLUDES = -I. -I$(srcdir) -I.. -I../src/include
 
 libgnuintl.h: $(srcdir)/libgnuintl.h.in
 	sed -e '/IN_LIBGLOCALE/d' \
@@ -480,7 +480,7 @@ uninstall:
 
 info dvi ps pdf html:
 
-$(OBJECTS): ../config.h libgnuintl.h
+$(OBJECTS): ../src/include/config.h libgnuintl.h
 bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: $(srcdir)/gettextP.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
 hash-string.$lo dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h
 explodename.$lo l10nflist.$lo: $(srcdir)/loadinfo.h