[Libreoffice-commits] .: configure.in shell/Library_gconfbe.mk

[David Tardon]

 configure.in             |    2 +-
 shell/Library_gconfbe.mk |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 03b8f169eb02622aa18bc2b6e2307e6a1a0dcbe1
Author: David Tardon <dtardon at redhat.com>
Date:   Wed May 30 10:36:26 2012 +0200

    fix linking with gconf on release machine
    
    Change-Id: Iec63ac2c1a128e800df92f583fe349526addec4e

diff --git a/configure.in b/configure.in
index f5088f9..d52f912 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 9fb520d..0616898 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,\