diff --git a/configure.ac b/configure.ac
index 44e3168..df5c229 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1045237..448dabd 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -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
 
diff --git a/test/Makefile.am b/test/Makefile.am
index ad60770..47e6b76 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,10 +1,10 @@
 SUBDIRS =
 
-if ENABLE_JAVA
+if WITH_JAVA
 SUBDIRS += java
 endif
 
-if ENABLE_PYTHON
+if WITH_PYTHON
 SUBDIRS += py
 endif