Only compare "bison -y" to the basename of YACC variable

[babeltrace.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index d30801df4dd28e7189bc97f42b9caa6da0d19ac7..b358a083209ea96cd95dc962a8c581f4466aa915 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.50])
-AC_INIT([babeltrace],[1.2.4],[mathieu dot desnoyers at efficios dot com])
+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
@@ -60,7 +60,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 +81,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 +137,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],
 [