X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=configure.ac;h=55c1ab389e1d5e1cb3f05b306900829a8b881b25;hp=b358a083209ea96cd95dc962a8c581f4466aa915;hb=12471830622f2f6e67bb14e3fdb112c70a5dbe5e;hpb=671c16a587f332d59f856b61fa1660345a6ce64c

diff --git a/configure.ac b/configure.ac
index b358a083..55c1ab38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,5 @@
 AC_PREREQ([2.50])
-AC_INIT([babeltrace],[1.3.0],[jeremie.galarneau@efficios.com],[],[https://diamon.org/babeltrace])
-
-# 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_INIT([babeltrace],[1.3.2],[jeremie.galarneau@efficios.com],[],[https://diamon.org/babeltrace])
 AC_SUBST([BABELTRACE_LIBRARY_VERSION], [1:0:0])
 
 AC_CONFIG_HEADERS([config.h])
@@ -128,12 +125,18 @@ AC_CHECK_FUNCS([ \
 	uname \
 ])
 
-# Check for MinGW32.
 MINGW32=no
-case $host in
-  *-*-mingw*)
-	MINGW32=yes;;
-esac
+DEFAULT_ENABLE_DEBUGINFO=yes
+AS_CASE([$host_os],
+  [solaris*|darwin*],
+    [
+	DEFAULT_ENABLE_DEBUGINFO=no
+    ],
+  [mingw*],
+    [
+	MINGW32=yes
+    ]
+)
 
 AM_CONDITIONAL([BABELTRACE_BUILD_WITH_MINGW], [test "x$MINGW32" = "xyes"])
 
@@ -234,8 +237,20 @@ else
 
 fi
 
-pkg_modules="gmodule-2.0 >= 2.0.0"
-PKG_CHECK_MODULES(GMODULE, [$pkg_modules])
+# Optional debuginfo feature (enabled by default)
+AS_IF([test "x$DEFAULT_ENABLE_DEBUGINFO" = xyes],
+    [AC_ARG_ENABLE([debug-info], [AC_HELP_STRING([--disable-debug-info], [disable the debug-info feature (default on OS X and Solaris)])], [], [enable_debuginfo=yes])],
+    [AC_ARG_ENABLE([debug-info], [AC_HELP_STRING([--enable-debug-info], [enable the debug-info feature (default on Linux)])], [], [enable_debuginfo=no])]
+)
+
+AM_CONDITIONAL([ENABLE_DEBUGINFO], [test "x$enable_debuginfo" = xyes])
+AS_IF([test "x$enable_debuginfo" = xyes], [
+            PKG_CHECK_MODULES(LIBDW, [libdw >= 0.154], [], [AC_MSG_ERROR(Missing libdw (from elfutils >= 0.154) which is required by debug-info. You can disable this feature using --disable-debuginfo.)])
+            PKG_CHECK_MODULES(LIBELF, [libelf >= 0.154], [], [AC_MSG_ERROR(Missing libelf (from elfutils >= 0.154) which is required by debug-info. You can disable this feature using --disable-debuginfo.)])
+            AC_DEFINE([ENABLE_DEBUGINFO], [1], [Define to 1 if you enable the 'debug-info' feature])
+], [])
+
+PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.0.0])
 AC_SUBST(PACKAGE_LIBS)
 
 LIBS="$LIBS $GMODULE_LIBS"
@@ -285,4 +300,11 @@ AC_CONFIG_FILES([
 	babeltrace.pc
 	babeltrace-ctf.pc
 ])
+
+AC_CONFIG_FILES([tests/lib/test_seek_big_trace], [chmod +x tests/lib/test_seek_big_trace])
+AC_CONFIG_FILES([tests/lib/test_seek_empty_packet], [chmod +x tests/lib/test_seek_empty_packet])
+AC_CONFIG_FILES([tests/bin/test_trace_read], [chmod +x tests/bin/test_trace_read])
+AC_CONFIG_FILES([tests/bin/test_intersection], [chmod +x tests/bin/test_intersection])
+AC_CONFIG_FILES([tests/bin/test_packet_seq_num], [chmod +x tests/bin/test_packet_seq_num])
+
 AC_OUTPUT