[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/mono

[Petr Mladek]

 patches/mono/mono-build.diff |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 18b9ab827c191f1966814710bfed75c9114061f1
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Apr 13 17:57:20 2011 +0200

    fix mono-build.diff to apply again

diff --git a/patches/mono/mono-build.diff b/patches/mono/mono-build.diff
index f5db663..4f65fee 100644
--- a/patches/mono/mono-build.diff
+++ b/patches/mono/mono-build.diff
@@ -126,10 +126,10 @@ diff --git configure.in configure.in
 index 12fbec8..9c8aa00 100644
 --- configure.in
 +++ configure.in
-@@ -456,6 +456,10 @@
-     fi ,
- )
-
+@@ -472,6 +472,10 @@ AC_ARG_ENABLE(extra-font,
+ 	[Add extra font content.]),
+ ,)
+ 
 +AC_ARG_ENABLE(mono,
 +[  --enable-mono           Enables the compilation of the Mono bindings
 +],,)
@@ -137,12 +137,12 @@ index 12fbec8..9c8aa00 100644
  dnl ===================================================================
  dnl Optional Packages (--with/without-)
  dnl ===================================================================
-@@ -1992,7 +1992,6 @@
+@@ -2267,7 +2271,6 @@ dnl that to mean Visual Studio .NET 2003
  dnl in fact apply equally to what we actually support, i.e.
  dnl Visual Studio 2008 and 2010?)
  dnl ===================================================================
 -if test "$_os" = "WINNT"; then
- if test "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then
+ if test "$WITH_MINGW" = "yes" || test "$COMEX" -ge "10"; then
      dnl Check midl.exe
      AC_PATH_PROG(MIDL_PATH, midl.exe)
 @@ -2049,7 +2048,9 @@