|
 |
0b9da0f |
From 90d6987412c2f9e413f826c6e52bc24fa5de5723 Mon Sep 17 00:00:00 2001
|
|
|
89d86ed |
From: Richard W.M. Jones <rjones@redhat.com>
|
|
|
89d86ed |
Date: Sat, 16 Jun 2012 14:34:25 +0100
|
|
|
06798bf |
Subject: [PATCH 05/20] EPEL 5: Remove Erlang bindings.
|
|
|
89d86ed |
|
|
|
89d86ed |
---
|
|
|
89d86ed |
Makefile.am | 3 ---
|
|
|
89d86ed |
configure.ac | 23 -----------------------
|
|
|
89d86ed |
po/POTFILES | 2 --
|
|
|
89d86ed |
3 files changed, 0 insertions(+), 28 deletions(-)
|
|
|
89d86ed |
|
|
|
89d86ed |
diff --git a/Makefile.am b/Makefile.am
|
|
|
89d86ed |
index be9191c..6bd6047 100644
|
|
|
89d86ed |
--- a/Makefile.am
|
|
|
89d86ed |
+++ b/Makefile.am
|
|
|
89d86ed |
@@ -84,9 +84,6 @@ endif
|
|
|
89d86ed |
if HAVE_PHP
|
|
|
89d86ed |
SUBDIRS += php
|
|
|
89d86ed |
endif
|
|
|
89d86ed |
-if HAVE_ERLANG
|
|
|
89d86ed |
-SUBDIRS += erlang erlang/examples
|
|
|
89d86ed |
-endif
|
|
|
89d86ed |
if HAVE_GOBJECT
|
|
|
89d86ed |
SUBDIRS += gobject
|
|
|
89d86ed |
endif
|
|
|
89d86ed |
diff --git a/configure.ac b/configure.ac
|
|
|
0b9da0f |
index 5e67931..399a726 100644
|
|
|
89d86ed |
--- a/configure.ac
|
|
|
89d86ed |
+++ b/configure.ac
|
|
|
89d86ed |
@@ -1115,25 +1115,6 @@ AS_IF([test "x$enable_php" != "xno"],
|
|
|
89d86ed |
])
|
|
|
89d86ed |
AM_CONDITIONAL([HAVE_PHP], [test "x$PHP" != "xno" && test "x$PHPIZE" != "xno"])
|
|
|
89d86ed |
|
|
|
89d86ed |
-dnl Erlang
|
|
|
89d86ed |
-ERLANG=no
|
|
|
89d86ed |
-AC_ARG_ENABLE([erlang],
|
|
|
89d86ed |
- AS_HELP_STRING([--disable-erlang], [Disable Erlang language bindings]),
|
|
|
89d86ed |
- [],
|
|
|
89d86ed |
- [enable_erlang=yes])
|
|
|
89d86ed |
-# NB: Don't use AS_IF here: it doesn't work.
|
|
|
89d86ed |
-if test "x$enable_erlang" != "xno"; then
|
|
|
89d86ed |
- ERLANG=
|
|
|
89d86ed |
- AC_ERLANG_PATH_ERLC([no])
|
|
|
89d86ed |
-
|
|
|
89d86ed |
- if test "x$ERLC" != "xno"; then
|
|
|
89d86ed |
- AC_ERLANG_CHECK_LIB([erl_interface], [],
|
|
|
89d86ed |
- [AC_MSG_FAILURE([Erlang erl_interface library not installed. Use --disable-erlang to disable.])])
|
|
|
89d86ed |
- AC_ERLANG_SUBST_LIB_DIR
|
|
|
89d86ed |
- fi
|
|
|
89d86ed |
-fi
|
|
|
89d86ed |
-AM_CONDITIONAL([HAVE_ERLANG], [test "x$ERLANG" != "xno" && test "x$ERLC" != "xno"])
|
|
|
89d86ed |
-
|
|
|
89d86ed |
dnl Check for Perl modules needed by Perl virt tools (virt-df, etc.)
|
|
|
89d86ed |
AS_IF([test "x$PERL" != "xno"],
|
|
|
89d86ed |
[
|
|
|
89d86ed |
@@ -1242,8 +1223,6 @@ AC_CONFIG_FILES([Makefile
|
|
|
89d86ed |
daemon/Makefile
|
|
|
89d86ed |
df/Makefile
|
|
|
89d86ed |
edit/Makefile
|
|
|
89d86ed |
- erlang/Makefile
|
|
|
89d86ed |
- erlang/examples/Makefile
|
|
|
89d86ed |
examples/Makefile
|
|
|
89d86ed |
fish/Makefile
|
|
|
89d86ed |
format/Makefile
|
|
|
89d86ed |
@@ -1325,8 +1304,6 @@ echo -n "Haskell bindings .................... "
|
|
|
89d86ed |
if test "x$HAVE_HASKELL_TRUE" = "x"; then echo "yes"; else echo "no"; fi
|
|
|
89d86ed |
echo -n "PHP bindings ........................ "
|
|
|
89d86ed |
if test "x$HAVE_PHP_TRUE" = "x"; then echo "yes"; else echo "no"; fi
|
|
|
89d86ed |
-echo -n "Erlang bindings ..................... "
|
|
|
89d86ed |
-if test "x$HAVE_ERLANG_TRUE" = "x"; then echo "yes"; else echo "no"; fi
|
|
|
89d86ed |
echo "guestfish and C virt tools .......... yes"
|
|
|
89d86ed |
echo -n "Perl virt tools ..................... "
|
|
|
89d86ed |
if test "x$HAVE_TOOLS_TRUE" = "x"; then echo "yes"; else echo "no"; fi
|
|
|
89d86ed |
diff --git a/po/POTFILES b/po/POTFILES
|
|
|
89d86ed |
index 747b341..3e3f300 100644
|
|
|
89d86ed |
--- a/po/POTFILES
|
|
|
89d86ed |
+++ b/po/POTFILES
|
|
|
89d86ed |
@@ -91,8 +91,6 @@ df/domains.c
|
|
|
89d86ed |
df/main.c
|
|
|
89d86ed |
df/output.c
|
|
|
89d86ed |
edit/virt-edit.c
|
|
|
89d86ed |
-erlang/erl-guestfs-proto.c
|
|
|
89d86ed |
-erlang/erl-guestfs.c
|
|
|
89d86ed |
fish/alloc.c
|
|
|
89d86ed |
fish/cmds.c
|
|
|
89d86ed |
fish/cmds_gperf.c
|
|
|
89d86ed |
--
|
|
|
89d86ed |
1.7.4.1
|
|
|
89d86ed |
|