dnl Version infos
m4_define([V_MAJOR], [2])
m4_define([V_MINOR], [8])
-m4_define([V_PATCH], [2])
+m4_define([V_PATCH], [4])
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])])
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.
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"
])
AS_IF([test "x$java_agent_log4j" = "xyes"], [
_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