projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release: Babeltrace 2.0.4 "Amqui"
[babeltrace.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index ee22576f5f07114d703c7c53cbec9c570c1b4b75..51f4ab2507b116b9aca78027a7fd00d4a2b10d18 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-116,9
+116,10
@@
AC_SYS_LARGEFILE
# Choose the c compiler
AC_PROG_CC
# Choose the c compiler
AC_PROG_CC
+m4_version_prereq([2.70], [], [AC_PROG_CC_STDC])
# Make sure the c compiler supports C99
# Make sure the c compiler supports C99
-A
C_PROG_CC_C99([
], [AC_MSG_ERROR([The compiler does not support C99])])
+A
S_IF([test "$ac_cv_prog_cc_c99" = "no"
], [AC_MSG_ERROR([The compiler does not support C99])])
# Make sure the c compiler supports __attributes__
AX_C___ATTRIBUTE__
# Make sure the c compiler supports __attributes__
AX_C___ATTRIBUTE__
@@
-195,6
+196,11
@@
AX_CHECK_LINK_FLAG([-Wl,--whole-archive,--no-whole-archive],
# Initialize and configure libtool
LT_INIT([win32-dll])
# Initialize and configure libtool
LT_INIT([win32-dll])
+# Check if the linker supports the "notext" keyword
+AX_CHECK_LINK_FLAG([-Wl,-z,notext],[
+ AC_SUBST([LD_NOTEXT], [-Wl,-z,notext])
+])
+
## ##
## Programs checks ##
## ##
## Programs checks ##
@@
-232,7
+238,9
@@
detection.
AM_CONDITIONAL([HAVE_BISON], [test "x$have_bison" = "xyes"])
# check for flex
AM_CONDITIONAL([HAVE_BISON], [test "x$have_bison" = "xyes"])
# check for flex
-AC_PROG_LEX
+# Prior to autoconf 2.70, AC_PROG_FLEX did not take an argument. This is not a
+# problem since the argument is silently ignored by older versions.
+AC_PROG_LEX([noyywrap])
AX_PROG_FLEX_VERSION([2.5.35], [have_flex=yes])
AS_IF([test "x$have_flex" != "xyes"], [
AX_PROG_FLEX_VERSION([2.5.35], [have_flex=yes])
AS_IF([test "x$have_flex" != "xyes"], [
@@
-365,7
+373,7
@@
AS_IF([test "x$BABELTRACE_DEBUG_MODE" = x1], [
# Python bindings
# Disabled by default
AC_ARG_ENABLE([python-bindings],
# Python bindings
# Disabled by default
AC_ARG_ENABLE([python-bindings],
- [A
C
_HELP_STRING([--enable-python-bindings], [build the Python bindings])],
+ [A
S
_HELP_STRING([--enable-python-bindings], [build the Python bindings])],
[], dnl AC_ARG_ENABLE will fill enable_python_bindings with the user choice
[enable_python_bindings=unspecified]
)
[], dnl AC_ARG_ENABLE will fill enable_python_bindings with the user choice
[enable_python_bindings=unspecified]
)
@@
-373,7
+381,7
@@
AC_ARG_ENABLE([python-bindings],
# Python bindings documentation
# Disabled by default
AC_ARG_ENABLE([python-bindings-doc],
# Python bindings documentation
# Disabled by default
AC_ARG_ENABLE([python-bindings-doc],
- [A
C
_HELP_STRING([--enable-python-bindings-doc], [build the Python bindings documentation])],
+ [A
S
_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]
)
[], dnl AC_ARG_ENABLE will fill enable_python_bindings_doc with the user choice
[enable_python_bindings_doc=no]
)
@@
-381,14
+389,14
@@
AC_ARG_ENABLE([python-bindings-doc],
# Python plugins
# Disabled by default
AC_ARG_ENABLE([python-plugins],
# Python plugins
# Disabled by default
AC_ARG_ENABLE([python-plugins],
- [A
C
_HELP_STRING([--enable-python-plugins], [enable the Python plugins support for the library and converter])]
+ [A
S
_HELP_STRING([--enable-python-plugins], [enable the Python plugins support for the library and converter])]
dnl AC_ARG_ENABLE will fill enable_python_plugins with the user choice
)
# Debug info
# Enabled by default, except on some platforms
AC_ARG_ENABLE([debug-info],
dnl AC_ARG_ENABLE will fill enable_python_plugins with the user choice
)
# Debug info
# Enabled by default, except on some platforms
AC_ARG_ENABLE([debug-info],
- [A
C
_HELP_STRING([--disable-debug-info], [disable the debug info support (default on macOS, Solaris and Windows)])],
+ [A
S
_HELP_STRING([--disable-debug-info], [disable the debug info support (default on macOS, Solaris and Windows)])],
[], dnl AC_ARG_ENABLE will fill enable_debug_info with the user choice
[enable_debug_info="$DEFAULT_ENABLE_DEBUG_INFO"]
)
[], dnl AC_ARG_ENABLE will fill enable_debug_info with the user choice
[enable_debug_info="$DEFAULT_ENABLE_DEBUG_INFO"]
)
@@
-396,21
+404,21
@@
AC_ARG_ENABLE([debug-info],
# API documentation
# Disabled by default
AC_ARG_ENABLE([api-doc],
# API documentation
# Disabled by default
AC_ARG_ENABLE([api-doc],
- [A
C
_HELP_STRING([--enable-api-doc], [build the HTML API documentation])],
+ [A
S
_HELP_STRING([--enable-api-doc], [build the HTML API documentation])],
[enable_api_doc=$enableval]
)
# Built-in plugins
# Disabled by default
AC_ARG_ENABLE([built-in-plugins],
[enable_api_doc=$enableval]
)
# Built-in plugins
# Disabled by default
AC_ARG_ENABLE([built-in-plugins],
- [A
C
_HELP_STRING([--enable-built-in-plugins], [Statically-link in-tree plug-ins into the babeltrace2 executable])]
+ [A
S
_HELP_STRING([--enable-built-in-plugins], [Statically-link in-tree plug-ins into the babeltrace2 executable])]
dnl AC_ARG_ENABLE will fill enable_built_in_plugins with the user choice
)
# Built-in python plugin support
# Disabled by default
AC_ARG_ENABLE([built-in-python-plugin-support],
dnl AC_ARG_ENABLE will fill enable_built_in_plugins with the user choice
)
# Built-in python plugin support
# Disabled by default
AC_ARG_ENABLE([built-in-python-plugin-support],
- [A
C
_HELP_STRING([--enable-built-in-python-plugin-support], [Statically-link Python plugin support into the babeltrace library])]
+ [A
S
_HELP_STRING([--enable-built-in-python-plugin-support], [Statically-link Python plugin support into the babeltrace library])]
dnl AC_ARG_ENABLE will fill enable_built_in_python_plugin_support with the user choice
)
dnl AC_ARG_ENABLE will fill enable_built_in_python_plugin_support with the user choice
)
This page took
0.02494 seconds
and
4
git commands to generate.