[PATCH 0/2] v4l-utils: fix gettext problems

[PATCH 0/2] v4l-utils: fix gettext problems

[Hans Verkuil]

Building with a gettext 0.21 environment caused various issues:

- configure.ac was updated automatically to a newer AM_GNU_GETTEXT_VERSION
  which is not something you want since it is under revision control.

- after a clean clone running make causes this error:
  *** error: gettext infrastructure mismatch: using a Makefile.in.in from
  gettext version 0.20 but the autoconf macros are from gettext
  version 0.19

These two patches fix these issues. Tested with both gettext 0.21 and
gettext 0.19.8. Autoconf was at 2.69.

Hopefully this will keep working once autoconf is bumped to 2.70.

[PATCH 1/2] configure.ac: add AM_GNU_GETTEXT_REQUIRE_VERSION

[Hans Verkuil]

This is needed for newer gettext versions (>= 0.20).

It avoids this error:

Making all in v4l-utils-po
*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.20 but the autoconf macros are from gettext version 0.19

The old AM_GNU_GETTEXT_VERSION is still needed for older (< 2.70)
autoconf versions.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
 configure.ac | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configure.ac b/configure.ac
index 5290fa01..62b12549 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,7 +97,10 @@ PKG_PROG_PKG_CONFIG
 DX_DOT_FEATURE(ON)
 DX_INIT_DOXYGEN($PACKAGE_NAME, doxygen_libdvbv5.cfg)
 ALL_LINGUAS=""
+# AM_GNU_GETTEXT_VERSION kept for autoreconf versions that do
+# not support AM_GNU_GETTEXT_REQUIRE_VERSION
 AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8])
 AM_GNU_GETTEXT([external])
 
 LIBDVBV5_DOMAIN="libdvbv5"
-- 
2.30.1

[PATCH 2/2] bootstrap.sh: restore configure.ac

[Hans Verkuil]

gettextize overwrites AM_GNU_GETTEXT_VERSION in configure.ac,
which is not what we want since we want to support older gettext
versions as well. Restore the original configure.ac on exit.

Also add set -e to exit if one of the commands fails.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
 bootstrap.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 0e9eb2d4..52bb0165 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-mkdir build-aux/ 2>/dev/null
+set -e
+mkdir -p build-aux/ 2>/dev/null
 touch build-aux/config.rpath libdvbv5-po/Makefile.in.in v4l-utils-po/Makefile.in.in
 autoreconf -vfi
 
@@ -13,6 +14,13 @@ if [ "GETTEXTIZE" != "" ]; then
 	sed "s,read dummy < /dev/tty,," < $GETTEXTIZE > ./gettextize
 	chmod 755 ./gettextize
 
+	# gettextize overwrites AM_GNU_GETTEXT_VERSION in
+	# configure.ac, which is not what we want since we want to
+	# support older gettext versions as well. Restore the
+	# original configure.ac on exit.
+	cp configure.ac configure.ac.orig
+	trap "mv configure.ac.orig configure.ac" EXIT
+
 	echo "Generating locale v4l-utils-po build files for gettext version $VER"
 	./gettextize --force --copy --no-changelog --po-dir=v4l-utils-po >/dev/null
 
-- 
2.30.1