From f7e9bd3fbed6bc8625346686b6db5fb47f89968f Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Mon, 17 Sep 2018 09:46:15 +0200
Subject: tests: pkgconfig.sh: backported improvements from master branch

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
---
 tests/pkgconfig.sh | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/tests/pkgconfig.sh b/tests/pkgconfig.sh
index 75bb59d10a..e1034162ae 100755
--- a/tests/pkgconfig.sh
+++ b/tests/pkgconfig.sh
@@ -23,6 +23,7 @@
 srcdir="${srcdir:-.}"
 top_builddir="${top_builddir:-..}"
 PKGCONFIG="${PKG_CONFIG:-$(which pkg-config)}"
+CC=${CC:-cc}
 unset RETCODE
 TMPFILE=c.$$.tmp.c
 TMPFILE_O=c.$$.tmp.o
@@ -31,7 +32,27 @@ echo "$CFLAGS"|grep sanitize && exit 77
 
 ${PKGCONFIG} --version >/dev/null || exit 77
 
-PKG_CONFIG_PATH=${top_builddir}/lib
+${PKGCONFIG} --libs nettle
+if test $? != 0;then
+	echo "Nettle was not found in pkg-config"
+	exit 77
+fi
+
+for lib in libidn2 p11-kit-1
+do
+	OTHER=$(${PKGCONFIG} --libs --static $lib)
+	if test -n "${OTHER}" && test "${OTHER#*-R}" != "$OTHER";then
+		echo "Found invalid string in $lib flags: ${OTHER}"
+		exit 77
+	fi
+done
+
+if ! test -r ${top_builddir}/lib/gnutls.pc ;then
+	echo "gnutls.pc not present at ${top_builddir}/lib"
+	exit 1
+fi
+
+PKG_CONFIG_PATH=${top_builddir}/lib:$PKG_CONFIG_PATH
 export PKG_CONFIG_PATH
 
 set -e
@@ -45,16 +66,18 @@ gnutls_global_init();
 }
 __EOF__
 
-COMMON="-I${PKG_CONFIG_PATH}/includes -L${PKG_CONFIG_PATH}/.libs -I${srcdir}/../lib/includes"
+COMMON="-I${top_builddir}/lib/includes -L${top_builddir}/lib/.libs -I${srcdir}/../lib/includes"
 echo "Trying dynamic linking with:"
 echo "  * flags: $(${PKGCONFIG} --libs gnutls)"
 echo "  * common: ${COMMON}"
 echo "  * lib: ${CFLAGS}"
-cc ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON}
+echo cc ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON}
+${CC} ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON}
 
 echo ""
 echo "Trying static linking with $(${PKGCONFIG} --libs --static gnutls)"
-cc ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --static --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON}
+echo cc ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --static --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON}
+${CC} ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --static --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON}
 
 rm -f ${TMPFILE} ${TMPFILE_O}
 
-- 
cgit v1.2.1