Use a single macro to configure CXX

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3c92b40749492b05ccdfefc87e6764fb58dfcde1..9b6a3f1ceeb5e49eb80e19fa39faf5c7692a808f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -55,10 +55,8 @@ AC_SYS_LARGEFILE
 AC_PROG_CC
 # AC_PROG_CC_STDC was merged in AC_PROG_CC in autoconf 2.70
 m4_version_prereq([2.70], [], [AC_PROG_CC_STDC])
-AC_PROG_CXX
-AX_CXX_COMPILE_STDCXX([11])
-RW_PROG_CXX_WORKS
-AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"])
+AX_CXX_COMPILE_STDCXX([11], [noext], [optional])
+AM_CONDITIONAL([HAVE_CXX], [test "$HAVE_CXX11" = "1"])
 
 # Check if the compiler support weak symbols
 AX_SYS_WEAK_ALIAS
@@ -74,8 +72,8 @@ AC_PROG_GREP
 AC_PROG_LN_S
 AC_PROG_MKDIR_P
 AC_PROG_MAKE_SET
-AC_CHECK_PROG([HAVE_CMAKE], [cmake], ["yes"])
-AM_CONDITIONAL([HAVE_CMAKE], [test "x$HAVE_CMAKE" = "xyes"])
+AC_CHECK_PROG([CMAKE], [cmake])
+AM_CONDITIONAL([HAVE_CMAKE], [test "x$CMAKE" != "x"])
 
 # libtool link_all_deplibs fixup. See http://bugs.lttng.org/issues/321.
 AC_ARG_ENABLE([libtool-linkdep-fixup], [
@@ -167,6 +165,7 @@ AC_CHECK_FUNCS([ \
 
 # Check for pthread_setname_np and its signature
 LTTNG_PTHREAD_SETNAME_NP
+LTTNG_PTHREAD_GETNAME_NP
 
 # AC_FUNC_MALLOC causes problems when cross-compiling.
 #AC_FUNC_MALLOC
@@ -195,18 +194,16 @@ AS_CASE([$host_cpu],
        [ppc64le], [],
        [powerpc64], [],
        [powerpc64le], [],
-       [s390], [NO_UNALIGNED_ACCESS=1],
-       [s390x], [NO_UNALIGNED_ACCESS=1],
+       [s390], [],
+       [s390x], [],
        [arm*], [
-               NO_UNALIGNED_ACCESS=1
                NO_NUMA=1
                ],
-       [aarch64*], [NO_UNALIGNED_ACCESS=1],
-       [mips*], [NO_UNALIGNED_ACCESS=1],
-       [tile*], [NO_UNALIGNED_ACCESS=1],
+       [aarch64*], [],
+       [mips*], [],
+       [tile*], [],
        [
                UNSUPPORTED_ARCH=1
-               NO_UNALIGNED_ACCESS=1
        ])
 
 # Set os specific options
@@ -215,9 +212,7 @@ AS_CASE([$host_os],
 )
 
 # Configuration options, which will be installed in the config.h
-AH_TEMPLATE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.])
 AH_TEMPLATE([LTTNG_UST_HAVE_SDT_INTEGRATION], [SystemTap integration via sdt.h])
-AH_TEMPLATE([LTTNG_UST_HAVE_PERF_EVENT], [Perf event integration via perf_event.h])
 
 # Checks for libraries.
 AC_CHECK_LIB([dl], [dlopen], [
@@ -250,7 +245,7 @@ AS_IF([test "x${ac_cv_header_dlfcn_h}" = "xyes"], [
        ac_cv_have_decl_RTLD_DI_LINKMAP="no"
 ])
 
-AM_CONDITIONAL([HAVE_DLINFO], [test "x${ac_cv_have_decl_RTLD_DI_LINKMAP}" = "xyes"])
+AM_CONDITIONAL([ENABLE_UST_DL], [test "x${ac_cv_have_decl_RTLD_DI_LINKMAP}" = "xyes"])
 
 # Require URCU >= 0.12 for DEFINE_URCU_TLS_INIT
 PKG_CHECK_MODULES([URCU], [liburcu >= 0.12])
@@ -274,7 +269,7 @@ AS_IF([test "x$enable_numa" = "xyes"], [
 [AC_MSG_ERROR([libnuma is not available. Please either install it (e.g. libnuma-dev) or use [LDFLAGS]=-Ldir to specify the right location, or use --disable-numa configure argument to disable NUMA support.])])
        have_libnuma=yes
 ])
-AM_CONDITIONAL([HAVE_LIBNUMA], [test "x$have_libnuma" = "xyes"])
+AM_CONDITIONAL([ENABLE_NUMA], [test "x$have_libnuma" = "xyes"])
 
 # optional linux/perf_event.h
 AC_CHECK_HEADERS([linux/perf_event.h], [have_perf_event=yes], [])
@@ -283,12 +278,9 @@ AC_CHECK_HEADERS([linux/perf_event.h], [have_perf_event=yes], [])
 # perf, using the read system call as fallback.
 AM_CONDITIONAL([HAVE_PERF_EVENT], [test "x$have_perf_event" = "xyes"])
 
+AH_TEMPLATE([HAVE_PERF_EVENT], ["Perf event integration via perf_event.h"])
 AS_IF([test "x$have_perf_event" = "xyes"], [
-       AC_DEFINE([LTTNG_UST_HAVE_PERF_EVENT], [1])
-])
-
-AS_IF([test "x$NO_UNALIGNED_ACCESS" = "x"], [
-       AC_DEFINE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [1])
+       AC_DEFINE([HAVE_PERF_EVENT], [1])
 ])
 
 # Check for JNI header files if requested
@@ -300,7 +292,7 @@ AS_HELP_STRING([--enable-jni-interface], [build JNI interface between C and Java
        jni_interface=no
 ])
 
-AM_CONDITIONAL([BUILD_JNI_INTERFACE], [test "x$jni_interface" = "xyes"])
+AM_CONDITIONAL([ENABLE_JNI_INTERFACE], [test "x$jni_interface" = "xyes"])
 
 
 AC_ARG_ENABLE([java-agent-jul], [
@@ -326,9 +318,9 @@ AS_HELP_STRING([--enable-java-agent-all], [build the LTTng UST Java agent with a
        java_agent_log4j=$enableval
 ], [:])
 
-AM_CONDITIONAL([BUILD_JAVA_AGENT], [test "x$java_agent_jul" = "xyes" || test "x$java_agent_log4j" = "xyes"])
-AM_CONDITIONAL([BUILD_JAVA_AGENT_WITH_JUL], [test "x$java_agent_jul" = "xyes"])
-AM_CONDITIONAL([BUILD_JAVA_AGENT_WITH_LOG4J], [test "x$java_agent_log4j" = "xyes"])
+AM_CONDITIONAL([ENABLE_JAVA_AGENT], [test "x$java_agent_jul" = "xyes" || test "x$java_agent_log4j" = "xyes"])
+AM_CONDITIONAL([ENABLE_JAVA_AGENT_WITH_JUL], [test "x$java_agent_jul" = "xyes"])
+AM_CONDITIONAL([ENABLE_JAVA_AGENT_WITH_LOG4J], [test "x$java_agent_log4j" = "xyes"])
 
 AS_IF([test "x$jni_interface" = "xyes" || test "x$java_agent_jul" = "xyes" || test "x$java_agent_log4j" = "xyes"], [
        AX_JAVA_OPTIONS
@@ -365,7 +357,7 @@ AS_HELP_STRING([--enable-python-agent], [build the LTTng UST Python agent [defau
 ], [
        python_agent=$enableval
 ], [:])
-AM_CONDITIONAL([BUILD_PYTHON_AGENT], [test "x$python_agent" = "xyes"])
+AM_CONDITIONAL([ENABLE_PYTHON_AGENT], [test "x$python_agent" = "xyes"])
 AS_IF([test "x$python_agent" = "xyes"], [
        AM_PATH_PYTHON([2.7])
 ])
@@ -407,8 +399,8 @@ AS_HELP_STRING([--with-lttng-system-rundir], [Location of the system directory w
 AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"],
                [LTTng system runtime directory])
 
-AC_CHECK_PROG([BUILD_GEN_TP_EXAMPLES], [python], ["yes"])
-AM_CONDITIONAL([BUILD_GEN_TP_EXAMPLES], [test "x$BUILD_GEN_TP_EXAMPLES" = "xyes"])
+AC_CHECK_PROG([ENABLE_GEN_TP_EXAMPLES], [python], ["yes"])
+AM_CONDITIONAL([ENABLE_GEN_TP_EXAMPLES], [test "x$ENABLE_GEN_TP_EXAMPLES" = "xyes"])
 
 # Enable building examples
 AC_ARG_ENABLE(
@@ -471,18 +463,9 @@ they will not be installed.
 
 # Export man page build condition: build the man pages if the user
 # asked for it, and if the tools are available.
-AM_CONDITIONAL([MAN_PAGES_OPT], [test "x$man_pages_opt" != "xno"])
+AM_CONDITIONAL([ENABLE_MAN_PAGES], [test "x$man_pages_opt" != "xno"])
 AM_CONDITIONAL([HAVE_ASCIIDOC_XMLTO], [test "x$have_asciidoc_xmlto" = "xyes"])
 
-# Default values
-AC_DEFUN([_AC_DEFINE_AND_SUBST], [
-       AC_DEFINE_UNQUOTED([CONFIG_$1], [$2], [$1])
-       $1="$2"
-       AC_SUBST([$1])
-])
-
-_AC_DEFINE_AND_SUBST([LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS], [3000])
-
 AM_CFLAGS="-Wall $URCU_CFLAGS $PTHREAD_CFLAGS"
 AC_SUBST(AM_CFLAGS)
 
@@ -553,17 +536,6 @@ AC_CONFIG_FILES([
        lttng-ust-ctl.pc
 ])
 
-# Create link for python agent for the VPATH guru.
-AC_CONFIG_LINKS([
-       python-lttngust/lttngust/agent.py:python-lttngust/lttngust/agent.py
-       python-lttngust/lttngust/cmd.py:python-lttngust/lttngust/cmd.py
-       python-lttngust/lttngust/compat.py:python-lttngust/lttngust/compat.py
-       python-lttngust/lttngust/debug.py:python-lttngust/lttngust/debug.py
-       python-lttngust/lttngust/loghandler.py:python-lttngust/lttngust/loghandler.py
-])
-
-AC_CONFIG_FILES([tests/unit/ust-elf/test_ust_elf],[chmod +x tests/unit/ust-elf/test_ust_elf])
-
 AC_OUTPUT
 
 
@@ -586,9 +558,6 @@ PPRINT_SUBTITLE([System])
 
 PPRINT_PROP_STRING([Target architecture], $host_cpu)
 
-test "x$NO_UNALIGNED_ACCESS" != "x1" && value=1 || value=0
-PPRINT_PROP_BOOL([Efficient unaligned memory access], $value)
-
 AS_IF([test "x$UNSUPPORTED_ARCH" = "x1"],[
        PPRINT_WARN([Your architecture ($host_cpu) is unsupported, using safe default of no unaligned access.])
 ])