Fix gettext update problems.

The keymap_alldefs.h file was previously generated and scanned inside
po/Makefile.in.in as an additional POTFILES files build dependency and
step.

The file can't be scanned by just adding it to po/POTFILES.in because
it's a generated file that will be in the build directory.  The next
commit will instead add the OPS* files directly to POTFILES.in to be
scanned.

For this commit, remove the generation of keymap_alldefs.h.

Remove the redundant ALL_LINGUAS setting from configure.ac.  Reformat
the LINGUAS file to be on one line, as the documentation shows.  I
think it was okay before, but just to be safe.

Fix L10N scanning by adding '--add-comments=L10N' to XGETTEXT_OPTIONS
in po/Makevars.

Set MSGID_BUGS_ADDRESS to silence a warning.

Add gettext.h to the Makefile.am EXTRA_DIST list.

Remove -Iintl flags from all Makefile.am files, since the intl
directory is no longer bundled in Mutt.

6 files changed, 8 insertions, 45 deletions

diff --git a/Makefile.am b/Makefile.am
index 97df1669..39229458 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,7 +56,7 @@ DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
 	-DHAVE_CONFIG_H=1
 
-AM_CPPFLAGS=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(AUTOCRYPT_INCLUDES) $(GPGME_CFLAGS) -Iintl
+AM_CPPFLAGS=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(AUTOCRYPT_INCLUDES) $(GPGME_CFLAGS)
 
 # This option allows `make distcheck` to run without encountering
 # setgid errors.
@@ -76,7 +76,7 @@ EXTRA_mutt_SOURCES = account.c bcache.c compress.c crypt-gpgme.c crypt-mod-pgp-c
 EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \
 	configure account.h \
 	attach.h buffer.h buffy.h charset.h compress.h copy.h crypthash.h \
-	dotlock.h functions.h gen_defs \
+	dotlock.h functions.h gen_defs gettext.h \
 	globals.h hash.h history.h init.h keymap.h mutt_crypt.h \
 	mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \
 	mutt_regex.h mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \
@@ -121,7 +121,7 @@ conststrings.c: txt2c config.status
 	sed -e 's/^"//' -e 's/"$$//' | ${srcdir}/txt2c.sh configure_options >>conststrings_c
 	mv -f conststrings_c conststrings.c
 
-CLEANFILES = mutt_dotlock.c keymap_alldefs.h $(BUILT_SOURCES)
+CLEANFILES = mutt_dotlock.c $(BUILT_SOURCES)
 
 DISTCLEANFILES= flea smime_keys txt2c po/$(PACKAGE).pot
 
@@ -140,12 +140,6 @@ smime_keys: $(srcdir)/smime_keys.pl
 keymap_defs.h: $(OPS) $(srcdir)/gen_defs
 	$(srcdir)/gen_defs $(OPS) > keymap_defs.h
 
-keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.SIDEBAR $(srcdir)/OPS.PGP $(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME $(srcdir)/gen_defs
-	rm -f $@
-	$(srcdir)/gen_defs $(srcdir)/OPS $(srcdir)/OPS.SIDEBAR $(srcdir)/OPS.PGP \
-		$(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME \
-			> keymap_alldefs.h
-
 # If we have GNU make, we can use the FORCE target to enable
 # automatic rebuilding of version.h after a commit.
 if GNU_MAKE
diff --git a/autocrypt/Makefile.am b/autocrypt/Makefile.am
index 59327cf1..8655a3a9 100644
--- a/autocrypt/Makefile.am
+++ b/autocrypt/Makefile.am
@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
 
 EXTRA_DIST = README
 
-AM_CPPFLAGS = -I$(top_srcdir) -I../intl
+AM_CPPFLAGS = -I$(top_srcdir)
 
 noinst_LIBRARIES = libautocrypt.a
 
diff --git a/configure.ac b/configure.ac
index 69792330..76354242 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,8 +12,6 @@ AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/VERSION'])
 
 AC_USE_SYSTEM_EXTENSIONS
 
-ALL_LINGUAS="de eu ru it es uk fr pl nl cs id sk ko el zh_TW zh_CN pt_BR eo gl sv da lt tr ja hu et ca bg ga fi"
-
 AC_CANONICAL_HOST
 
 AC_MSG_CHECKING([for prefix])
diff --git a/imap/Makefile.am b/imap/Makefile.am
index 199f6d6b..3cfb1a57 100644
--- a/imap/Makefile.am
+++ b/imap/Makefile.am
@@ -16,7 +16,7 @@ endif
 EXTRA_DIST = README TODO auth_anon.c auth_cram.c auth_gss.c auth_oauth.c \
 	auth_sasl.c
 
-AM_CPPFLAGS = -I$(top_srcdir) -I../intl
+AM_CPPFLAGS = -I$(top_srcdir)
 
 noinst_LIBRARIES = libimap.a
 noinst_HEADERS = auth.h imap_private.h message.h
diff --git a/po/LINGUAS b/po/LINGUAS
index 1c2f1512..94e88b51 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,31 +1,2 @@
 # Set of available languages.
-bg
-ca
-cs
-da
-de
-el
-eo
-es
-et
-eu
-fi
-fr
-ga
-gl
-hu
-id
-it
-ja
-ko
-lt
-nl
-pl
-pt_BR
-ru
-sk
-sv
-tr
-uk
-zh_CN
-zh_TW
+bg ca cs da de el eo es et eu fi fr ga gl hu id it ja ko lt nl pl pt_BR ru sk sv tr uk zh_CN zh_TW
diff --git a/po/Makevars b/po/Makevars
index 867d6de4..4cfac79b 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -12,7 +12,7 @@ subdir = po
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+XGETTEXT_OPTIONS = --add-comments=L10N --keyword=_ --keyword=N_
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
@@ -45,7 +45,7 @@ PACKAGE_GNU = no
 # It can be your email address, or a mailing list address where translators
 # can write to without being subscribed, or the URL of a web page through
 # which the translators can contact you.
-MSGID_BUGS_ADDRESS =
+MSGID_BUGS_ADDRESS = https://gitlab.com/muttmua/mutt/-/issues
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.