Build system: enable/disable flags, pkg-config fixes

* Add enable/disable flags for enca, fontconfig and libpng.
* Add dependent libraries to pkg-config file to allow static linking.

diff --git a/configure.ac b/configure.ac
index 99550b6221affe379458fd7c3952b144046d6e66..03aa72e1a045684bc2981119922fb72671f251a0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -34,11 +34,12 @@ AC_SEARCH_LIBS([iconv_open], [iconv], AC_DEFINE(CONFIG_ICONV, 1, [use iconv]))
 AC_CHECK_LIB([m], [fabs])
 
 # Check for libraries via pkg-config
-PKG_CHECK_MODULES([FONTCONFIG], fontconfig >= 2.2.0, [
-    CFLAGS="$CFLAGS $FONTCONFIG_CFLAGS"
-    LIBS="$LIBS $FONTCONFIG_LIBS"
-    AC_DEFINE(CONFIG_FONTCONFIG, 1, [found fontconfig via pkg-config])
-    ], [true])
+AC_ARG_ENABLE([png], AS_HELP_STRING([--disable-png],
+    [disable png support @<:@default=check@:>@]))
+AC_ARG_ENABLE([enca], AS_HELP_STRING([--disable-enca],
+    [disable enca (charset autodetect) support @<:@default=check@:>@]))
+AC_ARG_ENABLE([fontconfig], AS_HELP_STRING([--disable-fontconfig],
+    [disable fontconfig support @<:@default=check@:>@]))
 
 PKG_CHECK_MODULES([FREETYPE], freetype2 >= 9.6.3, [
     CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
@@ -46,21 +47,45 @@ PKG_CHECK_MODULES([FREETYPE], freetype2 >= 9.6.3, [
     AC_DEFINE(CONFIG_FREETYPE, 1, [found freetype2 via pkg-config])
     ])
 
+if test x$enable_fontconfig != xno; then
+PKG_CHECK_MODULES([FONTCONFIG], fontconfig >= 2.2.0, [
+    CFLAGS="$CFLAGS $FONTCONFIG_CFLAGS"
+    LIBS="$LIBS $FONTCONFIG_LIBS"
+    AC_DEFINE(CONFIG_FONTCONFIG, 1, [found fontconfig via pkg-config])
+       fontconfig=true
+    ], [fontconfig=false])
+fi
+
+if test x$enable_enca != xno; then
 PKG_CHECK_MODULES([ENCA], enca, [
     CFLAGS="$CFLAGS $ENCA_CFLAGS"
     LIBS="$LIBS $ENCA_LIBS"
     AC_DEFINE(CONFIG_ENCA, 1, [found enca via pkg-config])
-       ], [true])
+       enca=true
+       ], [enca=false])
+fi
 
+if test x$enable_png != xno; then
 PKG_CHECK_MODULES([LIBPNG], libpng >= 1.2.0, [
     CFLAGS="$CFLAGS $LIBPNG_CFLAGS"
     LIBS="$LIBS $LIBPNG_LIBS"
     AC_DEFINE(CONFIG_LIBPNG, 1, [found libpng via pkg-config])
     libpng=true
        ], [libpng=false])
+fi
 
 AM_CONDITIONAL([HAVE_LIBPNG], [test x$libpng = xtrue])
 
+# Add dependent libraries to pkg-config for static linking
+PKG_REQUIRES="freetype2 >= 9.6.3"
+if test x$enca = xtrue; then
+    PKG_REQUIRES="enca, ${PKG_REQUIRES}"
+fi
+if test x$fontconfig = xtrue; then
+    PKG_REQUIRES="fontconfig >= 2.2.0, ${PKG_REQUIRES}"
+fi
+AC_SUBST([PKG_REQUIRES])
+
 # Setup output beautifier.
 SHAVE_INIT([shave], [enable])
 

diff --git a/libass.pc.in b/libass.pc.in
index 8ec5504d063b139febceefcc7ac44522f8ecd298..137aac9a935a3529b4d114f86e938e027522c7a9 100644 (file)
--- a/libass.pc.in
+++ b/libass.pc.in
@@ -6,5 +6,7 @@ includedir=@includedir@
 Name: libass
 Description: LibASS is an SSA/ASS subtitles rendering library
 Version: @PACKAGE_VERSION@
+Requires.private: @PKG_REQUIRES@
 Libs: -L${libdir} -lass
+Libs.private: -lm
 Cflags: -I${includedir}