Fix build for amd64 environment (for FreeBSD 8.2)

[urcu.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 179cb7d9643584a72b0edbd7845a43e95b223132..15e39ad93d33a56f92fbcb49c10458d4de4df0bb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 
-AC_INIT([userspace-rcu], [0.5.4], [mathieu dot desnoyers at efficios dot com])
+AC_INIT([userspace-rcu], [0.6.6], [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
@@ -48,6 +48,7 @@ case $host_cpu in
        i486) ARCHTYPE="x86";;
        i586) ARCHTYPE="x86";;
        i686) ARCHTYPE="x86";;
+       amd64) ARCHTYPE="x86";;
        x86_64) ARCHTYPE="x86";;
        powerpc) ARCHTYPE="ppc" ;;
        ppc64) ARCHTYPE="ppc" ;;
@@ -81,13 +82,8 @@ asm volatile("dmb":::"memory");
 )
 fi
 
-UATOMICSRC=urcu/uatomic_arch_$ARCHTYPE.h
-ARCHSRC=urcu/arch_$ARCHTYPE.h
-if test "x$ARCHTYPE" != xx86 -a "x$ARCHTYPE" != xppc; then
-       APISRC=tests/api_gcc.h
-else
-       APISRC=tests/api_$ARCHTYPE.h
-fi
+UATOMICSRC=urcu/uatomic/$ARCHTYPE.h
+ARCHSRC=urcu/arch/$ARCHTYPE.h
 if test "$ARCHTYPE" == "armv7l"; then
        CFLAGS="-mcpu=cortex-a9 -mtune=cortex-a9 -O"
 fi
@@ -240,12 +236,12 @@ CFLAGS=$saved_CFLAGS
 
 AC_CONFIG_LINKS([
        urcu/arch.h:$ARCHSRC
-       urcu/uatomic_arch.h:$UATOMICSRC
-       tests/api.h:$APISRC
+       urcu/uatomic.h:$UATOMICSRC
 ])
 AC_CONFIG_FILES([
        Makefile
        tests/Makefile
+       liburcu-cds.pc
        liburcu.pc
        liburcu-bp.pc
        liburcu-qsbr.pc