|
 |
7dda85d |
From 21943f8c165ce6a971d063fe7bed474a3271aed9 Mon Sep 17 00:00:00 2001
|
|
|
89d86ed |
From: Richard W.M. Jones <rjones@redhat.com>
|
|
|
89d86ed |
Date: Sun, 17 Jun 2012 23:01:43 +0100
|
|
|
7dda85d |
Subject: [PATCH 07/33] EPEL 5: Remove PHP bindings.
|
|
|
89d86ed |
|
|
|
89d86ed |
---
|
|
|
89d86ed |
Makefile.am | 3 ---
|
|
|
b03e9cf |
configure.ac | 16 ----------------
|
|
|
89d86ed |
po/POTFILES | 1 -
|
|
|
b03e9cf |
3 files changed, 0 insertions(+), 20 deletions(-)
|
|
|
89d86ed |
|
|
|
89d86ed |
diff --git a/Makefile.am b/Makefile.am
|
|
|
7dda85d |
index 04a6565..327e0c4 100644
|
|
|
89d86ed |
--- a/Makefile.am
|
|
|
89d86ed |
+++ b/Makefile.am
|
|
|
aa5ae27 |
@@ -86,9 +86,6 @@ endif
|
|
|
89d86ed |
if HAVE_HASKELL
|
|
|
89d86ed |
SUBDIRS += haskell
|
|
|
89d86ed |
endif
|
|
|
89d86ed |
-if HAVE_PHP
|
|
|
89d86ed |
-SUBDIRS += php
|
|
|
89d86ed |
-endif
|
|
|
b03e9cf |
if HAVE_LUA
|
|
|
b03e9cf |
SUBDIRS += lua lua/examples
|
|
|
b03e9cf |
endif
|
|
|
89d86ed |
diff --git a/configure.ac b/configure.ac
|
|
|
7dda85d |
index 07c360e..0e49b34 100644
|
|
|
89d86ed |
--- a/configure.ac
|
|
|
89d86ed |
+++ b/configure.ac
|
|
|
7dda85d |
@@ -1298,19 +1298,6 @@ AS_IF([test "x$enable_haskell" != "xno"],[
|
|
|
b03e9cf |
])
|
|
|
b03e9cf |
AM_CONDITIONAL([HAVE_HASKELL],[test "x$GHC" != "xno"])
|
|
|
89d86ed |
|
|
|
89d86ed |
-dnl PHP
|
|
|
89d86ed |
-PHP=no
|
|
|
89d86ed |
-AC_ARG_ENABLE([php],
|
|
|
b03e9cf |
- AS_HELP_STRING([--disable-php], [disable PHP language bindings]),
|
|
|
b03e9cf |
- [],
|
|
|
b03e9cf |
- [enable_php=yes])
|
|
|
b03e9cf |
-AS_IF([test "x$enable_php" != "xno"],[
|
|
|
b03e9cf |
- PHP=
|
|
|
b03e9cf |
- AC_CHECK_PROG([PHP],[php],[php],[no])
|
|
|
b03e9cf |
- AC_CHECK_PROG([PHPIZE],[phpize],[phpize],[no])
|
|
|
b03e9cf |
-])
|
|
|
89d86ed |
-AM_CONDITIONAL([HAVE_PHP], [test "x$PHP" != "xno" && test "x$PHPIZE" != "xno"])
|
|
|
89d86ed |
-
|
|
|
b03e9cf |
dnl Lua
|
|
|
b03e9cf |
AC_ARG_ENABLE([lua],
|
|
|
b03e9cf |
AS_HELP_STRING([--disable-lua], [disable Lua language bindings]),
|
|
|
7dda85d |
@@ -1424,7 +1411,6 @@ AC_CONFIG_FILES([Makefile
|
|
|
89d86ed |
perl/Makefile
|
|
|
89d86ed |
perl/Makefile.PL
|
|
|
89d86ed |
perl/examples/Makefile
|
|
|
89d86ed |
- php/Makefile
|
|
|
89d86ed |
po-docs/Makefile
|
|
|
89d86ed |
po-docs/ja/Makefile
|
|
|
89d86ed |
po-docs/uk/Makefile
|
|
|
7dda85d |
@@ -1500,8 +1486,6 @@ echo -n "Java bindings ....................... "
|
|
|
89d86ed |
if test "x$HAVE_JAVA_TRUE" = "x"; then echo "yes"; else echo "no"; fi
|
|
|
89d86ed |
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
|
|
|
b03e9cf |
echo -n "Lua bindings ........................ "
|
|
|
b03e9cf |
if test "x$HAVE_LUA_TRUE" = "x"; then echo "yes"; else echo "no"; fi
|
|
|
b03e9cf |
echo
|
|
|
89d86ed |
diff --git a/po/POTFILES b/po/POTFILES
|
|
|
7dda85d |
index c3f1d67..14eb1e8 100644
|
|
|
89d86ed |
--- a/po/POTFILES
|
|
|
89d86ed |
+++ b/po/POTFILES
|
|
|
b03e9cf |
@@ -149,7 +149,6 @@ perl/Guestfs.c
|
|
|
89d86ed |
perl/bindtests.pl
|
|
|
89d86ed |
perl/lib/Sys/Guestfs.pm
|
|
|
89d86ed |
perl/lib/Sys/Guestfs/Lib.pm
|
|
|
89d86ed |
-php/extension/guestfs_php.c
|
|
|
89d86ed |
python/guestfs-py-byhand.c
|
|
|
89d86ed |
python/guestfs-py.c
|
|
|
b03e9cf |
rescue/test-virt-rescue.pl
|
|
|
89d86ed |
--
|
|
|
89d86ed |
1.7.4.1
|
|
|
89d86ed |
|