projects / babeltrace.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
configure: Add flags as hints when option is disabled
[babeltrace.git] / configure.ac
diff --git a/configure.ac b/configure.ac
index cbbb66317c606035ba481a0c3f4a3c98c7516940..0b362178589dbdad97d0a6f9ae0340697b3bd7b1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,12 +27,14 @@ dnl SOFTWARE.
 AC_PREREQ([2.50])
 
 m4_define([bt_version_major], [2])
-m4_define([bt_version_minor], [0])
+m4_define([bt_version_minor], [1])
 m4_define([bt_version_patch], [0])
-m4_define([bt_version_extra], [-pre6])
-m4_define([bt_version], bt_version_major[.]bt_version_minor[.]bt_version_patch[]bt_version_extra)
+m4_define([bt_version_dev_stage], [-rc1])
+m4_define([bt_version], bt_version_major[.]bt_version_minor[.]bt_version_patch[]bt_version_dev_stage)
+m4_define([bt_version_name], [])
 
-AC_INIT([babeltrace], bt_version, [jeremie dot galarneau at efficios dot com], [], [https://efficios.com/babeltrace/])
+AC_INIT([babeltrace2], bt_version, [jeremie dot galarneau at efficios dot com], [], [https://efficios.com/babeltrace/])
+AC_PROG_SED
 
 # Following the numbering scheme proposed by libtool for the library version
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
@@ -41,6 +43,9 @@ m4_define([bt_lib_version_revision], [0])
 m4_define([bt_lib_version_age], [0])
 m4_define([bt_lib_version], bt_lib_version_current[:]bt_lib_version_revision[:]bt_lib_version_age)
 
+bt_version_description=""
+bt_version_description_c_safe=$(echo $bt_version_description | $SED 's/"/\\"/g')
+
 AC_SUBST([BABELTRACE_LIBRARY_VERSION], bt_lib_version)
 
 AC_CONFIG_HEADERS([src/common/config.h])
@@ -50,7 +55,9 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_DEFINE([BT_VERSION_MAJOR], bt_version_major, [Babeltrace major version])
 AC_DEFINE([BT_VERSION_MINOR], bt_version_minor, [Babeltrace minor version])
 AC_DEFINE([BT_VERSION_PATCH], bt_version_patch, [Babeltrace patch version])
-AC_DEFINE([BT_VERSION_EXTRA], ["]bt_version_extra["], [Babeltrace extra version])
+AC_DEFINE([BT_VERSION_DEV_STAGE], ["]bt_version_dev_stage["], [Babeltrace version development stage (can be empty)])
+AC_DEFINE([BT_VERSION_NAME], ["]bt_version_name["], [Babeltrace version name])
+AC_DEFINE_UNQUOTED([BT_VERSION_DESCRIPTION], ["$bt_version_description_c_safe"], [Babeltrace version description])
 
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -192,6 +199,7 @@ LT_INIT([win32-dll])
 AC_PROG_MAKE_SET
 AC_PROG_MKDIR_P
 AC_PROG_LN_S
+AC_PATH_PROG([report_fold], [fold])
 
 # set $IN_GIT_REPO if we're in the Git repository; the `bootstrap` file
 # is not distributed in tarballs
@@ -358,14 +366,6 @@ AC_ARG_ENABLE([python-bindings],
   [enable_python_bindings=no]
 )
 
-# Python bindings documentation
-# Disabled by default
-AC_ARG_ENABLE([python-bindings-doc],
-  [AC_HELP_STRING([--enable-python-bindings-doc], [build the Python bindings documentation])],
-  [], dnl AC_ARG_ENABLE will fill enable_python_bindings_doc with the user choice
-  [enable_python_bindings_doc=no]
-)
-
 # Python plugins
 # Disabled by default
 AC_ARG_ENABLE([python-plugins],
@@ -417,7 +417,6 @@ AC_ARG_ENABLE([man-pages],
 
 # Set automake variables for optionnal feature conditionnals in Makefile.am
 AM_CONDITIONAL([ENABLE_PYTHON_BINDINGS], [test "x$enable_python_bindings" = xyes])
-AM_CONDITIONAL([ENABLE_PYTHON_BINDINGS_DOC], [test "x$enable_python_bindings_doc" = xyes])
 AM_CONDITIONAL([ENABLE_PYTHON_PLUGINS], [test "x$enable_python_plugins" = xyes])
 AM_CONDITIONAL([ENABLE_DEBUG_INFO], [test "x$enable_debug_info" = xyes])
 AM_CONDITIONAL([ENABLE_API_DOC], [test "x$enable_api_doc" = xyes])
@@ -455,12 +454,6 @@ AC_SUBST([ENABLE_DEBUG_INFO_VAL])
 
 # Check for conflicting optional features user choices
 
-AS_IF([test "x$enable_python_bindings" = xno],
-  [
-    AS_IF([test "x$enable_python_bindings_doc" = xyes], [AC_MSG_ERROR([--enable-python-bindings-doc was specified without --enable-python-bindings])])
-  ]
-)
-
 AS_IF([test "x$enable_built_in_plugins" = xyes],
   [
     # Built-in plug-ins are only available when the --disable-shared --enable-static options are used.
@@ -510,7 +503,10 @@ AM_PATH_PYTHON([3.0], [
 
     AS_IF([test -z "$PYTHON_LDFLAGS"], [
       AC_MSG_CHECKING([Python library flags])
-      PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
+      # Python 3.8+ requires that we pass --embed to get the -lpython3.x flag.
+      AS_IF([! PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags --embed`], [
+        PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
+      ])
       AC_MSG_RESULT([$PYTHON_LDFLAGS])
     ])
   ])
@@ -528,15 +524,6 @@ AS_IF([test "x$enable_python_bindings" = xyes || test "x$enable_python_plugins"
   ])
 ])
 
-AS_IF([test "x$enable_python_bindings_doc" = xyes],
-  [
-    AM_CHECK_PYTHON_SPHINX([PYTHON])
-    AS_IF([test "x$PYTHON_SPHINX_EXISTS" = xno],
-      [AC_MSG_ERROR([The Sphinx package for Python 3 is required to build the Python bindings documentation])]
-    )
-  ]
-)
-
 AS_IF([test "x$enable_debug_info" = xyes],
   [
     # Check if libelf and libdw are present
@@ -560,7 +547,7 @@ AS_IF([test "x$enable_api_doc" = "xyes"],
     DX_XML_FEATURE(OFF)
     DX_PDF_FEATURE(OFF)
     DX_PS_FEATURE(OFF)
-    DX_INIT_DOXYGEN([Babeltrace], [$(srcdir)/Doxyfile], [output])
+    DX_INIT_DOXYGEN([Babeltrace 2], [$(builddir)/Doxyfile], [output])
     AS_IF([test -z "$DX_DOXYGEN"],
          [AC_MSG_ERROR([You need doxygen to enable the API documentation])]
     )
@@ -671,17 +658,21 @@ AX_COMPILER_FLAGS(
                -Wno-packed dnl
                -Wno-pointer-arith dnl
                -Wno-format-nonliteral dnl
-               -Wno-undef dnl
-               -Wno-missing-prototypes dnl
-               -Wno-missing-declarations dnl
-               -Wno-redundant-decls dnl
-               -Wno-logical-op dnl
-               -Wno-shadow dnl
-               -Wno-null-dereference dnl
-               -Wno-jump-misses-init dnl
-               -Wno-missing-include-dirs dnl
                -Wno-double-promotion dnl
                -Wno-cast-align dnl
+               dnl
+               dnl Some versions of SWIG (like 3.0.12) generate code that produces
+               dnl -Wcast-function-type warnings.  This warning is present in gcc >= 8.  This
+               dnl combo happens on RHEL/Centos 8, for example.  Later versions of SWIG (like
+               dnl 4.0.1) have the correct function signatures to not produce this warning.
+               dnl It's simpler to just disable the warning globally.
+               dnl
+               dnl Note that the Debian/Ubuntu SWIG package 3.0.12-2 contains a local patch to
+               dnl fix this (python-fix-function-cast-warnings.patch), so you won't be able to
+               dnl reproduce the warning using that package.
+               dnl
+               dnl Ref: https://github.com/swig/swig/issues/1259
+               -Wno-cast-function-type dnl
        ])
 
 # CFLAGS from AX_COMPILER_FLAGS.
@@ -717,10 +708,9 @@ program_transform_name="s&babeltrace2\.bin&babeltrace2&;$program_transform_name"
 AC_SUBST(program_transform_name)
 
 AC_CONFIG_FILES([
-       doc/api/Doxyfile
        doc/api/Makefile
-       doc/bindings/Makefile
-       doc/bindings/python/Makefile
+       doc/api/libbabeltrace2/Doxyfile
+       doc/api/libbabeltrace2/Makefile
        doc/contributing-images/Makefile
        doc/Makefile
        doc/man/asciidoc-attrs.conf
@@ -776,9 +766,9 @@ AC_CONFIG_FILES([
        src/py-common/Makefile
        src/python-plugin-provider/Makefile
        src/param-parse/Makefile
+       src/string-format/Makefile
        tests/bitfield/Makefile
        tests/ctf-writer/Makefile
-       tests/argpar/Makefile
        tests/lib/Makefile
        tests/lib/test-plugin-plugins/Makefile
        tests/Makefile
@@ -807,9 +797,25 @@ PPRINT_SET_INDENT(1)
 PPRINT_SET_TS(38)
 
 AS_ECHO
-AS_ECHO("${PPRINT_COLOR_BLDBLU}Babeltrace $PACKAGE_VERSION$PPRINT_COLOR_RST")
+
+AS_IF([test -n "bt_version_name"], [
+       AS_ECHO("${PPRINT_COLOR_BLDBLU}Babeltrace $PACKAGE_VERSION \"bt_version_name\"$PPRINT_COLOR_RST")
+], [
+       AS_ECHO("${PPRINT_COLOR_BLDBLU}Babeltrace $PACKAGE_VERSION")
+])
+
 AS_ECHO
 
+AS_IF([test -n "$bt_version_description"], [
+       AS_IF([test -n "$report_fold"], [
+               AS_ECHO("`AS_ECHO("$bt_version_description") | $report_fold -s`")
+       ], [
+               AS_ECHO("$bt_version_description")
+       ])
+
+       AS_ECHO
+])
+
 PPRINT_SUBTITLE([System])
 
 # Target architecture we're building for.
@@ -833,9 +839,9 @@ 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)
+PPRINT_PROP_BOOL_CUSTOM([Python bindings], $value, [To enable, use --enable-python-bindings])
 test "x$enable_python_plugins" = "xyes" && value=1 || value=0
-PPRINT_PROP_BOOL([Python plugin support], $value)
+PPRINT_PROP_BOOL_CUSTOM([Python plugin support], $value, [To enable, use --enable-python-plugins])
 AS_IF([test "x$have_python" = "xyes"], [
   PPRINT_PROP_STRING([Python interpreter path], [$PYTHON])
 ])
@@ -853,16 +859,16 @@ AS_ECHO
 PPRINT_SUBTITLE([Plugins])
 PPRINT_PROP_BOOL(['ctf' plugin], 1)
 test "x$enable_debug_info" = "xyes" && value=1 || value=0
-PPRINT_PROP_BOOL(['lttng-utils' plugin], $value)
+PPRINT_PROP_BOOL_CUSTOM(['lttng-utils' plugin], $value, [To enable, use --enable-debug-info])
 PPRINT_PROP_BOOL(['text' plugin], 1)
 PPRINT_PROP_BOOL(['utils' plugin], 1)
 
 AS_ECHO
 PPRINT_SUBTITLE([Built-in features])
 test "x$enable_built_in_plugins" = "xyes" && value=1 || value=0
-PPRINT_PROP_BOOL([Built-in plugins], $value)
+PPRINT_PROP_BOOL_CUSTOM([Built-in plugins], $value, [To enable, use --enable-built-in-plugins])
 test "x$enable_built_in_python_plugin_support" = "xyes" && value=1 || value=0
-PPRINT_PROP_BOOL([Built-in Python plugin support], $value)
+PPRINT_PROP_BOOL_CUSTOM([Built-in Python plugin support], $value, [To enable, use --enable-built-in-python-plugin-support])
 
 AS_ECHO
 PPRINT_SUBTITLE([Documentation])
@@ -883,15 +889,13 @@ AS_IF([test "x$enable_man_pages" != "xno"], [
     ])
   ])
 ], [
-  PPRINT_PROP_BOOL([build_man_pages_msg], 0)
+  PPRINT_PROP_BOOL_CUSTOM([build_man_pages_msg], 0, [To build man pages, use --enable-man-pages])
 ])
 
 m4_popdef([build_man_pages_msg])
 
 test "x$enable_api_doc" = "xyes" && value=1 || value=0
-PPRINT_PROP_BOOL([HTML API documentation], $value)
-test "x$enable_python_bindings_doc" = "xyes" && value=1 || value=0
-PPRINT_PROP_BOOL([Python bindings documentation], $value)
+PPRINT_PROP_BOOL_CUSTOM([HTML API documentation], $value, [To build documentation, use --enable-api-doc])
 
 AS_ECHO
 PPRINT_SUBTITLE([Logging])
@@ -899,8 +903,8 @@ PPRINT_PROP_STRING([Minimal log level], $BABELTRACE_MINIMAL_LOG_LEVEL)
 
 AS_ECHO
 PPRINT_SUBTITLE([Special build modes])
-PPRINT_PROP_BOOL([Debug mode], $BABELTRACE_DEBUG_MODE)
-PPRINT_PROP_BOOL([Developer mode], $BABELTRACE_DEV_MODE)
+PPRINT_PROP_BOOL_CUSTOM([Debug mode], $BABELTRACE_DEBUG_MODE, [To enable, set the BABELTRACE_DEBUG_MODE environment variable to 1])
+PPRINT_PROP_BOOL_CUSTOM([Developer mode], $BABELTRACE_DEV_MODE, [To enable, set the BABELTRACE_DEV_MODE environment variable to 1])
 
 report_bindir="`eval eval echo $bindir`"
 report_libdir="`eval eval echo $libdir`"
BabelTrace - Trace Format Babel Tower
This page took 0.028513 seconds and 4 git commands to generate.