diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2017-09-18 13:32:40 +0300 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-09-20 08:34:39 +0200 |
| commit | 1512eac42a5b1a6a36a6b122586270510aea7f87 (patch) | |
| tree | ae38d52e5c42505da4d4fe0af87f19934007985a | |
| parent | 3029923c2cdb91001c7a4a4714c6926aa656b636 (diff) | |
| download | gnutls-1512eac42a5b1a6a36a6b122586270510aea7f87.tar.gz | |
tests: use libidn2 in pkgconfig.sh
Since abe6a12b9766219163f99d7807a0b07fbe5f590c GnuTLS does not support
libidn1. Switch pkgconfig.sh test to use libidn2.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
| -rwxr-xr-x | tests/pkgconfig.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/pkgconfig.sh b/tests/pkgconfig.sh index 6fea21511e..cdc203ed7b 100755 --- a/tests/pkgconfig.sh +++ b/tests/pkgconfig.sh @@ -37,13 +37,13 @@ if test $? != 0;then exit 77 fi -PKG_CONFIG_PATH=${top_builddir}/lib +PKG_CONFIG_PATH=${top_builddir}/lib:$PKG_CONFIG_PATH export PKG_CONFIG_PATH -OTHER=$(${PKGCONFIG} --libs --static libidn) +OTHER=$(${PKGCONFIG} --libs --static libidn2) OTHER="${OTHER} $(${PKGCONFIG} --libs --static p11-kit-1)" if test -n "${OTHER}" && test "${OTHER#*-R}" != "$OTHER";then - echo "Found invalid string in libidn flags: ${OTHER}" + echo "Found invalid string in libidn2 flags: ${OTHER}" exit 77 fi @@ -58,15 +58,17 @@ 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}" +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)" +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} |