X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=f745ef2341d9e10669eaf06227151b962d6fd450;hb=056632bfab2b876e4e6149eaa3a6889ca3d28533;hp=d9d41eea57c4cd57aacff0799c0241f9e1954f07;hpb=e30aed9ec6bb1906aa2a7972a09adce4269480c0;p=babeltrace.git diff --git a/configure.ac b/configure.ac index d9d41eea..f745ef23 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.])] @@ -378,33 +333,26 @@ AC_SUBST(POPT_LIBS) ## ## AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for Python, bypassing python-config]) -AC_ARG_VAR([PYTHON_LIBS], [Library 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_MINIMAL_LOG_LEVEL: -AC_ARG_VAR([BABELTRACE_MINIMAL_LOG_LEVEL], [Minimal log level for Babeltrace program, library, and plugins (VERBOSE, DEBUG, INFO, WARN, ERROR (default), FATAL, or NONE)]) -AS_IF([test "x$BABELTRACE_MINIMAL_LOG_LEVEL" = x], [BABELTRACE_MINIMAL_LOG_LEVEL="VERBOSE"]) -AS_IF([test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "VERBOSE" && \ +AC_ARG_VAR([BABELTRACE_MINIMAL_LOG_LEVEL], [Minimal log level for Babeltrace program, library, and plugins (TRACE, DEBUG (default), or INFO)]) +AS_IF([test "x$BABELTRACE_MINIMAL_LOG_LEVEL" = x], [BABELTRACE_MINIMAL_LOG_LEVEL="DEBUG"]) +AS_IF([test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "TRACE" && \ test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "DEBUG" && \ - test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "INFO" && \ - test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "WARN" && \ - test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "ERROR" && \ - test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "FATAL" && \ - test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "NONE"], - [AC_MSG_ERROR([Invalid BABELTRACE_MINIMAL_LOG_LEVEL value ($BABELTRACE_MINIMAL_LOG_LEVEL): use VERBOSE, DEBUG, INFO, WARN, ERROR, FATAL, or NONE.])] + test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "INFO"], + [AC_MSG_ERROR([Invalid BABELTRACE_MINIMAL_LOG_LEVEL value ($BABELTRACE_MINIMAL_LOG_LEVEL): use TRACE, DEBUG, or INFO.])] ) -AC_DEFINE_UNQUOTED([BT_LOG_LEVEL], [BT_LOG_$BABELTRACE_MINIMAL_LOG_LEVEL], [Minimal log level]) +AC_DEFINE_UNQUOTED([BT_MINIMAL_LOG_LEVEL], [BT_LOG_$BABELTRACE_MINIMAL_LOG_LEVEL], [Minimal log level]) # BABELTRACE_DEV_MODE: AC_ARG_VAR([BABELTRACE_DEV_MODE], [Set to 1 to enable the Babeltrace developer mode (enables run-time checks for plugin developers)]) AS_IF([test "x$BABELTRACE_DEV_MODE" = x1], [ - AS_IF([test "x$BABELTRACE_MINIMAL_LOG_LEVEL" = "xNONE"], [ - AC_MSG_ERROR([Babeltrace developer mode (\$BABELTRACE_DEV_MODE) needs \$BABELTRACE_MINIMAL_LOG_LEVEL to be at least FATAL.]) - ]) AC_DEFINE([BT_DEV_MODE], 1, [Babeltrace developer mode]) ], [BABELTRACE_DEV_MODE=0]) @@ -493,7 +441,7 @@ AM_CONDITIONAL([ENABLE_API_DOC], [test "x$enable_api_doc" = xyes]) AM_CONDITIONAL([ENABLE_BUILT_IN_PLUGINS], [test "x$enable_built_in_plugins" = xyes]) AM_CONDITIONAL([ENABLE_BUILT_IN_PYTHON_PLUGIN_SUPPORT], [test "x$enable_built_in_python_plugin_support" = xyes]) AM_CONDITIONAL([ENABLE_MAN_PAGES], [test "x$enable_man_pages" = xyes]) - +AM_CONDITIONAL([HAVE_PYTHON], [test "x$enable_python_bindings" = xyes || test "x$enable_python_plugins" = xyes]) # Set defines for optionnal features conditionnals in the source code @@ -575,7 +523,7 @@ AS_IF([test "x$enable_python_bindings" = xyes || test "x$enable_python_plugins" PYTHON_INCLUDE=`$PYTHON_CONFIG --includes` AC_MSG_RESULT([$PYTHON_INCLUDE]) ]) - AS_IF([test -z "$PYTHON_LIBS"], [ + AS_IF([test -z "$PYTHON_LDFLAGS"], [ AS_IF([test -z "$PYTHON_CONFIG"], [ AC_PATH_PROGS([PYTHON_CONFIG], [python$PYTHON_VERSION-config python-config], @@ -584,8 +532,8 @@ AS_IF([test "x$enable_python_bindings" = xyes || test "x$enable_python_plugins" AS_IF([test "$PYTHON_CONFIG" = no], [AC_MSG_ERROR([cannot find python-config for $PYTHON. Is python-dev installed?])]) ]) AC_MSG_CHECKING([Python library flags]) - PYTHON_LIBS=`$PYTHON_CONFIG --libs` - AC_MSG_RESULT([$PYTHON_LIBS]) + PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags` + AC_MSG_RESULT([$PYTHON_LDFLAGS]) ]) ] ) @@ -760,7 +708,6 @@ AC_CONFIG_FILES([ src/plugins/ctf/common/Makefile src/plugins/ctf/common/metadata/Makefile src/plugins/ctf/common/msg-iter/Makefile - src/plugins/ctf/common/utils/Makefile src/plugins/ctf/fs-sink/Makefile src/plugins/ctf/fs-src/Makefile src/plugins/ctf/lttng-live/Makefile @@ -777,7 +724,9 @@ AC_CONFIG_FILES([ src/plugins/utils/Makefile src/plugins/utils/muxer/Makefile 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 @@ -785,47 +734,14 @@ AC_CONFIG_FILES([ tests/plugins/Makefile tests/plugins/src.ctf.fs/Makefile tests/plugins/src.ctf.fs/succeed/Makefile - tests/utils/common.sh - tests/utils/diff.sh + 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 ]) -AC_CONFIG_FILES([tests/cli/test_intersection], [chmod +x tests/cli/test_intersection]) -AC_CONFIG_FILES([tests/cli/test_convert_args], [chmod +x tests/cli/test_convert_args]) -AC_CONFIG_FILES([tests/cli/test_output_ctf_metadata], [chmod +x tests/cli/test_output_ctf_metadata]) -AC_CONFIG_FILES([tests/cli/test_packet_seq_num], [chmod +x tests/cli/test_packet_seq_num]) -AC_CONFIG_FILES([tests/cli/test_trace_copy], [chmod +x tests/cli/test_trace_copy]) -AC_CONFIG_FILES([tests/cli/test_trace_read], [chmod +x tests/cli/test_trace_read]) -AC_CONFIG_FILES([tests/cli/test_trimmer], [chmod +x tests/cli/test_trimmer]) -AC_CONFIG_FILES([tests/ctf-writer/test_ctf_writer], [chmod +x tests/ctf-writer/test_ctf_writer]) -AC_CONFIG_FILES([tests/lib/test_plugin_complete], [chmod +x tests/lib/test_plugin_complete]) -AC_CONFIG_FILES([tests/lib/trace-ir/test_trace_ir], [chmod +x tests/lib/trace-ir/test_trace_ir]) -AC_CONFIG_FILES([tests/plugins/src.ctf.fs/query/test_query], [chmod +x tests/plugins/src.ctf.fs/query/test_query]) -AC_CONFIG_FILES([tests/plugins/src.ctf.fs/succeed/test_succeed], [chmod +x tests/plugins/src.ctf.fs/succeed/test_succeed]) -AC_CONFIG_FILES([tests/plugins/test_utils_muxer_complete], [chmod +x tests/plugins/test_utils_muxer_complete]) -AC_CONFIG_FILES([tests/plugins/test_lttng_utils_debug_info], [chmod +x tests/plugins/test_lttng_utils_debug_info]) -AC_CONFIG_FILES([tests/plugins/test_dwarf_i386-linux-gnu], [chmod +x tests/plugins/test_dwarf_i386-linux-gnu]) -AC_CONFIG_FILES([tests/plugins/test_dwarf_powerpc-linux-gnu], [chmod +x tests/plugins/test_dwarf_powerpc-linux-gnu]) -AC_CONFIG_FILES([tests/plugins/test_dwarf_powerpc64le-linux-gnu], [chmod +x tests/plugins/test_dwarf_powerpc64le-linux-gnu]) -AC_CONFIG_FILES([tests/plugins/test_dwarf_x86_64-linux-gnu], [chmod +x tests/plugins/test_dwarf_x86_64-linux-gnu]) -AC_CONFIG_FILES([tests/plugins/test_bin_info_i386-linux-gnu], [chmod +x tests/plugins/test_bin_info_i386-linux-gnu]) -AC_CONFIG_FILES([tests/plugins/test_bin_info_powerpc-linux-gnu], [chmod +x tests/plugins/test_bin_info_powerpc-linux-gnu]) -AC_CONFIG_FILES([tests/plugins/test_bin_info_powerpc64le-linux-gnu], [chmod +x tests/plugins/test_bin_info_powerpc64le-linux-gnu]) -AC_CONFIG_FILES([tests/plugins/test_bin_info_x86_64-linux-gnu], [chmod +x tests/plugins/test_bin_info_x86_64-linux-gnu]) - -AS_IF([test "x$enable_python_bindings" = xyes], - [ - AC_CONFIG_FILES([tests/bindings/python/bt2/test_python_bt2], [chmod +x tests/bindings/python/bt2/test_python_bt2]) - AC_CONFIG_FILES([tests/utils/test_python_bt2_env], [chmod +x tests/utils/test_python_bt2_env]) - ] -) - -AS_IF([test "x$enable_python_plugins" = "xyes"], - [AC_CONFIG_FILES([tests/python-plugin-provider/test_python_plugin_provider], [chmod +x tests/python-plugin-provider/test_python_plugin_provider])] - [AC_CONFIG_FILES([tests/python-plugin-provider/test_python_plugin_provider_env], [chmod +x tests/python-plugin-provider/test_python_plugin_provider_env])] -) - AC_OUTPUT # @@ -864,7 +780,7 @@ test "x$enable_python_plugins" = "xyes" && value=1 || value=0 PPRINT_PROP_BOOL([Python plugin support], $value) AS_IF([test "x$enable_python_bindings" = "xyes" || test "x$enable_python_plugins" = "xyes"], [ PPRINT_PROP_STRING([Python include paths], [$PYTHON_INCLUDE]) - PPRINT_PROP_STRING([Python libraries], [$PYTHON_LIBS]) + PPRINT_PROP_STRING([Python linker flags], [$PYTHON_LDFLAGS]) ]) AS_ECHO @@ -923,11 +839,12 @@ 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`" # 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([Configuration], [$report_sysconfdif])