fix #4055

1 files changed, 47 insertions, 42 deletions

diff --git a/m4/ax_create_pkgconfig_info.m4 b/m4/ax_create_pkgconfig_info.m4
index df34f1f..35f0213 100644
--- a/m4/ax_create_pkgconfig_info.m4
+++ b/m4/ax_create_pkgconfig_info.m4
@@ -1,4 +1,6 @@
-##### http://autoconf-archive.cryp.to/ax_create_pkgconfig_info.html
+# =============================================================================
+#  https://www.gnu.org/software/autoconf-archive/ax_create_pkgconfig_info.html
+# =============================================================================
 #
 # SYNOPSIS
 #
@@ -6,64 +8,57 @@
 #
 # DESCRIPTION
 #
-#   defaults:
+#   Defaults:
 #
 #     $1 = $PACKAGE_NAME.pc
 #     $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.
 #
-#   the resulting file is called $PACKAGE.pc.in / $PACKAGE.pc
+#   The resulting file is called $PACKAGE.pc.in / $PACKAGE.pc
 #
 #   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 information being updated in a single place for the
-#   whole project.
+#   ax_spec_defaults that can read good initializers from the .spec file. In
+#   consequence, most of the generatable installable stuff can be made from
+#   information being updated in a single place for the whole project.
 #
-# LAST MODIFICATION
+# LICENSE
 #
-#   2006-10-13
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2008 Sven Verdoolaege <skimo@kotnet.org>
 #
-# COPYLEFT
-#
-#   Copyright (c) 2006 Sven Verdoolaege <skimo*liacs.nl>
-#   Copyright (c) 2006 Guido U. Draheim <guidod@gmx.de>
-#
-#   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 option) any later version.
+#   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 3 of the License, or (at your
+#   option) any later version.
 #
 #   This program is distributed in the hope that it will be useful, but
 #   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#   General Public License for more details.
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
 #
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-#   02111-1307, USA.
+#   You should have received a copy of the GNU General Public License along
+#   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 scripts that are the output of Autoconf when processing
-#   the Macro. You need not follow the terms of the GNU General Public
-#   License when using or distributing such scripts, even though
-#   portions of the text of the Macro appear in them. The GNU General
-#   Public License (GPL) does govern all other use of the material that
-#   constitutes the Autoconf Macro.
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
 #
-#   This special exception to the GPL applies to versions of the
-#   Autoconf Macro released by the Autoconf Macro Archive. When you
-#   make and distribute a modified version of the Autoconf Macro, you
-#   may extend this special exception to the GPL to apply to your
-#   modified version as well.
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   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
@@ -152,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)
@@ -185,7 +180,7 @@ PKGCONFIG_src_headers=`pwd`
 v="$ac_top_srcdir" ;
 test ".$v" != "." || v="$ax_spec_dir"
 test ".$v" != "." || v="$srcdir"
-case "$v" in /*) PKG_CONFIG_src_headers="" ;; esac
+case "$v" in /*) PKGCONFIG_src_headers="" ;; esac
 PKGCONFIG_src_headers=`AS_DIRNAME("$PKGCONFIG_src_headers/$v/x")`
 test ! -d $PKGCONFIG_src_headers/incl[]ude || \
 PKGCONFIG_src_headers="$PKGCONFIG_src_headers/incl[]ude"
@@ -210,6 +205,8 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 libdir=@libdir@
+datarootdir=@datarootdir@
+datadir=@datadir@
 sysconfdir=@sysconfdir@
 includedir=@includedir@
 package=@PACKAGE@
@@ -229,6 +226,8 @@ s|@prefix@|${pkgconfig_prefix}|
 s|@exec_prefix@|${pkgconfig_execprefix}|
 s|@bindir@|${pkgconfig_bindir}|
 s|@libdir@|${pkgconfig_libdir}|
+s|@datarootdir@|${pkgconfig_datarootdir}|
+s|@datadir@|${pkgconfig_datadir}|
 s|@sysconfdir@|${pkgconfig_sysconfdir}|
 s|@includedir@|${pkgconfig_includedir}|
 s|@suffix@|${pkgconfig_suffix}|
@@ -252,6 +251,8 @@ s|@prefix@|${pkgconfig_prefix}|
 s|@exec_prefix@|${pkgconfig_execprefix}|
 s|@bindir@|${pkgconfig_bindir}|
 s|@libdir@|${pkgconfig_src_libdir}|
+s|@datarootdir@|${pkgconfig_datarootdir}|
+s|@datadir@|${pkgconfig_datadir}|
 s|@sysconfdir@|${pkgconfig_sysconfdir}|
 s|@includedir@|${pkgconfig_src_headers}|
 s|@suffix@|${pkgconfig_suffix}|
@@ -279,6 +280,8 @@ s|@prefix@|\"${pkgconfig_prefix}\"|
 s|@exec_prefix@|\"${pkgconfig_execprefix}\"|
 s|@bindir@|\"${pkgconfig_bindir}\"|
 s|@libdir@|\"${pkgconfig_src_libdir}\"|
+s|@datarootdir@|\"${pkgconfig_datarootdir}\"|
+s|@datadir@|\"${pkgconfig_datadir}\"|
 s|@sysconfdir@|\"${pkgconfig_sysconfdir}\"|
 s|@includedir@|\"${pkgconfig_src_headers}\"|
 s|@suffix@|\"${pkgconfig_suffix}\"|
@@ -316,6 +319,8 @@ pkgconfig_execprefix='$exec_prefix'
 pkgconfig_bindir='$bindir'
 pkgconfig_libdir='$libdir'
 pkgconfig_includedir='$includedir'
+pkgconfig_datarootdir='$datarootdir'
+pkgconfig_datadir='$datadir'
 pkgconfig_sysconfdir='$sysconfdir'
 pkgconfig_suffix='$ax_create_pkgconfig_suffix'
 pkgconfig_package='$PACKAGE_NAME'