[vlc-commits] contrib: cddb: fix autoreconf failure

[Alexandre Janniaux]

vlc | branch: master | Alexandre Janniaux <ajanni at videolabs.io> | Fri Jan  8 15:38:15 2021 +0100| [a25d07c45434af9fa1866f5295585ac698be4edd] | committer: Alexandre Janniaux

contrib: cddb: fix autoreconf failure

> configure.ac: error: AM_GNU_GETTEXT_VERSION or
> AM_GNU_GETTEXT_REQUIRE_VERSION is used, but not AM_GNU_GETTEXT

Fix #25370

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a25d07c45434af9fa1866f5295585ac698be4edd
---

 contrib/src/cddb/AM_GNU_GETTEXT.patch | 32 ++++++++++++++++++++++++++++++++
 contrib/src/cddb/rules.mak            |  1 +
 2 files changed, 33 insertions(+)

diff --git a/contrib/src/cddb/AM_GNU_GETTEXT.patch b/contrib/src/cddb/AM_GNU_GETTEXT.patch
new file mode 100644
index 0000000000..d58eee3ae7
--- /dev/null
+++ b/contrib/src/cddb/AM_GNU_GETTEXT.patch
@@ -0,0 +1,32 @@
+From 94db7a169628ae3031defd278211b96a1bc8893f Mon Sep 17 00:00:00 2001
+From: Alexandre Janniaux <ajanni at videolabs.io>
+Date: Fri, 8 Jan 2021 15:33:53 +0100
+Subject: [PATCH] configure.ac: call AM_GNU_GETTEXT
+
+Fix failure when reconfiguring libcddb with:
+ - autoconf (GNU Autoconf) 2.70
+ - automake (GNU automake) 1.16.3
+ - /usr/bin/autopoint (GNU gettext-tools) 0.21
+ - libtool (GNU libtool) 2.4.6.42-b88ce-dirty
+
+> configure.ac: error: AM_GNU_GETTEXT_VERSION or
+> AM_GNU_GETTEXT_REQUIRE_VERSION is used, but not AM_GNU_GETTEXT
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 9aa4984..a4a85bb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,6 +21,7 @@ AC_SUBST(LIBCDDB_VERSION_NUM)
+ 
+ dnl iconv uses gettext macros (dependency on config.rpath)
+ AM_GNU_GETTEXT_VERSION(0.14.4)
++AM_GNU_GETTEXT([external], [need-formatstring-macros])
+ 
+ dnl Process custom command-line options
+ AC_ARG_ENABLE([loglevel],
+-- 
+2.30.0
+
diff --git a/contrib/src/cddb/rules.mak b/contrib/src/cddb/rules.mak
index adb6c5e310..214cc51459 100644
--- a/contrib/src/cddb/rules.mak
+++ b/contrib/src/cddb/rules.mak
@@ -22,6 +22,7 @@ cddb: libcddb-$(CDDB_VERSION).tar.bz2 .sum-cddb
 	$(APPLY) $(SRC)/cddb/getenv-crash.patch
 	$(APPLY) $(SRC)/cddb/cddb-no-alarm.patch
 	$(APPLY) $(SRC)/cddb/fix-header-guards.patch
+	$(APPLY) $(SRC)/cddb/AM_GNU_GETTEXT.patch
 ifdef HAVE_WIN32
 	$(APPLY) $(SRC)/cddb/win32-pkg.patch
 endif