- drop obsolete and outdated manual inclusion of rpm macros

[packages/dotnet-gtk-sharp2.git] / dotnet-gtk-sharp2-mint.patch

diff --git a/dotnet-gtk-sharp2-mint.patch b/dotnet-gtk-sharp2-mint.patch
index 1f218480964d8f9d79d8e9ca8c8dff07cc377cad..9717a05ba5b66f7fd98116be45e3ff356fab56b0 100644 (file)
--- a/dotnet-gtk-sharp2-mint.patch
+++ b/dotnet-gtk-sharp2-mint.patch
@@ -1,48 +1,32 @@
-diff -ruN gtk-sharp-2.5.91./configure.in gtk-sharp-2.5.91/configure.in
---- gtk-sharp-2.5.91./configure.in     2005-09-09 21:24:00.000000000 +0200
-+++ gtk-sharp-2.5.91/configure.in      2005-09-09 21:26:55.681573250 +0200
-@@ -87,6 +87,7 @@
+diff -urN gtk-sharp-2.12.10/configure.in gtk-sharp-2.12.10.new//configure.in
+--- gtk-sharp-2.12.10/configure.in     2010-03-08 22:32:31.000000000 +0100
++++ gtk-sharp-2.12.10.new//configure.in        2010-03-16 19:30:35.090746038 +0100
+@@ -112,6 +112,7 @@
  
  MONO_REQUIRED_VERSION=1.0
  PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
-+PKG_CHECK_MODULES(MINT_DEPENDENCY, mint >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
- 
- AC_PATH_PROG(GACUTIL, gacutil, no)
- if test "x$GACUTIL" = "xno" ; then
-@@ -112,18 +113,24 @@
-       enable_dotnet=no
++PKG_CHECK_MODULES(MINT_DEPENDENCY, mint >= $MONO_REQUIRED_VERSION, has_mint=true, has_mint=false)
+ if test "x$has_mono" = "xfalse" ; then
+       PKG_CHECK_MODULES(MONO_DEPENDENCY, mono-2 >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
  fi
+@@ -150,6 +151,20 @@
  else
--AC_PATH_PROG(CSC, csc.exe, no)
--GACUTIL_FLAGS=
--GENERATED_SOURCES=generated\\\\*.cs
--enable_dotnet=yes
--
--if test x$CSC = "xno"; then
--      AC_MSG_ERROR([You need to install either mono or .Net])
--else
--RUNTIME=
--LIB_PREFIX=
--LIB_SUFFIX=.dylib
--fi
-+      dnl use mint if mono is not found
-+      if test "x$has_mint" = "xtrue"; then
-+              GACUTIL_FLAGS='/package $(PACKAGE) /root $(DESTDIR)$(libdir)'
-+              GENERATED_SOURCES=generated/*.cs
-+              AC_PATH_PROG(RUNTIME, mint, no)
-+              AC_PATH_PROG(CSC, mcs, no)
-+              LIB_PREFIX=.so
-+              LIB_SUFFIX=
-+      else
-+              AC_PATH_PROG(CSC, csc.exe, no)
-+              if test x$CSC = "xno"; then
-+                      AC_MSG_ERROR([You need to install either mono or .Net])
-+              else
-+                      RUNTIME=
-+                      LIB_PREFIX=
-+                      LIB_SUFFIX=.dylib
-+              fi
-+      fi
+       enable_dotnet=no
  fi
- 
- CS="C#"
++elif test "x$has_mint" = "xtrue"; then
++dnl use mint if mono is not found
++GACUTIL_FLAGS='/package $(PACKAGE_VERSION) /root $(DESTDIR)$(prefix)/lib'
++GENERATED_SOURCES=generated/*.cs
++AC_PATH_PROG(RUNTIME, mint, no)
++AC_PATH_PROG(CSC, mcs, no)
++LIB_PREFIX=.so
++LIB_SUFFIX=
++SDCHECK="`$GACUTIL /l |grep ^System.Drawing, | head -n1 |cut -f1 -d','`"
++if test "x$SDCHECK" = "xSystem.Drawing"; then
++       enable_dotnet=yes
++else
++       enable_dotnet=no
++fi
+ else
+ AC_PATH_PROG(CSC, csc.exe, no)
+ GACUTIL_FLAGS=