projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Don't override user variables within the build system
[lttng-ust.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index a9f0222915aa275f591f3b1ebb13d65bfd97dcf0..f896d2ff46a29905b40ec2e57f3df9e43f628837 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-171,8
+171,6
@@
dnl AC_CHECK_TYPES([ptrdiff_t])
AC_FUNC_MALLOC
AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol sched_getcpu sysconf])
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.
# URCU
# urcu - check if we just find the headers it out of the box.
@@
-297,10
+295,13
@@
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
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
done
+ saved_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $JNI_CPPFLAGS"
AX_PROG_JAVAH
AX_PROG_JAVAH
+ CPPFLAGS="$saved_CPPFLAGS"
])
AS_IF([test "x$java_agent_log4j" = "xyes"], [
])
AS_IF([test "x$java_agent_log4j" = "xyes"], [
@@
-435,6
+436,10
@@
AC_DEFUN([_AC_DEFINE_AND_SUBST], [
_AC_DEFINE_AND_SUBST([LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS], [3000])
_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
AC_CONFIG_FILES([
Makefile
doc/Makefile
This page took
0.023842 seconds
and
4
git commands to generate.