diff options
| author | Danny Al-Gaaf <danny.al-gaaf@bisect.de> | 2013-01-09 22:35:16 +0100 |
|---|---|---|
| committer | Gary Lowell <glowell@inktank.com> | 2013-01-09 19:52:05 -0800 |
| commit | 59aad34795f54fddcc09a19cd44344d9a6eabbc1 (patch) | |
| tree | eff30cb17a6d59b2c2fad38ae726d954ff7cc924 /configure.ac | |
| parent | 61437ee24e4f1c887fd431f5dc2dc4827bdbbfa5 (diff) | |
| download | ceph-59aad34795f54fddcc09a19cd44344d9a6eabbc1.tar.gz | |
configure.ac: check for org.junit.rules.ExternalResource
Check for org.junit.rules.ExternalResource if build with
--enable-cephfs-java and --with-debug. Checking for junit4
isn't enough since junit4 has this class not before 4.7.
Added some m4 files to get some JAVA related macros. Changed
autogen.sh to work with local m4 files/macros.
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 832054b2926..32814b8da1d 100644 --- a/configure.ac +++ b/configure.ac @@ -271,9 +271,6 @@ AM_CONDITIONAL(ENABLE_CEPHFS_JAVA, test "x$enable_cephfs_java" = "xyes") AC_ARG_WITH(jdk-dir, AC_HELP_STRING([--with-jdk-dir(=DIR)], [Path to JDK directory])) -AC_DEFUN([JAVA_DNE], - AC_MSG_ERROR([Cannot find $1 '$2'. Try setting --with-jdk-dir])) - AS_IF([test "x$enable_cephfs_java" = "xyes"], [ # setup bin/include dirs from --with-jdk-dir (search for jni.h, javac) @@ -314,20 +311,20 @@ AS_IF([test "x$enable_cephfs_java" = "xyes"], [ AC_MSG_NOTICE([Cannot find junit4.jar (apt-get install junit4)]) [have_junit4=0]])]) - # Check for Java programs: javac, javah, jar - PATH_save=$PATH - PATH="$PATH:$EXTRA_JDK_BIN_DIR" - AC_PATH_PROG(JAVAC, javac) - AC_PATH_PROG(JAVAH, javah) - AC_PATH_PROG(JAR, jar) - PATH=$PATH_save + AC_CHECK_CLASSPATH + AC_PROG_JAVAC + AC_PROG_JAVAH + AC_PROG_JAR - # Ensure we have them... - AS_IF([test -z "$JAVAC"], JAVA_DNE(program, javac)) - AS_IF([test -z "$JAVAH"], JAVA_DNE(program, javah)) - AS_IF([test -z "$JAR"], JAVA_DNE(program, jar)) + CLASSPATH=$CLASSPATH:$EXTRA_CLASSPATH_JAR + export CLASSPATH + AC_MSG_NOTICE([classpath - $CLASSPATH]) + AS_IF([test "$have_junit4" = "1"], [ + AC_CHECK_CLASS([org.junit.rules.ExternalResource], [], [ + AC_MSG_NOTICE(Could not find org.junit.rules.ExternalResource) + have_junit4=0])]) - # Check for jni.h + # Check for jni.h CPPFLAGS_save=$CPPFLAGS AS_IF([test -n "$EXTRA_JDK_INC_DIR"], @@ -336,7 +333,7 @@ AS_IF([test "x$enable_cephfs_java" = "xyes"], [ [JDK_CPPFLAGS="$JDK_CPPFLAGS -I$EXTRA_JDK_INC_DIR/linux"]) CPPFLAGS="$CPPFLAGS $JDK_CPPFLAGS"]) - AC_CHECK_HEADER([jni.h], [], JAVA_DNE(header, jni.h)) + AC_CHECK_HEADER([jni.h], [], AC_MSG_ERROR([Cannot find header 'jni.h'. Try setting --with-jdk-dir])) CPPFLAGS=$CPPFLAGS_save |