X-Git-Url: https://git.eyrie.org/?a=blobdiff_plain;f=m4%2Fkrb5-config.m4;fp=m4%2Fkrb5-config.m4;h=8f8123c70866866c4ac3c9a907e9eb6a2aa5cae7;hb=510f358be6a968b5640b0b554118a08aa554d8cf;hp=bbfcdc194e6c5233c1b1ad01f499f01609475742;hpb=42bbbcfb783fe4e2e698b31472ed640d49baed8c;p=kerberos%2Fkrb5-strength.git
diff --git a/m4/krb5-config.m4 b/m4/krb5-config.m4
index bbfcdc1..8f8123c 100644
--- a/m4/krb5-config.m4
+++ b/m4/krb5-config.m4
@@ -1,3 +1,5 @@
+# serial 1
+
dnl Use krb5-config to get link paths for Kerberos libraries.
dnl
dnl Provides one macro, RRA_KRB5_CONFIG, which attempts to get compiler and
@@ -11,7 +13,7 @@ dnl The canonical version of this file is maintained in the rra-c-util
dnl package, available at .
dnl
dnl Written by Russ Allbery
-dnl Copyright 2018 Russ Allbery
+dnl Copyright 2018, 2021-2022 Russ Allbery
dnl Copyright 2011-2012
dnl The Board of Trustees of the Leland Stanford Junior University
dnl
@@ -86,9 +88,9 @@ AC_DEFUN([RRA_KRB5_CONFIG],
rra_krb5_config_$3="$PATH_KRB5_CONFIG"])
AS_IF([test x"$rra_krb5_config_$3" != x && test -x "$rra_krb5_config_$3"],
[AC_CACHE_CHECK([for $2 support in krb5-config], [rra_cv_lib_$3[]_config],
- [AS_IF(["$rra_krb5_config_$3" 2>&1 | grep $2 >/dev/null 2>&1],
- [rra_cv_lib_$3[]_config=yes],
- [rra_cv_lib_$3[]_config=no])])
+ [AS_IF(["$rra_krb5_config_$3" 2>&1 | grep $2 >/dev/null 2>&1],
+ [rra_cv_lib_$3[]_config=yes],
+ [rra_cv_lib_$3[]_config=no])])
AS_IF([test "$rra_cv_lib_$3[]_config" = yes],
[$3[]_CPPFLAGS=`"$rra_krb5_config_$3" --cflags $2 2>/dev/null`
_RRA_KRB5_CONFIG_LIBS([$rra_krb5_config_$3], [$2], [$3])
@@ -98,7 +100,7 @@ AC_DEFUN([RRA_KRB5_CONFIG],
$3[]_LIBS=`"$rra_krb5_config_$3" --libs $2 2>/dev/null`
rra_krb5_config_$3[]_ok=yes])])])
AS_IF([test x"$rra_krb5_config_$3[]_ok" = xyes],
- [$3[]_CPPFLAGS=`echo "$$3[]_CPPFLAGS" | sed 's%-I/usr/include %%'`
- $3[]_CPPFLAGS=`echo "$$3[]_CPPFLAGS" | sed 's%-I/usr/include$%%'`
+ [$3[]_CPPFLAGS=`AS_ECHO(["$$3[]_CPPFLAGS"]) | sed 's%-I/usr/include %%'`
+ $3[]_CPPFLAGS=`AS_ECHO(["$$3[]_CPPFLAGS"]) | sed 's%-I/usr/include$%%'`
$4],
[$5])])