summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-05-30 10:36:26 +0200
committerDavid Tardon <dtardon@redhat.com>2012-05-30 10:37:47 +0200
commit03b8f169eb02622aa18bc2b6e2307e6a1a0dcbe1 (patch)
tree18e61c5c47684fadc655bfde28f0a227c8d38fb4
parent9ba256eac5fbeaa5fa5d69abff51be353aa2b3d0 (diff)
fix linking with gconf on release machine
Change-Id: Iec63ac2c1a128e800df92f583fe349526addec4e
-rw-r--r--configure.in2
-rw-r--r--shell/Library_gconfbe.mk1
2 files changed, 1 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index f5088f9aaee3..d52f91241d76 100644
--- a/configure.in
+++ b/configure.in
@@ -8807,7 +8807,7 @@ AC_MSG_CHECKING([whether to enable GConf support])
if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gconf" = "yes"; then
ENABLE_GCONF="TRUE"
AC_MSG_RESULT([yes])
- PKG_CHECK_MODULES( GCONF, gconf-2.0 ORBit-2.0 )
+ PKG_CHECK_MODULES( GCONF, gconf-2.0 gobject-2.0 ORBit-2.0 )
else
AC_MSG_RESULT([no])
fi
diff --git a/shell/Library_gconfbe.mk b/shell/Library_gconfbe.mk
index 9fb520dfc92f..061689863b91 100644
--- a/shell/Library_gconfbe.mk
+++ b/shell/Library_gconfbe.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_Library_use_api,gconfbe1,\
$(eval $(call gb_Library_use_externals,gconfbe1,\
gconf \
- gobject \
))
$(eval $(call gb_Library_use_libraries,gconfbe1,\