svn commit: r774132 - in /incubator/thrift/trunk: configure.ac lib/java/Makefile.am

[dr...@apache.org]

Author: dreiss
Date: Tue May 12 23:16:55 2009
New Revision: 774132

URL: http://svn.apache.org/viewvc?rev=774132&view=rev
Log:
THRIFT-450. Don't use Ivy if log4j is already available

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=774132&r1=774131&r2=774132&view=diff
==============================================================================
--- incubator/thrift/trunk/configure.ac (original)
+++ incubator/thrift/trunk/configure.ac Tue May 12 23:16:55 2009
@@ -70,6 +70,12 @@
 if test "$with_java" = "yes";  then
   AX_JAVAC_AND_JAVA
   AC_PATH_PROG([ANT], [ant])
+  AX_CHECK_JAVA_CLASS(org.apache.log4j.Logger)
+  have_log4j="$success"
+  if test "x$have_log4j" = "xyes" ; then
+    ANT_FLAGS="$ANT_FLAGS -Dnoivy="
+  fi
+  AC_SUBST(ANT_FLAGS)
 fi
 AM_CONDITIONAL([WITH_JAVA],
                [test -n "$ANT" -a -n "$JAVA" -a -n "$JAVAC"])

Modified: incubator/thrift/trunk/lib/java/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/Makefile.am?rev=774132&r1=774131&r2=774132&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/java/Makefile.am (original)
+++ incubator/thrift/trunk/lib/java/Makefile.am Tue May 12 23:16:55 2009
@@ -20,17 +20,17 @@
 EXTRA_DIST = build.xml src test
 
 all-local:
-	$(ANT)
+	$(ANT) $(ANT_FLAGS)
 
 install-exec-hook:
-	$(ANT) install -Dinstall.path=$(DESTDIR)$(JAVA_PREFIX) \
+	$(ANT) $(ANT_FLAGS) install -Dinstall.path=$(DESTDIR)$(JAVA_PREFIX) \
 		-Dinstall.javadoc.path=$(DESTDIR)$(docdir)/java
 
 # Make sure this doesn't fail if ant is not configured.
 clean-local:
 	ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \
-	$$ANT clean
+	$$ANT $(ANT_FLAGS) clean
 
 check-local: all
-	$(ANT) test
+	$(ANT) $(ANT_FLAGS) test