X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=configure.ac;h=9e95aee537b5d0f98ea681424c8e53a965b7b7da;hp=eb72e613c63360c5dab5aa0eceeb36ba91e29131;hb=3db793e7f1a553587e96efdc6e063837f5ff93c5;hpb=b7cbc7991dbe94cebca2b9319da0e87af6006efb diff --git a/configure.ac b/configure.ac index eb72e613..9e95aee5 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ AC_PREREQ([2.50]) m4_define([bt_version_major], [2]) m4_define([bt_version_minor], [0]) m4_define([bt_version_patch], [0]) -m4_define([bt_version_extra], [-pre5]) +m4_define([bt_version_extra], [-rc2]) m4_define([bt_version], bt_version_major[.]bt_version_minor[.]bt_version_patch[]bt_version_extra) AC_INIT([babeltrace], bt_version, [jeremie dot galarneau at efficios dot com], [], [https://efficios.com/babeltrace/]) @@ -46,7 +46,6 @@ AC_SUBST([BABELTRACE_LIBRARY_VERSION], bt_lib_version) AC_CONFIG_HEADERS([src/common/config.h]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_MACRO_DIR([m4]) -AC_REQUIRE_AUX_FILE([tap-driver.sh]) AC_DEFINE([BT_VERSION_MAJOR], bt_version_major, [Babeltrace major version]) AC_DEFINE([BT_VERSION_MINOR], bt_version_minor, [Babeltrace minor version]) @@ -61,7 +60,7 @@ AC_CANONICAL_HOST ## Automake base setup ## ## ## -AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-ustar nostdinc]) +AM_INIT_AUTOMAKE([1.12 foreign dist-bzip2 no-dist-gzip tar-ustar nostdinc]) AM_MAINTAINER_MODE([enable]) # Enable silent rules if available (Introduced in AM 1.11) @@ -201,7 +200,7 @@ AM_CONDITIONAL([IN_GIT_REPO], [test "x$in_git_repo" = "xyes"]) # check for bison AC_PROG_YACC -AX_PROG_BISON_VERSION([2.4], [have_bison=yes]) +AX_PROG_BISON_VERSION([2.5], [have_bison=yes]) AS_IF([test "x$have_bison" != "xyes"], [ AS_IF([test "x$in_git_repo" = "xyes"], [ @@ -249,9 +248,9 @@ AM_CONDITIONAL([HAVE_FLEX], [test "x$have_flex" = "xyes"]) # Check what libraries are required on this platform to link sockets programs. AX_LIB_SOCKET_NSL -# Check for glib >= 2.22 with gmodule support -AM_PATH_GLIB_2_0([2.22.0], [], - AC_MSG_ERROR([glib >= 2.22 is required - download it from ftp://ftp.gtk.org/pub/gtk]), +# Check for glib >= 2.28 with gmodule support +AM_PATH_GLIB_2_0([2.28.0], [], + AC_MSG_ERROR([glib >= 2.28 is required - download it from ftp://ftp.gtk.org/pub/gtk]), [gmodule-no-export] ) @@ -293,51 +292,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.])] @@ -353,26 +307,6 @@ AC_CHECK_LIB([c], [posix_fallocate], [AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_POSIX_FALLOCATE], 1, [Has posix_fallocate support.])] ) -# Check libpopt -PKG_CHECK_MODULES([POPT], [popt], - [ - dnl PKG_CHECK_MODULES defines POPT_LIBS - ], - [ - AC_MSG_WARN([pkg-config was unable to find a valid .pc for libpopt. Set PKG_CONFIG_PATH to specify the pkgconfig configuration file location]) - AC_MSG_WARN([Finding libpopt without pkg-config.]) - AC_CHECK_LIB([popt], - [poptGetContext], - [POPT_LIBS="-lpopt"], - [ - AC_MSG_FAILURE([Cannot find libpopt. Either set PKG_CONFIG_PATH to the configuration file location or use LDFLAGS=-Ldir to specify the library location]) - ] - ) - ] -) -AC_SUBST(POPT_LIBS) - - ## ## ## User variables ## ## ## @@ -381,9 +315,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)]) @@ -486,7 +424,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]) +AM_CONDITIONAL([ENABLE_PYTHON_COMMON_DEPS], [test "x$enable_python_bindings" = xyes || test "x$enable_python_plugins" = xyes]) # Set defines for optionnal features conditionnals in the source code @@ -547,41 +485,48 @@ AS_IF([test "x$enable_python_bindings" = xyes], [AX_PKG_SWIG(2.0.0, [], [AC_MSG_ERROR([SWIG 2.0.0 or newer is required to build the python bindings])])] ) -AS_IF([test "x$enable_python_bindings" = xyes || test "x$enable_python_plugins" = xyes], - [ - AM_PATH_PYTHON([3.0], [], [AC_MSG_ERROR(Python 3 is not available or is not the default Python interpreter on your system. See the README file to learn how to override your distribution's default Python interpreter.)]) - +AM_PATH_PYTHON([3.0], [ AM_PATH_PYTHON_MODULES([PYTHON]) + # pythondir is the path where extra modules are to be installed pythondir=$PYTHON_PREFIX/$PYTHON_MODULES_PATH + # pyexecdir is the path that contains shared objects used by the extra modules pyexecdir=$PYTHON_EXEC_PREFIX/$PYTHON_MODULES_PATH - AS_IF([test -z "$PYTHON_INCLUDE"], [ - AS_IF([test -z "$PYTHON_CONFIG"], [ - AC_PATH_PROGS([PYTHON_CONFIG], - [python$PYTHON_VERSION-config python-config], - [no], - [`dirname $PYTHON`]) - AS_IF([test "$PYTHON_CONFIG" = no], [AC_MSG_ERROR([cannot find python-config for $PYTHON. Is python-dev installed?])]) - ]) - AC_MSG_CHECKING([Python include flags]) - PYTHON_INCLUDE=`$PYTHON_CONFIG --includes` - AC_MSG_RESULT([$PYTHON_INCLUDE]) + + AS_IF([test -z "$PYTHON_CONFIG"], [ + AC_PATH_PROGS([PYTHON_CONFIG], + [python$PYTHON_VERSION-config python-config], + [], + [`dirname $PYTHON`]) ]) - AS_IF([test -z "$PYTHON_LDFLAGS"], [ - AS_IF([test -z "$PYTHON_CONFIG"], [ - AC_PATH_PROGS([PYTHON_CONFIG], - [python$PYTHON_VERSION-config python-config], - [no], - [`dirname $PYTHON`]) - AS_IF([test "$PYTHON_CONFIG" = no], [AC_MSG_ERROR([cannot find python-config for $PYTHON. Is python-dev installed?])]) + + AS_IF([test -n "$PYTHON_CONFIG"], [ + AS_IF([test -z "$PYTHON_INCLUDE"], [ + AC_MSG_CHECKING([Python include flags]) + PYTHON_INCLUDE=`$PYTHON_CONFIG --includes` + AC_MSG_RESULT([$PYTHON_INCLUDE]) + ]) + + AS_IF([test -z "$PYTHON_LDFLAGS"], [ + AC_MSG_CHECKING([Python library flags]) + PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags` + AC_MSG_RESULT([$PYTHON_LDFLAGS]) ]) - AC_MSG_CHECKING([Python library flags]) - PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags` - AC_MSG_RESULT([$PYTHON_LDFLAGS]) ]) - ] -) +], [:]) + +AS_IF([test "$PYTHON" != :], [have_python=yes], [have_python=no]) +AS_IF([test -n "$PYTHON_CONFIG"], [have_python_dev=yes], [have_python_dev=no]) + +AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = xyes]) +AM_CONDITIONAL([HAVE_PYTHON_DEV], [test "x$have_python_dev" = xyes]) + +AS_IF([test "x$enable_python_bindings" = xyes || test "x$enable_python_plugins" = xyes], [ + AS_IF([test "x$have_python_dev" = xno], [ + AC_MSG_ERROR([Cannot find a suitable python-config. You can override the python-config path with the PYTHON_CONFIG environment variable.]) + ]) +]) AS_IF([test "x$enable_python_bindings_doc" = xyes], [ @@ -671,17 +616,9 @@ AS_IF([test "x$exec_prefix" = xNONE], [ AC_SUBST(LIBDIR) - -# Set global CFLAGS in AM_CFLAGS -AM_CFLAGS="-Wall -Wformat -Werror=implicit-function-declaration $PTHREAD_CFLAGS $GLIB_CFLAGS" -AC_SUBST(AM_CFLAGS) - -# Set global CPPFLAGS in AM_CPPFLAGS -AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/src -I\$(top_srcdir)/src -include common/config.h" -AC_SUBST(AM_CPPFLAGS) - -# Add glib to global link libs -LIBS="$LIBS $GLIB_LIBS" +# CFLAGS from libraries (the glib ones are needed for the following sizeof +# test). +AM_CFLAGS="${PTHREAD_CFLAGS} ${GLIB_CFLAGS}" # Check that the current size_t matches the size that glib thinks it should # be. This catches problems on multi-arch where people try to do a 32-bit @@ -689,6 +626,10 @@ LIBS="$LIBS $GLIB_LIBS" # glib.h is not platform specific but it includes glibconfig.h which is and # is usually installed in a non-standard path. +# Do this before enabling all the warning flags, as the +# AC_LANG_PROGRAM-generated program may generate some warning, which makes this +# test fail unnecessarily. + # Older versions of the pkg-config macros disallows PKG_* in the autoconf # output. Specifically allow pkg_config_libdir to be able to print the # error message. @@ -712,9 +653,58 @@ target. ]) CFLAGS=${save_CFLAGS} +# Detect C and LD warning flags supported by the compiler. +AX_COMPILER_FLAGS( + [WARN_CFLAGS], dnl CFLAGS variable name + [WARN_LDFLAGS], dnl LDFLAGS variable name (unused for now) + [], dnl is-release + [], dnl Extra base CFLAGS + [ dnl Extra "yes" CFLAGS + dnl Disable these flags, either because we don't want them + dnl or because we want them but are not ready to enable them + dnl yet. + -Wno-sign-compare dnl + -Wno-inline dnl + -Wno-declaration-after-statement dnl + -Wno-switch-enum dnl + -Wno-switch-default dnl + -Wno-packed dnl + -Wno-pointer-arith dnl + -Wno-format-nonliteral dnl + -Wno-double-promotion dnl + -Wno-cast-align dnl + ]) + +# CFLAGS from AX_COMPILER_FLAGS. +AM_CFLAGS="${AM_CFLAGS} ${WARN_CFLAGS}" + +# The test used in AX_COMPILER_FLAGS, generated using AC_LANG_PROGRAM, is +# written in such a way that it triggers a -Wold-style-definition warning. So +# if the user has -Werror in their CFLAGS, that warning flag will end up +# disabled, because the test program will not build. +# +# Enable it here unconditionally. It is supported by GCC >= 4.8 and by Clang +# (it is accepted for compatibility although it has no effect), and there is +# not reason to not want it. + +AM_CFLAGS="${AM_CFLAGS} -Wold-style-definition" + +# We want this one to always be an error. +AM_CFLAGS="${AM_CFLAGS} -Werror=implicit-function-declaration" + +# Done for AM_CFLAGS. +AC_SUBST(AM_CFLAGS) + +# Set global CPPFLAGS in AM_CPPFLAGS +AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/src -I\$(top_srcdir)/src -include common/config.h" +AC_SUBST(AM_CPPFLAGS) + +# Add glib to global link libs +LIBS="$LIBS $GLIB_LIBS" + # Abuse autoconf's AC_ARG_PROGRAM output variable 'program_transform_name' # to rename babeltrace2.bin to babeltrace2 at install time. -program_transform_name="s&babeltrace2\.bin&babeltrace2&;s&babeltrace2-log\.bin&babeltrace2-log&;$program_transform_name" +program_transform_name="s&babeltrace2\.bin&babeltrace2&;$program_transform_name" AC_SUBST(program_transform_name) AC_CONFIG_FILES([ @@ -728,10 +718,12 @@ AC_CONFIG_FILES([ doc/man/Makefile include/Makefile Makefile + src/argpar/Makefile + src/autodisc/Makefile src/babeltrace2-ctf-writer.pc src/babeltrace2.pc src/bindings/Makefile - src/bindings/python/bt2/bt2/__init__.py + src/bindings/python/bt2/bt2/version.py src/bindings/python/bt2/Makefile src/bindings/python/bt2/setup.py src/bindings/python/Makefile @@ -749,6 +741,9 @@ AC_CONFIG_FILES([ src/lib/trace-ir/Makefile src/logging/Makefile src/Makefile + src/plugins/common/Makefile + src/plugins/common/muxing/Makefile + src/plugins/common/param-validation/Makefile src/plugins/ctf/common/bfcr/Makefile src/plugins/ctf/common/Makefile src/plugins/ctf/common/metadata/Makefile @@ -771,16 +766,22 @@ AC_CONFIG_FILES([ src/plugins/utils/trimmer/Makefile src/py-common/Makefile src/python-plugin-provider/Makefile + src/param-parse/Makefile + tests/bitfield/Makefile tests/ctf-writer/Makefile + tests/argpar/Makefile tests/lib/Makefile tests/lib/test-plugin-plugins/Makefile tests/Makefile + tests/param-validation/Makefile 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/sink.ctf.fs/Makefile + tests/plugins/sink.ctf.fs/succeed/Makefile tests/plugins/flt.lttng-utils.debug-info/Makefile + tests/plugins/flt.utils.muxer/Makefile + tests/plugins/flt.utils.muxer/succeed/Makefile tests/plugins/flt.utils.trimmer/Makefile tests/utils/Makefile tests/utils/tap/Makefile @@ -818,14 +819,26 @@ PPRINT_PROP_STRING([Target architecture], $target_arch) AS_ECHO PPRINT_SUBTITLE([Python 3 language support]) +test "x$have_python" = "xyes" && value=1 || value=0 +PPRINT_PROP_BOOL([Have Python interpreter], $value) +test "x$have_python_dev" = "xyes" && value=1 || value=0 +PPRINT_PROP_BOOL([Have Python development libraries], $value) test "x$enable_python_bindings" = "xyes" && value=1 || value=0 PPRINT_PROP_BOOL([Python bindings], $value) 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"], [ +AS_IF([test "x$have_python" = "xyes"], [ + PPRINT_PROP_STRING([Python interpreter path], [$PYTHON]) +]) +AS_IF([test "x$have_python_dev" = "xyes"], [ + PPRINT_PROP_STRING([python-config path], [$PYTHON_CONFIG]) PPRINT_PROP_STRING([Python include paths], [$PYTHON_INCLUDE]) PPRINT_PROP_STRING([Python linker flags], [$PYTHON_LDFLAGS]) ]) +AS_IF([test "x$enable_python_bindings" = "xyes"], [ + PPRINT_PROP_STRING([SWIG executable], [$SWIG]) + PPRINT_PROP_STRING([SWIG library], [$SWIG_LIB]) +]) AS_ECHO PPRINT_SUBTITLE([Plugins]) @@ -883,11 +896,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])