On Tue, May 17, 2011 at 05:36:06PM -0600, Eric Blake wrote: > 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. > --- > > v2: no diff from v1: > https://www.redhat.com/archives/libvir-list/2011-May/msg00790.html > > DV, since you build the nightly snapshots on RHEL, I need to make sure > your machine will handle this patch. > > bootstrap.conf | 2 +- > configure.ac | 8 ++------ > 2 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/bootstrap.conf b/bootstrap.conf > index f3e204a..769e57c 100644 > --- a/bootstrap.conf > +++ b/bootstrap.conf > @@ -164,7 +164,7 @@ buildreq="\ > autoconf 2.59 > automake 1.9.6 > autopoint - > -gettext - > +gettext 0.17 > git 1.5.5 > gzip - > libtool - > diff --git a/configure.ac b/configure.ac > index 233e4af..8a3de4c 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -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$++'` Okay ACK, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@xxxxxxxxxxxx | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/ -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list