Author: qboosh Date: Fri Oct 14 13:31:04 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- fixed (set enable_dotnet, pass proper /package to gacutil)
---- Files affected:
SOURCES:
dotnet-gtk-sharp2-mint.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/dotnet-gtk-sharp2-mint.patch
diff -u SOURCES/dotnet-gtk-sharp2-mint.patch:1.3
SOURCES/dotnet-gtk-sharp2-mint.patch:1.4
--- SOURCES/dotnet-gtk-sharp2-mint.patch:1.3 Fri Sep 9 21:41:20 2005
+++ SOURCES/dotnet-gtk-sharp2-mint.patch Fri Oct 14 15:30:58 2005
@@ -1,6 +1,5 @@
-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
+--- gtk-sharp-2.5.91/configure.in.orig 2005-10-14 13:09:21.000000000 +0200
++++ gtk-sharp-2.5.91/configure.in 2005-10-14 13:13:32.000000000 +0200
@@ -87,6 +87,7 @@
MONO_REQUIRED_VERSION=1.0
@@ -9,40 +8,24 @@
AC_PATH_PROG(GACUTIL, gacutil, no)
if test "x$GACUTIL" = "xno" ; then
-@@ -112,18 +113,24 @@
+@@ -111,6 +112,20 @@
+ else
enable_dotnet=no
fi
++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=
--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
- fi
-
- CS="C#"
+ AC_PATH_PROG(CSC, csc.exe, no)
+ GACUTIL_FLAGS=
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/dotnet-gtk-sharp2-mint.patch?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
