diff options
| author | Michael Scherer <misc@zarb.org> | 2011-10-14 01:05:00 +0200 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-10-14 09:50:39 +0100 |
| commit | 787baf1bad89aecf4d01738fb8344e4446eb5ba1 (patch) | |
| tree | 7a9bd00b2f07fe14964dbefb28c8449f868e8243 | |
| parent | c019d073a4f218b538d5176500b014e83dbce84f (diff) | |
| download | libguestfs-787baf1bad89aecf4d01738fb8344e4446eb5ba1.tar.gz libguestfs-787baf1bad89aecf4d01738fb8344e4446eb5ba1.tar.xz libguestfs-787baf1bad89aecf4d01738fb8344e4446eb5ba1.zip | |
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.
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 337a3eda..e0bed2f1 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"], |