X-Git-Url: http://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=configure.ac;h=753bec56f53bfa218ade1dca636e1e12e79c82df;hp=ba7538dbfca5cf33d4ae1b95deb2963f8a9ef08f;hb=fed2db62a1ff24a30d364b5a528221e3bdb5f6ab;hpb=628a1a723be893a52b715d25a2d529dc56c2dc03

diff --git a/configure.ac b/configure.ac
index ba7538d..753bec5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,9 +89,8 @@ 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])])
-LIBS="$PTHREAD_LIBS $LIBS"
-CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-CC="$PTHREAD_CC"
+
+AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS"
 
 # Checks for library functions.
 AC_FUNC_MMAP
@@ -168,7 +167,7 @@ AS_IF([test "x$SUBARCHTYPE" = xx86compat],[
 ])
 
 AS_IF([test "$host_cpu" = "armv7l"],[
-	CFLAGS="$CFLAGS -mcpu=cortex-a9 -mtune=cortex-a9 -O1"
+	AM_CFLAGS="$AM_CFLAGS -mcpu=cortex-a9 -mtune=cortex-a9 -O1"
 ])
 
 # ARM-specific checks
@@ -367,8 +366,10 @@ AC_CHECK_FUNCS([sched_setaffinity],[
 	])
 ])
 
-DEFAULT_INCLUDES="-include config.h"
-AC_SUBST(DEFAULT_INCLUDES)
+AM_CPPFLAGS="-include config.h"
+AC_SUBST(AM_CPPFLAGS)
+
+AC_SUBST(AM_CFLAGS)
 
 AC_CONFIG_LINKS([
 	include/urcu/arch.h:$ARCHSRC