applied_patches/0053-wpsimport-config_office.diff

   1 --- configure.in.old    2009-04-02 11:06:59.000000000 +0000
   2 +++ configure.in        2009-04-06 16:41:41.000000000 +0000
   3 @@ -342,6 +342,9 @@ AC_ARG_WITH(system-expat,
   4  AC_ARG_WITH(system-libwpd,
   5  [  --with-system-libwpd    Use libwpd already on system
   6  ],,)
   7 +AC_ARG_WITH(system-libwps,
   8 +[  --with-system-libwps    Use libwps already on system
   9 +],,)
  10  AC_ARG_WITH(system-libxml,
  11  [  --with-system-libxml    Use libxml already on system
  12  ],,)
  13 @@ -3479,6 +3482,24 @@ AC_SUBST(FREETYPE_CFLAGS)
  14  AC_SUBST(FREETYPE_LIBS)
  15
  16  dnl ===================================================================
  17 +dnl Check for system libwps
  18 +dnl ===================================================================
  19 +AC_MSG_CHECKING([which libwps to use])
  20 +if test -n "$with_system_libwps" -o -n "$with_system_libs" && \
  21 +        test "$with_system_libwps" != "no"; then
  22 +    AC_MSG_RESULT([external])
  23 +    SYSTEM_LIBWPS=YES
  24 +    PKG_CHECK_MODULES( LIBWPS, libwps-0.1 )
  25 +else
  26 +    AC_MSG_RESULT([internal])
  27 +    SYSTEM_LIBWPS=NO
  28 +    BUILD_TYPE="$BUILD_TYPE LIBWPS"
  29 +fi
  30 +AC_SUBST(SYSTEM_LIBWPS)
  31 +AC_SUBST(LIBWPS_CFLAGS)
  32 +AC_SUBST(LIBWPS_LIBS)
  33 +
  34 +dnl ===================================================================
  35  dnl Check whether freetype2 supports emboldening
  36  dnl ===================================================================
  37  if test  "$test_freetype" = "yes"; then
  38 --- set_soenv.in.old    2009-04-02 11:06:59.000000000 +0000
  39 +++ set_soenv.in        2009-04-06 16:41:41.000000000 +0000
  40 @@ -1961,6 +1961,9 @@ ToFile( "XRANDR_DLOPEN",     "@XRANDR_DL
  41  ToFile( "SYSTEM_LIBWPD",     "@SYSTEM_LIBWPD@",    "e" );
  42  ToFile( "LIBWPD_CFLAGS",     "@LIBWPD_CFLAGS@",    "e" );
  43  ToFile( "LIBWPD_LIBS",       "@LIBWPD_LIBS@",      "e" );
  44 +ToFile( "SYSTEM_LIBWPS",     "@SYSTEM_LIBWPS@",    "e" );
  45 +ToFile( "LIBWPS_CFLAGS",     "@LIBWPS_CFLAGS@",    "e" );
  46 +ToFile( "LIBWPS_LIBS",       "@LIBWPS_LIBS@",      "e" );
  47  ToFile( "SYSTEM_LIBXML",     "@SYSTEM_LIBXML@",    "e" );
  48  ToFile( "USE_FT_EMBOLDEN",   "@USE_FT_EMBOLDEN@",  "e" );
  49  ToFile( "LIBXML_CFLAGS",     "@LIBXML_CFLAGS@",    "e" );