[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r6857 - in Extractor: . intl
From: |
gnunet |
Subject: |
[GNUnet-SVN] r6857 - in Extractor: . intl |
Date: |
Wed, 21 May 2008 06:34:56 -0600 (MDT) |
Author: holindho
Date: 2008-05-21 06:34:56 -0600 (Wed, 21 May 2008)
New Revision: 6857
Modified:
Extractor/configure.ac
Extractor/intl/Makefile.in
Log:
fixups for 'gettextize --intl': makes ./bootstrap and building work
Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac 2008-05-21 12:29:51 UTC (rev 6856)
+++ Extractor/configure.ac 2008-05-21 12:34:56 UTC (rev 6857)
@@ -23,6 +23,7 @@
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_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
Modified: Extractor/intl/Makefile.in
===================================================================
--- Extractor/intl/Makefile.in 2008-05-21 12:29:51 UTC (rev 6856)
+++ Extractor/intl/Makefile.in 2008-05-21 12:34:56 UTC (rev 6857)
@@ -275,7 +275,7 @@
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 @@
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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r6857 - in Extractor: . intl,
gnunet <=