Fix: .split() the CC environment variable in lttng-gen-tp

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7edbc9f2227e66b9c559246f79daf15e6a9b3d27..5d2d5dfdd67e0f1c2d0a053f41a6951de89177a6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 

-AC_INIT([lttng-ust],[2.3.0-rc2],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.4.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
 
 # Following the numbering scheme proposed by libtool for the library version
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html


@@ -39,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])
 
 AC_DEFINE_UNQUOTED([VERSION_MINOR], $minor_version, [UST minor version number])
 AC_DEFINE_UNQUOTED([VERSION_PATCHLEVEL], $patchlevel_version, [UST patchlevel version number])
 

-version_name="Dominus Vobiscum"
-version_description="A very succulent line-up of beers brewed at Microbrasserie Charlevoix. Elaborated starting from special malts and fermented with a Belgian yeast. These beers are refermented in bottle and will make you discover the richness of wheat, amber and triple styles."
+version_name="Époque Opaque"
+version_description="The Époque Opaque is a black IPA from Trou du Diable brewery. The nose is eerily reminiscent of the coffee crisp candy from of our childhood. These strong mocha accents are present on the palate, which are quickly subdued by Japanese and Australian hops leading to a final state of satisfaction enjoyable for any fan of bitter beer."

 
 AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], [UST version name])
 AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description"], [UST version description])
 
 AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], [UST version name])
 AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description"], [UST version description])


@@ -145,6 +145,9 @@ AC_C_INLINE
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol sched_getcpu sysconf])
 
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol sched_getcpu sysconf])
 

+AC_CHECK_FUNCS([dlinfo])
+AM_CONDITIONAL([HAVE_DLINFO], [test "${ac_cv_func_dlinfo}" = "yes"])
+

 CFLAGS="-Wall $CFLAGS"
 
 # URCU
 CFLAGS="-Wall $CFLAGS"
 
 # URCU


@@ -198,6 +201,7 @@ changequote([,])dnl
        tile*) NO_UNALIGNED_ACCESS=1 ;;
        *) AC_MSG_ERROR([unable to detect alignment requirements (unsupported architecture ($host_cpu)?)]) ;;
 esac
        tile*) NO_UNALIGNED_ACCESS=1 ;;
        *) AC_MSG_ERROR([unable to detect alignment requirements (unsupported architecture ($host_cpu)?)]) ;;
 esac

+AC_MSG_RESULT([$host_cpu])

 
 if test x$NO_UNALIGNED_ACCESS = x ; then
 AC_DEFINE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [1])
 
 if test x$NO_UNALIGNED_ACCESS = x ; then
 AC_DEFINE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [1])


@@ -209,6 +213,9 @@ AC_ARG_WITH([java-jdk],
        [JAVA_JDK=$withval],
        [JAVA_JDK=""]
 )
        [JAVA_JDK=$withval],
        [JAVA_JDK=""]
 )

+AM_CONDITIONAL([HAVE_JAVA_JDK], [test $JAVA_JDK], [Java JDK path])
+AC_SUBST([JAVA_JDK])
+

 AS_IF([test $JAVA_JDK],[
        AS_IF([test -d $JAVA_JDK],[
                 AC_MSG_RESULT([using Java includes in $JAVA_SDK])
 AS_IF([test $JAVA_JDK],[
        AS_IF([test -d $JAVA_JDK],[
                 AC_MSG_RESULT([using Java includes in $JAVA_SDK])


@@ -262,6 +269,16 @@ AS_IF([test "x$with_sdt" = "xyes"],[
        ])
 ])
 
        ])
 ])
 

+AC_MSG_CHECKING([whether shared libraries are enabled])
+AS_IF([test "x$enable_shared" = "xyes"],
+       [
+               AC_MSG_RESULT([yes])
+       ],
+       [
+               AC_MSG_RESULT([no])
+               AC_MSG_ERROR([LTTng-UST requires shared libraries to be enabled])
+       ])
+

 AC_ARG_WITH([lttng-system-rundir],
        AS_HELP_STRING([--with-lttng-system-rundir],
        [Location of the system directory where LTTng-UST expects the system-wide lttng-sessiond runtime files. The default is "/var/run/lttng".]),
 AC_ARG_WITH([lttng-system-rundir],
        AS_HELP_STRING([--with-lttng-system-rundir],
        [Location of the system directory where LTTng-UST expects the system-wide lttng-sessiond runtime files. The default is "/var/run/lttng".]),


@@ -270,6 +287,12 @@ AC_ARG_WITH([lttng-system-rundir],
 AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"],
        [LTTng system runtime directory])
 
 AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"],
        [LTTng system runtime directory])
 

+lttnglibjavadir="${libdir}/lttng/java"
+AC_SUBST(lttnglibjavadir)
+
+AM_PATH_PYTHON([2.7],BUILD_GEN_TP_EXAMPLES=1,[:])
+AM_CONDITIONAL([BUILD_GEN_TP_EXAMPLES], [test $BUILD_GEN_TP_EXAMPLES], [Build examples requiring lttng-gen-tp])
+

 AC_CONFIG_FILES([
        Makefile
        doc/Makefile
 AC_CONFIG_FILES([
        Makefile
        doc/Makefile


@@ -282,7 +305,9 @@ AC_CONFIG_FILES([
        liblttng-ust/Makefile
        liblttng-ust-ctl/Makefile
        liblttng-ust-fork/Makefile
        liblttng-ust/Makefile
        liblttng-ust-ctl/Makefile
        liblttng-ust-fork/Makefile

+       liblttng-ust-dl/Makefile

        liblttng-ust-java/Makefile
        liblttng-ust-java/Makefile

+       liblttng-ust-jul/Makefile

        liblttng-ust-libc-wrapper/Makefile
        liblttng-ust-cyg-profile/Makefile
        tools/Makefile
        liblttng-ust-libc-wrapper/Makefile
        liblttng-ust-cyg-profile/Makefile
        tools/Makefile


@@ -293,6 +318,7 @@ AC_CONFIG_FILES([
        tests/snprintf/Makefile
        tests/benchmark/Makefile
        tests/utils/Makefile
        tests/snprintf/Makefile
        tests/benchmark/Makefile
        tests/utils/Makefile

+       tests/java-jul/Makefile

        lttng-ust.pc
 ])
 
        lttng-ust.pc
 ])