X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=configure.ac;h=3ad995de0ce1e7cc33215590fd4cc0f25beb0937;hp=5cb7c6deeecec494522b1c985c51884d4e9a8759;hb=7801621dc946fe894c960e683db3cf921ef23af6;hpb=606d8ccee17c27e6ecf6fcfc9d05c5758ba77611 diff --git a/configure.ac b/configure.ac index 5cb7c6d..3ad995d 100644 --- a/configure.ac +++ b/configure.ac @@ -15,11 +15,31 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -AC_INIT([libguestfs],[1.0.49]) -AM_INIT_AUTOMAKE +# major/minor/release must be numbers +m4_define([libguestfs_major], [1]) +m4_define([libguestfs_minor], [0]) +m4_define([libguestfs_release], [71]) +# 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]) + +m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])]) +AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. AC_CONFIG_MACRO_DIR([m4]) +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. @@ -27,6 +47,69 @@ AC_PROG_CC_STDC AC_PROG_INSTALL AC_PROG_CPP +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]) @@ -45,8 +128,8 @@ dnl Check for rpcgen and XDR library. rpcgen is optional. AC_CHECK_PROG([RPCGEN],[rpcgen],[rpcgen],[no]) AM_CONDITIONAL([HAVE_RPCGEN],[test "x$RPCGEN" != "xno"]) AC_CHECK_LIB([portablexdr],[xdrmem_create],[],[ - AC_SEARCH_LIBS([xdrmem_create],[rpc xdr nsl]) - ]) + AC_SEARCH_LIBS([xdrmem_create],[rpc xdr nsl]) + ]) dnl Check for pod2man and pod2text. AC_CHECK_PROG([POD2MAN],[pod2man],[pod2man],[no]) @@ -56,42 +139,71 @@ 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], - [$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin]) -test "x$MKSQUASHFS" = "xno" && AC_MSG_ERROR([mksquashfs must be installed]) +dnl Check for mkisofs. +AC_PATH_PROGS([MKISOFS],[mkisofs],[no], + [$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin]) +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. default_qemu="qemu-kvm qemu-system-$host_cpu qemu" AC_ARG_WITH([qemu], - [AS_HELP_STRING([--with-qemu], - [set default QEMU binary @<:@default=[qemu-kvm] qemu-system- qemu@:>@])], - [], - [with_qemu="$default_qemu"]) + [AS_HELP_STRING([--with-qemu], + [set default QEMU binary @<:@default=[qemu-kvm] qemu-system- qemu@:>@])], + [], + [with_qemu="$default_qemu"]) AC_PATH_PROGS([QEMU],[$with_qemu],[no], - [$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin]) + [$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/libexec]) 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 vmchannel 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_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_FAILURE( -[I did not find vmchannel 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]) + 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 @@ -99,34 +211,56 @@ and install it in another location, then you should configure with the --with-qemu option. ]) fi - AC_MSG_RESULT([yes]) fi +dnl Set drive interface used by the guestfs_add_drive{,_ro} calls +dnl ('-drive ...,if=...' option to qemu). +dnl +dnl NB. We will change the default in future to virtio, but at the +dnl moment this causes a performance problem, RHBZ#509383. +AC_ARG_WITH([drive-if], + [AS_HELP_STRING([--with-drive-if], + [set default driver (ide|scsi|virtio) @<:@default=ide@:>@])], + [], + [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]) + [febootstrap],[febootstrap],[no]) if test "x$FEBOOTSTRAP" != "xno"; then AC_CHECK_PROG([FEBOOTSTRAP_RUN], - [febootstrap-run],[febootstrap-run],[no]) + [febootstrap-run],[febootstrap-run],[no]) test "x$FEBOOTSTRAP_RUN" = "xno" && \ AC_MSG_ERROR([febootstrap-run must be installed]) AC_CHECK_PROG([FEBOOTSTRAP_INSTALL], - [febootstrap-install],[febootstrap-install],[no]) + [febootstrap-install],[febootstrap-install],[no]) test "x$FEBOOTSTRAP_INSTALL" = "xno" && \ AC_MSG_ERROR([febootstrap-install must be installed]) AC_CHECK_PROG([FEBOOTSTRAP_MINIMIZE], - [febootstrap-minimize],[febootstrap-minimize],[no]) + [febootstrap-minimize],[febootstrap-minimize],[no]) test "x$FEBOOTSTRAP_MINIMIZE" = "xno" && \ AC_MSG_ERROR([febootstrap-minimize must be installed]) AC_CHECK_PROG([FEBOOTSTRAP_TO_INITRAMFS], - [febootstrap-to-initramfs],[febootstrap-to-initramfs],[no]) + [febootstrap-to-initramfs],[febootstrap-to-initramfs],[no]) test "x$FEBOOTSTRAP_TO_INITRAMFS" = "xno" && \ AC_MSG_ERROR([febootstrap-to-initramfs must be installed]) dnl Check we have fakechroot >= 2.9 (it's an indirect requirement dnl of febootstrap, but old versions will fail with yum). AC_CHECK_PROG([FAKECHROOT], - [fakechroot],[fakechroot],[no]) + [fakechroot],[fakechroot],[no]) test "x$FAKECHROOT" = "xno" && \ AC_MSG_ERROR([fakechroot must be installed]) @@ -137,65 +271,78 @@ 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]) fi fi + DIST="REDHAT" else # check for debootstrap and debirf AC_CHECK_PROG([DEBOOTSTRAP], - [debootstrap],[debootstrap],[no]) + [debootstrap],[debootstrap],[no]) test "x$DEBOOTSTRAP" = "xno" && \ - AC_MSG_ERROR([Either febootstrap or debootstrap must be installed]) + AC_MSG_ERROR([Either febootstrap or debootstrap must be installed]) AC_CHECK_PROG([DEBIRF],[debirf],[debirf],[no]) test "x$DEBIRF" = "xno" && AC_MSG_ERROR([debirf must be installed]) + DIST="DEBIAN" + case "$host_cpu" in + *86) + DEBIAN_KERNEL_ARCH=486 + ;; + x86_64) + DEBIAN_KERNEL_ARCH=amd64 + ;; + *) + DEBIAN_KERNEL_ARCH=$host_cpu + ;; + esac + AC_SUBST(DEBIAN_KERNEL_ARCH) fi +AC_SUBST(DIST) dnl --with-repo to specify a Fedora repository. AC_ARG_WITH([repo], - [AS_HELP_STRING([--with-repo], - [set name of Fedora repository @<:@default=fedora-11@:>@])], - [], - [with_repo=fedora-11]) + [AS_HELP_STRING([--with-repo], + [set name of Fedora repository @<:@default=fedora-11@:>@])], + [], + [with_repo=fedora-11]) REPO="$with_repo" AC_SUBST(REPO) AC_DEFINE_UNQUOTED([REPO],["$REPO"],[Name of Fedora repository.]) -AC_DEFINE_UNQUOTED([host_cpu],["$host_cpu"],[Host architecture.]) - dnl --with-updates to specify a Fedora updates repository. AC_ARG_WITH([updates], - [AS_HELP_STRING([--with-updates], - [set name of Fedora updates repository @<:@default=updates-released-f11@:>@])], - [], - [with_updates=updates-released-f11]) + [AS_HELP_STRING([--with-updates], + [set name of Fedora updates repository @<:@default=updates-released-f11@:>@])], + [], + [with_updates=updates-released-f11]) UPDATES="$with_updates" AC_SUBST(UPDATES) -AC_DEFINE_UNQUOTED([UPDATES],["$UPDATES"],[Name of Fedora updates repository.]) +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], - [set URI of a local Fedora mirror])], - [], - [with_mirror=]) + [AS_HELP_STRING([--with-mirror], + [set URI of a local Fedora mirror])], + [], + [with_mirror=]) MIRROR="$with_mirror" AC_SUBST(MIRROR) dnl Build the supermin appliance? Please see README file before dnl enabling this option. AC_ARG_ENABLE([supermin], - [AS_HELP_STRING([--enable-supermin], - [enable supermin appliance (see README) @<:@default=no@:>@])], - [], - [enable_supermin=no]) + [AS_HELP_STRING([--enable-supermin], + [enable supermin appliance (see README) @<:@default=no@:>@])], + [], + [enable_supermin=no]) AM_CONDITIONAL([SUPERMIN],[test "x$enable_supermin" = "xyes"]) if test "x$enable_supermin" = "xyes"; then @@ -204,9 +351,9 @@ 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( + AC_MSG_FAILURE( [febootstrap-to-initramfs does not support the --files option. To build the supermin appliance, you need to upgrade to the latest @@ -220,9 +367,9 @@ 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( + AC_MSG_FAILURE( [febootstrap-to-initramfs does not support the --nocompress option. To build the supermin appliance, you need to upgrade to the latest @@ -232,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], @@ -254,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 @@ -302,11 +457,11 @@ if test "x$PYTHON" != "xno"; then do AC_MSG_CHECKING([Python.h in $d]) if test -r "$d/Python.h"; then - AC_MSG_RESULT([found]) - PYTHON_INCLUDEDIR=$d - break - fi - AC_MSG_RESULT([not found]) + AC_MSG_RESULT([found]) + PYTHON_INCLUDEDIR=$d + break + fi + AC_MSG_RESULT([not found]) done for d in \ $PYTHON_PREFIX/lib64/python$PYTHON_VERSION/site-packages \ @@ -317,11 +472,11 @@ if test "x$PYTHON" != "xno"; then do AC_MSG_CHECKING([for $d]) if test -d "$d"; then - AC_MSG_RESULT([found]) - PYTHON_SITE_PACKAGES=$d - break - fi - AC_MSG_RESULT([not found]) + AC_MSG_RESULT([found]) + PYTHON_SITE_PACKAGES=$d + break + fi + AC_MSG_RESULT([not found]) done fi @@ -350,39 +505,46 @@ 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 + JAVA_HOME="$with_java_home" + else AC_MSG_FAILURE([$with_java_home is not a directory (use --with-java-home=no to disable Java support)]) - fi + fi fi if test "x$JAVA_HOME" = "x"; then # Look for Java in some likely locations. - for d in \ - /usr/lib/jvm/java \ - /usr/lib/jvm/java-6-openjdk - do - if test -d $d -a -f $d/bin/java; then + for d in \ + /usr/lib/jvm/java \ + /usr/lib/jvm/java-6-openjdk + do + if test -d $d -a -f $d/bin/java; then JAVA_HOME=$d - break - fi - done + break + fi + done fi if test "x$JAVA_HOME" != "x"; then AC_MSG_CHECKING(for JDK in $JAVA_HOME) - if test ! -x "$JAVA_HOME/bin/java"; then + 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 - JAVA="$JAVA_HOME/bin/java" - fi - if test ! -x "$JAVA_HOME/bin/javac"; then + else + JAVA="$JAVA_HOME/bin/java" + fi + if test ! -x "$JAVA_HOME/bin/javac"; then AC_MSG_ERROR([missing $JAVA_HOME/bin/javac binary]) - else - JAVAC="$JAVA_HOME/bin/javac" + else + JAVAC="$JAVA_HOME/bin/javac" fi - if test ! -x "$JAVA_HOME/bin/javah"; then + if test ! -x "$JAVA_HOME/bin/javah"; then AC_MSG_ERROR([missing $JAVA_HOME/bin/javah binary]) else JAVAH="$JAVA_HOME/bin/javah" @@ -407,10 +569,10 @@ 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` - JNI_CFLAGS="-I$dir" + dir=`dirname "$head"` + JNI_CFLAGS="-I$dir" else - AC_MSG_FAILURE([missing jni.h header file]) + AC_MSG_FAILURE([missing jni.h header file]) fi fi AC_MSG_RESULT([$JNI_CFLAGS]) @@ -428,7 +590,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]) @@ -452,10 +614,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 @@ -479,9 +641,9 @@ AC_CHECK_PROG([GHC],[ghc],[ghc],[no]) AM_CONDITIONAL([HAVE_HASKELL], [test "x$GHC" != "xno"]) -dnl Check for Perl modules needed by the inspector. +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; do +for pm in Pod::Usage Getopt::Long Sys::Virt Data::Dumper XML::Writer Locale::TextDomain; do AC_MSG_CHECKING([for $pm]) if ! perl -M$pm -e1 >/dev/null 2>&1; then AC_MSG_RESULT([no]) @@ -491,40 +653,65 @@ for pm in Pod::Usage Getopt::Long Sys::Virt Data::Dumper; do fi done if test "x$missing_perl_modules" = "xyes"; then - AC_MSG_WARN([some Perl modules required to compile virt-inspector 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_RESCUE], + [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes"]) + +dnl Library versioning. +MAX_PROC_NR=`cat $srcdir/src/MAX_PROC_NR` +AC_SUBST(MAX_PROC_NR) dnl Run in subdirs. AC_CONFIG_SUBDIRS([daemon]) dnl Produce output files. AC_CONFIG_HEADERS([config.h]) +dnl http://www.mail-archive.com/automake@gnu.org/msg10204.html +AC_CONFIG_FILES([appliance/make.sh], + [chmod +x appliance/make.sh]) +AC_CONFIG_FILES([appliance/update.sh], + [chmod +x appliance/update.sh]) +AC_CONFIG_FILES([appliance/supermin-split.sh], + [chmod +x appliance/supermin-split.sh]) +AC_CONFIG_FILES([appliance/supermin-make.sh], + [chmod +x appliance/supermin-make.sh]) +AC_CONFIG_FILES([appliance/libguestfs-supermin-helper], + [chmod +x appliance/libguestfs-supermin-helper]) AC_CONFIG_FILES([Makefile - src/Makefile fish/Makefile po/Makefile.in examples/Makefile - appliance/Makefile - appliance/make.sh appliance/update.sh - appliance/supermin-split.sh appliance/supermin-make.sh - appliance/libguestfs-supermin-helper - images/Makefile - capitests/Makefile - regressions/Makefile - ocaml/Makefile ocaml/examples/Makefile - perl/Makefile - python/Makefile - ruby/Makefile ruby/Rakefile - java/Makefile - haskell/Makefile - inspector/Makefile - libguestfs.pc - ocaml/META perl/Makefile.PL]) + src/Makefile fish/Makefile po/Makefile.in examples/Makefile + appliance/Makefile + appliance/debian/debirf.conf + images/Makefile + capitests/Makefile + regressions/Makefile + test-tool/Makefile + ocaml/Makefile ocaml/examples/Makefile + perl/Makefile + python/Makefile + ruby/Makefile ruby/Rakefile + java/Makefile + haskell/Makefile + cat/Makefile + df/Makefile + edit/Makefile + inspector/Makefile + rescue/Makefile + libguestfs.pc + gnulib/lib/Makefile + gnulib/tests/Makefile + ocaml/META perl/Makefile.PL]) AC_OUTPUT -dnl WTF? -chmod +x appliance/*.sh appliance/libguestfs-supermin-helper - dnl Produce summary. echo echo @@ -546,15 +733,23 @@ echo -n "Java bindings ....................... " if test "x$HAVE_JAVA_TRUE" = "x"; then echo "yes"; else echo "no"; fi echo -n "Haskell bindings .................... " if test "x$HAVE_HASKELL" = "x"; then echo "yes"; else echo "no"; fi +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-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'" echo "then you should check the preceeding messages." echo -echo "Please report bugs back to the fedora-virt mailing list:" -echo "http://www.redhat.com/mailman/listinfo/fedora-virt" +echo "Please report bugs back to the mailing list:" +echo "http://www.redhat.com/mailman/listinfo/libguestfs" echo echo "Next you should type 'make' to build the package," echo "then 'make check' to run the tests."