Author: Diego Barrios Romero <[email protected]>
Date: Thu Mar 29 10:16:19 2012 +0200
No needed libpng 1.4 specific check
---
synfig-core/configure.ac | 24 ++++++------------------
1 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/synfig-core/configure.ac b/synfig-core/configure.ac
index da72895..620c505 100644
--- a/synfig-core/configure.ac
+++ b/synfig-core/configure.ac
@@ -434,33 +434,21 @@ dnl PKG_CHECK_MODULES(GLIB,
glib-2.0,[GLIB="yes"],[GLIB="no"])
TARGET_PNG="yes"
TARGET_MNG="yes"
-AC_CHECK_LIB(png14, png_write_row,[
- PNG_LIBS="-lpng14"
- AC_DEFINE(HAVE_LIBPNG14,[], [ Define if PNG 1.4 library is available ])
- AC_DEFINE(HAVE_LIBPNG,[], [ Define if PNG library is available ])
+AC_CHECK_LIB(png, png_write_row,[
+ PNG_LIBS="-lpng"
+ AC_DEFINE(HAVE_LIBPNG,[], [ Define if PNG library is available ] )
AC_SUBST(PNG_LIBS)
- AM_CONDITIONAL(HAVE_LIBPNG14,true)
AM_CONDITIONAL(HAVE_LIBPNG,true)
],[
AC_CHECK_LIB(png12, png_write_row,[
PNG_LIBS="-lpng12"
AC_DEFINE(HAVE_LIBPNG,[])
AC_SUBST(PNG_LIBS)
- AM_CONDITIONAL(HAVE_LIBPNG14,false)
AM_CONDITIONAL(HAVE_LIBPNG,true)
],[
- AC_CHECK_LIB(png, png_write_row,[
- PNG_LIBS="-lpng"
- AC_DEFINE(HAVE_LIBPNG,[])
- AC_SUBST(PNG_LIBS)
- AM_CONDITIONAL(HAVE_LIBPNG14,false)
- AM_CONDITIONAL(HAVE_LIBPNG,true)
- ],[
- AC_MSG_RESULT([ *** PNG Output target disabled])
- TARGET_PNG="no"
- AM_CONDITIONAL(HAVE_LIBPNG14,false)
- AM_CONDITIONAL(HAVE_LIBPNG,false)
- ],[-lz -L${exec_prefix}/lib])
+ AC_MSG_RESULT([ *** PNG Output target disabled])
+ TARGET_PNG="no"
+ AM_CONDITIONAL(HAVE_LIBPNG,false)
],[-lz -L${exec_prefix}/lib])
],[-lz -L${exec_prefix}/lib])
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
