X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=8e03697d2c2e4b1c3fce4bce174a020d608d0e0c;hb=67af1e87d18817cc55b7445f67484db3a32682d4;hp=30fa06b0538f92a61934ea1b26ab518bdd2d87ff;hpb=d126826ca1f3fc7c869b2c3ebc9162d82d1e21f0;p=babeltrace.git diff --git a/configure.ac b/configure.ac index 30fa06b0..8e03697d 100644 --- a/configure.ac +++ b/configure.ac @@ -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]) @@ -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"], [ @@ -308,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 ## ## ## @@ -336,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)]) @@ -441,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 @@ -502,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], [ @@ -669,7 +659,7 @@ CFLAGS=${save_CFLAGS} # 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([ @@ -683,10 +673,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 @@ -704,6 +696,8 @@ AC_CONFIG_FILES([ src/lib/trace-ir/Makefile src/logging/Makefile src/Makefile + src/plugins/common/Makefile + src/plugins/common/muxing/Makefile src/plugins/ctf/common/bfcr/Makefile src/plugins/ctf/common/Makefile src/plugins/ctf/common/metadata/Makefile @@ -726,16 +720,20 @@ 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/argpar/Makefile tests/lib/Makefile tests/lib/test-plugin-plugins/Makefile tests/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 @@ -773,14 +771,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]) @@ -838,11 +848,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])