From: Bruno Haible <bruno@clisp.org>
Date: Tue, 28 Jan 2025 09:37:33 +0000 (+0100)
Subject: build: Update package version handling after gnulib changed.
X-Git-Tag: v0.24~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=19bddbc2cfa9503ba7a2d2623b4378f54cc6a681;p=thirdparty%2Fgettext.git

build: Update package version handling after gnulib changed.

* configure.ac: Drop postprocessing of git-version-gen output.
* gettext-runtime/configure.ac: Likewise.
* gettext-runtime/intl/configure.ac: Likewise.
* gettext-tools/configure.ac: Likewise.
* gettext-tools/examples/configure.ac: Likewise.
---

diff --git a/configure.ac b/configure.ac
index 2daad61b3..672ff59a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,8 +21,7 @@ AC_INIT([gettext], [dummy], [bug-gettext@gnu.org])
 AC_CONFIG_SRCDIR([gettext-tools/src/msgfmt.c])
 AC_CONFIG_AUX_DIR([build-aux])
 VERSION_NUMBER=`cd $srcdir \
-                && build-aux/git-version-gen .tarball-version \
-                   | sed -e 's/dirty$/modified/'`
+                && build-aux/git-version-gen .tarball-version`
 gl_INIT_PACKAGE_VERSION([$VERSION_NUMBER])
 AM_INIT_AUTOMAKE([1.13 silent-rules parallel-tests tar-ustar])
 
diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index 19af0de1b..aabfefcae 100644
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -21,8 +21,7 @@ AC_INIT([gettext-runtime], [dummy], [bug-gettext@gnu.org])
 AC_CONFIG_SRCDIR([intl/dcigettext.c])
 AC_CONFIG_AUX_DIR([../build-aux])
 VERSION_NUMBER=`cd $srcdir/.. \
-                && build-aux/git-version-gen .tarball-version \
-                   | sed -e 's/dirty$/modified/'`
+                && build-aux/git-version-gen .tarball-version`
 gl_INIT_PACKAGE_VERSION([$VERSION_NUMBER])
 AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
 AC_CONFIG_HEADERS([config.h])
diff --git a/gettext-runtime/intl/configure.ac b/gettext-runtime/intl/configure.ac
index 8f1fa8def..0fccf1075 100644
--- a/gettext-runtime/intl/configure.ac
+++ b/gettext-runtime/intl/configure.ac
@@ -21,8 +21,7 @@ AC_INIT([libintl], [dummy], [bug-gettext@gnu.org])
 AC_CONFIG_SRCDIR([dcigettext.c])
 AC_CONFIG_AUX_DIR([../../build-aux])
 VERSION_NUMBER=`cd $srcdir/../.. \
-                && build-aux/git-version-gen .tarball-version \
-                   | sed -e 's/dirty$/modified/'`
+                && build-aux/git-version-gen .tarball-version`
 gl_INIT_PACKAGE_VERSION([$VERSION_NUMBER])
 AM_INIT_AUTOMAKE([silent-rules])
 AC_CONFIG_HEADERS([config.h])
diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 7cb645f2f..921657314 100644
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -21,8 +21,7 @@ AC_INIT([gettext-tools], [dummy], [bug-gettext@gnu.org])
 AC_CONFIG_SRCDIR([src/msgfmt.c])
 AC_CONFIG_AUX_DIR([../build-aux])
 VERSION_NUMBER=`cd $srcdir/.. \
-                && build-aux/git-version-gen .tarball-version \
-                   | sed -e 's/dirty$/modified/'`
+                && build-aux/git-version-gen .tarball-version`
 gl_INIT_PACKAGE_VERSION([$VERSION_NUMBER])
 AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
 AC_CONFIG_HEADERS([config.h])
diff --git a/gettext-tools/examples/configure.ac b/gettext-tools/examples/configure.ac
index 278376363..43352bcec 100644
--- a/gettext-tools/examples/configure.ac
+++ b/gettext-tools/examples/configure.ac
@@ -21,8 +21,7 @@ AC_INIT([gettext], [dummy], [bug-gettext@gnu.org])
 AC_CONFIG_SRCDIR([installpaths.in])
 AC_CONFIG_AUX_DIR([../../build-aux])
 VERSION_NUMBER=`cd $srcdir/../.. \
-                && build-aux/git-version-gen .tarball-version \
-                   | sed -e 's/dirty$/modified/'`
+                && build-aux/git-version-gen .tarball-version`
 gl_INIT_PACKAGE_VERSION([$VERSION_NUMBER])
 AM_INIT_AUTOMAKE([silent-rules])