X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=configure.ac;h=3ad995de0ce1e7cc33215590fd4cc0f25beb0937;hp=28514b623fdecc25e3fd6be990cc2479a28a2e64;hb=7801621dc946fe894c960e683db3cf921ef23af6;hpb=2f1a50d81671810256dce0852e6b1e0810ac44af diff --git a/configure.ac b/configure.ac index 28514b6..3ad995d 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], [65]) +m4_define([libguestfs_release], [71]) # extra can be any string m4_define([libguestfs_extra], []) @@ -26,9 +26,10 @@ AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release[]libgu AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([foreign]) -AC_CONFIG_MACRO_DIR([m4]) +m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])]) +AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. -AC_PROG_LIBTOOL +AC_CONFIG_MACRO_DIR([m4]) dnl Split up the version string. AC_DEFINE([PACKAGE_VERSION_MAJOR],[libguestfs_major],[Major version number]) @@ -36,13 +37,78 @@ 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)])], + [case $enableval in + yes|no) ;; + *) AC_MSG_ERROR([bad value $enableval for gcc-warnings option]) ;; + esac + gl_gcc_warnings=$enableval], + [gl_gcc_warnings=no] +) + +if test "$gl_gcc_warnings" = yes; then + gl_WARN_ADD([-Werror], [WERROR_CFLAGS]) + AC_SUBST([WERROR_CFLAGS]) + + nw= + # This, $nw, is the list of warnings we disable. + nw="$nw -Wdeclaration-after-statement" # too useful to forbid + nw="$nw -Waggregate-return" # anachronistic + nw="$nw -Wc++-compat" # We don't care about C++ compilers + nw="$nw -Wundef" # Warns on '#if GNULIB_FOO' etc in gnulib + nw="$nw -Wtraditional" # Warns on #elif which we use often + nw="$nw -Wcast-qual" # Too many warnings for now + nw="$nw -Wconversion" # Too many warnings for now + nw="$nw -Wsystem-headers" # Don't let system headers trigger warnings + nw="$nw -Wsign-conversion" # Too many warnings for now + nw="$nw -Wtraditional-conversion" # Too many warnings for now + nw="$nw -Wunreachable-code" # Too many warnings for now + nw="$nw -Wpadded" # Our structs are not padded + nw="$nw -Wredundant-decls" # openat.h declares e.g., mkdirat + nw="$nw -Wlogical-op" # any use of fwrite provokes this + nw="$nw -Wvla" # two warnings in mount.c + # things I might fix soon: + nw="$nw -Wmissing-format-attribute" # daemon.h's asprintf_nowarn + 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]) + for w in $ws; do + gl_WARN_ADD([$w]) + done + gl_WARN_ADD([-Wno-unused-parameter]) # stubs.c + gl_WARN_ADD([-Wno-jump-misses-init]) # stubs.c + gl_WARN_ADD([-Wno-unused-variable]) # FIXME: only temporary, for guestfs_protocol.c, etc + + # In spite of excluding -Wlogical-op above, it is enabled, as of + # gcc 4.5.0 20090517, and it provokes warnings in cat.c, dd.c, truncate.c + gl_WARN_ADD([-Wno-logical-op]) + + gl_WARN_ADD([-fdiagnostics-show-option]) + + AC_SUBST([WARN_CFLAGS]) + + AC_DEFINE([lint], [1], [Define to 1 if the compiler is checking for lint.]) + AC_DEFINE([_FORTIFY_SOURCE], [2], + [enable compile-time and run-time bounds-checking, and some warnings]) + AC_DEFINE([GNULIB_PORTCHECK], [1], [enable some gnulib portability checks]) +fi AC_C_PROTOTYPES test "x$U" != "x" && AC_MSG_ERROR([Compiler not ANSI compliant]) @@ -73,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. @@ -91,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 + + 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. -http://lists.gnu.org/archive/html/qemu-devel/2009-02/msg01042.html +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 @@ -138,6 +225,17 @@ AC_ARG_WITH([drive-if], [with_drive_if=ide]) AC_DEFINE_UNQUOTED([DRIVE_IF],["$with_drive_if"],[Default drive interface.]) +dnl Set interface used by the network. Normally you should +dnl leave this at the default (virtio) but you can use the +dnl alternative (ne2k_pci) because of bugs in virtio networking +dnl eg. https://bugzilla.redhat.com/show_bug.cgi?id=516022 +AC_ARG_WITH([net-if], + [AS_HELP_STRING([--with-net-if], + [set default net driver (virtio|ne2k_pci) @<:@default=virtio@:>@])], + [], + [with_net_if=virtio]) +AC_DEFINE_UNQUOTED([NET_IF],["$with_net_if"],[Default network interface.]) + dnl Check for febootstrap etc. AC_CHECK_PROG([FEBOOTSTRAP], [febootstrap],[febootstrap],[no]) @@ -281,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], @@ -303,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 @@ -535,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]) @@ -547,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. @@ -595,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 @@ -628,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'"