diff options
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 22ad103..0e61cdf 100644 --- a/configure.ac +++ b/configure.ac @@ -78,7 +78,7 @@ AS_IF([test x$enable_asm != xno], [ AS_CASE([$host], [*darwin*], [ ASFLAGS="$ASFLAGS -f macho$BITS -DPREFIX -DHAVE_ALIGNED_STACK=1" ], - [*linux*|*dragonfly*|*bsd*], [ + [*linux*|*dragonfly*|*bsd*|*solaris*], [ ASFLAGS="$ASFLAGS -f elf -DHAVE_ALIGNED_STACK=1" ], [*cygwin*|*mingw*], [ ASFLAGS="$ASFLAGS -f win$BITS" @@ -227,6 +227,10 @@ AM_CONDITIONAL([ENABLE_PROFILE], [test x$enable_profile = xyes]) # add packages to pkg-config for static linking if test "$use_libiconv" = true; then AC_DEFINE(CONFIG_ICONV, 1, [use iconv]) + if test x$ac_cv_search_libiconv_open != x'none required' && + test x$ac_cv_search_iconv_open != x'none required'; then + pkg_libs="${pkg_libs} -liconv" + fi fi pkg_requires="freetype2 >= 9.10.3" pkg_requires="fribidi >= 0.19.0, ${pkg_requires}" |