X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=configure.ac;h=e99ef57c0f4a8ff94dcca836698dbdb784c7632a;hb=f54450b4a0cbf506d9d54e521069e9a90c20a78e;hp=268119a00a0d6e744b5d69b5431d4b87c97ad0a8;hpb=872e67ffdf6c7b19782514445d13e8f405e435c1;p=libguestfs.git diff --git a/configure.ac b/configure.ac index 268119a..e99ef57 100644 --- a/configure.ac +++ b/configure.ac @@ -15,12 +15,12 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# major/minor/release must be numbers +# The major, minor, and release fields MUST be numbers. Packagers can +# add extra information using --with-extra="..." which may be any +# freeform string. m4_define([libguestfs_major], [1]) -m4_define([libguestfs_minor], [9]) -m4_define([libguestfs_release], [17]) -# extra can be any string -m4_define([libguestfs_extra], []) +m4_define([libguestfs_minor], [12]) +m4_define([libguestfs_release], [4]) AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release) AC_CONFIG_AUX_DIR([build-aux]) @@ -31,12 +31,6 @@ 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]) - dnl Stable or unstable version? AC_MSG_CHECKING([if this is a stable or unstable branch of libguestfs]) AS_IF([test "$((libguestfs_minor % 2))" -eq 0 ],[ @@ -53,6 +47,22 @@ please see the section "LIBGUESTFS VERSION NUMBERS" in guestfs(3). ***]) ]) +dnl Extra string, a freeform string defined by packagers. +AC_ARG_WITH([extra], + [AS_HELP_STRING([--with-extra], + [extra version string (for use by packagers)])], + [libguestfs_extra="$withval"], + [libguestfs_extra=] +) + +AC_MSG_NOTICE([libguestfs version libguestfs_major.libguestfs_minor.libguestfs_release$libguestfs_extra]) + +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_UNQUOTED([PACKAGE_VERSION_EXTRA],["$libguestfs_extra"],[Extra version string]) + dnl Early gnulib initialization. gl_EARLY gl_INIT @@ -107,6 +117,8 @@ if test "$gl_gcc_warnings" = yes; then # by Python, Ruby and xstrtoll. nw="$nw -Wstack-protector" # Don't warn about stack-protector # failures (seen on Ubuntu). + nw="$nw -Wmissing-noreturn" # Don't warn about missed noreturn funcs + # (seen on Ubuntu). gl_MANYWARN_ALL_GCC([ws]) gl_MANYWARN_COMPLEMENT([ws], [$ws], [$nw]) @@ -187,7 +199,7 @@ if test "x$enable_appliance" = "xyes"; then test "x$FEBOOTSTRAP" = "xno" && AC_MSG_ERROR([febootstrap must be installed]) dnl febootstrap 2.x did not support the --version parameter - $FEBOOTSTRAP --version >/dev/null 2>&1 || + $FEBOOTSTRAP --version >&AS_MESSAGE_LOG_FD 2>&1 || AC_MSG_ERROR([febootstrap >= 3.0 must be installed, your version is too old]) dnl Pass a febootstrap --yum-config option. @@ -210,7 +222,7 @@ if test "x$enable_appliance" = "xyes"; then DISTRO=REDHAT if test -f /etc/debian_version; then DISTRO=DEBIAN - if grep -q 'DISTRIB_ID=Ubuntu' /etc/lsb-release 2>/dev/null; then + if grep -q 'DISTRIB_ID=Ubuntu' /etc/lsb-release 2>&AS_MESSAGE_LOG_FD; then DISTRO=UBUNTU fi fi @@ -251,7 +263,7 @@ test "x$POD2HTML" = "xno" && dnl Check if pod2man, pod2text take --stderr and -u options (not in RHEL 5). AC_MSG_CHECKING([if pod2man takes --stderr option]) -if "$POD2MAN" --stderr >/dev/null 2>&1; then +if "$POD2MAN" --stderr >&AS_MESSAGE_LOG_FD 2>&1; then AC_MSG_RESULT([yes]) POD2_STDERR_OPTION="--stderr" else @@ -261,7 +273,7 @@ fi AC_SUBST([POD2_STDERR_OPTION]) AC_MSG_CHECKING([if pod2man takes -u option]) -if "$POD2MAN" -u >/dev/null 2>&1; then +if "$POD2MAN" -u >&AS_MESSAGE_LOG_FD 2>&1; then AC_MSG_RESULT([yes]) POD2_UTF8_OPTION="-u" else @@ -310,6 +322,19 @@ AC_DEFINE_UNQUOTED([QEMU],["$QEMU"],[Location of qemu binary.]) dnl Check that the chosen qemu has virtio-serial support. if test "x$vmchannel_test" != "xno"; then + AC_MSG_CHECKING([that $QEMU -help works]) + if $QEMU -help >&AS_MESSAGE_LOG_FD 2>&1; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_FAILURE( +[$QEMU -help: command failed. + +This could be a very old version of qemu, or qemu might not be +working. +]) + fi + AC_MSG_CHECKING([for virtio-serial support in $QEMU]) if $QEMU -nographic -device \? 2>&1 | grep -sq virtio-serial; then AC_MSG_RESULT([yes]) @@ -396,6 +421,9 @@ AS_IF([test "x$with_readline" != xno], dnl For i18n. AM_GNU_GETTEXT([external]) +dnl Check for PCRE (required) +PKG_CHECK_MODULES([PCRE], [libpcre]) + dnl libmagic (highly recommended) AC_CHECK_LIB([magic],[magic_file], [AC_CHECK_HEADER([magic.h], @@ -405,14 +433,6 @@ AC_CHECK_LIB([magic],[magic_file], ], [AC_MSG_WARN([libmagic not found, some core features will be disabled])]) -dnl Check for PCRE (highly recommended) -PKG_CHECK_MODULES([PCRE], [libpcre], - [AC_SUBST([PCRE_CFLAGS]) - AC_SUBST([PCRE_LIBS]) - AC_DEFINE([HAVE_PCRE],[1],[PCRE found at compile time.]) - ], - [AC_MSG_WARN([PCRE not found, some core features will be disabled])]) - dnl libvirt (highly recommended) PKG_CHECK_MODULES([LIBVIRT], [libvirt], [AC_SUBST([LIBVIRT_CFLAGS]) @@ -476,9 +496,16 @@ AS_IF([test "x$enable_ocaml" != "xno"], OCAMLFIND= AC_PROG_OCAML AC_PROG_FINDLIB + + AS_IF([test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"], + [AC_CHECK_OCAML_PKG([pcre])]) ]) AM_CONDITIONAL([HAVE_OCAML], [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"]) +AM_CONDITIONAL([HAVE_OCAML_PCRE], + [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" && test "x$OCAML_PKG_pcre" != "xno"]) +AM_CONDITIONAL([HAVE_OCAMLDOC], + [test "x$OCAMLDOC" != "xno"]) dnl Check for Perl (optional, for Perl bindings). PERL=no @@ -496,7 +523,7 @@ AS_IF([test "x$enable_perl" != "xno"], missing_perl_modules=no for pm in Test::More ExtUtils::MakeMaker; do AC_MSG_CHECKING([for $pm]) - if ! perl -M$pm -e1 >/dev/null 2>&1; then + if ! perl -M$pm -e1 >&AS_MESSAGE_LOG_FD 2>&1; then AC_MSG_RESULT([no]) missing_perl_modules=yes else @@ -533,22 +560,13 @@ AS_IF([test "x$enable_python" != "xno"], PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"` AC_MSG_RESULT([$PYTHON_VERSION]) - for d in \ - $PYTHON_PREFIX/include/python$PYTHON_VERSION \ - /usr/include/python$PYTHON_VERSION \ - /usr/local/include/python$PYTHON_VERSION - 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]) - done - if test "x$PYTHON_INCLUDEDIR" = "x"; then - AC_MSG_WARN([Python include directory not found]) + AC_MSG_CHECKING([for Python include path]) + if test -z "$PYTHON_INCLUDEDIR"; then + python_path=`$PYTHON -c "import distutils.sysconfig; \ + print (distutils.sysconfig.get_python_inc ());"` + PYTHON_INCLUDEDIR=$python_path fi + AC_MSG_RESULT([$PYTHON_INCLUDEDIR]) AC_ARG_WITH([python-installdir], [AS_HELP_STRING([--with-python-installdir], @@ -559,24 +577,12 @@ AS_IF([test "x$enable_python" != "xno"], if test "x$PYTHON_INSTALLDIR" = "xcheck"; then PYTHON_INSTALLDIR= - for d in \ - $PYTHON_PREFIX/lib64/python$PYTHON_VERSION/site-packages \ - $PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages \ - /usr/lib64/python$PYTHON_VERSION/site-packages \ - /usr/lib/python$PYTHON_VERSION/site-packages \ - /usr/local/lib/python$PYTHON_VERSION/site-packages - do - AC_MSG_CHECKING([for $d]) - if test -d "$d"; then - AC_MSG_RESULT([found]) - PYTHON_INSTALLDIR=$d - break - fi - AC_MSG_RESULT([not found]) - done - if test "x$PYTHON_INSTALLDIR" = "x"; then - AC_MSG_WARN([Python site-packages directory not found]) + AC_MSG_CHECKING([for Python site-packages path]) + if test -z "$PYTHON_INSTALLDIR"; then + PYTHON_INSTALLDIR=`$PYTHON -c "import distutils.sysconfig; \ + print (distutils.sysconfig.get_python_lib(1,0));"` fi + AC_MSG_RESULT([$PYTHON_INSTALLDIR]) fi old_LIBS="$LIBS" @@ -780,7 +786,7 @@ AS_IF([test "x$PERL" != "xno"], missing_perl_modules=no for pm in Pod::Usage Getopt::Long Sys::Virt Data::Dumper Locale::TextDomain Win::Hivex Win::Hivex::Regedit String::ShellQuote; do AC_MSG_CHECKING([for $pm]) - if ! $PERL -M$pm -e1 >/dev/null 2>&1; then + if ! $PERL -M$pm -e1 >&AS_MESSAGE_LOG_FD 2>&1; then AC_MSG_RESULT([no]) missing_perl_modules=yes else @@ -801,7 +807,7 @@ AC_SUBST(MAX_PROC_NR) dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html -LIBTOOL='$(SHELL) $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool' +LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool' AC_SUBST([LIBTOOL]) dnl Run in subdirs. @@ -814,36 +820,51 @@ AC_CONFIG_HEADERS([config.h]) dnl http://www.mail-archive.com/automake@gnu.org/msg10204.html AC_CONFIG_FILES([podwrapper.sh], [chmod +x podwrapper.sh]) +AC_CONFIG_FILES([run], + [chmod +x run]) AC_CONFIG_FILES([Makefile - generator/Makefile - src/Makefile fish/Makefile po/Makefile.in examples/Makefile appliance/Makefile - images/Makefile capitests/Makefile - regressions/Makefile - test-tool/Makefile - ocaml/Makefile ocaml/examples/Makefile - perl/Makefile perl/examples/Makefile - python/Makefile python/examples/Makefile - ruby/Makefile ruby/Rakefile ruby/examples/Makefile - java/Makefile + cat/Makefile + caution/Makefile + csharp/Makefile + debian/changelog + df/Makefile + edit/Makefile + examples/Makefile + fish/Makefile + fuse/Makefile + generator/Makefile + gnulib/lib/Makefile + gnulib/tests/Makefile haskell/Makefile + images/Makefile inspector/Makefile - tools/Makefile + java/Makefile + java/examples/Makefile libguestfs.pc - gnulib/lib/Makefile - gnulib/tests/Makefile - fuse/Makefile + ocaml/META + ocaml/Makefile + ocaml/examples/Makefile + perl/Makefile + perl/Makefile.PL + perl/examples/Makefile + php/Makefile po-docs/Makefile po-docs/ja/Makefile po-docs/uk/Makefile - php/Makefile - csharp/Makefile - cat/Makefile - df/Makefile + po/Makefile.in + python/Makefile + python/examples/Makefile + regressions/Makefile rescue/Makefile - debian/changelog - ocaml/META perl/Makefile.PL]) + resize/Makefile + ruby/Makefile + ruby/Rakefile + ruby/examples/Makefile + src/Makefile + test-tool/Makefile + tools/Makefile]) AC_OUTPUT dnl Produce summary. @@ -871,8 +892,11 @@ echo -n "Haskell bindings .................... " if test "x$HAVE_HASKELL_TRUE" = "x"; then echo "yes"; else echo "no"; fi echo -n "PHP bindings ........................ " if test "x$HAVE_PHP_TRUE" = "x"; then echo "yes"; else echo "no"; fi -echo -n "virt-* tools ........................ " +echo "guestfish and C virt tools .......... yes" +echo -n "Perl virt tools ..................... " if test "x$HAVE_TOOLS_TRUE" = "x"; then echo "yes"; else echo "no"; fi +echo -n "virt-resize ......................... " +if test "x$HAVE_OCAML_TRUE" = "x" && test "x$HAVE_OCAML_PCRE_TRUE" = "x"; then echo "yes"; else echo "no"; fi echo "FUSE filesystem ..................... $enable_fuse" echo echo "If any optional component is configured 'no' when you expected 'yes'"