Author: dreiss
Date: Fri May 22 19:50:33 2009
New Revision: 777678
URL: http://svn.apache.org/viewvc?rev=777678&view=rev
Log:
THRIFT-450. java: Propagate CLASSPATH from ./configure to make and ant
- Put "AC_SUBST(CLASSPATH)" configure.ac so the CLASSPATH used to run
./configure is passed in to make.
- Put "export CLASSPATH" in lib/java/Makefile.am so that the CLASSPATH
passed to make is passed to ant.
Modified:
incubator/thrift/trunk/configure.ac
incubator/thrift/trunk/lib/java/Makefile.am
Modified: incubator/thrift/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/configure.ac?rev=777678&r1=777677&r2=777678&view=diff
==============================================================================
--- incubator/thrift/trunk/configure.ac (original)
+++ incubator/thrift/trunk/configure.ac Fri May 22 19:50:33 2009
@@ -77,6 +77,7 @@
if test "x$have_log4j" = "xyes" && test "x$have_hashcode" = "xyes" ; then
ANT_FLAGS="$ANT_FLAGS -Dnoivy="
fi
+ AC_SUBST(CLASSPATH)
AC_SUBST(ANT_FLAGS)
fi
AM_CONDITIONAL([WITH_JAVA],
Modified: incubator/thrift/trunk/lib/java/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/Makefile.am?rev=777678&r1=777677&r2=777678&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/java/Makefile.am (original)
+++ incubator/thrift/trunk/lib/java/Makefile.am Fri May 22 19:50:33 2009
@@ -19,6 +19,8 @@
EXTRA_DIST = build.xml src test
+export CLASSPATH
+
all-local:
$(ANT) $(ANT_FLAGS)