Enlightenment CVS committal Author : englebass Project : e17 Module : libs/epsilon
Dir : e17/libs/epsilon Modified Files: configure.in Log Message: Support alternative png pkg-config names. =================================================================== RCS file: /cvs/e/e17/libs/epsilon/configure.in,v retrieving revision 1.34 retrieving revision 1.35 diff -u -3 -r1.34 -r1.35 --- configure.in 26 Aug 2007 14:33:40 -0000 1.34 +++ configure.in 7 Nov 2007 20:42:23 -0000 1.35 @@ -44,16 +44,20 @@ ) dnl Make sure the png header/lib is available -PKG_CHECK_MODULES(PNG, libpng12 >= 1.2.0, +PKG_CHECK_EXISTS(libpng12, + [ PKG_CHECK_MODULES(PNG, libpng12, [ have_png="yes" ], [ have_png="no"]) ], [ - have_png="yes" - AC_DEFINE(HAVE_PNG_H, 1, [png.h is available]) - ], - [ - have_png="no" - AC_MSG_WARN(Cannot find libpng on your system: png thumbnail suckage!) + PKG_CHECK_EXISTS(libpng10, + [ PKG_CHECK_MODULES(PNG, libpng10, [ have_png="yes" ], [ have_png="no"]) ], + [ PKG_CHECK_MODULES(PNG, libpng, [ have_png="yes" ], [ have_png="no"]) ] + ) ] ) +if test X"$have_png" = Xyes; then + AC_DEFINE(HAVE_PNG_H, 1, [png.h is available]) +else + AC_MSG_WARN(Cannot find libpng on your system: png thumbnail suckage!) +fi AC_PATH_PROG(PERL, perl, 0) AC_SUBST(PERL) @@ -69,7 +73,7 @@ epdf="" PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0]) -PKG_CHECK_MODULES(EPDF, [epdf >= 0.1], epdf="yes",epdf="no") +PKG_CHECK_MODULES(EPDF, [epdf >= 0.1], epdf="yes", epdf="no") AM_CONDITIONAL(HAVE_EPDF, test $epdf = "yes") xine="" ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs