From: Cedric Duval Date: Sat, 22 Oct 2005 19:55:21 +0000 (+0000) Subject: Fix libintl build (thanks to TAKAHASHI Tamotsu). X-Git-Tag: upstream/0.6.1~2^2~130 X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=9d57f5517367679f4f7be5af1aec91ac300db4e3;p=pkg%2Fabook.git Fix libintl build (thanks to TAKAHASHI Tamotsu). --- diff --git a/Makefile.am b/Makefile.am index b48b800..304d608 100644 --- 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 7c919f4..f35534c 100644 --- 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 ----------------------