X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=configure.ac;h=bc81a66d8199882a5b61a79e3bd785f8892ed34e;hp=637daa56761370c9a7c19f5f45e5ada72d396b4a;hb=65d3497f615f8e56481f47ea9eec2ebb01ae21fa;hpb=550461940505dbeae425d1b87d145549800a5341

diff --git a/configure.ac b/configure.ac
index 637daa56..bc81a66d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,12 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([babeltrace],[1.1.1],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([babeltrace],[1.2.0-rc2],[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
+AC_SUBST([BABELTRACE_LIBRARY_VERSION], [1:0:0])
+
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -106,17 +111,14 @@ AC_CHECK_LIB([popt], [poptGetContext], [],
 # SWIG version needed or newer:
 swig_version=2.0.0
 
-AC_ARG_ENABLE([python],
-              [AC_HELP_STRING([--disable-python],
-                              [do not compile Python bindings])],
-              [], [enable_python=yes])
+AC_ARG_ENABLE([python-bindings],
+              [AC_HELP_STRING([--enable-python-bindings],
+                              [generate Python bindings])],
+              [enable_python=yes], [enable_python=no])
 
 AM_CONDITIONAL([USE_PYTHON], [test "x${enable_python:-yes}" = xyes])
 
 if test "x${enable_python:-yes}" = xyes; then
-  AC_MSG_NOTICE([You may configure with --disable-python ]dnl
-[if you do not want Python bindings.])
-
   AX_PKG_SWIG($swig_version, [], [ AC_MSG_ERROR([SWIG $swig_version or newer is needed]) ])
   AM_PATH_PYTHON
 
@@ -128,12 +130,17 @@ if test "x${enable_python:-yes}" = xyes; then
                     [python$PYTHON_VERSION-config python-config],
                     [no],
                     [`dirname $PYTHON`])
-      AS_IF([test "$PYTHON_CONFIG" = no], [AC_MSG_ERROR([cannot find python-config for $PYTHON.])])
+      AS_IF([test "$PYTHON_CONFIG" = no], [AC_MSG_ERROR([cannot find python-config for $PYTHON. Do you have python-dev installed?])])
     ])
     AC_MSG_CHECKING([python include flags])
     PYTHON_INCLUDE=`$PYTHON_CONFIG --includes`
     AC_MSG_RESULT([$PYTHON_INCLUDE])
   ])
+
+else
+    AC_MSG_NOTICE([You may configure with --enable-python-bindings ]dnl
+[if you want Python bindings.])
+
 fi
 
 pkg_modules="gmodule-2.0 >= 2.0.0"
@@ -164,6 +171,7 @@ AC_CONFIG_FILES([
 	formats/ctf-text/types/Makefile
 	formats/ctf-metadata/Makefile
 	formats/bt-dummy/Makefile
+	formats/lttng-live/Makefile
 	formats/ctf/metadata/Makefile
 	formats/ctf/writer/Makefile
 	converter/Makefile