X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=configure.ac;h=df466fa86886e6a625226042a4d3a73667d59be5;hp=bc60608675dd5380f7166b070347160f4998bd66;hb=58e7e42033b1ac5044ae03f0aa5d5082c5fdb497;hpb=f9de01b9b97e3d13959754446464f9b768deea81 diff --git a/configure.ac b/configure.ac index bc60608..df466fa 100644 --- a/configure.ac +++ b/configure.ac @@ -18,11 +18,12 @@ # major/minor/release must be numbers m4_define([libguestfs_major], [1]) m4_define([libguestfs_minor], [0]) -m4_define([libguestfs_release], [62]) +m4_define([libguestfs_release], [65]) # extra can be any string m4_define([libguestfs_extra], []) AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release[]libguestfs_extra) +AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([foreign]) AC_CONFIG_MACRO_DIR([m4]) @@ -40,6 +41,9 @@ AC_PROG_CC_STDC AC_PROG_INSTALL AC_PROG_CPP +gl_EARLY +gl_INIT + AC_C_PROTOTYPES test "x$U" != "x" && AC_MSG_ERROR([Compiler not ANSI compliant]) @@ -91,13 +95,14 @@ dnl Check that the chosen qemu has vmchannel support. dnl http://lists.gnu.org/archive/html/qemu-devel/2009-02/msg01042.html if test "x$vmchannel_test" != "xno"; then AC_MSG_CHECKING([for "guestfwd" support in $QEMU]) - if qemu-kvm --help | grep -sq guestfwd; then + if $QEMU --help | grep -sq guestfwd; then AC_MSG_RESULT([yes]) else + AC_MSG_RESULT([no]) AC_MSG_CHECKING([for "-net channel" support in $QEMU]) vmchannelout=`$QEMU -net channel /dev/zero 2>&1 ||:` echo "vmchannel test command output: $vmchannelout" >&AS_MESSAGE_LOG_FD - if echo $vmchannelout | grep -sq "vmchannel wrong port number" ; then + if echo "$vmchannelout" | grep -sq "vmchannel wrong port number" ; then AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) @@ -168,8 +173,8 @@ if test "x$FEBOOTSTRAP" != "xno"; then AC_MSG_WARN([fakechroot --version command failed, proceeding anyway]) else AC_MSG_RESULT([$fakechroot_version]) - fakechroot_major=`echo $fakechroot_version | awk -F. '{print $1}'` - fakechroot_minor=`echo $fakechroot_version | awk -F. '{print $2}'` + fakechroot_major=`echo "$fakechroot_version" | awk -F. '{print $1}'` + fakechroot_minor=`echo "$fakechroot_version" | awk -F. '{print $2}'` if test "$fakechroot_major" -lt 2 -o \ \( "$fakechroot_major" -eq 2 -a "$fakechroot_minor" -lt 9 \); then AC_MSG_ERROR([fakechroot version must be >= 2.9]) @@ -186,7 +191,7 @@ else test "x$DEBIRF" = "xno" && AC_MSG_ERROR([debirf must be installed]) DIST="DEBIAN" - case $host_cpu in + case "$host_cpu" in *86) DEBIAN_KERNEL_ARCH=486 ;; @@ -248,7 +253,7 @@ if test "x$enable_supermin" = "xyes"; then AC_MSG_CHECKING([for --files support in $FEBOOTSTRAP_TO_INITRAMFS]) out=`$FEBOOTSTRAP_TO_INITRAMFS 2>&1 ||:` echo "febootstrap_to_initramfs test command output: $out" >&AS_MESSAGE_LOG_FD - if ! echo $out | grep -sq -- "--files" ; then + if ! echo "$out" | grep -sq -e --files ; then AC_MSG_RESULT([no]) AC_MSG_FAILURE( [febootstrap-to-initramfs does not support the --files option. @@ -264,7 +269,7 @@ version of febootstrap. AC_MSG_CHECKING([for --nocompress support in $FEBOOTSTRAP_TO_INITRAMFS]) out=`$FEBOOTSTRAP_TO_INITRAMFS 2>&1 ||:` echo "febootstrap_to_initramfs test command output: $out" >&AS_MESSAGE_LOG_FD - if ! echo $out | grep -sq -- "--nocompress" ; then + if ! echo "$out" | grep -sq -e --nocompress ; then AC_MSG_RESULT([no]) AC_MSG_FAILURE( [febootstrap-to-initramfs does not support the --nocompress option. @@ -394,6 +399,13 @@ AC_ARG_WITH(java_home, if test "x$with_java_home" != "xno"; then if test "x$with_java_home" != "xyes" -a "x$with_java_home" != "xcheck" then + # Reject unsafe characters in $JAVA_HOME + jh_lf=' +' + case $JAVA_HOME in + *[\\\"\#\$\&\'\`$jh_lf\ \ ]*) + AC_MSG_FAILURE([unsafe \$JAVA_HOME directory (use --with-java-home=no to disable Java support)]);; + esac if test -d "$with_java_home"; then JAVA_HOME="$with_java_home" else @@ -418,7 +430,7 @@ if test "x$with_java_home" != "xno"; then AC_MSG_CHECKING(for JDK in $JAVA_HOME) if test ! -x "$JAVA_HOME/bin/java"; then AC_MSG_ERROR([missing $JAVA_HOME/bin/java binary (use --with-java-home=no to disable Java support)]) - else + else JAVA="$JAVA_HOME/bin/java" fi if test ! -x "$JAVA_HOME/bin/javac"; then @@ -451,7 +463,7 @@ if test "x$with_java_home" != "xno"; then else if test "`find $JAVA_HOME -name jni.h`" != ""; then head=`find $JAVA_HOME -name jni.h | tail -1` - dir=`dirname $head` + dir=`dirname "$head"` JNI_CFLAGS="-I$dir" else AC_MSG_FAILURE([missing jni.h header file]) @@ -472,7 +484,7 @@ if test "x$with_java_home" != "xno"; then else if test "`find $JAVA_HOME -name jni_md.h`" != ""; then head=`find $JAVA_HOME -name jni_md.h | tail -1` - dir=`dirname $head` + dir=`dirname "$head"` JNI_CFLAGS="$JNI_CFLAGS -I$dir" else AC_MSG_FAILURE([missing jni_md.h header file]) @@ -496,10 +508,10 @@ if test "x$with_java_home" != "xno"; then JNI_INSTALL_DIR=\${libdir} dnl JNI version. - jni_major_version=`echo $VERSION | awk -F. '{print $1}'` - jni_minor_version=`echo $VERSION | awk -F. '{print $2}'` - jni_micro_version=`echo $VERSION | awk -F. '{print $3}'` - JNI_VERSION_INFO=`expr $jni_major_version + $jni_minor_version`:$jni_micro_version:$jni_minor_version + jni_major_version=`echo "$VERSION" | awk -F. '{print $1}'` + jni_minor_version=`echo "$VERSION" | awk -F. '{print $2}'` + jni_micro_version=`echo "$VERSION" | awk -F. '{print $3}'` + JNI_VERSION_INFO=`expr "$jni_major_version" + "$jni_minor_version"`":$jni_micro_version:$jni_minor_version" fi fi @@ -586,6 +598,8 @@ AC_CONFIG_FILES([Makefile inspector/Makefile v2v/Makefile libguestfs.pc + gnulib/lib/Makefile + gnulib/tests/Makefile ocaml/META perl/Makefile.PL]) AC_OUTPUT