Author: dreiss
Date: Tue Jun 10 18:16:53 2008
New Revision: 666490
URL: http://svn.apache.org/viewvc?rev=666490&view=rev
Log:
Rename AM_CONDITIONALs from ENABLE_* to WITH_*.
This is to match the configure command-line options that define them.
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=666490&r1=666489&r2=666490&view=diff
==============================================================================
--- incubator/thrift/trunk/configure.ac (original)
+++ incubator/thrift/trunk/configure.ac Tue Jun 10 18:16:53 2008
@@ -38,7 +38,7 @@
if test "$with_csharp" = "yes"; then
PKG_CHECK_MODULES(MONO, mono >= 1.2.6, have_mono=yes, have_mono=no)
fi
-AM_CONDITIONAL(ENABLE_MONO, [test "$have_mono" = "yes"])
+AM_CONDITIONAL(WITH_MONO, [test "$have_mono" = "yes"])
AX_THRIFT_LIB(java, [Java], yes)
if test "$with_java" = "yes"; then
@@ -46,20 +46,20 @@
AX_PROG_JAVAC
AX_PROG_JAVA
fi
-AM_CONDITIONAL([ENABLE_JAVA],
+AM_CONDITIONAL([WITH_JAVA],
[test -n "$ANT" -a -n "$JAVA" -a -n "$JAVAC"])
AX_THRIFT_LIB(erlang, [Erlang], yes)
if test "$with_erlang" = "yes"; then
AC_PATH_PROG([ERLC], [erlc])
fi
-AM_CONDITIONAL(ENABLE_ERLANG, [test -n "$ERLC"])
+AM_CONDITIONAL(WITH_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" != ":"])
+AM_CONDITIONAL(WITH_PYTHON, [test -n "$PYTHON" -a "$PYTHON" != ":"])
AC_C_CONST
AC_C_INLINE
Modified: incubator/thrift/trunk/lib/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/Makefile.am?rev=666490&r1=666489&r2=666490&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/Makefile.am (original)
+++ incubator/thrift/trunk/lib/Makefile.am Tue Jun 10 18:16:53 2008
@@ -1,19 +1,19 @@
SUBDIRS = \
cpp
-if ENABLE_MONO
+if WITH_MONO
SUBDIRS += csharp
endif
-if ENABLE_JAVA
+if WITH_JAVA
SUBDIRS += java
endif
-if ENABLE_PYTHON
+if WITH_PYTHON
SUBDIRS += py
endif
-if ENABLE_ERLANG
+if WITH_ERLANG
SUBDIRS += erl
endif
Modified: incubator/thrift/trunk/test/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/test/Makefile.am?rev=666490&r1=666489&r2=666490&view=diff
==============================================================================
--- incubator/thrift/trunk/test/Makefile.am (original)
+++ incubator/thrift/trunk/test/Makefile.am Tue Jun 10 18:16:53 2008
@@ -1,10 +1,10 @@
SUBDIRS =
-if ENABLE_JAVA
+if WITH_JAVA
SUBDIRS += java
endif
-if ENABLE_PYTHON
+if WITH_PYTHON
SUBDIRS += py
endif
