X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=238cad3bfc6ee708b44da8dff54d67b429918bf5;hb=refs%2Fheads%2Fstable-2.9;hp=32d69d512de6243e0e70ece5c3c9fab0d5d8695c;hpb=cd9f2eeba85f93a49dc9b8dbaa415eb5dd77bedb;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 32d69d51..238cad3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Version infos
 m4_define([V_MAJOR], [2])
 m4_define([V_MINOR], [9])
-m4_define([V_PATCH], [0])
+m4_define([V_PATCH], [7])
 dnl m4_define([V_EXTRA], [])
 m4_define([V_STRING], [V_MAJOR.V_MINOR.V_PATCH])
 m4_ifdef([V_EXTRA], [m4_append([V_STRING], [-V_EXTRA])])
@@ -187,8 +187,6 @@ dnl AC_CHECK_TYPES([ptrdiff_t])
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol sched_getcpu sysconf])
 
-CFLAGS="-Wall $CFLAGS"
-
 # URCU
 
 # urcu - check if we just find the headers it out of the box.
@@ -306,12 +304,17 @@ AS_IF([test "x$jni_interface" = "xyes" || test "x$java_agent_jul" = "xyes" || te
 	AX_JNI_INCLUDE_DIR
 	for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS
 	do
-		CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR"
+		JNI_CPPFLAGS="$JNI_CPPFLAGS -I$JNI_INCLUDE_DIR"
 	done
 
+	saved_CPPFLAGS="$CPPFLAGS"
+	CPPFLAGS="$CPPFLAGS $JNI_CPPFLAGS"
 	AX_PROG_JAVAH
+	CPPFLAGS="$saved_CPPFLAGS"
 ])
 
+AM_CONDITIONAL([HAVE_JAVAH], [test "x$JAVAH" != "x"])
+
 AS_IF([test "x$java_agent_log4j" = "xyes"], [
 	AX_CHECK_CLASSPATH
 	AX_CHECK_CLASS([org.apache.log4j.Logger])
@@ -444,6 +447,10 @@ AC_DEFUN([_AC_DEFINE_AND_SUBST], [
 
 _AC_DEFINE_AND_SUBST([LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS], [3000])
 
+AM_CFLAGS="-Wall"
+AC_SUBST(AM_CFLAGS)
+AC_SUBST(JNI_CPPFLAGS)
+
 AC_CONFIG_FILES([
 	Makefile
 	doc/Makefile