Build the liblttng-ust-java library using the new M4 macros

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4841f46fa0c62c1da1adf75bea15c7e2ae69afdd..bf626697ff34ad2b09ea2265783b99c804235d68 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([lttng-ust],[2.5.0-rc1],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.5.0],[mathieu dot desnoyers at efficios dot com])
 
 # Following the numbering scheme proposed by libtool for the library version
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
@@ -224,7 +224,9 @@ changequote([,])dnl
        amd64) ;;
        powerpc) ;;
        ppc64) ;;
+       ppc64le) ;;
        powerpc64) ;;
+       powerpc64le) ;;
        s390) NO_UNALIGNED_ACCESS=1 ;;
        s390x) NO_UNALIGNED_ACCESS=1 ;;
         arm*) NO_UNALIGNED_ACCESS=1 ;;
@@ -260,19 +262,12 @@ AS_IF([test $JAVA_JDK],[
 ])
 
 # Check for JNI header files if requested
-AC_ARG_WITH([jni-interface],
-       [AS_HELP_STRING([--with-jni-interface],[build JNI interface between C and Java. Needs Java include files [default=no]])],
+AC_ARG_ENABLE([jni-interface],
+       [AS_HELP_STRING([--enable-jni-interface],[build JNI interface between C and Java. Needs Java include files [default=no]])],
        [jni_interface=$withval],
        [jni_interface=no]
 )
 
-AS_IF([test "x$jni_interface" = "xyes"],[
-        AC_CHECK_HEADERS([jni.h],[],[
-        AC_MSG_ERROR([missing jni.h
-Make sure Sun Java, OpenJDK or GCJ is installed and that this header file exists in the system path.
-Use the --with-java-jdk=DIR flag to point to your Java include files, or disable the JNI interface.])
-       ])
-])
 AM_CONDITIONAL([BUILD_JNI_INTERFACE], [test "x$jni_interface" = "xyes"])
 
 # sdt.h integration