You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
59 lines
2.2 KiB
59 lines
2.2 KiB
12 years ago
|
From 4e72579d1bbb302776a42551cbfb560ddd4258b3 Mon Sep 17 00:00:00 2001
|
||
|
From: Robert Ancell <robert.ancell@canonical.com>
|
||
|
Date: Fri, 5 Oct 2012 09:15:51 +1300
|
||
|
Subject: [PATCH] core: Split packages into public and private so the .pc file
|
||
|
has correct depenencies
|
||
|
|
||
|
https://bugzilla.gnome.org/show_bug.cgi?id=685464
|
||
|
---
|
||
|
configure.ac | 12 ++++++++++--
|
||
|
libgdata.pc.in | 3 ++-
|
||
|
2 files changed, 12 insertions(+), 3 deletions(-)
|
||
|
|
||
|
diff --git a/configure.ac b/configure.ac
|
||
|
index 2ee881b..76d4898 100644
|
||
|
--- a/configure.ac
|
||
|
+++ b/configure.ac
|
||
|
@@ -62,7 +62,11 @@ AC_SUBST(GDATA_API_VERSION)
|
||
|
AC_SUBST(GDATA_API_VERSION_MAJOR)
|
||
|
AC_SUBST(GDATA_API_VERSION_MINOR)
|
||
|
|
||
|
-GDATA_PACKAGES="glib-2.0 >= $GLIB_REQS libxml-2.0 gthread-2.0 gio-2.0 >= $GIO_REQS libsoup-2.4 >= $SOUP_REQS oauth >= $OAUTH_REQS"
|
||
|
+GDATA_PACKAGES_PUBLIC="gobject-2.0 glib-2.0 >= $GLIB_REQS gio-2.0 >= $GIO_REQS libxml-2.0 libsoup-2.4 >= $SOUP_REQS"
|
||
|
+GDATA_PACKAGES_PRIVATE="gthread-2.0 oauth >= $OAUTH_REQS"
|
||
|
+GDATA_PACKAGES="$GDATA_PACKAGES_PUBLIC $GDATA_PACKAGES_PRIVATE"
|
||
|
+AC_SUBST([GDATA_PACKAGES_PUBLIC])
|
||
|
+AC_SUBST([GDATA_PACKAGES_PRIVATE])
|
||
|
AC_SUBST([GDATA_PACKAGES])
|
||
|
|
||
|
PKG_CHECK_MODULES(GDATA, [$GDATA_PACKAGES])
|
||
|
@@ -87,7 +91,11 @@ AC_ARG_ENABLE(gnome, AS_HELP_STRING([--enable-gnome], [Whether to enable GNOME s
|
||
|
AC_MSG_RESULT($enable_gnome)
|
||
|
AM_CONDITIONAL([ENABLE_GNOME], [test "x$enable_gnome" = "xyes"])
|
||
|
|
||
|
-GNOME_PACKAGES="libsoup-gnome-2.4 gcr-base-3 libxml-2.0 goa-1.0 >= $GOA_REQS"
|
||
|
+GNOME_PACKAGES_PUBLIC=""
|
||
|
+GNOME_PACKAGES_PRIVATE="libsoup-gnome-2.4 gcr-base-3 libxml-2.0 goa-1.0 >= $GOA_REQS"
|
||
|
+GNOME_PACKAGES="$GNOME_PACKAGES_PUBLIC $GNOME_PACKAGES_PRIVATE"
|
||
|
+AC_SUBST([GNOME_PACKAGES_PUBLIC])
|
||
|
+AC_SUBST([GNOME_PACKAGES_PRIVATE])
|
||
|
AC_SUBST([GNOME_PACKAGES])
|
||
|
|
||
|
if test "x$enable_gnome" = "xyes"; then
|
||
|
diff --git a/libgdata.pc.in b/libgdata.pc.in
|
||
|
index ed1f4a4..cc927a7 100644
|
||
|
--- a/libgdata.pc.in
|
||
|
+++ b/libgdata.pc.in
|
||
|
@@ -6,6 +6,7 @@ includedir=@includedir@
|
||
|
Name: libgdata
|
||
|
Description: GData client library
|
||
|
Version: @VERSION@
|
||
|
-Requires: @GDATA_PACKAGES@ @GNOME_PACKAGES@
|
||
|
+Requires: @GDATA_PACKAGES_PUBLIC@ @GNOME_PACKAGES_PUBLIC@
|
||
|
+Requires.private: @GDATA_PACKAGES_PRIVATE@ @GNOME_PACKAGES_PRIVATE@
|
||
|
Libs: -L${libdir} -lgdata
|
||
|
Cflags: -I${includedir}/libgdata
|
||
|
--
|
||
|
1.8.0.2
|
||
|
|