applied_patches/0107-gnome-vfs-locking-config_office.diff

   1 --- configure.in.old    2009-04-06 16:41:44.000000000 +0000
   2 +++ configure.in        2009-04-06 16:41:46.000000000 +0000
   3 @@ -5249,6 +5249,7 @@ dnl Gnome VFS check
   4  dnl ===================================================================
   5
   6  ENABLE_GNOMEVFS=""
   7 +GNOMEVFS_HAS_LOCKING=""
   8  AC_MSG_CHECKING([whether to enable GNOME VFS support])
   9  if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gnome_vfs" = "yes"; then
  10      ENABLE_GNOMEVFS="TRUE"
  11 @@ -5257,10 +5258,21 @@ if test "$_os" != "WINNT" -a "$_os" != "
  12      if test "$ENABLE_GCONF" != "TRUE"; then
  13          PKG_CHECK_MODULES( GCONF, gconf-2.0 )
  14      fi
  15 +
  16 +    AC_LANG_SAVE
  17 +    AC_LANG_CPLUSPLUS
  18 +    save_CXXFLAGS=$CXXFLAGS
  19 +    CXXFLAGS="$CXXFLAGS $GNOMEVFS_CFLAGS"
  20 +    AC_CHECK_DECL(GNOME_VFS_OPEN_LOCKED,
  21 +                  GNOMEVFS_HAS_LOCKING="YES",,
  22 +                  [#include <libgnomevfs/gnome-vfs-handle.h>])
  23 +    CXXFLAGS=$save_CXXFLAGS
  24 +    AC_LANG_RESTORE
  25  else
  26      AC_MSG_RESULT([no])
  27  fi
  28  AC_SUBST(ENABLE_GNOMEVFS)
  29 +AC_SUBST(GNOMEVFS_HAS_LOCKING)
  30
  31  dnl ===================================================================
  32  dnl Check whether the gtk 2.0 libraries are available.
  33 --- set_soenv.in.old    2009-04-06 16:41:41.000000000 +0000
  34 +++ set_soenv.in        2009-04-06 16:41:46.000000000 +0000
  35 @@ -1753,6 +1753,7 @@ ToFile( "SERVLETAPI_JAR",    "@SERVLETAP
  36  ToFile( "ENABLE_DBUS",       "@ENABLE_DBUS@",      "e" );
  37  ToFile( "ENABLE_GCONF",      "@ENABLE_GCONF@",     "e" );
  38  ToFile( "ENABLE_GNOMEVFS",   "@ENABLE_GNOMEVFS@",  "e" );
  39 +ToFile( "GNOMEVFS_HAS_LOCKING","@GNOMEVFS_HAS_LOCKING@",  "e" );
  40  ToFile( "ENABLE_GIO",        "@ENABLE_GIO@",       "e" );
  41  ToFile( "ENABLE_KDE",        "@ENABLE_KDE@",       "e" );
  42  ToFile( "KDE_CFLAGS",        "@KDE_CFLAGS@",       "e" );