From: Ira Cooper <ira@samba.org>
Date: Wed, 17 Jun 2015 16:45:29 +0000 (-0400)
Subject: configure.ac: Fix JUnit 4 detection on Fedora 22.
X-Git-Tag: v9.0.3~169^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F4990%2Fhead;p=ceph.git

configure.ac: Fix JUnit 4 detection on Fedora 22.

This allows the build to detect JUnit 4 on Fedora 22, by adding
junit.jar as a valid jar name for JUnit 4.

Signed-off-by: Ira Cooper <ira@samba.org>
---

diff --git a/configure.ac b/configure.ac
index 20e47cd38df9..f912aa430929 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 | head -n 1`
+	        junit4_jar=`find $dir -name junit4.jar -o -name junit.jar | head -n 1`
 		AS_IF([test -r "$junit4_jar"], [
-		      EXTRA_CLASSPATH_JAR=`dirname $junit4_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)])