diff options
author | 2012-07-22 02:52:31 +0000 | |
---|---|---|
committer | 2012-07-22 02:52:31 +0000 | |
commit | 311c6bf447129c9ebd5d1215bde98ea44fbe2d6b (patch) | |
tree | 343b46f3eb36fb0321191d7fa20f7f6d591030f1 /dev-util/pkgconf/files | |
parent | Version bump (bug #427570). (diff) | |
download | historical-311c6bf447129c9ebd5d1215bde98ea44fbe2d6b.tar.gz historical-311c6bf447129c9ebd5d1215bde98ea44fbe2d6b.tar.bz2 historical-311c6bf447129c9ebd5d1215bde98ea44fbe2d6b.zip |
Version bump
Package-Manager: portage-2.2.0_alpha119/cvs/Linux i686
Diffstat (limited to 'dev-util/pkgconf/files')
-rw-r--r-- | dev-util/pkgconf/files/pkgconf-0.8.1-newm4.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/dev-util/pkgconf/files/pkgconf-0.8.1-newm4.patch b/dev-util/pkgconf/files/pkgconf-0.8.1-newm4.patch deleted file mode 100644 index 498850485d23..000000000000 --- a/dev-util/pkgconf/files/pkgconf-0.8.1-newm4.patch +++ /dev/null @@ -1,66 +0,0 @@ -commit 840ecc846d1a168b475a31bb927b78c3677d565a -Author: Dan Nicholson <dbn.lists@gmail.com> -Date: Sat Jul 21 01:09:13 2012 -0500 - - Add autoconf macros to help packagers install .pc files - - Some distros and users have unusual installation needs that don't - conform to the standard $libdir/pkgconfig and $datadir/pkgconfig - pathways. Help packagers support these users with the macros - PKG_INSTALLDIR and PKG_NOARCH_INSTALLDIR. These are simple macros that - provide the configure parameters --with-pkgconfigdir and - --with-noarch-pkgconfigdir to allow users to override the standard - locations. - - Freedesktop #48743 - -diff --git a/pkg.m4 b/pkg.m4 -index 4748f99..0354609 100644 ---- a/pkg.m4 -+++ b/pkg.m4 -@@ -158,6 +158,45 @@ else - fi[]dnl - ])# PKG_CHECK_MODULES - -+# 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_NOARCH_INSTALLDIR(DIRECTORY) -+# ------------------------- -+# Substitutes the variable noarch_pkgconfigdir as the location where a -+# module should install arch-independent pkg-config .pc files. By -+# default the directory is $datadir/pkgconfig, but the default can be -+# changed by passing DIRECTORY. The user can override through the -+# --with-noarch-pkgconfigdir parameter. -+AC_DEFUN([PKG_NOARCH_INSTALLDIR], -+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) -+m4_pushdef([pkg_description], -+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) -+AC_ARG_WITH([noarch-pkgconfigdir], -+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, -+ [with_noarch_pkgconfigdir=]pkg_default) -+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) -+m4_popdef([pkg_default]) -+m4_popdef([pkg_description]) -+]) dnl PKG_NOARCH_INSTALLDIR -+ - # PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, - # [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], - # [DESCRIPTION], [DEFAULT]) |