Building from cloned sources was failing, as Paul pointed out. This fixes it by removing some now-unnecessary work-around code from bootstrap.conf.
The second patch updates to the latest from gnulib. >From ef98fdebc56ed76c3e7f5cd2b84dd06b712e3acc Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Mon, 20 Jun 2011 13:55:53 +0200 Subject: [PATCH 1/2] build: avoid configure/gnulib-related errors * bootstrap.conf: Remove now-unnecessary code to exclude gettext/intl-related m4 tests. --- bootstrap.conf | 32 -------------------------------- 1 files changed, 0 insertions(+), 32 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index a9cafd5..143d7b5 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -15,7 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. - # gnulib modules used by this package. gnulib_modules=' alloca @@ -83,7 +82,6 @@ wctype-h xalloc xstrtoumax ' - gnulib_name=libgreputils checkout_only_file= @@ -98,36 +96,6 @@ XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\ --flag=error:3:c-format --flag=error_at_line:5:c-format\\\ ' -# If "AM_GNU_GETTEXT(external" or "AM_GNU_GETTEXT([external]" -# appears in configure.ac, exclude some unnecessary files. -# Without grep's -E option (not portable enough, pre-configure), -# the following test is ugly. Also, this depends on the existence -# of configure.ac, not the obsolescent-named configure.in. But if -# you're using this infrastructure, you should care about such things. - -gettext_external=0 -grep '^[ ]*AM_GNU_GETTEXT(external\>' configure.ac > /dev/null && - gettext_external=1 -grep '^[ ]*AM_GNU_GETTEXT(\[external\]' configure.ac > /dev/null && - gettext_external=1 - -if test $gettext_external = 1; then - # Gettext supplies these files, but we don't need them since - # we don't have an intl subdirectory. - excluded_files=' - m4/glibc2.m4 - m4/intdiv0.m4 - m4/lcmessage.m4 - m4/lock.m4 - m4/printf-posix.m4 - m4/size_max.m4 - m4/uintmax_t.m4 - m4/ulonglong.m4 - m4/visibility.m4 - m4/xsize.m4 - ' -fi - # Automake requires that ChangeLog exist. test -f ChangeLog || touch ChangeLog || exit 1 -- 1.7.6.rc2.295.gb63f3 >From 8f09073c88002f4bf1d83331d6cff03a04a3b9b6 Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Tue, 21 Jun 2011 06:32:31 +0200 Subject: [PATCH 2/2] build: update gnulib submodule to latest --- gnulib | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gnulib b/gnulib index b6d3498..2dbdfc4 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit b6d3498bc359abfa38966b11184ea6831942efab +Subproject commit 2dbdfc4b6f524d0d35151ec175010c497609318a -- 1.7.6.rc2.295.gb63f3
