svn commit: r666488 - in /incubator/thrift/trunk: configure.ac lib/Makefile.am test/Makefile.am

[dr...@apache.org]

Author: dreiss
Date: Tue Jun 10 18:16:37 2008
New Revision: 666488

URL: http://svn.apache.org/viewvc?rev=666488&view=rev
Log:
Allow Thrift to be built without the Python library.

- Modify configure.ac to check for Python conditionally, like we do for
  Java, Mono, and Erlang.
- Modify Makefile.am to add "py" to SUBDIRS only if Python was detected.

Modified:
    incubator/thrift/trunk/configure.ac
    incubator/thrift/trunk/lib/Makefile.am
    incubator/thrift/trunk/test/Makefile.am

Modified: incubator/thrift/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/configure.ac?rev=666488&r1=666487&r2=666488&view=diff
==============================================================================
--- incubator/thrift/trunk/configure.ac (original)
+++ incubator/thrift/trunk/configure.ac Tue Jun 10 18:16:37 2008
@@ -12,8 +12,6 @@
                          Default = "/usr"])
 AS_IF([test "x$PY_PREFIX" = x], [PY_PREFIX="/usr"])
 
-AM_PATH_PYTHON(2.4,, :)
-
 
 AC_PROG_CC
 AC_PROG_CPP
@@ -57,6 +55,12 @@
 fi
 AM_CONDITIONAL(ENABLE_ERLANG, [test -n "$ERLC"])
 
+AX_THRIFT_LIB(py, [Python], yes)
+if test "$with_py" = "yes";  then
+  AM_PATH_PYTHON(2.4,, :)
+fi
+AM_CONDITIONAL(ENABLE_PYTHON, [test -n "$PYTHON" -a "$PYTHON" != ":"])
+
 AC_C_CONST
 AC_C_INLINE
 AC_C_VOLATILE

Modified: incubator/thrift/trunk/lib/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/Makefile.am?rev=666488&r1=666487&r2=666488&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/Makefile.am (original)
+++ incubator/thrift/trunk/lib/Makefile.am Tue Jun 10 18:16:37 2008
@@ -1,6 +1,5 @@
 SUBDIRS = \
-  cpp \
-  py
+  cpp
 
 if ENABLE_MONO
 SUBDIRS += csharp
@@ -10,6 +9,10 @@
 SUBDIRS += java
 endif
 
+if ENABLE_PYTHON
+SUBDIRS += py
+endif
+
 if ENABLE_ERLANG
 SUBDIRS += erl
 endif

Modified: incubator/thrift/trunk/test/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/Makefile.am?rev=666488&r1=666487&r2=666488&view=diff
==============================================================================
--- incubator/thrift/trunk/test/Makefile.am (original)
+++ incubator/thrift/trunk/test/Makefile.am Tue Jun 10 18:16:37 2008
@@ -1,9 +1,13 @@
-SUBDIRS = py
+SUBDIRS =
 
 if ENABLE_JAVA
 SUBDIRS += java
 endif
 
+if ENABLE_PYTHON
+SUBDIRS += py
+endif
+
 noinst_LTLIBRARIES = libtestgencpp.la
 libtestgencpp_la_SOURCES = \
 	gen-cpp/DebugProtoTest_types.cpp \