X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=86b1d052393846c8a7da13df2b5e1630cd602b09;hb=e0ca901df9ff4742dfcaf1c8839f042760197555;hp=cf2e0e3e75f04d18dbc85fff2781c7203e60238b;hpb=31c7a68a8c6b44e0a19a5f480425e8c9109ad901;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index cf2e0e3e..86b1d052 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,12 +7,12 @@ dnl Process this file with autoconf to produce a configure script.
 
 # Project version information
 m4_define([ust_version_major], [2])
-m4_define([ust_version_minor], [13])
+m4_define([ust_version_minor], [14])
 m4_define([ust_version_patch], [0])
 m4_define([ust_version_dev_stage], [-pre])
 m4_define([ust_version], ust_version_major[.]ust_version_minor[.]ust_version_patch[]ust_version_dev_stage)
-m4_define([ust_version_name], [[Codename TBD]])
-m4_define([ust_version_description], [[Description TBD]])
+m4_define([ust_version_name], [[O-Beer]])
+m4_define([ust_version_description], [[An alcoholic drink made from yeast-fermented malt flavored with hops.]])
 
 # Library version information of "liblttng-ust"
 # Following the numbering scheme proposed by libtool for the library version
@@ -179,6 +179,11 @@ AC_LANG_POP([C])
 # Clang >= 3.3 (required by the project) and are only valid for C code.
 WARN_CFLAGS="${WARN_CFLAGS} -Wold-style-definition -Wstrict-prototypes"
 
+# Disable 'strict aliasing' if the compiler supports it.
+AC_LANG_PUSH([C])
+AX_APPEND_COMPILE_FLAGS([-fno-strict-aliasing], [OPT_CFLAGS], [-Werror])
+AC_LANG_POP([C])
+
 
 ##                     ##
 ## C++ compiler checks ##
@@ -256,6 +261,7 @@ AC_CHECK_FUNCS([ \
   clock_gettime \
   ftruncate \
   getpagesize \
+  gettid \
   gettimeofday \
   localeconv \
   memchr \
@@ -316,7 +322,7 @@ AC_ARG_VAR([CLASSPATH], [Java class path])
 
 
 ##                              ##
-## Optionnal features selection ##
+## Optional features selection ##
 ##                              ##
 
 # numa integration
@@ -413,7 +419,7 @@ AS_IF([AE_IS_FEATURE_ENABLED([jni-interface]) || AE_IS_FEATURE_ENABLED([java-age
   AX_PROG_JAVA
   AX_PROG_JAR
 
-  # Get the CPPFLAGS required to build jni libaries
+  # Get the CPPFLAGS required to build jni libraries
   AX_JNI_INCLUDE_DIR
   for jni_include_dir in $JNI_INCLUDE_DIRS; do
     JNI_CPPFLAGS="$JNI_CPPFLAGS -I$jni_include_dir"
@@ -544,7 +550,7 @@ AC_SUBST([LTTNG_UST_CTL_LIBRARY_VERSION], ust_ctl_lib_version)
 # Major soname for python-lttngust
 AC_SUBST([LTTNG_UST_LIB_SONAME_MAJOR], [ust_lib_version_current])
 
-AM_CFLAGS="$WARN_CFLAGS $URCU_CFLAGS $PTHREAD_CFLAGS"
+AM_CFLAGS="$OPT_CFLAGS $WARN_CFLAGS $URCU_CFLAGS $PTHREAD_CFLAGS"
 AC_SUBST(AM_CFLAGS)
 
 AM_CXXFLAGS="$WARN_CXXFLAGS $URCU_CFLAGS $PTHREAD_CFLAGS"
@@ -569,6 +575,7 @@ AC_CONFIG_FILES([
   doc/examples/Makefile
   doc/Makefile
   doc/man/Makefile
+  extras/Makefile
   include/Makefile
   src/common/Makefile
   src/lib/lttng-ust-common/Makefile
@@ -594,21 +601,30 @@ AC_CONFIG_FILES([
   src/lib/lttng-ust/Makefile
   src/lib/lttng-ust-python-agent/Makefile
   src/lib/Makefile
-  src/lttng-ust-ctl.pc
-  src/lttng-ust.pc
+  src/lib/lttng-ust-ctl.pc
+  src/lib/lttng-ust.pc
   src/Makefile
   src/python-lttngust/lttngust/version.py
   src/python-lttngust/Makefile
   src/python-lttngust/setup.py
   tests/benchmark/Makefile
-  tests/compile/ctf-types/Makefile
-  tests/compile/hello.cxx/Makefile
-  tests/compile/hello/Makefile
-  tests/compile/hello-many/Makefile
+  tests/compile/api0/ctf-types/Makefile
+  tests/compile/api0/hello.cxx/Makefile
+  tests/compile/api0/hello/Makefile
+  tests/compile/api0/hello-many/Makefile
+  tests/compile/api0/Makefile
+  tests/compile/api0/same_line_tracepoint/Makefile
+  tests/compile/api1/ust-fields/Makefile
+  tests/compile/api1/hello.cxx/Makefile
+  tests/compile/api1/hello/Makefile
+  tests/compile/api1/hello-many/Makefile
+  tests/compile/api1/Makefile
+  tests/compile/api1/same_line_tracepoint/Makefile
+  tests/compile/api1/test-app-ctx/Makefile
   tests/compile/Makefile
-  tests/compile/same_line_tracepoint/Makefile
-  tests/compile/test-app-ctx/Makefile
   tests/Makefile
+  tests/regression/abi0-conflict/Makefile
+  tests/regression/Makefile
   tests/unit/gcc-weak-hidden/Makefile
   tests/unit/libmsgpack/Makefile
   tests/unit/libringbuffer/Makefile
@@ -644,9 +660,9 @@ AS_ECHO
 
 AS_IF([test -n "ust_version_description"], [
   AS_IF([test -n "$FOLD"], [
-    AS_ECHO("`AS_ECHO("ust_version_description") | $FOLD -s`")
+    AS_ECHO(["ust_version_description"]) | $FOLD -s
   ], [
-    AS_ECHO("ust_version_description")
+    AS_ECHO(["ust_version_description"])
   ])
   AS_ECHO
 ])