From 7b4ad04f5b4c01b1b1c1bc616e3e80b43563ebfe Mon Sep 17 00:00:00 2001 From: Kubat <mael.martin31@gmail.com> Date: Wed, 15 Sep 2021 11:54:05 +0200 Subject: [PATCH] FIX: Export the PKG_CONFIG_PATH with some standard folders, again a Manjaro problem --- configure | 8 ++++++++ configure.ac | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/configure b/configure index 919d7faa..d411549d 100755 --- a/configure +++ b/configure @@ -2819,6 +2819,14 @@ fi LKT_ARCH=`arch` if test $? -ne 0 ; then LKT_ARCH=`uname -m` ; fi +# Set the PKG_CONFIG_PATH to some default folders if not done by the +# distribution (Manjaro again...) +export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig +if test "${PKG_CONFIG_PATH:0:1}" = ":" ; then + PKG_CONFIG_PATH="${PKG_CONFIG_PATH:1}" + export PKG_CONFIG_PATH +fi + LKT_PATH_SOURCE="$(dirname $(readlink -f "$0"))" LKT_PATH_BUILD="$(pwd)" diff --git a/configure.ac b/configure.ac index d116756a..23b0f510 100644 --- a/configure.ac +++ b/configure.ac @@ -19,6 +19,14 @@ AC_PATH_PROG([TEST_SQLITE], [sqlite3], [:]) LKT_ARCH=`arch` if test $? -ne 0 ; then LKT_ARCH=`uname -m` ; fi +# Set the PKG_CONFIG_PATH to some default folders if not done by the +# distribution (Manjaro again...) +export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig +if test "${PKG_CONFIG_PATH:0:1}" = ":" ; then + PKG_CONFIG_PATH="${PKG_CONFIG_PATH:1}" + export PKG_CONFIG_PATH +fi + LKT_PATH_SOURCE="$(dirname $(readlink -f "$0"))" LKT_PATH_BUILD="$(pwd)" AC_SUBST([LKT_PATH_SOURCE]) -- GitLab