summaryrefslogtreecommitdiffhomepage
path: root/subr
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2020-02-09 18:34:36 +0000
committerLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2020-02-09 18:34:36 +0000
commitdef55a0abe8c61b857c4bc021500bf52abd65a61 (patch)
treefd6b334116c47bacfd663964f130a38e2e3a58b4 /subr
parentbabea71bdc83c61191a3d0c4d93d35de439c85d1 (diff)
downloadmidipix_build-def55a0abe8c61b857c4bc021500bf52abd65a61.tar.bz2
midipix_build-def55a0abe8c61b857c4bc021500bf52abd65a61.tar.xz
patches/{libcaca,toilet}_pre.local.patch: use $PKG_CONFIG vs. pkg-config.
subr/pkg_configure_autotools.subr: export ${PKG_CONFIG{,_PATH}}.
Diffstat (limited to 'subr')
-rw-r--r--subr/pkg_configure_autotools.subr7
1 files changed, 7 insertions, 0 deletions
diff --git a/subr/pkg_configure_autotools.subr b/subr/pkg_configure_autotools.subr
index 4838717e..01f81ce5 100644
--- a/subr/pkg_configure_autotools.subr
+++ b/subr/pkg_configure_autotools.subr
@@ -8,6 +8,12 @@ pkg_configure_autotools() {
-e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure.ac" -o \
-e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure.in" -o \
-e "${PKG_BASE_DIR}/${PKG_SUBDIR}/config.guess" ]; then
+ if [ -n "${PKG_PKG_CONFIG}" ]; then
+ export PKG_CONFIG="${PKG_PKG_CONFIG}";
+ fi;
+ if [ -n "${PKG_PKG_CONFIG_PATH}" ]; then
+ export PKG_CONFIG_PATH="${PKG_PKG_CONFIG_PATH}";
+ fi;
if [ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure.ac" ]\
&& [ ! -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure" ]; then
for _script_fname in bootstrap bootstrap.sh autogen.sh ""; do
@@ -51,6 +57,7 @@ pkg_configure_autotools() {
fi;
sed -i"" "s,%PREFIX%,${PKG_PREFIX},g" "${PKG_BUILD_DIR}/config.cache";
fi;
+ unset PKG_CONFIG PKG_CONFIG_PATH;
fi;
};