X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=configure.ac;h=93b6256e9c60cd7df289e9a5145fd6a9d67d0c9a;hb=b7d59e2cdaa73b42a2063a0653151bae20497074;hp=aa757dc83f3a8e47e4a093f8ccb5cade82342b10;hpb=84bcb4dbee2f3b359409e911deaf82e6e5d0ab43;p=libguestfs.git diff --git a/configure.ac b/configure.ac index aa757dc..93b6256 100644 --- a/configure.ac +++ b/configure.ac @@ -128,6 +128,9 @@ AC_SYS_LARGEFILE dnl Check sizeof long. AC_CHECK_SIZEOF([long]) +dnl Define a C symbol for the host CPU architecture. +AC_DEFINE_UNQUOTED([host_cpu],["$host_cpu"],[Host architecture.]) + dnl Headers. AC_CHECK_HEADERS([errno.h sys/types.h sys/un.h sys/wait.h sys/socket.h endian.h byteswap.h]) @@ -173,7 +176,7 @@ dnl fallback to null vmchannel (still using SLIRP). See the dnl discussion in the README file. if test "x$vmchannel_test" != "xno"; then AC_MSG_CHECKING([for guestfwd support in $QEMU]) - if $QEMU --help | grep -sq guestfwd; then + if $QEMU -nographic --help | grep -sq guestfwd; then AC_MSG_RESULT([yes]) vmchannel_guestfwd=guestfwd else @@ -182,7 +185,7 @@ if test "x$vmchannel_test" != "xno"; then # test failing. This is because recent qemu will throw # up an SDL window and hang if we try to run this test. AC_MSG_CHECKING([for "-net channel" (old guestfwd) support in $QEMU]) - vmchannelout=`$QEMU -net channel /dev/zero 2>&1 ||:` + vmchannelout=`$QEMU -nographic -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 AC_MSG_RESULT([yes]) @@ -194,7 +197,7 @@ if test "x$vmchannel_test" != "xno"; then fi AC_MSG_CHECKING([for "-net user" (user mode network) support in $QEMU]) - if $QEMU --help | grep -sq -- "-net user"; then + if $QEMU -nographic --help | grep -sq -- "-net user"; then AC_MSG_RESULT([yes]) vmchannel_net_user=yes else @@ -335,9 +338,6 @@ AC_ARG_WITH([updates], UPDATES="$with_updates" AC_SUBST(UPDATES) -dnl Define a symbol for the host CPU architecture. -AC_DEFINE_UNQUOTED([host_cpu],["$host_cpu"],[Host architecture.]) - dnl --with-mirror to specify a local Fedora mirror. AC_ARG_WITH([mirror], [AS_HELP_STRING([--with-mirror],