X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=configure.ac;h=e0bed2f109d8fc7e9cfd9b5dd418d59e8775e15b;hp=e0fd7de114205f51ee6af41e55bc6a82cc0a72ce;hb=787baf1bad89aecf4d01738fb8344e4446eb5ba1;hpb=c155330f04f933d13298d5cddab6b7f3dc9d218f

diff --git a/configure.ac b/configure.ac
index e0fd7de..e0bed2f 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], [19])
+m4_define([libguestfs_release], [20])
 
 AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
 AC_CONFIG_AUX_DIR([build-aux])
@@ -892,12 +892,14 @@ AS_IF([test "x$enable_php" != "xno"],
 AM_CONDITIONAL([HAVE_PHP], [test "x$PHP" != "xno" && test "x$PHPIZE" != "xno"])
 
 dnl Erlang
+ERLANG=no
 AC_ARG_ENABLE([erlang],
-        AS_HELP_STRING([--disable-erlang], [Disable Erlang language bindings]),
-        [],
-        [enable_erlang=yes])
+    AS_HELP_STRING([--disable-erlang], [Disable Erlang language bindings]),
+         [],
+         [enable_erlang=yes])
 AS_IF([test "x$enable_erlang" != "xno"],
         [
+        ERLANG=
         AC_ERLANG_PATH_ERLC([no])
 
         if test "x$ERLC" != "xno"; then
@@ -906,7 +908,7 @@ AS_IF([test "x$enable_erlang" != "xno"],
             AC_ERLANG_SUBST_LIB_DIR
         fi
         ])
-AM_CONDITIONAL([HAVE_ERLANG], [test "x$ERLC" != "xno"])
+AM_CONDITIONAL([HAVE_ERLANG], [test "x$ERLANG" != "xno" && test "x$ERLC" != "xno"])
 
 dnl Check for Perl modules needed by Perl virt tools (virt-df, etc.)
 AS_IF([test "x$PERL" != "xno"],