| Fabrice Fontaine | a78ed3f | 2019-04-14 10:45:59 +0200 | [diff] [blame] | 1 | From c53b36698fe4721fb562908ac6119aa9280383af Mon Sep 17 00:00:00 2001 |
| 2 | From: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
| 3 | Date: Sun, 14 Apr 2019 10:22:12 +0200 |
| 4 | Subject: [PATCH] configure.ac: fix static build with idn2 and unistring |
| 5 | |
| 6 | Commit 78db40f25c6479b14da5a73adf7207bfbec5ccc5 did not fix static build |
| 7 | failure |
| 8 | |
| 9 | AC_SEARCH_LIBS prepends the library to LIBS as a result -lunistring is |
| 10 | added before -lidn2. To fix static build, we must set -lunistring after |
| 11 | -lidn2 |
| 12 | |
| 13 | Fixes: |
| 14 | - http://autobuild.buildroot.org/results/c9544b4f1a0252e260a2ed19218fa950f4dc2d2d |
| 15 | |
| 16 | Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
| 17 | [Upstream status: https://gitlab.com/muttmua/mutt/merge_requests/42] |
| 18 | --- |
| 19 | configure.ac | 2 +- |
| 20 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 21 | |
| 22 | diff --git a/configure.ac b/configure.ac |
| 23 | index bd8beb91..75943eee 100644 |
| 24 | --- a/configure.ac |
| 25 | +++ b/configure.ac |
| 26 | @@ -1402,7 +1402,7 @@ if test "x$with_idn2" != "xno"; then |
| 27 | AC_SEARCH_LIBS([idn2_check_version], [idn2], [ |
| 28 | AC_DEFINE([HAVE_LIBIDN2], 1, [Define to 1 if you have the GNU idn2 library]) |
| 29 | dnl -lunistring is needed for static linking |
| 30 | - AC_SEARCH_LIBS([u8_strconv_from_locale], [unistring]) |
| 31 | + AC_SEARCH_LIBS([u8_strconv_from_locale], [unistring], [LIBS="$LIBS -lunistring"]) |
| 32 | MUTTLIBS="$MUTTLIBS $LIBS" |
| 33 | |
| 34 | dnl libidn2 >= 2.0.0 declares compatibility macros in idn2.h |
| 35 | -- |
| 36 | 2.20.1 |
| 37 | |