X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=configure.ac;h=403a9981338fcf07bf316bc97d4281203631b521;hp=438726cda64df9982c36d4ad2a45da616733c6b5;hb=dc0c80b3884c5fa2735b55b205e7406599bd77b0;hpb=0f7656f2870fd5f1644e54438e7639fa2dcbc747 diff --git a/configure.ac b/configure.ac index 438726c..403a998 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ # major/minor/release must be numbers m4_define([libguestfs_major], [1]) m4_define([libguestfs_minor], [0]) -m4_define([libguestfs_release], [68]) +m4_define([libguestfs_release], [72]) # extra can be any string m4_define([libguestfs_extra], []) @@ -31,22 +31,22 @@ AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. AC_CONFIG_MACRO_DIR([m4]) -AC_PROG_LIBTOOL - dnl Split up the version string. AC_DEFINE([PACKAGE_VERSION_MAJOR],[libguestfs_major],[Major version number]) AC_DEFINE([PACKAGE_VERSION_MINOR],[libguestfs_minor],[Minor version number]) AC_DEFINE([PACKAGE_VERSION_RELEASE],[libguestfs_release],[Release number]) AC_DEFINE([PACKAGE_VERSION_EXTRA],["libguestfs_extra"],[Extra version string]) +gl_EARLY +gl_INIT + +AC_PROG_LIBTOOL + dnl Check for basic C environment. AC_PROG_CC_STDC AC_PROG_INSTALL AC_PROG_CPP -gl_EARLY -gl_INIT - AC_ARG_ENABLE([gcc-warnings], [AS_HELP_STRING([--enable-gcc-warnings], [turn on lots of GCC warnings (for developers)])], @@ -84,6 +84,8 @@ if test "$gl_gcc_warnings" = yes; then nw="$nw -Winline" # daemon.h's asprintf_nowarn nw="$nw -Wshadow" # numerous, plus we're not unanimous # ?? -Wstrict-overflow + nw="$nw -Wunsafe-loop-optimizations" # just a warning that an optimization + # was not possible, safe to ignore gl_MANYWARN_ALL_GCC([ws]) gl_MANYWARN_COMPLEMENT([ws], [$ws], [$nw]) @@ -137,10 +139,10 @@ AC_CHECK_PROG([POD2TEXT],[pod2text],[pod2text],[no]) test "x$POD2TEXT" = "xno" && AC_MSG_ERROR([pod2text must be installed]) -dnl Check for mksquashfs. -AC_PATH_PROGS([MKSQUASHFS],[mksquashfs],[no], +dnl Check for mkisofs. +AC_PATH_PROGS([MKISOFS],[mkisofs],[no], [$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin]) -test "x$MKSQUASHFS" = "xno" && AC_MSG_ERROR([mksquashfs must be installed]) +test "x$MKISOFS" = "xno" && AC_MSG_ERROR([mkisofs must be installed]) dnl Check for QEMU for running binaries on this $host_cpu, fall dnl back to basic 'qemu'. Allow the user to override it. @@ -155,38 +157,59 @@ AC_PATH_PROGS([QEMU],[$with_qemu],[no], test "x$QEMU" = "xno" && AC_MSG_ERROR([qemu must be installed]) AC_DEFINE_UNQUOTED([QEMU],["$QEMU"],[Location of qemu binary.]) -dnl Check that the chosen qemu has vmchannel support. -dnl http://lists.gnu.org/archive/html/qemu-devel/2009-02/msg01042.html +dnl Check that the chosen qemu has vmchannel support or we can +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]) + AC_MSG_CHECKING([for guestfwd support in $QEMU]) if $QEMU --help | grep -sq guestfwd; then AC_MSG_RESULT([yes]) + vmchannel_guestfwd=guestfwd else AC_MSG_RESULT([no]) - AC_MSG_CHECKING([for "-net channel" support in $QEMU]) + # Note that this test must be conditional on the previous + # 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 ||:` echo "vmchannel test command output: $vmchannelout" >&AS_MESSAGE_LOG_FD if echo "$vmchannelout" | grep -sq "vmchannel wrong port number" ; then AC_MSG_RESULT([yes]) + vmchannel_guestfwd=net_channel else AC_MSG_RESULT([no]) - AC_MSG_FAILURE( -[I did not find vmchannel support in $QEMU. + vmchannel_guestfwd=no + fi + fi -vmchannel support is vital for libguestfs to operate. You need a version -of qemu >= 0.10, or the following patch backported to earlier versions: + AC_MSG_CHECKING([for "-net user" (user mode network) support in $QEMU]) + if $QEMU --help | grep -sq -- "-net user"; then + AC_MSG_RESULT([yes]) + vmchannel_net_user=yes + else + AC_MSG_RESULT([no]) + vmchannel_net_user=no + fi -http://lists.gnu.org/archive/html/qemu-devel/2009-02/msg01042.html + if test "x$vmchannel_net_user" = "xno" -a "x$vmchannel_guestfwd" = "xno"; then + AC_MSG_FAILURE( +[I did not find user mode network or vmchannel support in +$QEMU. + +Either user mode networking or vmchannel support is vital for +libguestfs to operate. + +Please read the relevant section in the README file for more +information about this. You can override this test by setting the environment variable -vmchannel_test=no However if you don't have vmchannel support +vmchannel_test=no However if you don't have the right support in your qemu, then this just delays the pain. If I am using the wrong qemu or you want to compile qemu from source and install it in another location, then you should configure with the --with-qemu option. ]) - fi fi fi @@ -356,6 +379,14 @@ version of febootstrap. AC_MSG_RESULT([yes]) fi +dnl Enable packet dumps when in verbose mode. This generates lots +dnl of debug info, only useful for people debugging the RPC mechanism. +AC_ARG_ENABLE([packet-dump], + [AS_HELP_STRING([--enable-packet-dump], + [enable packet dumps in verbose mode @<:@default=no@:>@])], + [AC_DEFINE([ENABLE_PACKET_DUMP],[1],[Enable packet dumps in verbose mode.])], + []) + dnl Readline. AC_ARG_WITH([readline], [AS_HELP_STRING([--with-readline], @@ -378,7 +409,7 @@ AS_IF([test "x$with_readline" != xno], dnl For i18n. AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.14]) +AM_GNU_GETTEXT_VERSION([0.17]) dnl Check for OCaml (optional, for OCaml bindings). AC_PROG_OCAML @@ -610,7 +641,7 @@ AC_CHECK_PROG([GHC],[ghc],[ghc],[no]) AM_CONDITIONAL([HAVE_HASKELL], [test "x$GHC" != "xno"]) -dnl Check for Perl modules needed by virt-df, inspector, V2V etc. +dnl Check for Perl modules needed by virt-df, inspector, etc. missing_perl_modules=no for pm in Pod::Usage Getopt::Long Sys::Virt Data::Dumper XML::Writer Locale::TextDomain; do AC_MSG_CHECKING([for $pm]) @@ -622,16 +653,18 @@ for pm in Pod::Usage Getopt::Long Sys::Virt Data::Dumper XML::Writer Locale::Tex fi done if test "x$missing_perl_modules" = "xyes"; then - AC_MSG_WARN([some Perl modules required to compile virt-cat, virt-df, virt-inspector and virt-v2v are missing]) + AC_MSG_WARN([some Perl modules required to compile virt-cat, virt-df, virt-edit, virt-inspector and virt-rescue are missing]) fi AM_CONDITIONAL([HAVE_CAT], [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes"]) AM_CONDITIONAL([HAVE_DF], [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes"]) +AM_CONDITIONAL([HAVE_EDIT], + [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes"]) AM_CONDITIONAL([HAVE_INSPECTOR], [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes"]) -AM_CONDITIONAL([HAVE_V2V], +AM_CONDITIONAL([HAVE_RESCUE], [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes"]) dnl Library versioning. @@ -670,8 +703,9 @@ AC_CONFIG_FILES([Makefile haskell/Makefile cat/Makefile df/Makefile + edit/Makefile inspector/Makefile - v2v/Makefile + rescue/Makefile libguestfs.pc gnulib/lib/Makefile gnulib/tests/Makefile @@ -703,10 +737,12 @@ echo -n "virt-cat ............................ " if test "x$HAVE_CAT" = "x"; then echo "yes"; else echo "no"; fi echo -n "virt-df ............................. " if test "x$HAVE_DF" = "x"; then echo "yes"; else echo "no"; fi +echo -n "virt-edit ........................... " +if test "x$HAVE_EDIT" = "x"; then echo "yes"; else echo "no"; fi echo -n "virt-inspector ...................... " if test "x$HAVE_INSPECTOR" = "x"; then echo "yes"; else echo "no"; fi -echo -n "virt-v2v ............................ " -if test "x$HAVE_V2V" = "x"; then echo "yes"; else echo "no"; fi +echo -n "virt-rescue ......................... " +if test "x$HAVE_RESCUE" = "x"; then echo "yes"; else echo "no"; fi echo "supermin appliance .................. $enable_supermin" echo echo "If any optional component is configured 'no' when you expected 'yes'"