X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=ac7e43934a6b8a1c749c89198a2f4e0df432f637;hb=2cf1d51ed01eabac13f98ab660fb74e4e1b80b9b;hp=9fe8cee77c695b659250b12a5b544f4530f52aa7;hpb=5c47fba0fde7ee49e1a0e3f465646643a31afafa;p=babeltrace.git diff --git a/configure.ac b/configure.ac index 9fe8cee7..ac7e4393 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_INIT([babeltrace],[2.0.0-pre],[jeremie dot galarneau 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_SUBST([BABELTRACE_LIBRARY_VERSION], [1:0:0]) +AC_SUBST([BABELTRACE_LIBRARY_VERSION], [2:0:0]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([config]) @@ -142,11 +142,11 @@ AC_CHECK_FUNCS([ \ ]) MINGW32=no -DEFAULT_ENABLE_DEBUGINFO=yes +DEFAULT_ENABLE_DEBUG_INFO=yes AS_CASE([$host_os], [solaris*|darwin*], [ - DEFAULT_ENABLE_DEBUGINFO=no + DEFAULT_ENABLE_DEBUG_INFO=no ], [mingw*], [ @@ -163,24 +163,35 @@ AC_CHECK_FUNCS([uuid_generate], link_with_libuuid=no ], [ - # Check for libuuid - AC_CHECK_LIB([uuid], [uuid_generate], + # First, check the pkg-config module is available, otherwise explicitly check + # for libuuid, or uuid support in the C-library. + PKG_CHECK_MODULES([UUID], [uuid], [ + LIBS="${UUID_LIBS} ${LIBS}" + CFLAGS="${CFLAGS} ${UUID_CFLAGS}" AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.]) link_with_libuuid=yes ], [ - # libuuid not found, check for uuid_create in libc. - AC_CHECK_LIB([c], [uuid_create], + # Check for libuuid + AC_CHECK_LIB([uuid], [uuid_generate], [ - AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBC_UUID], 1, [Has libc uuid support.]) - link_with_libc_uuid=yes + AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.]) + link_with_libuuid=yes ], [ - # for MinGW32 we have our own internal implemenation of uuid using Windows functions. - if test "x$MINGW32" = xno; then - AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.]) - fi + # libuuid not found, check for uuid_create in libc. + AC_CHECK_LIB([c], [uuid_create], + [ + AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBC_UUID], 1, [Has libc uuid support.]) + link_with_libc_uuid=yes + ], + [ + # for MinGW32 we have our own internal implementation of uuid using Windows functions. + if test "x$MINGW32" = xno; then + AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.]) + fi + ]) ]) ]) ]) @@ -220,6 +231,10 @@ AC_CHECK_LIB([popt], [poptGetContext], [], [AC_MSG_ERROR([Cannot find popt.])] ) +# Plugins +AC_ARG_VAR([PLUGINSDIR], [built-in plugins install directory [LIBDIR/babeltrace/plugins]]) +AS_IF([test "x$PLUGINSDIR" = x], [PLUGINSDIR='$(libdir)/babeltrace/plugins']) + # For Python # SWIG version needed or newer: swig_version=2.0.0 @@ -278,28 +293,29 @@ if test "x${enable_python_bindings_doc:-yes}" = xyes; then ) fi -# Set default enable state for debug info -AS_IF([test "x$DEFAULT_ENABLE_DEBUGINFO" = xyes], [enable_debuginfo=yes], [enable_debuginfo=no]) +# Set default enable state for debug info. +# The _enable_debug_info variable is prepended with an underscore to +# avoid clashing with the one generated by AC_ARG_ENABLE. +AS_IF([test "x$DEFAULT_ENABLE_DEBUG_INFO" = xyes], [_enable_debug_info=yes], [_enable_debug_info=no]) -# Optional debuginfo feature +# Optional debug info feature # Do _not_ indent the help string below (appears in the configure --help # output). AC_ARG_ENABLE([debug-info], -[AC_HELP_STRING([--enable-debug-info], [enable the debug-info feature (default on Linux)])] -[AC_HELP_STRING([--disable-debug-info], [disable the debug-info feature (default on OS X and Solaris)])], - [AS_IF([test "x$enableval" = xyes], [enable_debuginfo=yes], [enable_debuginfo=no])], []) +[AC_HELP_STRING([--enable-debug-info], [enable the debug info feature (default on Linux)])] +[AC_HELP_STRING([--disable-debug-info], [disable the debug info feature (default on OS X and Solaris)])], + [AS_IF([test "x$enableval" = xyes], [_enable_debug_info=yes], [_enable_debug_info=no])], []) -AM_CONDITIONAL([ENABLE_DEBUGINFO], [test "x$enable_debuginfo" = xyes]) -AS_IF([test "x$enable_debuginfo" = xyes], [ +AM_CONDITIONAL([ENABLE_DEBUG_INFO], [test "x$_enable_debug_info" = xyes]) +AS_IF([test "x$_enable_debug_info" = xyes], [ # Check if libelf and libdw are present - AC_CHECK_LIB([elf], [elf_version], [], [AC_MSG_ERROR(Missing libelf (from elfutils >= 0.154) which is required by debug-info. You can disable this feature using --disable-debug-info.)]) - AC_CHECK_LIB([dw], [dwarf_begin], [], [AC_MSG_ERROR(Missing libdw (from elfutils >= 0.154) which is required by debug-info. You can disable this feature using --disable-debug-info.)]) - AX_LIB_ELFUTILS([0], [154], [], [AC_MSG_ERROR(elfutils >= 0.154 is required to use the debug-info feature. You can disable this feature using --disable-debug-info.)]) - AC_DEFINE([ENABLE_DEBUGINFO], [1], [Define to 1 if you enable the 'debug-info' feature]) + AC_CHECK_LIB([elf], [elf_version], [], [AC_MSG_ERROR(Missing libelf (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)]) + AC_CHECK_LIB([dw], [dwarf_begin], [], [AC_MSG_ERROR(Missing libdw (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)]) + BT_LIB_ELFUTILS([0], [154], [:], [AC_MSG_ERROR(elfutils >= 0.154 is required to use the debug info feature. You can disable this feature using --disable-debug-info.)]) + AC_DEFINE([ENABLE_DEBUG_INFO], [1], [Define to 1 if you enable the 'debug info' feature]) ], []) PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.0.0]) -AC_SUBST(PACKAGE_LIBS) LIBS="$LIBS $GMODULE_LIBS" PACKAGE_CFLAGS="$GMODULE_CFLAGS -Wall -Wformat" @@ -320,6 +336,9 @@ AC_SUBST(babeltracectfwriterincludedir) babeltracectfirincludedir="${includedir}/babeltrace/ctf-ir" AC_SUBST(babeltracectfirincludedir) +babeltracepluginincludedir="${includedir}/babeltrace/plugin" +AC_SUBST(babeltracepluginincludedir) + AC_CONFIG_FILES([ Makefile types/Makefile @@ -342,6 +361,8 @@ AC_CONFIG_FILES([ doc/images/Makefile lib/Makefile lib/prio_heap/Makefile + lib/plugin-system/Makefile + lib/plugin-system/notification/Makefile include/Makefile bindings/Makefile bindings/python/Makefile @@ -354,6 +375,16 @@ AC_CONFIG_FILES([ tests/utils/tap/Makefile extras/Makefile extras/valgrind/Makefile + plugins/Makefile + plugins/ctf/Makefile + plugins/ctf/common/Makefile + plugins/ctf/common/btr/Makefile + plugins/ctf/common/metadata/Makefile + plugins/ctf/common/notif-iter/Makefile + plugins/ctf/fs/Makefile + plugins/ctf/lttng-live/Makefile + plugins/correlator/Makefile + plugins/text/Makefile babeltrace.pc babeltrace-ctf.pc ]) @@ -368,7 +399,7 @@ AC_CONFIG_FILES([tests/bin/test_trace_read], [chmod +x tests/bin/test_trace_read AC_CONFIG_FILES([tests/bin/intersection/test_intersection], [chmod +x tests/bin/intersection/test_intersection]) AC_CONFIG_FILES([tests/bin/intersection/bt_python_helper.py]) AC_CONFIG_FILES([tests/bin/test_packet_seq_num], [chmod +x tests/bin/test_packet_seq_num]) -AC_CONFIG_FILES([tests/bin/intersection/test_multi_trace_intersection.py:tests/bin/intersection/test_multi_trace_intersection.py], [chmod +x tests/bin/intersection/test_multi_trace_intersection.py]) +AC_CONFIG_FILES([tests/bin/test_formats], [chmod +x tests/bin/test_formats]) AC_OUTPUT @@ -407,8 +438,8 @@ PPRINT_PROP_BOOL([Python bindings], $value) test "x$enable_python_bindings_doc" = "xyes" && value=1 || value=0 PPRINT_PROP_BOOL([Python bindings doc], $value) -# debug-info enabled/disabled -test "x$enable_debuginfo" = "xyes" && value=1 || value=0 +# debug info enabled/disabled +test "x$_enable_debug_info" = "xyes" && value=1 || value=0 PPRINT_PROP_BOOL([Debug information output], $value)