diff options
| author | Oleg Oshmyan <chortos@inbox.lv> | 2015-10-14 21:45:31 +0300 |
|---|---|---|
| committer | Oleg Oshmyan <chortos@inbox.lv> | 2015-10-14 21:48:42 +0300 |
| commit | 4b6a81eb4fd79198ceef813418aaa938190624ba (patch) | |
| tree | 01996537f06d9ee5b73572669fa1878972dbc161 | |
| parent | e572a26d29ddff883880ef7b1c295acaa62a8a2f (diff) | |
| download | libass-4b6a81eb4fd79198ceef813418aaa938190624ba.tar.bz2 libass-4b6a81eb4fd79198ceef813418aaa938190624ba.tar.xz | |
configure: don't add unnecessary libraries to PKG_LIBS_PRIVATE
Library checks can succeed if the needed functions exist in libc
and don't need any extra linker flags. Avoid adding unnecessary
flags (which break static linking against libass) in this case.
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 6bd96b6..8a2c7a8 100644 --- a/configure.ac +++ b/configure.ac @@ -22,10 +22,15 @@ AC_CHECK_HEADERS([stdint.h iconv.h]) AC_CHECK_FUNCS([strdup strndup]) # Checks for libraries. +# Add them to pkg-config for static linking. +OLDLIBS="$LIBS" +LIBS= use_libiconv=false AC_SEARCH_LIBS([libiconv_open], [iconv], use_libiconv=true) AC_SEARCH_LIBS([iconv_open], [iconv], use_libiconv=true) AC_CHECK_LIB([m], [fabs]) +pkg_libs="$LIBS" +LIBS="$OLDLIBS $LIBS" # Check for libraries via pkg-config AC_ARG_ENABLE([test], AS_HELP_STRING([--enable-test], @@ -219,11 +224,9 @@ AM_CONDITIONAL([HAVE_LIBPNG], [test x$libpng = xtrue]) AM_CONDITIONAL([ENABLE_PROFILE], [test x$enable_profile = xyes]) -# add libraries/packages to pkg-config for static linking -pkg_libs="-lm" +# add packages to pkg-config for static linking if test "$use_libiconv" = true; then AC_DEFINE(CONFIG_ICONV, 1, [use iconv]) - pkg_libs="${pkg_libs} -liconv" fi pkg_requires="freetype2 >= 9.10.3" pkg_requires="fribidi >= 0.19.0, ${pkg_requires}" |