configure.ac: fix static build

[lttng-tools.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a8a43e3e693d76b27dd708d476657631f0bbf86b..9208cb35c4599cbaf6d2bb1bb4960593027ab1f0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-AC_INIT([lttng-tools],[2.7.0-rc2],[jeremie.galarneau@efficios.com],[],[https://lttng.org])
 AC_PREREQ([2.64])
+AC_INIT([lttng-tools],[2.7.0],[jeremie.galarneau@efficios.com],[],[https://lttng.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -175,15 +175,17 @@ AC_CHECK_LIB([pthread], [pthread_create], [],
 )
 
 # Check libpopt
-AC_CHECK_LIB([popt], [poptGetContext], [],
+PKG_CHECK_MODULES([POPT], [popt],
+       [LIBS="$LIBS $POPT_LIBS"],
        [AC_MSG_ERROR([Cannot find libpopt. Use [LDFLAGS]=-Ldir to specify its location.])]
 )
 
 AM_PATH_XML2(2.7.6, true, AC_MSG_ERROR(No supported version of libxml2 found.))
 
 # Check for libuuid
-AC_CHECK_LIB([uuid], [uuid_generate],
+PKG_CHECK_MODULES([UUID], [uuid],
 [
+       LIBS="$LIBS $UUID_LIBS"
        AC_DEFINE_UNQUOTED([LTTNG_HAVE_LIBUUID], 1, [Has libuuid support.])
        have_libuuid=yes
 ],