]>
Commit | Line | Data |
---|---|---|
f1b98e26 MB |
1 | diff -urN gtk-sharp-2.12.10/configure.in gtk-sharp-2.12.10.new//configure.in |
2 | --- gtk-sharp-2.12.10/configure.in 2010-03-08 22:32:31.000000000 +0100 | |
3 | +++ gtk-sharp-2.12.10.new//configure.in 2010-03-16 19:30:35.090746038 +0100 | |
4 | @@ -112,6 +112,7 @@ | |
f0f1844c | 5 | |
61eb1c61 | 6 | MONO_REQUIRED_VERSION=1.0 |
f0f1844c | 7 | PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false) |
38b3c68e | 8 | +PKG_CHECK_MODULES(MINT_DEPENDENCY, mint >= $MONO_REQUIRED_VERSION, has_mint=true, has_mint=false) |
f1b98e26 MB |
9 | if test "x$has_mono" = "xfalse" ; then |
10 | PKG_CHECK_MODULES(MONO_DEPENDENCY, mono-2 >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false) | |
11 | fi | |
12 | @@ -150,6 +151,20 @@ | |
ebd57d3c | 13 | else |
61eb1c61 | 14 | enable_dotnet=no |
f0f1844c | 15 | fi |
ebd57d3c JB |
16 | +elif test "x$has_mint" = "xtrue"; then |
17 | +dnl use mint if mono is not found | |
18 | +GACUTIL_FLAGS='/package $(PACKAGE_VERSION) /root $(DESTDIR)$(prefix)/lib' | |
19 | +GENERATED_SOURCES=generated/*.cs | |
20 | +AC_PATH_PROG(RUNTIME, mint, no) | |
21 | +AC_PATH_PROG(CSC, mcs, no) | |
22 | +LIB_PREFIX=.so | |
23 | +LIB_SUFFIX= | |
24 | +SDCHECK="`$GACUTIL /l |grep ^System.Drawing, | head -n1 |cut -f1 -d','`" | |
25 | +if test "x$SDCHECK" = "xSystem.Drawing"; then | |
f1b98e26 | 26 | + enable_dotnet=yes |
ebd57d3c | 27 | +else |
f1b98e26 | 28 | + enable_dotnet=no |
ebd57d3c | 29 | +fi |
f0f1844c | 30 | else |
ebd57d3c JB |
31 | AC_PATH_PROG(CSC, csc.exe, no) |
32 | GACUTIL_FLAGS= |