INN commit: trunk/m4 (krb5.m4 pam-const.m4)

[INN Commit]

    Date: Friday, December 25, 2020 @ 01:51:06
  Author: iulius
Revision: 10468

Update to latest rra-c-util upstream version

Modified:
  trunk/m4/krb5.m4
  trunk/m4/pam-const.m4

--------------+
 krb5.m4      |   12 ++++++------
 pam-const.m4 |    8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

Modified: krb5.m4
===================================================================
--- krb5.m4	2020-12-24 22:33:03 UTC (rev 10467)
+++ krb5.m4	2020-12-25 09:51:06 UTC (rev 10468)
@@ -18,9 +18,9 @@
 dnl If KRB5_CPPFLAGS, KRB5_LDFLAGS, or KRB5_LIBS are set before calling these
 dnl macros, their values will be added to whatever the macros discover.
 dnl
-dnl KRB5_CPPFLAGS_GCC will be set to the same value as KRB5_CPPFLAGS but with
-dnl any occurrences of -I changed to -isystem.  This may be useful to suppress
-dnl warnings from the Kerberos header files when building with GCC and
+dnl KRB5_CPPFLAGS_WARNINGS will be set to the same value as KRB5_CPPFLAGS but
+dnl with any occurrences of -I changed to -isystem.  This may be useful to
+dnl suppress warnings from the Kerberos header files when building with and
 dnl aggressive warning flags.  Be aware that this change will change the
 dnl compiler header file search order as well.
 dnl
@@ -51,7 +51,7 @@
 dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
 dnl
 dnl Written by Russ Allbery <eagle at eyrie.org>
-dnl Copyright 2018 Russ Allbery <eagle at eyrie.org>
+dnl Copyright 2018, 2020 Russ Allbery <eagle at eyrie.org>
 dnl Copyright 2005-2011, 2013-2014
 dnl     The Board of Trustees of the Leland Stanford Junior University
 dnl
@@ -261,7 +261,7 @@
 [AC_REQUIRE([INN_ENABLE_REDUCED_DEPENDS])
  inn_krb5_incroot=
  AC_SUBST([KRB5_CPPFLAGS])
- AC_SUBST([KRB5_CPPFLAGS_GCC])
+ AC_SUBST([KRB5_CPPFLAGS_WARNINGS])
  AC_SUBST([KRB5_LDFLAGS])
  AC_SUBST([KRB5_LIBS])
  AS_IF([test x"$inn_krb5_includedir" != x],
@@ -279,7 +279,7 @@
  AS_CASE([$KRB5_LIBS], [*-lcom_err*], [inn_krb5_uses_com_err=true])
  AM_CONDITIONAL([KRB5_USES_COM_ERR],
     [test x"$inn_krb5_uses_com_err" = xtrue])
- KRB5_CPPFLAGS_GCC=`echo "$KRB5_CPPFLAGS" | sed -e 's/-I/-isystem /g'`])
+ KRB5_CPPFLAGS_WARNINGS=`echo "$KRB5_CPPFLAGS" | sed -e 's/-I/-isystem /g'`])
 
 dnl The main macro for packages with mandatory Kerberos support.
 AC_DEFUN([INN_LIB_KRB5],

Modified: pam-const.m4
===================================================================
--- pam-const.m4	2020-12-24 22:33:03 UTC (rev 10467)
+++ pam-const.m4	2020-12-25 09:51:06 UTC (rev 10468)
@@ -3,10 +3,10 @@
 dnl
 dnl Linux marks several PAM arguments const, including the argument to
 dnl pam_get_item and some arguments to conversation functions, which Solaris
-dnl doesn't.  Mac OS X, OS X and macOS mark the first argument to pam_strerror
-dnl const, and other platforms don't.  This test tries to determine which
-dnl style is in use to select whether to declare variables const and how
-dnl to prototype functions in order to avoid compiler warnings.
+dnl doesn't.  Mac OS X, OS X, and macOS mark the first argument to
+dnl pam_strerror const, and other platforms don't.  This test tries to
+dnl determine which style is in use to select whether to declare variables
+dnl const and how to prototype functions in order to avoid compiler warnings.
 dnl
 dnl Since this is just for compiler warnings, it's not horribly important if
 dnl we guess wrong.  This test is ugly, but it seems to work.