build: require newer gettext

Now that RHEL 5.6 ships with gettext 0.17, we can get out of the
stone age and use the newer gettext capabilities and improved
macros for certain configure tests.

* configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.17.
(MKINSTALLDIRS): Delete hack that is no longer needed.
* bootstrap.conf (buildreq): Check for minimum gettext version.
Based on a report by Wen Congyang.
This commit is contained in:
Eric Blake 2011-05-12 09:29:51 -06:00
parent 3c36f936b9
commit 0bb6e15515
2 changed files with 3 additions and 7 deletions

View File

@ -164,7 +164,7 @@ buildreq="\
autoconf 2.59
automake 1.9.6
autopoint -
gettext -
gettext 0.17
git 1.5.5
gzip -
libtool -

View File

@ -1984,13 +1984,9 @@ AM_CONDITIONAL([WITH_CIL],[test "$enable_locking" = "yes"])
dnl Enable building libvirtd?
AM_CONDITIONAL([WITH_LIBVIRTD],[test "x$with_libvirtd" = "xyes"])
dnl Check for gettext
AM_GNU_GETTEXT_VERSION([0.14.1])
dnl Check for gettext - don't go any newer than what RHEL 5 supports
AM_GNU_GETTEXT_VERSION([0.17])
AM_GNU_GETTEXT([external])
dnl Since we're using such an old version of gettext, we must also define
dnl this symbol, in order to make the autopoint-supplied Makefile.in.in
dnl work properly.
AC_SUBST([MKINSTALLDIRS], ["\$(top_builddir)/$ac_aux_dir/mkinstalldirs"])
ALL_LINGUAS=`cd "$srcdir/po" > /dev/null && ls *.po | sed 's+\.po$++'`