diff --git a/configure.ac b/configure.ac index ed08540..05e5f64 100644 --- a/configure.ac +++ b/configure.ac @@ -174,6 +174,10 @@ if test "x$HAVE_LIBIDN2" = "xyes" -o "x$HAVE_LIBIDN" = "xyes"; then LIBS=$OLDLIBS fi +# AM_ICONV sets @LIBICONV@ and @LTLIBICONV@ for use in Makefile.am +# do not use AM_ICONV conditionally +AM_ICONV + AM_CONDITIONAL([WITH_LIBICU], test "x$enable_runtime" = "xlibicu") AM_CONDITIONAL([WITH_LIBIDN2], test "x$enable_runtime" = "xlibidn2") AM_CONDITIONAL([WITH_LIBIDN], test "x$enable_runtime" = "xlibidn") diff --git a/src/Makefile.am b/src/Makefile.am index f600134..412e26f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,10 +27,10 @@ if BUILTIN_GENERATOR_LIBICU psl2c_LDADD = -licuuc endif if BUILTIN_GENERATOR_LIBIDN2 - psl2c_LDADD = -lidn2 -lunistring + psl2c_LDADD = @LTLIBICONV@ -lidn2 -lunistring endif if BUILTIN_GENERATOR_LIBIDN - psl2c_LDADD = -lidn -lunistring + psl2c_LDADD = @LTLIBICONV@ -lidn -lunistring endif # Build rule for suffix.c