X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=configure.ac;h=0851f63ac12168b0c745a64e8f192da3dc0f9662;hp=f66104648324b2bd3f96efa78f6e4a11cd596c7e;hb=beef86dc741318692ee1affa5a733a0ec4d6fd3d;hpb=0692ec698484e532211e8cc13127d26b9060d954

diff --git a/configure.ac b/configure.ac
index f6610464..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
@@ -234,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)