Cleanup: use mutex_lock() wrapper in rculfhash

[urcu.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ba7538dbfca5cf33d4ae1b95deb2963f8a9ef08f..1001586a297ce35dda19e1b228f922cc35b38a1b 100644 (file)
--- 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
@@ -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