Update .gitignore

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index d3cac78f9954b23a1af7353abd9197a8909ef5d5..74fb795db41e9cc8b9d35e5176df95595c03b1fb 100644 (file)
--- 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], [1.9.0], [mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[1.9.0],[mathieu dot desnoyers at efficios dot com])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -27,8 +27,9 @@ AC_DEFINE_UNQUOTED([VERSION_PATCHLEVEL], $patchlevel_version, [UST patchlevel ve
 
 # Checks for programs.
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_MAKE_SET
-AC_PROG_LIBTOOL
+LT_INIT
 
 ## Checks for libraries.
 AC_CHECK_LIB([dl], [dlopen])
@@ -70,25 +71,21 @@ AC_CHECK_HEADERS([urcu-bp.h], [], [AC_MSG_ERROR([Cannot find [URCU] headers (urc
 This error can also occur when the liburcu package's configure script has not been run.])])
 
 AC_MSG_CHECKING([caa_likely()])
-AC_TRY_COMPILE(
-[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <urcu/compiler.h>
-],
-[
+]], [[
 void fct(void)
 {
        if (caa_likely(1)) {
        }
 }
-],
-[
+]])],[
        AC_MSG_RESULT([yes])
-],
-[
+],[
        AC_MSG_RESULT([no])
        AC_MSG_ERROR([Please upgrade your version of liburcu to 0.6.6 or better])
-]
-)
+
+])
 
 # urcu - check that URCU lib is available to compilation
 AC_CHECK_LIB([urcu-bp], [synchronize_rcu_bp], [], [AC_MSG_ERROR([Cannot find liburcu-bp lib. Use [LDFLAGS]=-Ldir to specify its location.])])
@@ -145,23 +142,19 @@ AC_MSG_RESULT($LIBFORMAT)
 
 if test "x$host_cpu" = "xarm" ; then
 AC_MSG_CHECKING([checking for armv5])
-AC_TRY_COMPILE(
-[
-],
-[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+]], [[
 #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])
@@ -231,6 +224,7 @@ AC_CONFIG_FILES([
        liblttng-ust-java/Makefile
        tests/Makefile
        tests/hello/Makefile
+       tests/hello.cxx/Makefile
        tests/demo/Makefile
        tests/fork/Makefile
        tests/ust-basic-tracing/Makefile