From: Philippe Proulx Date: Wed, 2 Nov 2016 06:01:30 +0000 (-0400) Subject: ax_lib_elfutils -> bt_lib_elfutils X-Git-Tag: v1.5.3~6 X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=ec294ef4a5a92cb5a80a69dfe65f36c152cbc3e9;p=babeltrace.git ax_lib_elfutils -> bt_lib_elfutils `ax` is a prefix for the GNU Autoconf Archive. `ax_lib_elfutils` should be namespaced within the project here, with the `bt_` prefix. Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- diff --git a/configure.ac b/configure.ac index e74faaa8..99de2b8a 100644 --- a/configure.ac +++ b/configure.ac @@ -281,7 +281,7 @@ AS_IF([test "x$_enable_debug_info" = xyes], [ # Check if libelf and libdw are present AC_CHECK_LIB([elf], [elf_version], [], [AC_MSG_ERROR(Missing libelf (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)]) AC_CHECK_LIB([dw], [dwarf_begin], [], [AC_MSG_ERROR(Missing libdw (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)]) - AX_LIB_ELFUTILS([0], [154], [:], [AC_MSG_ERROR(elfutils >= 0.154 is required to use the debug info feature. You can disable this feature using --disable-debug-info.)]) + BT_LIB_ELFUTILS([0], [154], [:], [AC_MSG_ERROR(elfutils >= 0.154 is required to use the debug info feature. You can disable this feature using --disable-debug-info.)]) AC_DEFINE([ENABLE_DEBUG_INFO], [1], [Define to 1 if you enable the 'debug info' feature]) ], []) diff --git a/m4/ax_lib_elfutils.m4 b/m4/ax_lib_elfutils.m4 deleted file mode 100644 index 5cefc748..00000000 --- a/m4/ax_lib_elfutils.m4 +++ /dev/null @@ -1,58 +0,0 @@ -# ax_lib_elfutils.m4 -- Check elfutils version -# -# Copyright (C) 2016 - Jérémie Galarneau -# -# Permission is hereby granted, free of charge, to any person -# obtaining a copy of this software and associated documentation files -# (the "Software"), to deal in the Software without restriction, -# including without limitation the rights to use, copy, modify, merge, -# publish, distribute, sublicense, and/or sell copies of the Software, -# and to permit persons to whom the Software is furnished to do so, -# subject to the following conditions: The above copyright notice and -# this permission notice shall be included in all copies or substantial -# portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Check the currently installed version of elfutils by using the -# `_ELFUTILS_PREREQ` macro defined in . -# -# The cache variable for this test is `bt_cv_lib_elfutils`. -# -# AX_LIB_ELFUTILS(MAJOR_VERSION, MINOR_VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) -# --------------------------------------------------------------------------- -AC_DEFUN([AX_LIB_ELFUTILS], [ - m4_pushdef([major_version], [$1]) - m4_pushdef([minor_version], [$2]) - m4_pushdef([true_action], m4_default([$3], [:])) - m4_pushdef([false_action], m4_default( - [$4], [AC_MSG_ERROR(elfutils >= major_version.minor_version is required)] - )) - - AC_CACHE_CHECK( - [for elfutils version >= major_version.minor_version], - [bt_cv_lib_elfutils], [ - AC_RUN_IFELSE([AC_LANG_SOURCE([ - #include - #include - - int main(void) { - return _ELFUTILS_PREREQ(major_version, minor_version) ? EXIT_SUCCESS : EXIT_FAILURE; - } - ])], [bt_cv_lib_elfutils=yes], [bt_cv_lib_elfutils=no]) - ] - ) - - AS_IF([test "x$bt_cv_lib_elfutils" = "xyes"], [true_action], [false_action]) - - m4_popdef([false_action]) - m4_popdef([true_action]) - m4_popdef([minor_version]) - m4_popdef([major_version]) -]) diff --git a/m4/bt_lib_elfutils.m4 b/m4/bt_lib_elfutils.m4 new file mode 100644 index 00000000..d1a5716b --- /dev/null +++ b/m4/bt_lib_elfutils.m4 @@ -0,0 +1,58 @@ +# bt_lib_elfutils.m4 -- Check elfutils version +# +# Copyright (C) 2016 - Jérémie Galarneau +# +# Permission is hereby granted, free of charge, to any person +# obtaining a copy of this software and associated documentation files +# (the "Software"), to deal in the Software without restriction, +# including without limitation the rights to use, copy, modify, merge, +# publish, distribute, sublicense, and/or sell copies of the Software, +# and to permit persons to whom the Software is furnished to do so, +# subject to the following conditions: The above copyright notice and +# this permission notice shall be included in all copies or substantial +# portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Check the currently installed version of elfutils by using the +# `_ELFUTILS_PREREQ` macro defined in . +# +# The cache variable for this test is `bt_cv_lib_elfutils`. +# +# BT_LIB_ELFUTILS(MAJOR_VERSION, MINOR_VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# --------------------------------------------------------------------------- +AC_DEFUN([BT_LIB_ELFUTILS], [ + m4_pushdef([major_version], [$1]) + m4_pushdef([minor_version], [$2]) + m4_pushdef([true_action], m4_default([$3], [:])) + m4_pushdef([false_action], m4_default( + [$4], [AC_MSG_ERROR(elfutils >= major_version.minor_version is required)] + )) + + AC_CACHE_CHECK( + [for elfutils version >= major_version.minor_version], + [bt_cv_lib_elfutils], [ + AC_RUN_IFELSE([AC_LANG_SOURCE([ + #include + #include + + int main(void) { + return _ELFUTILS_PREREQ(major_version, minor_version) ? EXIT_SUCCESS : EXIT_FAILURE; + } + ])], [bt_cv_lib_elfutils=yes], [bt_cv_lib_elfutils=no]) + ] + ) + + AS_IF([test "x$bt_cv_lib_elfutils" = "xyes"], [true_action], [false_action]) + + m4_popdef([false_action]) + m4_popdef([true_action]) + m4_popdef([minor_version]) + m4_popdef([major_version]) +])