Fix libintl build (thanks to TAKAHASHI Tamotsu).

diff --git a/Makefile.am b/Makefile.am
index b48b800bd4ebb99381c1241d2405d35b032b9eea..304d60840ae736d2c0b9f45c98e7fa7329ee3182 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,6 +13,8 @@ abook_SOURCES = abook.c database.c filter.c list.c misc.c \
 EXTRA_DIST = config.rpath  ANNOUNCE BUGS FAQ abook.1 abookrc.5 sample.abookrc \
                abook.spec contrib doc/HOWTO.translating_abook
 
+abook_LDADD = @LIBINTL@
+
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5
        $(INSTALL_DATA) $(srcdir)/abook.1 $(DESTDIR)$(mandir)/man1/
@@ -26,3 +28,7 @@ uninstall-local:
 SUBDIRS = intl po
 
 ACLOCAL_AMFLAGS = -I m4
+
+if USE_INCLUDED_INTL_H
+AM_CPPFLAGS = -Iintl
+endif

diff --git a/configure.in b/configure.in
index 7c919f42b52b54323a3772401c86610541fb26e0..f35534c55bd559e366925843a0807d25cb0463f0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -30,6 +30,8 @@ fi
 AC_DEFINE_UNQUOTED(LOCALEDIR, "$abook_localedir", [locale directory])
 AC_SUBST(localedir)
 
+AM_CONDITIONAL(USE_INCLUDED_INTL_H, test x$USE_INCLUDED_LIBINTL = xyes)
+
 dnl ----------------------
 dnl end of gettext support
 dnl ----------------------