You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

26 lines
809 B

  1. From e18bcc65d5772e518c6496b439bad8a986f7e434 Mon Sep 17 00:00:00 2001
  2. From: Rosen Penev <rosenp@gmail.com>
  3. Date: Thu, 20 Jun 2019 15:18:19 -0700
  4. Subject: [PATCH] configure: Fix iconv check for cross compilation
  5. AC_CHECK_LIB is more friendly towards cross-compilation.
  6. Added check for libiconv_open as that can be used when the libc lacks iconv.
  7. ---
  8. configure.ac | 3 ++-
  9. 1 file changed, 2 insertions(+), 1 deletion(-)
  10. diff --git a/configure.ac b/configure.ac
  11. index 07e8703..1b09964 100644
  12. --- a/configure.ac
  13. +++ b/configure.ac
  14. @@ -75,7 +75,8 @@ if test "x$with_udev" != "xno"; then
  15. [true])
  16. fi
  17. -AC_SEARCH_LIBS(iconv_open, iconv)
  18. +AC_CHECK_LIB(iconv, iconv_open)
  19. +AC_CHECK_LIB(iconv, libiconv_open)
  20. # xxd (distributed with vim) is used in the testsuite
  21. AC_CHECK_PROG([XXD_FOUND], [xxd], [yes])