38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
|
From c53b36698fe4721fb562908ac6119aa9280383af Mon Sep 17 00:00:00 2001
|
||
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||
|
|
Date: Sun, 14 Apr 2019 10:22:12 +0200
|
||
|
|
Subject: [PATCH] configure.ac: fix static build with idn2 and unistring
|
||
|
|
|
||
|
|
Commit 78db40f25c6479b14da5a73adf7207bfbec5ccc5 did not fix static build
|
||
|
|
failure
|
||
|
|
|
||
|
|
AC_SEARCH_LIBS prepends the library to LIBS as a result -lunistring is
|
||
|
|
added before -lidn2. To fix static build, we must set -lunistring after
|
||
|
|
-lidn2
|
||
|
|
|
||
|
|
Fixes:
|
||
|
|
- http://autobuild.buildroot.org/results/c9544b4f1a0252e260a2ed19218fa950f4dc2d2d
|
||
|
|
|
||
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||
|
|
[Upstream status: https://gitlab.com/muttmua/mutt/merge_requests/42]
|
||
|
|
---
|
||
|
|
configure.ac | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index bd8beb91..75943eee 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -1402,7 +1402,7 @@ if test "x$with_idn2" != "xno"; then
|
||
|
|
AC_SEARCH_LIBS([idn2_check_version], [idn2], [
|
||
|
|
AC_DEFINE([HAVE_LIBIDN2], 1, [Define to 1 if you have the GNU idn2 library])
|
||
|
|
dnl -lunistring is needed for static linking
|
||
|
|
- AC_SEARCH_LIBS([u8_strconv_from_locale], [unistring])
|
||
|
|
+ AC_SEARCH_LIBS([u8_strconv_from_locale], [unistring], [LIBS="$LIBS -lunistring"])
|
||
|
|
MUTTLIBS="$MUTTLIBS $LIBS"
|
||
|
|
|
||
|
|
dnl libidn2 >= 2.0.0 declares compatibility macros in idn2.h
|
||
|
|
--
|
||
|
|
2.20.1
|
||
|
|
|