diff options
author | waker <wakeroid@gmail.com> | 2011-05-02 22:09:26 +0200 |
---|---|---|
committer | waker <wakeroid@gmail.com> | 2011-05-02 22:09:26 +0200 |
commit | c36ddf5f4b45f2853cbeb048e3b8ca80b81a2f44 (patch) | |
tree | 6a7b5e5c849e528564a18ac09a1def0f075b52b6 /configure.ac | |
parent | 76ec22fb6df43394202f40d39cc8c9cb3c85a368 (diff) |
added libpng support to artwork plugin (used when --disable-artwork-imlib2 option is supplied, or when imlib2 is not installed)
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index f1e47909..575d795c 100644 --- a/configure.ac +++ b/configure.ac @@ -412,6 +412,9 @@ if test "x$enable_artwork" != "xno" ; then HAVE_JPEG=yes JPEG_DEPS_LIBS="../../$LIB/libjpeg.a" AC_SUBST(JPEG_DEPS_LIBS) + HAVE_PNG=yes + PNG_DEPS_LIBS="../../$LIB/libpng15.a ../../$LIB/libz.a" + AC_SUBST(PNG_DEPS_LIBS) HAVE_IMLIB2=no else if test "x$enable_artwork_imlib2" != "xno" ; then @@ -420,6 +423,7 @@ if test "x$enable_artwork" != "xno" ; then if test "x$enable_artwork_imlib2" == "xno" || test "x$HAVE_IMLIB2" == "xno" ; then AC_CHECK_LIB([jpeg], [main], [HAVE_JPEG=yes;JPEG_DEPS_LIBS="-ljpeg";AC_SUBST(JPEG_DEPS_LIBS)]) + AC_CHECK_LIB([png], [main], [HAVE_PNG=yes;PNG_DEPS_LIBS="-lpng -lz";AC_SUBST(PNG_DEPS_LIBS)]) fi fi @@ -571,6 +575,7 @@ AM_CONDITIONAL(HAVE_VFS_ZIP, test "x$HAVE_VFS_ZIP" = "xyes") AM_CONDITIONAL(HAVE_CONVERTER, test "x$HAVE_CONVERTER" = "xyes") AM_CONDITIONAL(HAVE_IMLIB2, test "x$HAVE_IMLIB2" = "xyes") AM_CONDITIONAL(HAVE_JPEG, test "x$HAVE_JPEG" = "xyes") +AM_CONDITIONAL(HAVE_PNG, test "x$HAVE_PNG" = "xyes") AC_SUBST(PLUGINS_DIRS) |