From: Boris Ranto <branto@redhat.com>
Date: Thu, 18 Jun 2015 18:01:01 +0000 (+0200)
Subject: configure.ac: Fix junit4.jar detection
X-Git-Tag: v9.0.3~123^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ce80a606b618de97f4f45e8efa51ba99e497491a;p=ceph.git

configure.ac: Fix junit4.jar detection

If a system contains older (3) or later (5) release of junit.jar that is
default in the system, the auto-detection might find it before it finds
junit4.jar. This commit fixes that issue by always preferring the
junit4.jar library.

Signed-off-by: Boris Ranto <branto@redhat.com>
---

diff --git a/configure.ac b/configure.ac
index f912aa430929..95a85880b25f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -629,9 +629,9 @@ if test "x$enable_cephfs_java" = "xyes"; then
         # the search path.
         AS_IF([test "x$with_debug" = "xyes"], [
         	dir='/usr/share/java'
-	        junit4_jar=`find $dir -name junit4.jar -o -name junit.jar | head -n 1`
+	        junit4_jar=`( find $dir -name junit4.jar;find $dir -name junit.jar ) | head -n 1`
 		AS_IF([test -r "$junit4_jar"], [
-		      EXTRA_CLASSPATH_JAR=$junit4_jar
+		      EXTRA_CLASSPATH_JAR="$junit4_jar"
 		      AC_SUBST(EXTRA_CLASSPATH_JAR)
 		      [have_junit4=1]], [
 		      AC_MSG_NOTICE([Cannot find junit4.jar (apt-get install junit4)])