X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=dbb88787804172825e060cc30ccbbed77a31fe64;hb=refs%2Fheads%2Fstable-2.1;hp=79c33ff395896101319c4961e5d975f60c747d7e;hpb=faebb41808b9deda5ef5dfea0c035077407e7f9f;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 79c33ff3..dbb88787 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,14 +1,19 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([lttng-ust],[2.0.1],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.1.4],[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
+# This is the library version of liblttng-ust.
 AC_SUBST([LTTNG_UST_LIBRARY_VERSION], [0:0:0])
 # note: remember to update tracepoint.h dlopen() to match this version
 # number. TODO: eventually automate by exporting the major number.
 
+# This is the library version of liblttng-ust-ctl, used internally by
+# liblttng-ust, lttng-sessiond, and lttng-consumerd.
+AC_SUBST([LTTNG_UST_CTL_LIBRARY_VERSION], [1:0:0])
+
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -34,8 +39,8 @@ AC_DEFINE_UNQUOTED([VERSION_MAJOR], $major_version, [UST major version number])
 AC_DEFINE_UNQUOTED([VERSION_MINOR], $minor_version, [UST minor version number])
 AC_DEFINE_UNQUOTED([VERSION_PATCHLEVEL], $patchlevel_version, [UST patchlevel version number])
 
-version_name="Annedd'ale"
-version_description="New type of beer, 100% from Quebec, flavored with sapin beaumier needles, with a touch of hops."
+version_name="Basse Messe"
+version_description="Light coloured German ale whose style was named after the city Cologne (Koln) where it was first brewed. It is a rather simple beer with lightly fruity aromas and a delicate hoppy fragrance. The beer has a pronounced malty taste with a subtle bitter aftertaste"
 AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], [UST version name])
 AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description"], [UST version description])
 
@@ -64,12 +69,26 @@ AS_IF([test "x$libtool_fixup" = "xyes"],
 		  ])
 	    ])
 
+AM_CONDITIONAL([NO_SHARED], [test "x$enable_shared" = "xno"])
+
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_MAKE_SET
 LT_INIT
 
+# rw_PROG_CXX_WORKS
+# Check whether the C++ compiler works.
+AC_CACHE_CHECK([whether the C++ compiler works],
+		[rw_cv_prog_cxx_works],
+		[AC_LANG_PUSH([C++])
+		AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
+				[rw_cv_prog_cxx_works=yes],
+				[rw_cv_prog_cxx_works=no])
+		AC_LANG_POP([C++])])
+
+AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"])
+
 ## Checks for libraries.
 AC_CHECK_LIB([dl], [dlopen],
 [
@@ -168,69 +187,24 @@ AC_CHECK_LIB([urcu-bp], [synchronize_rcu_bp], [], [AC_MSG_ERROR([Cannot find lib
 # urcu - check that URCU lib is at least version 0.6
 AC_CHECK_LIB([urcu-bp], [call_rcu_bp], [], [AC_MSG_ERROR([liburcu 0.6 or newer is needed, please update your version or use [LDFLAGS]=-Ldir to specify the right location.])])
 
-
-# Check for various supplementary host information (beyond the
-# triplet) which might affect the library format choices.  E.g., we
-# can be building with `i686-unknown-linux-gnu-gcc -m64'
-
-case "${host}" in
-changequote(,)dnl
-  i[34567]86-*-linux*)
-changequote([,])dnl
-    AC_CACHE_CHECK([if building for x86-64], [ust_cv_i386_is_x86_64],
-                    [save_CPPFLAGS="$CPPFLAGS"
-                    CPPFLAGS="$CPPFLAGS $CFLAGS"
-                    AC_EGREP_CPP([got it], [
-#if __x86_64__
-got it
-#endif
-                 ], [ust_cv_i386_is_x86_64=yes],
-                    [ust_cv_i386_is_x86_64=no])
-                    CPPFLAGS="$save_CPPFLAGS"])
-    ;;
-esac
-
-AC_MSG_CHECKING([library format for the host system])
+AC_MSG_CHECKING([host system alignment requirements])
 case $host_cpu in
 changequote(,)dnl
 	i[3456]86)
 changequote([,])dnl
-	  if test "$ust_cv_i386_is_x86_64" = yes ; then
-	     LIBFORMAT="elf64-x86-64"
-	  else
-	     LIBFORMAT="elf32-i386"
-	  fi
 	  ;;
-	x86_64) LIBFORMAT="elf64-x86-64" ;;
-	amd64) LIBFORMAT="elf64-x86-64" ;;
-	powerpc) LIBFORMAT="elf32-powerpc" ;;
-	ppc64) LIBFORMAT="elf64-powerpc" ;;
-	powerpc64) LIBFORMAT="elf64-powerpc" ;;
-	s390) LIBFORMAT="elf32-s390"; NO_UNALIGNED_ACCESS=1 ;;
-	s390x) LIBFORMAT="elf64-s390"; NO_UNALIGNED_ACCESS=1 ;;
-        armv5) LIBFORMAT="elf32-littlearm"; NO_UNALIGNED_ACCESS=1 ;;
-	arm) LIBFORMAT="elf32-littlearm"; NO_UNALIGNED_ACCESS=1 ;;
-	mips*) LIBFORMAT=""; NO_UNALIGNED_ACCESS=1;;
-	*) AC_MSG_ERROR([unable to detect library format (unsupported architecture ($host_cpu)?)]) ;;
+	x86_64) ;;
+	amd64) ;;
+	powerpc) ;;
+	ppc64) ;;
+	powerpc64) ;;
+	s390) NO_UNALIGNED_ACCESS=1 ;;
+	s390x) NO_UNALIGNED_ACCESS=1 ;;
+        arm*) NO_UNALIGNED_ACCESS=1 ;;
+	mips*) NO_UNALIGNED_ACCESS=1;;
+	*) AC_MSG_ERROR([unable to detect alignment requirements (unsupported architecture ($host_cpu)?)]) ;;
 esac
-AC_SUBST(LIBFORMAT)
-AC_MSG_RESULT($LIBFORMAT)
 
-if test "x$host_cpu" = "xarm" ; then
-AC_MSG_CHECKING([checking for armv5])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-#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([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [1])
 fi
@@ -330,6 +304,7 @@ AC_CONFIG_FILES([
 	tests/hello/Makefile
 	tests/hello-static-lib/Makefile
 	tests/hello.cxx/Makefile
+	tests/daemon/Makefile
 	tests/demo/Makefile
 	tests/fork/Makefile
 	tests/ust-basic-tracing/Makefile