X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=configure.ac;h=56b0ad9d256cf16c98322df1448d0ed876cf7802;hp=2bac6adf6ff5a3565e5f48dc47f1a3d31e4761b4;hb=a4db75521d6026410425187fc2c5c9cb931a69b5;hpb=9ce239a8365b2209de24f72aa75a7a049ee72d01 diff --git a/configure.ac b/configure.ac index 2bac6ad..56b0ad9 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], [11]) -m4_define([libguestfs_release], [9]) -# extra can be any string -m4_define([libguestfs_extra], []) +m4_define([libguestfs_minor], [13]) +m4_define([libguestfs_release], [6]) 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]) @@ -151,14 +163,72 @@ AC_SYS_LARGEFILE dnl Check sizeof long. AC_CHECK_SIZEOF([long]) +dnl Check if dirent (readdir) supports d_type member. +AC_STRUCT_DIRENT_D_TYPE + +dnl Check if stat has the required fields. +AC_STRUCT_ST_BLOCKS +AC_CHECK_MEMBER([struct stat.st_blksize],[ + AC_DEFINE([HAVE_STRUCT_STAT_ST_BLKSIZE],[1],[Define to 1 if 'st_blksize' is a member of 'struct stat'])]) + 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]) +AC_CHECK_HEADERS([\ + attr/xattr.h \ + byteswap.h \ + endian.h \ + errno.h \ + printf.h \ + sys/inotify.h \ + sys/socket.h \ + sys/statvfs.h \ + sys/types.h \ + sys/un.h \ + sys/wait.h \ + windows.h \ + sys/xattr.h]) dnl Functions. -AC_CHECK_FUNCS([futimens posix_fallocate]) +AC_CHECK_FUNCS([\ + futimens \ + getxattr \ + htonl \ + htons \ + inotify_init1 \ + lgetxattr \ + listxattr \ + llistxattr \ + lsetxattr \ + lremovexattr \ + mknod \ + ntohl \ + ntohs \ + posix_fallocate \ + realpath \ + removexattr \ + setitimer \ + setxattr \ + sigaction \ + statvfs \ + sync]) + +dnl For modified printf in the daemon, we need glibc either (old-style) +dnl register_printf_function or (new-style) register_printf_specifier. +AC_CHECK_FUNC([register_printf_specifier],[ + AC_DEFINE([HAVE_REGISTER_PRINTF_SPECIFIER],[1], + [Define to 1 if you have new-style register_printf_specifier]) + ],[ + AC_CHECK_FUNC([register_printf_function],[ + AC_DEFINE([HAVE_REGISTER_PRINTF_FUNCTION],[1], + [Define to 1 if you have old-style register_printf_function]) + ],[ + AC_MSG_FAILURE( +[No support for glibc-style extended printf formatters. + +This means you either have a very old glibc (pre-2.0) or you +are using some other libc where this is not supported.])])]) dnl Build the daemon? AC_MSG_CHECKING([if we should build the daemon]) @@ -170,6 +240,18 @@ AC_ARG_ENABLE([daemon], AM_CONDITIONAL([ENABLE_DAEMON],[test "x$enable_daemon" = "xyes"]) AC_MSG_RESULT([$enable_daemon]) +if test "x$enable_daemon" = "xyes"; then + dnl Install the daemon (for libguestfs live service) + AC_MSG_CHECKING([if we should install the daemon]) + AC_ARG_ENABLE([install-daemon], + [AS_HELP_STRING([--enable-install-daemon], + [enable installing the daemon under $sbindir @<:@default=no@:>@])], + [], + [enable_install_daemon=no]) + AM_CONDITIONAL([INSTALL_DAEMON],[test "x$enable_install_daemon" = "xyes"]) + AC_MSG_RESULT([$enable_install_daemon]) +fi + dnl Build the appliance? AC_MSG_CHECKING([if we should build the appliance]) AC_ARG_ENABLE([appliance], @@ -187,7 +269,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 +292,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 @@ -228,6 +310,40 @@ AC_CHECK_LIB([portablexdr],[xdrmem_create],[],[ AC_SEARCH_LIBS([xdrmem_create],[rpc xdr nsl]) ]) +dnl Check for Augeas (now optional). +AC_CHECK_LIB([augeas],[aug_match],[ + have_augeas=yes + AUGEAS_LIB="-laugeas" + + old_LIBS="$LIBS" + LIBS="$LIBS $AUGEAS_LIB" + dnl Check for functions not available in earlier versions of Augeas. + AC_CHECK_FUNCS([aug_load aug_defvar aug_defnode]) + LIBS="$old_LIBS" + + ],[have_augeas=no]) +if test "x$have_augeas" = "xyes"; then + AC_DEFINE([HAVE_AUGEAS],[1],[Define to 1 if you have Augeas]) +fi +AC_SUBST([AUGEAS_LIB]) + +dnl Check for libselinux (optional). +AC_CHECK_HEADERS([selinux/selinux.h]) +AC_CHECK_LIB([selinux],[setexeccon],[ + have_libselinux="$ac_cv_header_selinux_selinux_h" + SELINUX_LIB="-lselinux" + + old_LIBS="$LIBS" + LIBS="$LIBS $SELINUX_LIB" + AC_CHECK_FUNCS([setcon getcon]) + LIBS="$old_LIBS" + + ],[have_libselinux=no]) +if test "x$have_libselinux" = "xyes"; then + AC_DEFINE([HAVE_LIBSELINUX],[1],[Define to 1 if you have libselinux]) +fi +AC_SUBST([SELINUX_LIB]) + dnl Check for cpio which isn't in the default Pardus install amazingly. AC_CHECK_PROG([CPIO],[cpio],[cpio],[no]) test "x$CPIO" = "xno" && @@ -251,7 +367,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 +377,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 +426,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 +525,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 +537,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]) @@ -484,6 +608,8 @@ 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 @@ -501,7 +627,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 @@ -764,7 +890,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 @@ -785,24 +911,23 @@ 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. -if test "x$enable_daemon" = "xyes"; then - AC_CONFIG_SUBDIRS([daemon]) -fi - dnl Produce output files. 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 appliance/Makefile capitests/Makefile cat/Makefile + caution/Makefile csharp/Makefile + daemon/Makefile debian/changelog df/Makefile edit/Makefile @@ -816,6 +941,7 @@ AC_CONFIG_FILES([Makefile images/Makefile inspector/Makefile java/Makefile + java/examples/Makefile libguestfs.pc ocaml/META ocaml/Makefile @@ -870,7 +996,7 @@ 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" = "x" && test "x$HAVE_OCAML_PCRE" = "x"; then echo "yes"; else echo "no"; fi +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'"