It should error out instead of warning if users provide the option '--with-default-backend=libvirt' and no libvirt devel package installed. Signed-off-by: Lin Ma <lma(a)suse.com&gt; --- m4/guestfs-libraries.m4 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/m4/guestfs-libraries.m4 b/m4/guestfs-libraries.m4 index 6d5f3e3c1..88d4f1cde 100644 --- a/m4/guestfs-libraries.m4 +++ b/m4/guestfs-libraries.m4 @@ -269,8 +269,13 @@ AS_IF([test "$with_libvirt" != "no"],[ AC_SUBST([LIBVIRT_CFLAGS]) AC_SUBST([LIBVIRT_LIBS]) AC_DEFINE([HAVE_LIBVIRT],[1],[libvirt found at compile time.]) - ], - [AC_MSG_WARN([libvirt not found, some core features will be disabled])]) + ],[ + if test "$DEFAULT_BACKEND" = "libvirt"; then + AC_MSG_ERROR([Please install the libvirt devel package]) + else + AC_MSG_WARN([libvirt not found, some core features will be disabled]) + fi + ]) ]) AM_CONDITIONAL([HAVE_LIBVIRT],[test "x$LIBVIRT_LIBS" != "x"]) -- 2.15.1

Signed-off-by: Lin Ma <lma(a)suse.com&gt; --- m4/guestfs-libraries.m4 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/m4/guestfs-libraries.m4 b/m4/guestfs-libraries.m4 index 88d4f1cde..647bea9ec 100644 --- a/m4/guestfs-libraries.m4 +++ b/m4/guestfs-libraries.m4 @@ -238,7 +238,14 @@ AC_ARG_ENABLE([packet-dump],[ []) dnl Check for PCRE (required) -PKG_CHECK_MODULES([PCRE], [libpcre]) +PKG_CHECK_MODULES([PCRE], [libpcre], [], [ + AC_CHECK_PROGS([PCRE_CONFIG], [pcre-config pcre2-config], [no]) + AS_IF([test "x$PCRE_CONFIG" = "xno"], [ + AC_MSG_ERROR([Please install the pcre devel package]) + ]) + PCRE_CFLAGS=`$PCRE_CONFIG --cflags` + PCRE_LIBS=`$PCRE_CONFIG --libs` +]) dnl Check for Augeas >= 1.0.0 (required). PKG_CHECK_MODULES([AUGEAS],[augeas >= 1.0.0]) -- 2.15.1

Don't clone online gnulib repo if the environment variable $GNULIB_SRCDIR is available, and add an option '--gnulib-srcdir' for bootstrap to specify a local source directory. (borrowed some code which wrote by Jim Meyering and Eric Blake in libvirt) Signed-off-by: Lin Ma <lma(a)suse.com&gt; --- bootstrap | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 73 insertions(+), 5 deletions(-) diff --git a/bootstrap b/bootstrap index bb665c6a8..aaf038d98 100755 --- a/bootstrap +++ b/bootstrap @@ -4,6 +4,13 @@ usage() { echo >&2 "\ Usage: $0 [OPTION]... Bootstrap this package from the checked-out sources. + +Options: + --gnulib-srcdir=DIRNAME specify the local directory where gnulib + sources reside. Use this if you already + have gnulib sources on your machine, and + do not want to waste your bandwidth downloading + them again. Defaults to \$GNULIB_SRCDIR " } @@ -13,18 +20,79 @@ do --help) usage exit;; + --gnulib-srcdir=*) + GNULIB_SRCDIR=${option#--gnulib-srcdir=};; *) echo >&2 "$0: $option: unknown option" exit 1;; esac done -# Get gnulib files. +cleanup_gnulib() { + status=$? + rm -fr "$gnulib_path" + exit $status +} + +git_modules_config () { + test -f .gitmodules && git config --file .gitmodules "$@" +} + +gnulib_path=$(git_modules_config submodule.gnulib.path) +test -z "$gnulib_path" && gnulib_path=gnulib + +# Get gnulib files. Populate $GNULIB_SRCDIR, possibly updating a +# submodule, for use in the rest of the script. + +case ${GNULIB_SRCDIR--} in +-) + if git_modules_config submodule.gnulib.url >/dev/null; then + echo "$0: getting gnulib files..." + git submodule init -- "$gnulib_path" || exit $? + git submodule update -- "$gnulib_path" || exit $? + + elif [ ! -d "$gnulib_path" ]; then + echo "$0: getting gnulib files..." + + trap cleanup_gnulib 1 2 13 15 + + shallow= + git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2' + git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" || + cleanup_gnulib -echo "$0: getting gnulib files..." -git submodule init || exit $? -git submodule update || exit $? -GNULIB_SRCDIR=.gnulib + trap - 1 2 13 15 + fi + GNULIB_SRCDIR=$gnulib_path + ;; +*) + # Use GNULIB_SRCDIR directly or as a reference. + if test -d "$GNULIB_SRCDIR"/.git && \ + git_modules_config submodule.gnulib.url >/dev/null; then + echo "$0: getting gnulib files..." + if git submodule -h|grep -- --reference > /dev/null; then + # Prefer the one-liner available in git 1.6.4 or newer. + git submodule update --init --reference "$GNULIB_SRCDIR" \ + "$gnulib_path" || exit $? + else + # This fallback allows at least git 1.5.5. + if test -f "$gnulib_path"/gnulib-tool; then + # Since file already exists, assume submodule init already complete. + git submodule update -- "$gnulib_path" || exit $? + else + # Older git can't clone into an empty directory. + rmdir "$gnulib_path" 2>/dev/null + git clone --reference "$GNULIB_SRCDIR" \ + "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \ + && git submodule init -- "$gnulib_path" \ + && git submodule update -- "$gnulib_path" \ + || exit $? + fi + fi + GNULIB_SRCDIR=$gnulib_path + fi + ;; +esac # Autoreconf runs aclocal before libtoolize, which causes spurious # warnings if the initial aclocal is confused by the libtoolized -- 2.15.1