Merge in THRIFT-784 and THRIFT-646
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/branches/0.3.0@946261 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/configure.ac b/configure.ac
index c97c8fd..95a794a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,9 +93,11 @@
AX_THRIFT_LIB(erlang, [Erlang], yes)
if test "$with_erlang" = "yes"; then
- AC_PATH_PROG([ERLC], [erlc])
+ AC_ERLANG_PATH_ERL
+ AC_ERLANG_PATH_ERLC
+ AC_ERLANG_SUBST_INSTALL_LIB_SUBDIR(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
fi
-AM_CONDITIONAL(WITH_ERLANG, [test -n "$ERLC"])
+AM_CONDITIONAL(WITH_ERLANG, [test -n "$ERL" -a -n "$ERLC"])
AX_THRIFT_LIB(py, [Python], yes)
if test "$with_py" = "yes"; then