--- fetchmail-6.6.3.old/configure.ac +++ fetchmail-6.6.3/configure.ac @@ -147,11 +147,6 @@ AC_CACHE_SAVE -dnl i18n -AM_GNU_GETTEXT([external], [need-ngettext]) -AM_GNU_GETTEXT_VERSION([0.25.1]) -dnl end i18n - # Under sysV68, socket and friends are provided by the C library. # -linet does not provide socket, but causes multiple definition # errors at link-time. It is thus better to only use the C library. --- fetchmail-6.6.3.old/Makefile.am +++ fetchmail-6.6.3/Makefile.am @@ -1,6 +1,6 @@ # Makefile for fetchmail -SUBDIRS= . po +SUBDIRS= . AUTOMAKE_OPTIONS= 1.12 foreign no-dist-gzip dist-xz color-tests parallel-tests subdir-objects AUTOCONF+= --force # we need this to override autom4te.cache/ which jeopardizes reading AC_INIT's version @@ -52,7 +52,7 @@ endif libfm_a_LIBADD= $(EXTRAOBJ) libfm_a_DEPENDENCIES= $(EXTRAOBJ) -LDADD = libfm.a @LIBINTL@ $(LIBOBJS) +LDADD = libfm.a $(LIBOBJS) DEPENDENCIES= libfm.a $(LIBOBJS) check_PROGRAMS= @@ -236,8 +236,8 @@ dist-hook: fetch-translations if test x = "x$(IN_DISTCHECK)" ; then $(MAKE) import-translations ; \ - ( cd $(distdir) && find $(distdirs) po -name .git -type d -prune -exec rm -rf '{}' ';' ) ; \ - ( cd $(distdir) && find $(distdirs) po -name '*~' -exec rm -f '{}' ';' ) ; \ + ( cd $(distdir) && find $(distdirs) -name .git -type d -prune -exec rm -rf '{}' ';' ) ; \ + ( cd $(distdir) && find $(distdirs) -name '*~' -exec rm -f '{}' ';' ) ; \ if ! $(top_srcdir)/dist-tools/git-commit-po-updates.sh -n ; then \ printf '\n*** There are new translations. Please add them to the distribution. ***\n\n' ; \ printf '\n=== You can use dist-tools/git-commit-po-updates.sh to check these updates in. ===\n\n' ; \ --- fetchmail-6.6.3.old/Makefile.in +++ fetchmail-6.6.3/Makefile.in @@ -708,7 +708,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ +LIBINTL = LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSSL = @LIBSSL@ @@ -716,7 +716,7 @@ LIBWOLFSSL = @LIBWOLFSSL@ LIBWOLFSSL_PREFIX = @LIBWOLFSSL_PREFIX@ LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ +LTLIBINTL = LTLIBOBJS = @LTLIBOBJS@ LTLIBSSL = @LTLIBSSL@ LTLIBWOLFSSL = @LTLIBWOLFSSL@ @@ -822,7 +822,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = . po +SUBDIRS = . AUTOMAKE_OPTIONS = 1.12 foreign no-dist-gzip dist-xz color-tests parallel-tests subdir-objects ACLOCAL_AMFLAGS = -I m4 -I m4-local AM_YFLAGS = -t -d -Wno-yacc @@ -849,7 +849,7 @@ $(am__append_1) libfm_a_LIBADD = $(EXTRAOBJ) libfm_a_DEPENDENCIES = $(EXTRAOBJ) -LDADD = libfm.a @LIBINTL@ $(LIBOBJS) +LDADD = libfm.a $(LIBOBJS) DEPENDENCIES = libfm.a $(LIBOBJS) TESTS = t.smoke t.validate-xhtml10 t.validate-xhtml t.x509_name_match t.realpath t.tls-aux \ t.operation @@ -933,7 +933,6 @@ m4/lock.m4 \ m4/longlong.m4 \ m4/nls.m4 \ - m4/po.m4 \ m4/printf-posix.m4 \ m4/progtest.m4 \ m4/size_max.m4 \