# HG changeset patch # User Paul Wise # Date 1576934744 -28800 # Node ID f1f9920cc7b1b7f55cef502e9d01b0173eaf7632 # Parent 0917d53d78b3b16fc88fc4ff1f6baafc036ab662 Add AM_GNU_GETTEXT macros AM_ICONV relies on config.rpath and autopoint/gettextize will only copy these in when the AM_GNU_GETTEXT macros are present. This is needed for the next commit that deletes config.rpath since it is cruft that should be copied in by autotools not embedded. Run autopoint to copy in config.rpath and leave it to automake to copy into the tarball. diff -r 0917d53d78b3 -r f1f9920cc7b1 Makefile.am --- a/Makefile.am Sat Dec 21 21:25:44 2019 +0800 +++ b/Makefile.am Sat Dec 21 21:25:44 2019 +0800 @@ -5,7 +5,7 @@ html_DATA = AUTHORS COPYING ChangeLog NEWS README CLEANFILES = xml/libpst xml/Makefile -EXTRA_DIST = config.rpath Doxyfile libpst.html.tar.gz libpst.spec $(wildcard xml/M*) $(wildcard xml/h*) $(wildcard xml/lib*) +EXTRA_DIST = Doxyfile libpst.html.tar.gz libpst.spec $(wildcard xml/M*) $(wildcard xml/h*) $(wildcard xml/lib*) if !STATIC_TOOLS pkgconfigdir = $(libdir)/pkgconfig diff -r 0917d53d78b3 -r f1f9920cc7b1 Makefile.cvs --- a/Makefile.cvs Sat Dec 21 21:25:44 2019 +0800 +++ b/Makefile.cvs Sat Dec 21 21:25:44 2019 +0800 @@ -3,6 +3,7 @@ HOST=$(shell hostname) all: + autopoint libtoolize --force --copy aclocal -I m4 autoheader diff -r 0917d53d78b3 -r f1f9920cc7b1 configure.ac --- a/configure.ac Sat Dec 21 21:25:44 2019 +0800 +++ b/configure.ac Sat Dec 21 21:25:44 2019 +0800 @@ -201,6 +201,8 @@ AC_FUNC_STRFTIME AC_FUNC_VPRINTF AC_CHECK_FUNCS([chdir getcwd memchr memmove memset regcomp strcasecmp strncasecmp strchr strdup strerror strpbrk strrchr strstr strtol get_current_dir_name]) +AM_GNU_GETTEXT +AM_GNU_GETTEXT_VERSION([0.19.1]) AM_ICONV if test "$am_cv_func_iconv" != "yes"; then AC_MSG_ERROR([libpst requires iconv which is missing])