diff options
| author | Grigori Goronzy <greg@blackbox> | 2009-09-18 01:45:38 +0200 |
|---|---|---|
| committer | Grigori Goronzy <greg@blackbox> | 2009-09-18 01:45:38 +0200 |
| commit | 300dcb789831e73c756d4dc5300d7c753e087d43 (patch) | |
| tree | b954ccef87efba4d9ef18c41c397cbd8c18e9637 /configure.ac | |
| parent | 44a7b6abcc75018f91c2339dac2f41fa4b9d8925 (diff) | |
| download | libass-300dcb789831e73c756d4dc5300d7c753e087d43.tar.bz2 libass-300dcb789831e73c756d4dc5300d7c753e087d43.tar.xz | |
Disable test program and libpng by default0.9.8
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 07c213c..7698492 100644 --- a/configure.ac +++ b/configure.ac @@ -34,8 +34,8 @@ 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([--disable-png], - [disable png support @<:@default=check@:>@])) +AC_ARG_ENABLE([png], AS_HELP_STRING([--enable-png], + [enable png (test program) @<:@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], @@ -65,13 +65,14 @@ PKG_CHECK_MODULES([ENCA], enca, [ ], [enca=false]) fi -if test x$enable_png != xno; then +libpng=false +if test x$enable_png = 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=false]) + ]) fi AM_CONDITIONAL([HAVE_LIBPNG], [test x$libpng = xtrue]) |