[xmltooling] 17/24: CPPXT-111 - Build flags leak into pkg-config files

[Etienne Dysli Metref]

This is an automated email from the git hooks/post-receive script.

edm-guest pushed a commit to branch master
in repository xmltooling.

commit d701a6a657fd739809ca2945f37ca9e7ad73daa6
Author: Scott Cantor <cantor.2 at osu.edu>
Date:   Fri Jan 5 16:02:05 2018 -0500

    CPPXT-111 - Build flags leak into pkg-config files
    
    https://issues.shibboleth.net/jira/browse/CPPXT-111
---
 m4/ax_create_pkgconfig_info.m4 | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/m4/ax_create_pkgconfig_info.m4 b/m4/ax_create_pkgconfig_info.m4
index 60ac548..35f0213 100644
--- a/m4/ax_create_pkgconfig_info.m4
+++ b/m4/ax_create_pkgconfig_info.m4
@@ -1,6 +1,6 @@
-# ===========================================================================
-#    http://www.nongnu.org/autoconf-archive/ax_create_pkgconfig_info.html
-# ===========================================================================
+# =============================================================================
+#  https://www.gnu.org/software/autoconf-archive/ax_create_pkgconfig_info.html
+# =============================================================================
 #
 # SYNOPSIS
 #
@@ -14,8 +14,8 @@
 #     $2 = (empty)
 #     $3 = $PACKAGE_LIBS $LIBS (as set at that point in configure.ac)
 #     $4 = $PACKAGE_SUMMARY (or $1 Library)
-#     $5 = $CPPFLAGS $PACKAGE_CFLAGS (as set at the point in configure.ac)
-#     $6 = $LDFLAGS $PACKAGE_LDFLAGS (as set at the point in configure.ac)
+#     $5 = $PACKAGE_CFLAGS (as set at the point in configure.ac)
+#     $6 = $PACKAGE_LDFLAGS (as set at the point in configure.ac)
 #
 #     PACKAGE_NAME defaults to $PACKAGE if not set.
 #     PACKAGE_LIBS defaults to -l$PACKAGE_NAME if not set.
@@ -24,7 +24,7 @@
 #
 #   You will find this macro most useful in conjunction with
 #   ax_spec_defaults that can read good initializers from the .spec file. In
-#   consequencd, most of the generatable installable stuff can be made from
+#   consequence, most of the generatable installable stuff can be made from
 #   information being updated in a single place for the whole project.
 #
 # LICENSE
@@ -34,7 +34,7 @@
 #
 #   This program is free software; you can redistribute it and/or modify it
 #   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
+#   Free Software Foundation; either version 3 of the License, or (at your
 #   option) any later version.
 #
 #   This program is distributed in the hope that it will be useful, but
@@ -43,7 +43,7 @@
 #   Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright owner
 #   gives unlimited permission to copy, distribute and modify the configure
@@ -58,6 +58,8 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+#serial 16
+
 AC_DEFUN([AX_CREATE_PKGCONFIG_INFO],[dnl
 AS_VAR_PUSHDEF([PKGCONFIG_suffix],[ax_create_pkgconfig_suffix])dnl
 AS_VAR_PUSHDEF([PKGCONFIG_libdir],[ax_create_pkgconfig_libdir])dnl
@@ -145,13 +147,13 @@ PKGCONFIG_libs=`eval echo "$PKGCONFIG_libs"`
 AC_MSG_RESULT($PKGCONFIG_libs)
 
 AC_MSG_CHECKING(our pkgconfig cppflags)
-PKGCONFIG_cppflags="ifelse($5,,$CPPFLAGS $PACKAGE_CFLAGS,$5)"
+PKGCONFIG_cppflags="ifelse($5,,$PACKAGE_CFLAGS,$5)"
 PKGCONFIG_cppflags=`eval echo "$PKGCONFIG_cppflags"`
 PKGCONFIG_cppflags=`eval echo "$PKGCONFIG_cppflags"`
 AC_MSG_RESULT($PKGCONFIG_cppflags)
 
 AC_MSG_CHECKING(our pkgconfig ldflags)
-PKGCONFIG_ldflags="ifelse($6,,$LDFLAGS $PACKAGE_LDFLAGS,$5)"
+PKGCONFIG_ldflags="ifelse($6,,$PACKAGE_LDFLAGS,$6)"
 PKGCONFIG_ldflags=`eval echo "$PKGCONFIG_ldflags"`
 PKGCONFIG_ldflags=`eval echo "$PKGCONFIG_ldflags"`
 AC_MSG_RESULT($PKGCONFIG_ldflags)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/xmltooling.git