X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=878e1ced57a47496addc1235f335a1cf92f3b990;hb=b7fa35fce415b33207a9eba111069ed31ef122a0;hp=268de124542c89f2b6cd4da77ac738c9b5754296;hpb=03719f0a94bfc38be699482c7543cff82f784c53;p=babeltrace.git diff --git a/configure.ac b/configure.ac index 268de124..878e1ced 100644 --- a/configure.ac +++ b/configure.ac @@ -60,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) @@ -307,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 ## ## ## @@ -444,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 @@ -505,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], [ @@ -672,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([ @@ -686,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 @@ -707,6 +696,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 @@ -729,17 +721,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/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 @@ -777,13 +774,23 @@ 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]) ])