X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=configure.ac;h=337a3edabc993d23460094735ad33ffe0a7ffb70;hp=83f25c96c270faaded0b40872ed09da27809982f;hb=0beebeb6225bd868fe36b28ff8ad15bfb8c6028e;hpb=660daf31e23f2f7c65f29e1d57019af9ea9eba99

diff --git a/configure.ac b/configure.ac
index 83f25c9..337a3ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 # freeform string.
 m4_define([libguestfs_major],   [1])
 m4_define([libguestfs_minor],   [13])
-m4_define([libguestfs_release], [13])
+m4_define([libguestfs_release], [20])
 
 AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
 AC_CONFIG_AUX_DIR([build-aux])
@@ -346,6 +346,11 @@ if test "x$have_libselinux" = "xyes"; then
 fi
 AC_SUBST([SELINUX_LIB])
 
+dnl Check for systemtap/DTrace userspace probes (optional).
+dnl http://sourceware.org/systemtap/wiki/AddingUserSpaceProbingToApps
+AC_CHECK_HEADERS([sys/sdt.h])
+dnl AC_CHECK_PROG([DTRACE],[dtrace],[dtrace],[no])
+
 dnl Check for cpio which isn't in the default Pardus install amazingly.
 AC_CHECK_PROG([CPIO],[cpio],[cpio],[no])
 test "x$CPIO" = "xno" &&
@@ -887,42 +892,21 @@ AS_IF([test "x$enable_php" != "xno"],
 AM_CONDITIONAL([HAVE_PHP], [test "x$PHP" != "xno" && test "x$PHPIZE" != "xno"])
 
 dnl Erlang
-ERLC=no
-ERL_INTERFACEDIR=no
 AC_ARG_ENABLE([erlang],
         AS_HELP_STRING([--disable-erlang], [Disable Erlang language bindings]),
         [],
         [enable_erlang=yes])
 AS_IF([test "x$enable_erlang" != "xno"],
         [
-        ERLC=
-        AC_CHECK_PROG([ERLC],[erlc],[erlc],[no])
+        AC_ERLANG_PATH_ERLC([no])
 
         if test "x$ERLC" != "xno"; then
-            dnl Look for erl_interface directory in various places.
-            AC_MSG_CHECKING([for erl_interface])
-
-            for d in \
-                $libdir /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64
-            do
-                dir=`ls -1d $d/erlang/lib/erl_interface-* 2>/dev/null`
-                if test "x$dir" != "x" && test -d "$dir"; then
-                    AC_MSG_RESULT([$dir])
-                    ERL_INTERFACEDIR=$dir
-                    break
-                fi
-            done
-
-            if test "x$ERL_INTERFACEDIR" = "xno"; then
-                AC_MSG_RESULT([not found])
-            fi
+            AC_ERLANG_CHECK_LIB([erl_interface], [],
+                                [AC_MSG_FAILURE([Erlang erl_interface library not installed.  Use --disable-erlang to disable.])])
+            AC_ERLANG_SUBST_LIB_DIR
         fi
-
-        AC_SUBST([ERLC])
-        AC_SUBST([ERL_INTERFACEDIR])
         ])
-AM_CONDITIONAL([HAVE_ERLANG],
-        [test "x$ERLC" != "xno" && test "x$ERL_INTERFACEDIR" != "xno"])
+AM_CONDITIONAL([HAVE_ERLANG], [test "x$ERLC" != "xno"])
 
 dnl Check for Perl modules needed by Perl virt tools (virt-df, etc.)
 AS_IF([test "x$PERL" != "xno"],
@@ -957,15 +941,19 @@ AC_SUBST([LIBTOOL])
 dnl Produce output files.
 AC_CONFIG_HEADERS([config.h])
 dnl http://www.mail-archive.com/automake@gnu.org/msg10204.html
+AC_CONFIG_FILES([clone/virt-sysprep],
+                [chmod +x clone/virt-sysprep])
 AC_CONFIG_FILES([podwrapper.sh],
                 [chmod +x podwrapper.sh])
 AC_CONFIG_FILES([run],
                 [chmod +x run])
 AC_CONFIG_FILES([Makefile
+                 align/Makefile
                  appliance/Makefile
                  capitests/Makefile
                  cat/Makefile
                  caution/Makefile
+                 clone/Makefile
                  csharp/Makefile
                  daemon/Makefile
                  debian/changelog
@@ -1004,6 +992,7 @@ AC_CONFIG_FILES([Makefile
                  ruby/Makefile
                  ruby/Rakefile
                  ruby/examples/Makefile
+                 sparsify/Makefile
                  src/Makefile
                  test-tool/Makefile
                  tools/Makefile])