[svn] GnuPG - r4381 - in trunk: common tools

[svn author dshaw]

Author: dshaw
Date: 2006-12-13 20:48:31 +0100 (Wed, 13 Dec 2006)
New Revision: 4381

Modified:
   trunk/common/ChangeLog
   trunk/common/Makefile.am
   trunk/tools/ChangeLog
   trunk/tools/Makefile.am
Log:
Some build fixes for platforms like OSX where we use the built-in libintl.


Modified: trunk/common/ChangeLog
===================================================================
--- trunk/common/ChangeLog	2006-12-13 17:58:43 UTC (rev 4380)
+++ trunk/common/ChangeLog	2006-12-13 19:48:31 UTC (rev 4381)
@@ -1,3 +1,8 @@
+2006-12-13  David Shaw  <dshaw at jabberwocky.com>
+
+	* Makefile.am (AM_CPPFLAGS): Include intl/ so we can reference the
+	built-in headers.
+
 2006-11-23  Werner Koch  <wk at g10code.com>
 
 	* http.c: Include i18n.h

Modified: trunk/common/Makefile.am
===================================================================
--- trunk/common/Makefile.am	2006-12-13 17:58:43 UTC (rev 4380)
+++ trunk/common/Makefile.am	2006-12-13 19:48:31 UTC (rev 4381)
@@ -24,7 +24,7 @@
 noinst_PROGRAMS = $(module_tests)
 TESTS = $(module_tests)
 
-AM_CPPFLAGS = -I$(top_srcdir)/gl
+AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl
 
 AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
 

Modified: trunk/tools/ChangeLog
===================================================================
--- trunk/tools/ChangeLog	2006-12-13 17:58:43 UTC (rev 4380)
+++ trunk/tools/ChangeLog	2006-12-13 19:48:31 UTC (rev 4381)
@@ -1,3 +1,8 @@
+2006-12-13  David Shaw  <dshaw at jabberwocky.com>
+
+	* Makefile.am (gpgsplit_LDADD): Link to LIBINTL if we're using the
+	built-in code.
+
 2006-12-07  David Shaw  <dshaw at jabberwocky.com>
 
 	* Makefile.am: Link to iconv for jnlib dependency.

Modified: trunk/tools/Makefile.am
===================================================================
--- trunk/tools/Makefile.am	2006-12-13 17:58:43 UTC (rev 4380)
+++ trunk/tools/Makefile.am	2006-12-13 19:48:31 UTC (rev 4381)
@@ -55,7 +55,7 @@
 pwquery_libs = ../common/libsimple-pwquery.a
 
 gpgsplit_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
-		 $(ZLIBS) $(LIBICONV)
+		 $(ZLIBS) $(LIBINTL) $(LIBICONV)
 
 gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c no-libgcrypt.c