External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: fix bootstrap on fresh clone

Browse Source 
Commit 29db7a0 picked up a gnulib bug, where a change in
bootstrap meant that it would fail to run libtoolize on
projects, like libvirt, that used the older spelling
AM_PROG_LIBTOOL instead of LT_INIT for the sake of building
on RHEL 5.  Now that gnulib is fixed, we should pick up that
fix.

* .gnulib: Update to latest, for bootstrap fix.
* bootstrap: Resync from gnulib.
This commit is contained in:
Eric Blake 2012-01-16 10:23:32 -07:00
parent 487bdbd8e0
commit 9a070e8341
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gnulib

@ -1 +1 @@
Subproject commit 980097f8eca9e08feb2073d06179f53ba46b805e Subproject commit dd6b2d751b3c6ad417f6a4c48f2adb9d27cc59d2

12
bootstrap
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Print a version string. # Print a version string.
scriptversion=2012-01-06.07; # UTC scriptversion=2012-01-16.17; # UTC
# Bootstrap this package from checked-out sources. # Bootstrap this package from checked-out sources.
@ -758,7 +758,7 @@ fi
# Autoreconf runs aclocal before libtoolize, which causes spurious # Autoreconf runs aclocal before libtoolize, which causes spurious
# warnings if the initial aclocal is confused by the libtoolized # warnings if the initial aclocal is confused by the libtoolized
# (or worse out-of-date) macro directory. # (or worse out-of-date) macro directory.
if grep '^[ ]*LT_INIT' configure.ac >/dev/null; then if test $use_libtool = 1; then
echo "running: $LIBTOOLIZE --copy --install" echo "running: $LIBTOOLIZE --copy --install"
$LIBTOOLIZE --copy --install $LIBTOOLIZE --copy --install
fi fi
@ -820,10 +820,14 @@ find "$m4_base" "$source_base" \
-type l -xtype l -delete > /dev/null 2>&1 -type l -xtype l -delete > /dev/null 2>&1
# Tell autoreconf not to invoke autopoint or libtoolize; they were run above. # Tell autoreconf not to invoke autopoint or libtoolize; they were run above.
no_recursive=
case $($AUTORECONF --help) in
*--no-recursive*) no_recursive=--no-recursive;;
esac
echo "running: AUTOPOINT=true LIBTOOLIZE=true " \ echo "running: AUTOPOINT=true LIBTOOLIZE=true " \
"$AUTORECONF --verbose --install --no-recursive -I $m4_base $ACLOCAL_FLAGS" "$AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS"
AUTOPOINT=true LIBTOOLIZE=true \ AUTOPOINT=true LIBTOOLIZE=true \
$AUTORECONF --verbose --install --no-recursive -I $m4_base $ACLOCAL_FLAGS \ $AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS \
|| exit 1 || exit 1
# Get some extra files from gnulib, overriding existing files. # Get some extra files from gnulib, overriding existing files.