diff options
| author | Oneric <oneric@oneric.stub> | 2020-11-05 23:13:53 +0100 |
|---|---|---|
| committer | Oneric <oneric@oneric.stub> | 2020-11-13 22:14:51 +0100 |
| commit | 15041348e5add2677afd5495c00a805f3972cef7 (patch) | |
| tree | 025b57203339abe3ccfec46e848c7b5836c05c8e | |
| parent | c38fe27cb9d8894791fd6428bf5d888dd1870dd2 (diff) | |
| download | libass-15041348e5add2677afd5495c00a805f3972cef7.tar.bz2 libass-15041348e5add2677afd5495c00a805f3972cef7.tar.xz | |
configure: Don't add iconv to pkg_libs a second time
This seems to have erronously slipped in again with commit
5ab9950816ffcac46afec4ad327640ab28a49109. It was previously addded in
commmit e572a26d29ddff883880ef7b1c295acaa62a8a2f when all libs were
still added manually and shortly after removed again in commit
4b6a81eb4fd79198ceef813418aaa938190624ba, which switched to generating
pkg_libs from LIBS.
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 497e1b0..e01a306 100644 --- a/configure.ac +++ b/configure.ac @@ -48,6 +48,9 @@ LIBS= use_libiconv=false AC_SEARCH_LIBS([libiconv_open], [iconv], use_libiconv=true) AC_SEARCH_LIBS([iconv_open], [iconv], use_libiconv=true) +AS_IF([test "x$use_libiconv" = xtrue], [ + AC_DEFINE(CONFIG_ICONV, 1, [use iconv]) +]) AC_CHECK_LIB([m], [fabs]) pkg_libs="$LIBS" LIBS="$OLDLIBS $LIBS" @@ -153,14 +156,7 @@ Either DirectWrite (on Windows), CoreText (on OSX), or Fontconfig \ a system font provider, add --disable-require-system-font-provider]) fi -## Now 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 +## Now add packages to pkg_requires pkg_requires="freetype2 >= 9.10.3" pkg_requires="fribidi >= 0.19.0, ${pkg_requires}" pkg_requires="harfbuzz >= 1.2.3, ${pkg_requires}" |