diff options
| author | Grigori Goronzy <greg@kinoho.net> | 2016-03-10 10:48:18 +0100 |
|---|---|---|
| committer | Grigori Goronzy <greg@kinoho.net> | 2016-03-10 10:48:18 +0100 |
| commit | 28274d6469cb631c115763150ddee4a78aac49ec (patch) | |
| tree | 273e4fc8bcdd192f4e2680820d5076fe85e887a8 | |
| parent | 790210f4ed8ecc8461b1550ef9b58c1045001e28 (diff) | |
| parent | 5ab9950816ffcac46afec4ad327640ab28a49109 (diff) | |
| download | libass-28274d6469cb631c115763150ddee4a78aac49ec.tar.bz2 libass-28274d6469cb631c115763150ddee4a78aac49ec.tar.xz | |
Merge pull request #214 from SeanMcG/upstream
Patches from VLC contrib collection
| -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}" |