diff options
Diffstat (limited to 'lib/libass/configure.ac')
| -rw-r--r-- | lib/libass/configure.ac | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/lib/libass/configure.ac b/lib/libass/configure.ac index 827dd6c12c..7f5bfa4a7e 100644 --- a/lib/libass/configure.ac +++ b/lib/libass/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(libass, 0.9.11) +AC_INIT(libass, 0.9.13) AM_INIT_AUTOMAKE AC_CONFIG_MACRO_DIR([m4]) # Disable C++/Fortran checks @@ -34,12 +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 -AC_ARG_ENABLE([png], AS_HELP_STRING([--enable-png], - [enable png (test program) @<:@default=no@:>@])) +AC_ARG_ENABLE([test], AS_HELP_STRING([--enable-test], + [enable test program (requires libpng) @<:@default=no@:>@])) 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@:>@])) + [disable fontconfig support @<:@default=enabled@:>@])) PKG_CHECK_MODULES([FREETYPE], freetype2 >= 9.10.3, [ CFLAGS="$CFLAGS $FREETYPE_CFLAGS" @@ -53,7 +53,7 @@ PKG_CHECK_MODULES([FONTCONFIG], fontconfig >= 2.4.2, [ 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 @@ -66,13 +66,12 @@ PKG_CHECK_MODULES([ENCA], enca, [ fi libpng=false -if test x$enable_png = xyes; then +if test x$enable_test = xyes; 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=true]) fi AM_CONDITIONAL([HAVE_LIBPNG], [test x$libpng = xtrue]) |