From 6b3a69d3b2ac4658b1d3e14f696d884dfcf29c03 Mon Sep 17 00:00:00 2001 From: dooglus Date: Thu, 25 Oct 2007 21:46:44 +0000 Subject: [PATCH] Add mod_mng, and libmng detection. git-svn-id: http://svn.voria.com/code@977 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/config/configure.ac | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/synfig-core/trunk/config/configure.ac b/synfig-core/trunk/config/configure.ac index 951cf29..2beb02a 100644 --- a/synfig-core/trunk/config/configure.ac +++ b/synfig-core/trunk/config/configure.ac @@ -337,7 +337,7 @@ dnl PKG_CHECK_MODULES(GLIB, glib-2.0,[GLIB="yes"],[GLIB="no"]) TARGET_TIF="yes" TARGET_PNG="yes" -TARGET_MNG="no" +TARGET_MNG="yes" TARGET_JPEG="yes" if test "$TARGET_TIF" != "disabled" ; then @@ -371,16 +371,16 @@ AC_CHECK_LIB(png, png_write_row,[ ],[-lz -L${exec_prefix}/lib]) ],[-lz -L${exec_prefix}/lib]) -#AC_CHECK_LIB(mng, mng_initialize,[ -# MNG_LIBS="-lmng -lz" -# AC_DEFINE(HAVE_LIBMNG,[], [ Define if MNG library is available ] ) -# AC_SUBST(MNG_LIBS) -# AM_CONDITIONAL(HAVE_LIBMNG,true) -#],[ -# AC_MSG_RESULT([ *** MNG Output target disabled]) -# TARGET_MNG="no" -# AM_CONDITIONAL(HAVE_LIBMNG,false) -#],[-lz -L${exec_prefix}/lib]) +AC_CHECK_LIB(mng, mng_initialize,[ + MNG_LIBS="-lmng -lz" + AC_DEFINE(HAVE_LIBMNG,[], [ Define if MNG library is available ] ) + AC_SUBST(MNG_LIBS) + AM_CONDITIONAL(HAVE_LIBMNG,true) +],[ + AC_MSG_RESULT([ *** MNG Output target disabled]) + TARGET_MNG="no" + AM_CONDITIONAL(HAVE_LIBMNG,false) +],[-lz -L${exec_prefix}/lib]) AC_CHECK_LIB(jpeg, main,[ JPEG_LIBS="-ljpeg" @@ -532,8 +532,6 @@ AC_SUBST(synfigincludedir) )] -# src/modules/mod_mng/Makefile - AC_OUTPUT( synfig-config @PACKAGE_TARNAME@.pc @@ -546,6 +544,7 @@ src/modules/mod_bmp/Makefile src/modules/mod_gif/Makefile src/modules/mod_ppm/Makefile src/modules/mod_png/Makefile +src/modules/mod_mng/Makefile src/modules/mod_jpeg/Makefile src/modules/lyr_std/Makefile src/modules/mod_geometry/Makefile -- 2.7.4