X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=configure.ac;h=0851f63ac12168b0c745a64e8f192da3dc0f9662;hp=d30801df4dd28e7189bc97f42b9caa6da0d19ac7;hb=394fd13b86bfd96bfb4b607447e9aad24f5b1090;hpb=22d7cb55cf9622cee29c9d75dca31ffa4a8f7336

diff --git a/configure.ac b/configure.ac
index d30801df..0851f63a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,5 @@
 AC_PREREQ([2.50])
-AC_INIT([babeltrace],[1.2.4],[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_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])
@@ -60,7 +57,7 @@ AC_CHECK_HEADERS([ \
 ])
 
 if test ! -f "$srcdir/formats/ctf/metadata/ctf-parser.h"; then
-        if test x"$YACC" != "xbison -y"; then
+        if test x"$(basename "$YACC")" != "xbison -y"; then
                 AC_MSG_ERROR([[bison not found and is required when building from git.
                 Please install bison]])
         fi
@@ -81,9 +78,11 @@ if test ! -f "$srcdir/formats/ctf/metadata/ctf-lexer.c"; then
         ])
 fi
 
-
 AM_PATH_GLIB_2_0(2.22.0, ,AC_MSG_ERROR([glib is required in order to compile BabelTrace - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule)
 
+# Check what libraries are required on this platform to link sockets programs.
+AX_LIB_SOCKET_NSL
+
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
 AC_TYPE_PID_T
@@ -135,9 +134,6 @@ esac
 
 AM_CONDITIONAL([BABELTRACE_BUILD_WITH_MINGW], [test "x$MINGW32" = "xyes"])
 
-# Check what libraries are required on this platform to link sockets programs.
-AX_LIB_SOCKET_NSL
-
 # Check for libuuid
 AC_CHECK_LIB([uuid], [uuid_generate],
 [
@@ -235,6 +231,19 @@ else
 
 fi
 
+# Optional debuginfo feature (enabled by default)
+AC_ARG_ENABLE([debuginfo], [AC_HELP_STRING([--disable-debuginfo], [disable the debuginfo feature])], [], [enable_debuginfo=yes])
+
+AM_CONDITIONAL([ENABLE_DEBUGINFO], [test "x$enable_debuginfo" = xyes])
+AS_IF([test "x$enable_debuginfo" = xyes], [
+            AC_CHECK_LIB([elf], [elf_version], [], [])
+            AC_CHECK_LIB([dw], [dwarf_begin], [], [])
+            AS_IF([test "x$ac_cv_lib_elf_elf_version" = xno || test "x$ac_cv_lib_dw_dwarf_begin" = xno],
+                        [AC_MSG_ERROR(Missing library from elfutils required for debuginfo. You can disable this feature with --disable-debuginfo.)]
+            )
+            AC_DEFINE([ENABLE_DEBUGINFO], [1], [Define to 1 if you enable the 'debuginfo' feature])
+], [])
+
 pkg_modules="gmodule-2.0 >= 2.0.0"
 PKG_CHECK_MODULES(GMODULE, [$pkg_modules])
 AC_SUBST(PACKAGE_LIBS)