# major/minor/release must be numbers
m4_define([libguestfs_major], [1])
m4_define([libguestfs_minor], [13])
-m4_define([libguestfs_release], [0])
+m4_define([libguestfs_release], [2])
# extra can be any string
m4_define([libguestfs_extra], [])
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],
],
[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])
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.
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'"