projects
/
lttng-tools.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-tools.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 197288d9af88ae194f4e2e80882e6c16b9654a24..6ac21349761af0d7b89c8a4ea1357151baa89853 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-8,7
+8,7
@@
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_TARGET
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-pax])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-pax
nostdinc
])
AM_MAINTAINER_MODE([enable])
# Enable silent rules if available (Introduced in AM 1.11)
AM_MAINTAINER_MODE([enable])
# Enable silent rules if available (Introduced in AM 1.11)
@@
-59,9
+59,6
@@
AS_IF([test "x$ax_cv___attribute__" = "xyes"],
[AC_MSG_ERROR([The compiler does not support __attribute__ extensions])])
AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])])
[AC_MSG_ERROR([The compiler does not support __attribute__ extensions])])
AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])])
-LIBS="$PTHREAD_LIBS $LIBS"
-CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-CC="$PTHREAD_CC"
AX_LIB_SOCKET_NSL
AX_LIB_SOCKET_NSL
@@
-385,7
+382,7
@@
AM_CONDITIONAL([LTTNG_BUILD_WITH_LIBC_UUID], [test "x$link_with_libc_uuid" = "xy
AC_CHECK_FUNC([clock_gettime], [AC_DEFINE_UNQUOTED([LTTNG_HAVE_CLOCK_GETTIME], 1, [Has clock_gettime() support.])])
# URCU library version needed or newer
AC_CHECK_FUNC([clock_gettime], [AC_DEFINE_UNQUOTED([LTTNG_HAVE_CLOCK_GETTIME], 1, [Has clock_gettime() support.])])
# URCU library version needed or newer
-m4_define([WRONG_LIBURCU_MSG], [Userspace RCU (liburcu) >= 0.
8
.0 is needed])
+m4_define([WRONG_LIBURCU_MSG], [Userspace RCU (liburcu) >= 0.
9
.0 is needed])
# Check liburcu needed function calls
AC_CHECK_DECL([cds_list_add], [],
# Check liburcu needed function calls
AC_CHECK_DECL([cds_list_add], [],
@@
-410,13
+407,18
@@
AC_CHECK_DECL([cmm_smp_mb__before_uatomic_or], [],
[AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include <urcu.h>]]
)
[AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include <urcu.h>]]
)
+#Function added in urcu 0.9.0
+AC_CHECK_DECL([urcu_ref_get_unless_zero], [],
+ [AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include <urcu/ref.h>]]
+)
+
# Check kmod library
AC_ARG_WITH(kmod-prefix,
AS_HELP_STRING([--with-kmod-prefix=PATH],
[Specify the installation prefix of the kmod library.
Headers must be in PATH/include; libraries in PATH/lib.]),
[
# Check kmod library
AC_ARG_WITH(kmod-prefix,
AS_HELP_STRING([--with-kmod-prefix=PATH],
[Specify the installation prefix of the kmod library.
Headers must be in PATH/include; libraries in PATH/lib.]),
[
-
CPPFLAGS="$
CPPFLAGS -I${withval}/include"
+
AM_CPPFLAGS="$AM_
CPPFLAGS -I${withval}/include"
LDFLAGS="$LDFLAGS -L${withval}/lib64 -L${withval}/lib"
])
LDFLAGS="$LDFLAGS -L${withval}/lib64 -L${withval}/lib"
])
@@
-441,7
+443,7
@@
AC_ARG_WITH(lttng-ust-prefix,
[Specify the installation prefix of the lttng-ust library.
Headers must be in PATH/include; libraries in PATH/lib.]),
[
[Specify the installation prefix of the lttng-ust library.
Headers must be in PATH/include; libraries in PATH/lib.]),
[
-
CPPFLAGS="$
CPPFLAGS -I${withval}/include"
+
AM_CPPFLAGS="$AM_
CPPFLAGS -I${withval}/include"
LDFLAGS="$LDFLAGS -L${withval}/lib64 -L${withval}/lib"
])
LDFLAGS="$LDFLAGS -L${withval}/lib64 -L${withval}/lib"
])
@@
-970,9
+972,11
@@
modify their sources.
# export flex condition
AM_CONDITIONAL([HAVE_FLEX], [test "x$have_flex" = "xyes"])
# export flex condition
AM_CONDITIONAL([HAVE_FLEX], [test "x$have_flex" = "xyes"])
-CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
+AM_CFLAGS="-Wall -fno-strict-aliasing $PTHREAD_CFLAGS"
+AC_SUBST(AM_CFLAGS)
-DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/src -I\$(top_builddir)/include -include config.h"
+AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include -I\$(top_srcdir)/src -include config.h $AM_CPPFLAGS"
+AC_SUBST(AM_CPPFLAGS)
lttngincludedir="${includedir}/lttng"
AC_SUBST(lttngincludedir)
lttngincludedir="${includedir}/lttng"
AC_SUBST(lttngincludedir)
@@
-989,8
+993,6
@@
AC_SUBST(lttngnotificationincludedir)
lttngtriggerincludedir="${includedir}/lttng/trigger"
AC_SUBST(lttngtriggerincludedir)
lttngtriggerincludedir="${includedir}/lttng/trigger"
AC_SUBST(lttngtriggerincludedir)
-AC_SUBST(DEFAULT_INCLUDES)
-
lttnglibexecdir="${libdir}/lttng/libexec"
AC_SUBST(lttnglibexecdir)
lttnglibexecdir="${libdir}/lttng/libexec"
AC_SUBST(lttnglibexecdir)
@@
-1049,6
+1051,7
@@
AC_CONFIG_FILES([
tests/regression/tools/crash/Makefile
tests/regression/tools/regen-metadata/Makefile
tests/regression/tools/regen-statedump/Makefile
tests/regression/tools/crash/Makefile
tests/regression/tools/regen-metadata/Makefile
tests/regression/tools/regen-statedump/Makefile
+ tests/regression/tools/notification/Makefile
tests/regression/ust/Makefile
tests/regression/ust/nprocesses/Makefile
tests/regression/ust/high-throughput/Makefile
tests/regression/ust/Makefile
tests/regression/ust/nprocesses/Makefile
tests/regression/ust/high-throughput/Makefile
This page took
0.023817 seconds
and
4
git commands to generate.