[gdk-pixbuf] Clean up dependencies in the .pc file

[Matthias Clasen <matthiasc src gnome org>]

commit d430bc4df3314a88cd538474d26ff7764d1f408c
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Aug 26 22:41:35 2011 -0400

    Clean up dependencies in the .pc file
    
    Add libpng to Requires.private instead of Requires.
    Patches by Edward Sheldrake,
    https://bugzilla.gnome.org/show_bug.cgi?id=652737

 configure.ac         |    8 +++++---
 gdk-pixbuf-2.0.pc.in |    3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index dba5455..b5652fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -591,7 +591,7 @@ fi
 
 dnl Test for libpng
   if test x$with_libpng != xno && test -z "$LIBPNG"; then
-    for l in libpng libpng14 libpng12 libpng13 libpng10 ; do
+    for l in libpng15 libpng14 libpng12 libpng13 libpng10 libpng ; do
       AC_MSG_CHECKING(for $l)
       if $PKG_CONFIG --exists $l ; then
         AC_MSG_RESULT(yes)
@@ -814,7 +814,9 @@ if $dynworks ; then
     STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG"
   fi
   if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then
-    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
+    if test -z $PNG_DEP_CFLAGS_PACKAGES; then
+      STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
+    fi
   fi
   if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then
     STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER"
@@ -916,7 +918,7 @@ fi
 GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0"
 GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB"
 GDK_PIXBUF_EXTRA_CFLAGS=
-GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
+GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
 GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
 
 AC_SUBST(PNG_DEP_CFLAGS_PACKAGES)
diff --git a/gdk-pixbuf-2.0.pc.in b/gdk-pixbuf-2.0.pc.in
index 22a43a8..7addefc 100644
--- a/gdk-pixbuf-2.0.pc.in
+++ b/gdk-pixbuf-2.0.pc.in
@@ -13,6 +13,7 @@ Description: Image loading and scaling
 Version: @VERSION@
 Requires: gobject-2.0
 Requires.private: gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@
-Libs: -L${libdir} -lgdk_pixbuf- GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_LIBS@
+Libs: -L${libdir} -lgdk_pixbuf- GDK_PIXBUF_API_VERSION@
+Libs.private: @GDK_PIXBUF_EXTRA_LIBS@
 Cflags: -I${includedir}/gdk-pixbuf- GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@