From 644dd10729b86c8d21697c65e65d833e235cacfa Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Mon, 19 Jul 2010 10:30:54 +0100
Subject: [PATCH] Fix linking when libpng loader is builtin
When the libpng loader is builtin to gdk-pixbuf, we need to
require libpng itself, or the linking will fail:
/usr/bin/ld: cannot find -lpng12
https://bugzilla.gnome.org/show_bug.cgi?id=624712
---
configure.ac | 1 +
gdk-pixbuf-2.0-uninstalled.pc.in | 2 +-
gdk-pixbuf-2.0.pc.in | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index e7424c3..b71737e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -917,6 +917,7 @@ GDK_PIXBUF_EXTRA_CFLAGS=
GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_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)
AC_SUBST(GDK_PIXBUF_PACKAGES)
AC_SUBST(GDK_PIXBUF_EXTRA_LIBS)
AC_SUBST(GDK_PIXBUF_EXTRA_CFLAGS)
diff --git a/gdk-pixbuf-2.0-uninstalled.pc.in b/gdk-pixbuf-2.0-uninstalled.pc.in
index 8aac11a..32b4818 100644
--- a/gdk-pixbuf-2.0-uninstalled.pc.in
+++ b/gdk-pixbuf-2.0-uninstalled.pc.in
@@ -6,6 +6,6 @@ gdk_pixbuf_cache_file=${gdk_pixbuf_binarydir}/loaders.cache
Name: GdkPixbuf Uninstalled
Description: Image loading and scaling, Not Installed
Version: @VERSION@
-Requires: gobject-2.0,gmodule-2.0
+Requires: gobject-2.0 gmodule-2.0 @PNG_DEP_CFLAGS_PACKAGES@
Libs: ${pc_top_builddir}/${pcfiledir}/gdk-pixbuf/libgdk_pixbuf-@GDK_PIXBUF_API_VERSION@.la @GDK_PIXBUF_EXTRA_LIBS@
Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir} @GDK_PIXBUF_EXTRA_CFLAGS@
diff --git a/gdk-pixbuf-2.0.pc.in b/gdk-pixbuf-2.0.pc.in
index 167e1ea..7e61775 100644
--- a/gdk-pixbuf-2.0.pc.in
+++ b/gdk-pixbuf-2.0.pc.in
@@ -11,7 +11,7 @@ gdk_pixbuf_cache_file=${gdk_pixbuf_binarydir}/loaders.cache
Name: GdkPixbuf
Description: Image loading and scaling
Version: @VERSION@
-Requires: gobject-2.0,gmodule-no-export-2.0
+Requires: gobject-2.0 gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@
Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_LIBS@
Cflags: -I${includedir}/gdk-pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@
--
1.7.0.1