X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=a08643ee7c11bba1138fb05a3a4cb2d51b51fe35;hb=b96787d23b84a303d49058c68c382c43b6b53625;hp=0066a6673143459a8cbfae7b82145ca0e7c3cf8d;hpb=41a2a9aa8dec91b2173982bdedee59d3635e48c2;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 0066a667..a08643ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([lttng-ust],[2.1.0-rc2],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.1.0],[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
@@ -77,6 +77,18 @@ 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],
 [
@@ -97,27 +109,6 @@ AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBC_DL], [test "x$have_libc_dl" = "xyes"])
 
 AC_CHECK_LIB([pthread], [pthread_create])
 
-# Check for libuuid
-AC_CHECK_LIB([uuid], [uuid_generate],
-[
-	AC_DEFINE_UNQUOTED([LTTNG_UST_HAVE_LIBUUID], 1, [Has libuuid support.])
-	have_libuuid=yes
-],
-[
-	# libuuid not found, check for uuid_create in libc.
-	AC_CHECK_LIB([c], [uuid_create],
-	[
-		AC_DEFINE_UNQUOTED([LTTNG_UST_HAVE_LIBC_UUID], 1, [Has libc uuid support.])
-		have_libc_uuid=yes
-	],
-	[
-		AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.])
-	])
-]
-)
-AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBUUID], [test "x$have_libuuid" = "xyes"])
-AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBC_UUID], [test "x$have_libc_uuid" = "xyes"])
-
 # Checks for header files.
 #AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])
 
@@ -189,7 +180,8 @@ changequote([,])dnl
 	s390) NO_UNALIGNED_ACCESS=1 ;;
 	s390x) NO_UNALIGNED_ACCESS=1 ;;
         arm*) NO_UNALIGNED_ACCESS=1 ;;
-	mips*) NO_UNALIGNED_ACCESS=1;;
+	mips*) NO_UNALIGNED_ACCESS=1 ;;
+	tile*) NO_UNALIGNED_ACCESS=1 ;;
 	*) AC_MSG_ERROR([unable to detect alignment requirements (unsupported architecture ($host_cpu)?)]) ;;
 esac
 
@@ -287,13 +279,13 @@ AC_CONFIG_FILES([
 	liblttng-ust-fork/Makefile
 	liblttng-ust-java/Makefile
 	liblttng-ust-libc-wrapper/Makefile
+	liblttng-ust-cyg-profile/Makefile
 	tools/Makefile
 	tests/Makefile
 	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
 	tests/ust-multi-test/Makefile
@@ -309,7 +301,6 @@ AS_ECHO("$version_description")
 # Report on the configuration options
 AS_ECHO()
 AS_ECHO("LTTng-UST will be built with the following options:")
-AS_ECHO("Library format: $LIBFORMAT")
 
 AS_ECHO()
 AS_ECHO_N("Java support (JNI): ")