[Libreoffice-commits] .: configure.in

[Tomáš Chvátal]

 configure.in |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit f1f6f30bac305115fdf58fc4f2ecabaf236a519c
Author: Tomas Chvatal <tchvatal at suse.cz>
Date:   Tue Nov 1 10:59:38 2011 +0100

    When building with gconf check for orbit too.
    
    This avoids build error like:
    
    Entering /var/tmp/portage/app-office/libreoffice-3.4.3.2-r1/work/libreoffice-bootstrap-3.4.3.2/shell/source/backends/gconfbe
    
    Package ORBit-2.0 was not found in the pkg-config search path.
    Perhaps you should add the directory containing `ORBit-2.0.pc'
    to the PKG_CONFIG_PATH environment variable
    No package 'ORBit-2.0' found
    dmake:  Error code 1, while making 'Shell escape'
    
    Also update gvfs check to require gconf switch enabled instead of running
    pkgconfig again.

diff --git a/configure.in b/configure.in
index 65b81c1..b1c9e18 100644
--- a/configure.in
+++ b/configure.in
@@ -6956,7 +6956,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 )
+    PKG_CHECK_MODULES( GCONF, gconf-2.0 orbit-2.0 )
 else
     AC_MSG_RESULT([no])
 fi
@@ -6968,13 +6968,10 @@ dnl ===================================================================
 
 ENABLE_GNOMEVFS=""
 AC_MSG_CHECKING([whether to enable GNOME VFS support])
-if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gnome_vfs" = "yes"; then
+if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gnome_vfs" = "yes" -a "$enable_gconf" = "yes"; then
     ENABLE_GNOMEVFS="TRUE"
     AC_MSG_RESULT([yes])
     PKG_CHECK_MODULES( GNOMEVFS, gnome-vfs-2.0 >= 2.6.0 )
-    if test "$ENABLE_GCONF" != "TRUE"; then
-        PKG_CHECK_MODULES( GCONF, gconf-2.0 )
-    fi
 else
     AC_MSG_RESULT([no])
 fi