X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=configure.ac;h=cbe239691fea17330fda29575fac30e8d6be9dfd;hb=161239e0409832d65cb773a08d364b29945b18a7;hp=8ca32ff59570bc858bce406f7d518076cacdfa54;hpb=7adb228fd47dcde5f518c9c67afcdef15f575c03;p=ust.git

diff --git a/configure.ac b/configure.ac
index 8ca32ff..cbe2396 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([ust], [0.12], [nils dot carlson at ericsson dot com])
+AC_INIT([ust], [0.13], [nils dot carlson at ericsson dot com])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -9,7 +9,16 @@ AC_CONFIG_MACRO_DIR([config])
 AM_INIT_AUTOMAKE([foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_SRCDIR([ustctl/ustctl.c])
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([config.h include/ust/config.h])
+AH_TEMPLATE([HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.])
+# Compute minor/major version numbers
+major_version=`echo AC_PACKAGE_VERSION | sed 's/\..*//'`
+minor_version=`echo AC_PACKAGE_VERSION | sed 's/.*\.//' | sed 's/^0//'`
+AC_SUBST([MAJOR_VERSION], [$major_version])
+AC_SUBST([MINOR_VERSION], [$minor_version])
+AC_DEFINE_UNQUOTED([VERSION_MAJOR], $major_version, [UST major version number])
+AC_DEFINE_UNQUOTED([VERSION_MINOR], $minor_version, [UST minor version number])
+
 
 # Checks for programs.
 AC_PROG_CC
@@ -108,6 +117,7 @@ changequote([,])dnl
 	ppc64) LIBFORMAT="elf64-powerpc" ;;
 	s390) LIBFORMAT="elf32-s390" ;;
 	s390x) LIBFORMAT="elf64-s390" ;;
+        armv5) LIBFORMAT="elf32-littlearm"; NO_UNALIGNED_ACCESS=1 ;;
 	arm) LIBFORMAT="elf32-littlearm" ;;
 	mips*) LIBFORMAT="" ;;
 	*) AC_MSG_ERROR([unable to detect library format (unsupported architecture ($host_cpu)?)]) ;;
@@ -115,6 +125,30 @@ esac
 AC_SUBST(LIBFORMAT)
 AC_MSG_RESULT($LIBFORMAT)
 
+if test "x$host_cpu" = "xarm" ; then
+AC_MSG_CHECKING([checking for armv5])
+AC_TRY_COMPILE(
+[
+],
+[
+#ifndef __ARM_ARCH_5TEJ__
+#error "no arm5 here"
+#endif
+],
+[
+	AC_MSG_RESULT([yes])
+	NO_UNALIGNED_ACCESS=1
+]
+,
+[
+	AC_MSG_RESULT([no])
+]
+)
+fi
+if test x$NO_UNALIGNED_ACCESS = x ; then
+AC_DEFINE([HAVE_EFFICIENT_UNALIGNED_ACCESS], [1])
+fi
+
 AC_CONFIG_FILES([
 	Makefile
 	doc/Makefile
@@ -139,6 +173,7 @@ AC_CONFIG_FILES([
 	tests/tracepoint/benchmark/Makefile
 	tests/register_test/Makefile
 	tests/libustctl_function_tests/Makefile
+	tests/exit-fast/Makefile
 	libustinstr-malloc/Makefile
 	libustfork/Makefile
 	libustconsumer/Makefile
@@ -147,5 +182,7 @@ AC_CONFIG_FILES([
 	libustcomm/Makefile
 	libustctl/Makefile
 	snprintf/Makefile
+	ust.pc
+	include/ust/version.h
 ])
 AC_OUTPUT