From f1727df3176b48fac07cb123aa3e5b74622d2a3d Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 8 Dec 2003 20:59:19 +0000 Subject: Get the gettext version from the special GETTEXT_VERSION macro. --- autogen.sh | 4 ++-- configure.ac | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/autogen.sh b/autogen.sh index 3ba50a5..435cadb 100755 --- a/autogen.sh +++ b/autogen.sh @@ -42,8 +42,8 @@ q }' ${configure_ac}` automake_vers_num=`echo "$automake_vers" | cvtver` -gettext_vers=`sed -n '/^min_gettext_version=/ { -s/^.*="\(.*\)"/\1/p +gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ { +s/^.*(\(.*\))/\1/p q }' ${configure_ac}` gettext_vers_num=`echo "$gettext_vers" | cvtver` diff --git a/configure.ac b/configure.ac index b717300..fa8bef1 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ # The following lines are used by ./autogen.sh. AC_PREREQ(2.57) min_automake_version="1.7.6" -min_gettext_version="0.12.1" +# The gettext version is set below using AM_GNU_GETTEXT_VERSION. # Version number: Remember to change it immediately *after* a release. AC_INIT(libgpg-error, 0.7-cvs, bug-gnupg@gnupg.org) @@ -49,8 +49,10 @@ AC_PROG_LIBTOOL AC_PROG_AWK # Checks for libraries. -AM_GNU_GETTEXT([external]) + +# Note, that autogen.sh greps for the next line. AM_GNU_GETTEXT_VERSION(0.12.1) +AM_GNU_GETTEXT([external]) # Checks for header files. AC_HEADER_STDC -- cgit v1.2.3