mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix linking with gconf on release machine

Browse Source 
Change-Id: Iec63ac2c1a128e800df92f583fe349526addec4e
This commit is contained in:
David Tardon
2012-05-30 10:36:26 +02:00
parent 9ba256eac5
commit 03b8f169eb
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@@ -8807,7 +8807,7 @@ AC_MSG_CHECKING([whether to enable GConf support])
if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gconf" = "yes"; then if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gconf" = "yes"; then
ENABLE_GCONF="TRUE" ENABLE_GCONF="TRUE"
AC_MSG_RESULT([yes]) 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 else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi

1
shell/Library_gconfbe.mk
View File

@@ -40,7 +40,6 @@ $(eval $(call gb_Library_use_api,gconfbe1,\
$(eval $(call gb_Library_use_externals,gconfbe1,\ $(eval $(call gb_Library_use_externals,gconfbe1,\
gconf \ gconf \
gobject \
)) ))
$(eval $(call gb_Library_use_libraries,gconfbe1,\ $(eval $(call gb_Library_use_libraries,gconfbe1,\