NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

build: require pkg-config for bootstrap

Browse Source 
* .gnulib: Update to latest, for bootstrap fixes.
* bootstrap: Synchronize with upstream.
* bootstrap.conf: Add pkg-config pre-requisite.
* autogen.sh: Tweak wording message.
Reported by Justin Clift, and with feedback from Bruno Haible.
This commit is contained in:
Eric Blake
2010-10-05 09:10:31 -06:00
parent ad4cb9056a
commit b0f34a6a1a
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gnulib

Submodule .gnulib updated: 9f940e90a7...2bb63bfb25

2
autogen.sh
View File

@@ -49,7 +49,7 @@ if test "$t" = "$(cat $curr_status 2>/dev/null)" \
else else
echo running bootstrap... echo running bootstrap...
./bootstrap && bootstrap_hash > $curr_status \ ./bootstrap && bootstrap_hash > $curr_status \
|| { echo "Failed to bootstrap gnulib, please investigate."; exit 1; } || { echo "Failed to bootstrap, please investigate."; exit 1; }
fi fi
cd "$THEDIR" cd "$THEDIR"

18
bootstrap
View File

@@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Print a version string. # Print a version string.
scriptversion=2010-09-30.17; # UTC scriptversion=2010-10-05.15; # UTC
# Bootstrap this package from checked-out sources. # Bootstrap this package from checked-out sources.
@@ -351,7 +351,7 @@ check_versions() {
app=libtoolize app=libtoolize
fi fi
# Honor $APP variables ($TAR, $AUTOCONF, etc.) # Honor $APP variables ($TAR, $AUTOCONF, etc.)
appvar=`echo $app | tr '[a-z]' '[A-Z]'` appvar=`echo $app | tr '[a-z]-' '[A-Z]_'`
test "$appvar" = TAR && appvar=AMTAR test "$appvar" = TAR && appvar=AMTAR
eval "app=\${$appvar-$app}" eval "app=\${$appvar-$app}"
inst_ver=$(get_version $app) inst_ver=$(get_version $app)
@@ -374,7 +374,7 @@ check_versions() {
print_versions() { print_versions() {
echo "Program Min_version" echo "Program Min_version"
echo "----------------------" echo "----------------------"
printf "$buildreq" printf %s "$buildreq"
echo "----------------------" echo "----------------------"
# can't depend on column -t # can't depend on column -t
} }
@@ -392,10 +392,12 @@ if test $use_libtool = 1; then
fi fi
if ! printf "$buildreq" | check_versions; then if ! printf "$buildreq" | check_versions; then
test -f README-prereq && echo >&2
echo "See README-prereq for notes on obtaining these prerequisite programs:" >&2 if test -f README-prereq; then
echo echo "See README-prereq for notes on obtaining the prerequisite programs" >&2
print_versions else
echo "Please install the prerequisite programs" >&2
fi
exit 1 exit 1
fi fi
@@ -800,7 +802,7 @@ grep -E '^[ ]*AC_CONFIG_HEADERS?\>' configure.ac >/dev/null ||
for command in \ for command in \
libtool \ libtool \
"${ACLOCAL-aclocal} --force -I m4" \ "${ACLOCAL-aclocal} --force -I m4 $ACLOCAL_FLAGS" \
"${AUTOCONF-autoconf} --force" \ "${AUTOCONF-autoconf} --force" \
"${AUTOHEADER-autoheader} --force" \ "${AUTOHEADER-autoheader} --force" \
"${AUTOMAKE-automake} --add-missing --copy --force-missing" "${AUTOMAKE-automake} --add-missing --copy --force-missing"

1
bootstrap.conf
View File

@@ -150,6 +150,7 @@ git 1.5.5
gzip - gzip -
libtool - libtool -
perl 5.5 perl 5.5
pkg-config -
tar - tar -
" "