Fix coverity warning about sizeof(void **) != sizeof(void *)

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 76851dbaa989d6055919fe189dd1327785eb9206..6457a30ffbc0f56264f3a88ef89a8aab457a04f1 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.1],[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
@@ -194,9 +194,23 @@ AC_CHECK_LIB([urcu-bp], [call_rcu_bp], [], [AC_MSG_ERROR([liburcu 0.6 or newer i
 
 # optional linux/perf_event.h
 AC_CHECK_HEADERS([linux/perf_event.h], [have_perf_event=yes], [])
-AM_CONDITIONAL([HAVE_PERF_EVENT], [test "x$have_perf_event" = "xyes"])
 
-if test "x$have_perf_event" = "xyes"; then
+# Perf event counters are only supported on x86 so far.
+AC_MSG_CHECKING([UST support for architecture perf event counters])
+case $host_cpu in
+changequote(,)dnl
+       i[3456]86)
+changequote([,])dnl
+       UST_SUPPORT_FOR_ARCH_PERF_EVENT_COUNTERS=yes;;
+       x86_64) UST_SUPPORT_FOR_ARCH_PERF_EVENT_COUNTERS=yes;;
+       amd64) UST_SUPPORT_FOR_ARCH_PERF_EVENT_COUNTERS=yes;;
+       *) UST_SUPPORT_FOR_ARCH_PERF_EVENT_COUNTERS=no;;
+esac
+AC_MSG_RESULT([$UST_SUPPORT_FOR_ARCH_PERF_EVENT_COUNTERS])
+
+AM_CONDITIONAL([HAVE_PERF_EVENT], [test "x$have_perf_event" = "xyes" -a "x$UST_SUPPORT_FOR_ARCH_PERF_EVENT_COUNTERS" = "xyes"])
+
+if test "x$have_perf_event" = "xyes" -a "x$UST_SUPPORT_FOR_ARCH_PERF_EVENT_COUNTERS" = "xyes"; then
 AC_DEFINE([LTTNG_UST_HAVE_PERF_EVENT], [1])
 fi
 
@@ -210,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 ;;
@@ -256,7 +272,7 @@ 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.])
+Use the --with-java-jdk=DIR option to point to your JDK directory, or disable the JNI interface.])
        ])
 ])
 AM_CONDITIONAL([BUILD_JNI_INTERFACE], [test "x$jni_interface" = "xyes"])