Some build fixes for platforms like OSX where we use the built-in libintl.
authorDavid Shaw <dshaw@jabberwocky.com>
Wed, 13 Dec 2006 19:48:31 +0000 (19:48 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Wed, 13 Dec 2006 19:48:31 +0000 (19:48 +0000)
common/ChangeLog
common/Makefile.am
tools/ChangeLog
tools/Makefile.am

index 141838a..6e7fa6c 100644 (file)
@@ -1,3 +1,8 @@
+2006-12-13  David Shaw  <dshaw@jabberwocky.com>
+
+       * Makefile.am (AM_CPPFLAGS): Include intl/ so we can reference the
+       built-in headers.
+
 2006-11-23  Werner Koch  <wk@g10code.com>
 
        * http.c: Include i18n.h
index 57056de..f2b28c4 100644 (file)
@@ -24,7 +24,7 @@ noinst_LIBRARIES = libcommon.a libcommonpth.a libsimple-pwquery.a libgpgrl.a
 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)
 
index ef51ad7..47e0a58 100644 (file)
@@ -1,3 +1,8 @@
+2006-12-13  David Shaw  <dshaw@jabberwocky.com>
+
+       * Makefile.am (gpgsplit_LDADD): Link to LIBINTL if we're using the
+       built-in code.
+
 2006-12-07  David Shaw  <dshaw@jabberwocky.com>
 
        * Makefile.am: Link to iconv for jnlib dependency.
index be492c0..fd7f8a4 100644 (file)
@@ -55,7 +55,7 @@ common_libs = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a
 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