From: Michael Scherer <misc@zarb.org>
Date: Thu, 13 Oct 2011 23:05:00 +0000 (+0200)
Subject: Partially fix --disable-erlang
X-Git-Tag: 1.13.21~9
X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=787baf1bad89aecf4d01738fb8344e4446eb5ba1

Partially fix --disable-erlang

Without this, configure will always enable erlang, no matter what
argument are passed. Now, we can disable it, even if configure still
need the erlang compiler for some obscure reason.
---

diff --git a/configure.ac b/configure.ac
index 337a3ed..e0bed2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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"],