[Scummvm-git-logs] scummvm master -> 5ae854cc2474b744020d41368f08416b24a5b06a

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5ae854cc24 CONFIGURE: Allow using pkg-config to detect libpng


Commit: 5ae854cc2474b744020d41368f08416b24a5b06a
    https://github.com/scummvm/scummvm/commit/5ae854cc2474b744020d41368f08416b24a5b06a
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2019-09-21T03:08:56+02:00

Commit Message:
CONFIGURE: Allow using pkg-config to detect libpng

Changed paths:
    configure


diff --git a/configure b/configure
index 370e181..cb74cad 100755
--- a/configure
+++ b/configure
@@ -4429,6 +4429,12 @@ echo "$_jpeg"
 # Check for PNG
 #
 echocheck "PNG >= 1.2.8"
+if test "$_pkg_config" = "yes" && $_pkgconfig --exists libpng; then
+	append_var PNG_LIBS "`$_pkgconfig --libs libpng`"
+	append_var PNG_CFLAGS "`$_pkgconfig --cflags libpng`"
+else
+	append_var PNG_LIBS "-lpng -lz"
+fi
 if test "$_png" = auto ; then
 	_png=no
 	cat > $TMPC << EOF
@@ -4441,10 +4447,10 @@ int main(void) {
   return 0;
 }
 EOF
-	cc_check $PNG_CFLAGS $PNG_LIBS -lpng -lz && _png=yes
+	cc_check $PNG_CFLAGS $PNG_LIBS && _png=yes
 fi
 if test "$_png" = yes ; then
-	append_var LIBS "$PNG_LIBS -lpng -lz"
+	append_var LIBS "$PNG_LIBS"
 	append_var INCLUDES "$PNG_CFLAGS"
 fi
 define_in_config_if_yes "$_png" 'USE_PNG'