diff options
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | libass.pc.in | 4 |
2 files changed, 15 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 4c4613c..89b60ec 100644 --- a/configure.ac +++ b/configure.ac @@ -301,8 +301,19 @@ AC_SUBST([ASFLAGS], ["$ASFLAGS"]) AC_SUBST([AS], ["$AS"]) ## Relay package configuration to libass.pc.in -AC_SUBST([PKG_LIBS_PRIVATE], [${pkg_libs}]) -AC_SUBST([PKG_REQUIRES_PRIVATE], [${pkg_requires}]) +AS_IF([test "x$enable_shared" != xno], [ + AC_SUBST([PKG_LIBS_PUBLIC], []) + AC_SUBST([PKG_REQUIRES_PUBLIC], []) + AC_SUBST([PKG_LIBS_PRIVATE], [${pkg_libs}]) + AC_SUBST([PKG_REQUIRES_PRIVATE], [${pkg_requires}]) +], [ + # Not mentioned by the pkg-config specification, but + # a common workaround for poor support for mixed builds + AC_SUBST([PKG_LIBS_PUBLIC], [${pkg_libs}]) + AC_SUBST([PKG_REQUIRES_PUBLIC], [${pkg_requires}]) + AC_SUBST([PKG_LIBS_PRIVATE], []) + AC_SUBST([PKG_REQUIRES_PRIVATE], []) +]) ## Setup conditionals for use in Makefiles AM_CONDITIONAL([ASM], [test "x$can_asm" = xtrue]) diff --git a/libass.pc.in b/libass.pc.in index 222cc25..48de494 100644 --- a/libass.pc.in +++ b/libass.pc.in @@ -6,8 +6,8 @@ includedir=@includedir@ Name: libass Description: LibASS is an SSA/ASS subtitles rendering library Version: @PACKAGE_VERSION@ -Requires: +Requires: @PKG_REQUIRES_PUBLIC@ Requires.private: @PKG_REQUIRES_PRIVATE@ -Libs: -L${libdir} -lass +Libs: -L${libdir} -lass @PKG_LIBS_PUBLIC@ Libs.private: @PKG_LIBS_PRIVATE@ Cflags: -I${includedir} |