diff options
author | Tim Rühsen <tim.ruehsen@gmx.de> | 2019-01-22 21:28:38 +0000 |
---|---|---|
committer | Tim Rühsen <tim.ruehsen@gmx.de> | 2019-01-22 21:28:38 +0000 |
commit | 4fea021861d2c7e6275fefbad9750a8cd8fb471e (patch) | |
tree | 91866cd19fb6b71eb128ad80dbbf080ecd10a95e | |
parent | 5fb3a45e34a843942f0fe55d55779111d7f18eaa (diff) | |
parent | adb31e778c28ef821a173dd5d98585b525c53665 (diff) | |
download | gnutls-4fea021861d2c7e6275fefbad9750a8cd8fb471e.tar.gz |
Merge branch 'tmp-fix-libs-private' into 'master'
Fix libs.private in gnutls.pc for multiarch builds
Closes #675
See merge request gnutls/gnutls!877
-rw-r--r-- | configure.ac | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index e81ff89709..c21660c3f3 100644 --- a/configure.ac +++ b/configure.ac @@ -365,17 +365,17 @@ AC_ARG_WITH(included-unistring, AS_HELP_STRING([--with-included-unistring], if test "$included_unistring" = yes;then ac_have_unistring=no else - AC_LIB_HAVE_LINKFLAGS(unistring,, [#include <uninorm.h>], [u8_normalize(0, 0, 0, 0, 0);]) - - if test "$HAVE_LIBUNISTRING" = "yes";then + AC_SEARCH_LIBS(u8_normalize, unistring, [ included_unistring=no ac_have_unistring=yes - else - AC_MSG_ERROR([[ + AC_SUBST([LIBUNISTRING], [$ac_cv_search_u8_normalize]) + ], [ + ac_cv_libunistring=no + AC_MSG_ERROR([[ *** *** Libunistring was not found. To use the included one, use --with-included-unistring - ]]) - fi + ]]) + ]) fi AM_CONDITIONAL(HAVE_LIBUNISTRING, test "$ac_have_unistring" = "yes") |