From: David Reiss <dreiss@apache.org>
Date: Fri, 22 May 2009 19:50:33 +0000 (+0000)
Subject: THRIFT-450. java: Propagate CLASSPATH from ./configure to make and ant
X-Git-Tag: 0.2.0~100
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=fff84d1466d1848cc19054a56f1d4dc91f6d8326;p=common%2Fthrift.git

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.

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@777678 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/configure.ac b/configure.ac
index 4a88cd80..89517504 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,6 +77,7 @@ if test "$with_java" = "yes";  then
   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],
diff --git a/lib/java/Makefile.am b/lib/java/Makefile.am
index ffcdc035..c5c75217 100644
--- a/lib/java/Makefile.am
+++ b/lib/java/Makefile.am
@@ -19,6 +19,8 @@
 
 EXTRA_DIST = build.xml src test
 
+export CLASSPATH
+
 all-local:
 	$(ANT) $(ANT_FLAGS)