[shibboleth-sp2] 03/04: New patch Provide-PKG_INSTALLDIR-and-PKG_CHECK_VAR-macros-to-build-.patch

[Etienne Dysli Metref]

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

edm-guest pushed a commit to branch edm/debian/wheezy-backports-sloppy
in repository shibboleth-sp2.

commit 87292aabf9286d96ededf84858deba3a6e18cc3c
Author: Etienne Dysli Metref <etienne.dysli-metref at switch.ch>
Date:   Thu Nov 3 10:25:45 2016 +0100

    New patch Provide-PKG_INSTALLDIR-and-PKG_CHECK_VAR-macros-to-build-.patch
    
    Provide the two macros PKG_INSTALLDIR and PKG_CHECK_VAR which
    pkg-config < 0.27 does not have, in order to build for wheezy.
---
 ...ALLDIR-and-PKG_CHECK_VAR-macros-to-build-.patch | 75 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 76 insertions(+)

diff --git a/debian/patches/Provide-PKG_INSTALLDIR-and-PKG_CHECK_VAR-macros-to-build-.patch b/debian/patches/Provide-PKG_INSTALLDIR-and-PKG_CHECK_VAR-macros-to-build-.patch
new file mode 100644
index 0000000..a188dc9
--- /dev/null
+++ b/debian/patches/Provide-PKG_INSTALLDIR-and-PKG_CHECK_VAR-macros-to-build-.patch
@@ -0,0 +1,75 @@
+From: Etienne Dysli Metref <etienne.dysli-metref at switch.ch>
+Date: Thu, 3 Nov 2016 10:16:53 +0100
+Subject: Provide PKG_INSTALLDIR and PKG_CHECK_VAR macros to build with older
+ pkg-config
+
+Macros copied from '/usr/share/aclocal/pkg.m4', provided by jessie's
+pkg-config 0.28-1, into 'm4/pkg_newer_macros.m4'. Enables building the
+package with wheezy's older pkg-config.
+---
+ m4/pkg_newer_macros.m4 | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 56 insertions(+)
+ create mode 100644 m4/pkg_newer_macros.m4
+
+diff --git a/m4/pkg_newer_macros.m4 b/m4/pkg_newer_macros.m4
+new file mode 100644
+index 0000000..7cb119b
+--- /dev/null
++++ b/m4/pkg_newer_macros.m4
+@@ -0,0 +1,56 @@
++# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
++# serial 1 (pkg-config-0.24)
++# 
++# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
++#
++# 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 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.
++#
++# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# PKG_INSTALLDIR(DIRECTORY)
++# -------------------------
++# Substitutes the variable pkgconfigdir as the location where a module
++# should install pkg-config .pc files. By default the directory is
++# $libdir/pkgconfig, but the default can be changed by passing
++# DIRECTORY. The user can override through the --with-pkgconfigdir
++# parameter.
++AC_DEFUN([PKG_INSTALLDIR],
++[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
++m4_pushdef([pkg_description],
++    [pkg-config installation directory @<:@]pkg_default[@:>@])
++AC_ARG_WITH([pkgconfigdir],
++    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
++    [with_pkgconfigdir=]pkg_default)
++AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
++m4_popdef([pkg_default])
++m4_popdef([pkg_description])
++]) dnl PKG_INSTALLDIR
++
++# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
++# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++# -------------------------------------------
++# 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
++])# PKG_CHECK_VAR
diff --git a/debian/patches/series b/debian/patches/series
index 9008fc6..63c8cdd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ Use-pkg-config-for-GSSAPI.patch
 The-plugins-use-GSSAPI-only-if-the-naming-extensions.patch
 Enable-the-dot-feature-of-Doxygen.patch
 Increase-the-timeouts-in-the-shibd-service-file.patch
+Provide-PKG_INSTALLDIR-and-PKG_CHECK_VAR-macros-to-build-.patch

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