X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=74993c1d42456d7930fd53407344e0ca883c2981;hb=b14c7bf11ddef302870c4d1abf86d3a98f74cb08;hp=4a81e5c101a207855ebfd4f535375855b5218999;hpb=dd22a91fdf79ad39dedb83449b905e7659212b45;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index 4a81e5c1..74993c1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -293,51 +293,6 @@ AC_CHECK_FUNCS([ \
 #AC_FUNC_MALLOC
 #AC_FUNC_REALLOC
 
-# First, check for uuid in system libs
-AH_TEMPLATE([BABELTRACE_HAVE_LIBUUID], [Define if you have libuuid support])
-AC_CHECK_FUNCS([uuid_generate],
-  [
-    AC_DEFINE([BABELTRACE_HAVE_LIBUUID], [1])
-    UUID_LIBS=""
-  ],
-  [
-    # Then, check if the pkg-config module is available, otherwise explicitly check
-    # for libuuid, or uuid support in the C-library.
-    PKG_CHECK_MODULES([UUID], [uuid],
-      [
-        AC_DEFINE([BABELTRACE_HAVE_LIBUUID], [1])
-        dnl PKG_CHECK_MODULES defines UUID_LIBS
-      ],
-      [
-        AC_MSG_WARN([pkg-config was unable to find a valid .pc for libuuid. Set PKG_CONFIG_PATH to specify the pkgconfig configuration file location])
-        AC_MSG_WARN([Finding libuuid without pkg-config.])
-        AC_CHECK_LIB([uuid], [uuid_generate],
-          [
-            AC_DEFINE([BABELTRACE_HAVE_LIBUUID], [1])
-            UUID_LIBS="-luuid"
-          ],
-          [
-            # libuuid not found, check for uuid_create in libc.
-            AC_CHECK_LIB([c], [uuid_create],
-              [
-                AC_DEFINE([BABELTRACE_HAVE_LIBUUID], [1])
-                UUID_LIBS="-lc"
-              ],
-              [
-                # for MinGW32 we have our own internal implementation of uuid using Windows functions.
-                AS_IF([test "x$MINGW32" = xno],
-                  [AC_MSG_FAILURE([Cannot find libuuid uuid_generate nor libc uuid_create. Either set PKG_CONFIG_PATH to the configuration file location or use LDFLAGS=-Ldir to specify the library location])]
-		)
-              ]
-            )
-          ]
-        )
-      ]
-    )
-  ]
-)
-AC_SUBST(UUID_LIBS)
-
 # Check for fmemopen
 AC_CHECK_LIB([c], [fmemopen],
   [AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_FMEMOPEN], 1, [Has fmemopen support.])]
@@ -381,9 +336,13 @@ AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for Python, bypassing python-config]
 AC_ARG_VAR([PYTHON_LDFLAGS], [Linker flags for Python, bypassing python-config])
 AC_ARG_VAR([PYTHON_CONFIG], [Path to python-config])
 
-# PLUGINSDIR: Plugins directory
-AC_ARG_VAR([PLUGINSDIR], [built-in plugins install directory [LIBDIR/babeltrace2/plugins]])
-AS_IF([test "x$PLUGINSDIR" = x], [PLUGINSDIR='$(libdir)/babeltrace2/plugins'])
+# BABELTRACE_PLUGINS_DIR: Plugins directory
+AC_ARG_VAR([BABELTRACE_PLUGINS_DIR], [built-in plugins install directory [LIBDIR/babeltrace2/plugins]])
+AS_IF([test "x$BABELTRACE_PLUGINS_DIR" = x], [BABELTRACE_PLUGINS_DIR='${libdir}/babeltrace2/plugins'])
+
+# BABELTRACE_PLUGIN_PROVIDERS_DIR: Plugin providers directory
+AC_ARG_VAR([BABELTRACE_PLUGIN_PROVIDERS_DIR], [built-in plugin providers install directory [LIBDIR/babeltrace2/plugin-providers]])
+AS_IF([test "x$BABELTRACE_PLUGIN_PROVIDERS_DIR" = x], [BABELTRACE_PLUGIN_PROVIDERS_DIR='${libdir}/babeltrace2/plugin-providers'])
 
 # BABELTRACE_MINIMAL_LOG_LEVEL:
 AC_ARG_VAR([BABELTRACE_MINIMAL_LOG_LEVEL], [Minimal log level for Babeltrace program, library, and plugins (TRACE, DEBUG (default), or INFO)])
@@ -771,6 +730,7 @@ AC_CONFIG_FILES([
 	src/plugins/utils/trimmer/Makefile
 	src/py-common/Makefile
 	src/python-plugin-provider/Makefile
+	tests/bitfield/Makefile
 	tests/ctf-writer/Makefile
 	tests/lib/Makefile
 	tests/lib/test-plugin-plugins/Makefile
@@ -778,7 +738,10 @@ AC_CONFIG_FILES([
 	tests/plugins/Makefile
 	tests/plugins/src.ctf.fs/Makefile
 	tests/plugins/src.ctf.fs/succeed/Makefile
+  tests/plugins/sink.ctf.fs/Makefile
+  tests/plugins/sink.ctf.fs/succeed/Makefile
 	tests/plugins/flt.lttng-utils.debug-info/Makefile
+	tests/plugins/flt.utils.trimmer/Makefile
 	tests/utils/Makefile
 	tests/utils/tap/Makefile
 ])
@@ -880,11 +843,14 @@ PPRINT_PROP_BOOL([Developer mode], $BABELTRACE_DEV_MODE)
 report_bindir="`eval eval echo $bindir`"
 report_libdir="`eval eval echo $libdir`"
 report_sysconfdif="`eval eval echo $sysconfdir`"
+report_pluginsdir="`eval eval eval echo $BABELTRACE_PLUGINS_DIR`"
+report_pluginprovidersdir="`eval eval eval echo $BABELTRACE_PLUGIN_PROVIDERS_DIR`"
 
 # Print the bindir and libdir this `make install' will install into.
 AS_ECHO
 PPRINT_SUBTITLE([Install directories])
 PPRINT_PROP_STRING([Binaries], [$report_bindir])
 PPRINT_PROP_STRING([Libraries], [$report_libdir])
-PPRINT_PROP_STRING([Plugins], [$report_libdir/babeltrace2/plugins])
+PPRINT_PROP_STRING([Plugins], [$report_pluginsdir])
+PPRINT_PROP_STRING([Plugin providers], [$report_pluginprovidersdir])
 PPRINT_PROP_STRING([Configuration], [$report_sysconfdif])