X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=configure.ac;h=34c713c1492bb7e338e390b9fecbffff78fbe961;hp=ba7538dbfca5cf33d4ae1b95deb2963f8a9ef08f;hb=f9f870e486f0177fd7d28b5b54a300879099875e;hpb=628a1a723be893a52b715d25a2d529dc56c2dc03

diff --git a/configure.ac b/configure.ac
index ba7538d..34c713c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_INIT([userspace-rcu],[0.10.0-pre],[mathieu dot desnoyers at efficios dot com]
 
 # Following the numbering scheme proposed by libtool for the library version
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-AC_SUBST([URCU_LIBRARY_VERSION], [5:0:1])
+AC_SUBST([URCU_LIBRARY_VERSION], [6:0:0])
 
 AC_CONFIG_HEADERS([include/config.h include/urcu/config.h])
 AC_CONFIG_AUX_DIR([config])
@@ -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
@@ -149,6 +148,7 @@ AS_CASE([$host_cpu],
 	[nios2*], [ARCHTYPE="nios2"],
 	[tile*], [ARCHTYPE="tile"],
 	[hppa*], [ARCHTYPE="hppa"],
+	[m68k], [ARCHTYPE="m68k"],
 	[ARCHTYPE="unknown"]
 )
 
@@ -168,7 +168,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 +367,11 @@ AC_CHECK_FUNCS([sched_setaffinity],[
 	])
 ])
 
-DEFAULT_INCLUDES="-include config.h"
-AC_SUBST(DEFAULT_INCLUDES)
+AM_CPPFLAGS="-include config.h"
+AC_SUBST(AM_CPPFLAGS)
+
+AM_CFLAGS="-Wall $AM_CFLAGS"
+AC_SUBST(AM_CFLAGS)
 
 AC_CONFIG_LINKS([
 	include/urcu/arch.h:$ARCHSRC