From 2608b0c6ee0533346fba58adac38bfbc3e5a3945 Mon Sep 17 00:00:00 2001 From: Rodolfo Ribeiro Gomes Date: Feb 12 2020 07:48:18 +0000 Subject: remove unused definitions of libpng versions --- diff --git a/synfig-core/configure.ac b/synfig-core/configure.ac index 403dbf1..f86c548 100644 --- a/synfig-core/configure.ac +++ b/synfig-core/configure.ac @@ -416,43 +416,30 @@ TARGET_MNG="yes" AC_CHECK_LIB(png16, png_write_row,[ PNG_LIBS="-lpng16" - AC_DEFINE(HAVE_LIBPNG16,[], [ Define if PNG 1.6 library is available ]) - AC_DEFINE(HAVE_LIBPNG14,[], [ Define if PNG 1.4 library is available ]) AC_DEFINE(HAVE_LIBPNG,[], [ Define if PNG library is available ]) AC_SUBST(PNG_LIBS) - AM_CONDITIONAL(HAVE_LIBPNG16,true) - AM_CONDITIONAL(HAVE_LIBPNG14,true) AM_CONDITIONAL(HAVE_LIBPNG,true) ],[ 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_SUBST(PNG_LIBS) - AM_CONDITIONAL(HAVE_LIBPNG16,false) - 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_LIBPNG16,false) - 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_LIBPNG16,false) - AM_CONDITIONAL(HAVE_LIBPNG14,false) AM_CONDITIONAL(HAVE_LIBPNG,true) ],[ AC_MSG_RESULT([ *** PNG Output target disabled]) TARGET_PNG="no" - AM_CONDITIONAL(HAVE_LIBPNG16,false) - AM_CONDITIONAL(HAVE_LIBPNG14,false) AM_CONDITIONAL(HAVE_LIBPNG,false) ],[-lz -L${exec_prefix}/lib]) ],[-lz -L${exec_prefix}/lib])