From 74180f2a57a7b5dba45337dc79f411eaf4fada0f Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Tue, 11 Oct 2016 12:08:06 +0200 Subject: [PATCH 11/12] BUILD: Add a private copy of a pkg-config build macro --- src/build_macros.m4 | 7 +++++++ src/external/pkg.m4 | 14 ++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/src/build_macros.m4 b/src/build_macros.m4 index 92d7c65d1a073416b8f1c2ef43a7a827feae6629..ec704acfda754e72163b6ac9d20650b5dd90ac69 100644 --- a/src/build_macros.m4 +++ b/src/build_macros.m4 @@ -48,3 +48,10 @@ AC_DEFUN([SSS_AC_EXPAND_LIB_DIR], ]) sss_extra_libdir="$additional_libdir" ]) + +dnl A backwards-compatible way of declaring AS_VAR_COPY +dnl for example for CentOS-6 +m4_ifndef([AS_VAR_COPY], +[m4_define([AS_VAR_COPY], +[AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])])]) + diff --git a/src/external/pkg.m4 b/src/external/pkg.m4 index 568127f104de92fc81fa9b9ccf2fbd2d470840a1..edba30cdd0cf59654096e1768595351b9975ea68 100644 --- a/src/external/pkg.m4 +++ b/src/external/pkg.m4 @@ -154,3 +154,17 @@ else ifelse([$3], , :, [$3]) fi[]dnl ])# PKG_CHECK_MODULES + +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])dnl PKG_CHECK_VAR -- 2.7.4