SOURCES: dotnet-gtk-sharp2-mint.patch - 2.5.91

[wolf]

Author: wolf                         Date: Fri Sep  9 19:27:20 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 2.5.91

---- Files affected:
SOURCES:
   dotnet-gtk-sharp2-mint.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/dotnet-gtk-sharp2-mint.patch
diff -u SOURCES/dotnet-gtk-sharp2-mint.patch:1.1 SOURCES/dotnet-gtk-sharp2-mint.patch:1.2
--- SOURCES/dotnet-gtk-sharp2-mint.patch:1.1	Mon Aug 15 18:25:45 2005
+++ SOURCES/dotnet-gtk-sharp2-mint.patch	Fri Sep  9 21:27:15 2005
@@ -1,21 +1,22 @@
-diff -Nuard gtk-sharp-1.0.orig/configure.in gtk-sharp-1.0/configure.in
---- gtk-sharp-1.0.orig/configure.in	2004-06-29 18:02:15.000000000 +0200
-+++ gtk-sharp-1.0/configure.in	2004-06-30 23:45:46.724677928 +0200
-@@ -62,6 +62,7 @@
+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 @@
  
- MONO_REQUIRED_VERSION=0.96
+ 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_mint=true, has_mint=false)
++PKG_CHECK_MODULES(MINT_DEPENDENCY, mint >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
  
- if test "x$has_mono" = "xtrue"; then
- GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(libdir)'
-@@ -76,17 +77,24 @@
- 	LIB_SUFFIX=
+ AC_PATH_PROG(GACUTIL, gacutil, no)
+ if test "x$GACUTIL" = "xno" ; then
+@@ -112,18 +113,24 @@
+ 	enable_dotnet=no
  fi
  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])
@@ -24,24 +25,24 @@
 -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
++	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
  fi
  
  CS="C#"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/dotnet-gtk-sharp2-mint.patch?r1=1.1&r2=1.2&f=u