From abd31397fa246823179f2356ce6dff8987b2b265 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 20 Mar 2014 18:55:44 +0000
Subject: [PATCH] Always use debug flags for Mono to get decent stacktraces on
 error.

---
 Examples/csharp/arrays/Makefile    | 2 +-
 Examples/csharp/callback/Makefile  | 2 +-
 Examples/csharp/class/Makefile     | 2 +-
 Examples/csharp/enum/Makefile      | 2 +-
 Examples/csharp/extend/Makefile    | 2 +-
 Examples/csharp/funcptr/Makefile   | 2 +-
 Examples/csharp/nested/Makefile    | 2 +-
 Examples/csharp/reference/Makefile | 2 +-
 Examples/csharp/simple/Makefile    | 2 +-
 Examples/csharp/template/Makefile  | 2 +-
 Examples/csharp/variables/Makefile | 2 +-
 configure.ac                       | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Examples/csharp/arrays/Makefile b/Examples/csharp/arrays/Makefile
index 65386f0dc73..4be092d1c77 100644
--- a/Examples/csharp/arrays/Makefile
+++ b/Examples/csharp/arrays/Makefile
@@ -5,7 +5,7 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 CSHARPSRCS = *.cs
-CSHARPFLAGS= -nologo -unsafe -out:runme.exe
+CSHARPFLAGS= -nologo -debug+ -unsafe -out:runme.exe
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile csharp_run
diff --git a/Examples/csharp/callback/Makefile b/Examples/csharp/callback/Makefile
index 340febc88c1..6c58abd280f 100644
--- a/Examples/csharp/callback/Makefile
+++ b/Examples/csharp/callback/Makefile
@@ -5,7 +5,7 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 CSHARPSRCS = *.cs
-CSHARPFLAGS= -debug -nologo -out:runme.exe
+CSHARPFLAGS= -nologo -debug+ -out:runme.exe
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile csharp_run
diff --git a/Examples/csharp/class/Makefile b/Examples/csharp/class/Makefile
index bc3ce8ce875..6c58abd280f 100644
--- a/Examples/csharp/class/Makefile
+++ b/Examples/csharp/class/Makefile
@@ -5,7 +5,7 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 CSHARPSRCS = *.cs
-CSHARPFLAGS= -nologo -out:runme.exe
+CSHARPFLAGS= -nologo -debug+ -out:runme.exe
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile csharp_run
diff --git a/Examples/csharp/enum/Makefile b/Examples/csharp/enum/Makefile
index bc3ce8ce875..6c58abd280f 100644
--- a/Examples/csharp/enum/Makefile
+++ b/Examples/csharp/enum/Makefile
@@ -5,7 +5,7 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 CSHARPSRCS = *.cs
-CSHARPFLAGS= -nologo -out:runme.exe
+CSHARPFLAGS= -nologo -debug+ -out:runme.exe
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile csharp_run
diff --git a/Examples/csharp/extend/Makefile b/Examples/csharp/extend/Makefile
index bc3ce8ce875..6c58abd280f 100644
--- a/Examples/csharp/extend/Makefile
+++ b/Examples/csharp/extend/Makefile
@@ -5,7 +5,7 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 CSHARPSRCS = *.cs
-CSHARPFLAGS= -nologo -out:runme.exe
+CSHARPFLAGS= -nologo -debug+ -out:runme.exe
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile csharp_run
diff --git a/Examples/csharp/funcptr/Makefile b/Examples/csharp/funcptr/Makefile
index 875ae0e71d1..ed15cb28e75 100644
--- a/Examples/csharp/funcptr/Makefile
+++ b/Examples/csharp/funcptr/Makefile
@@ -5,7 +5,7 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 CSHARPSRCS = *.cs
-CSHARPFLAGS= -nologo -out:runme.exe
+CSHARPFLAGS= -nologo -debug+ -out:runme.exe
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile csharp_run
diff --git a/Examples/csharp/nested/Makefile b/Examples/csharp/nested/Makefile
index bc3ce8ce875..6c58abd280f 100644
--- a/Examples/csharp/nested/Makefile
+++ b/Examples/csharp/nested/Makefile
@@ -5,7 +5,7 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 CSHARPSRCS = *.cs
-CSHARPFLAGS= -nologo -out:runme.exe
+CSHARPFLAGS= -nologo -debug+ -out:runme.exe
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile csharp_run
diff --git a/Examples/csharp/reference/Makefile b/Examples/csharp/reference/Makefile
index bc3ce8ce875..6c58abd280f 100644
--- a/Examples/csharp/reference/Makefile
+++ b/Examples/csharp/reference/Makefile
@@ -5,7 +5,7 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 CSHARPSRCS = *.cs
-CSHARPFLAGS= -nologo -out:runme.exe
+CSHARPFLAGS= -nologo -debug+ -out:runme.exe
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile csharp_run
diff --git a/Examples/csharp/simple/Makefile b/Examples/csharp/simple/Makefile
index 875ae0e71d1..ed15cb28e75 100644
--- a/Examples/csharp/simple/Makefile
+++ b/Examples/csharp/simple/Makefile
@@ -5,7 +5,7 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 CSHARPSRCS = *.cs
-CSHARPFLAGS= -nologo -out:runme.exe
+CSHARPFLAGS= -nologo -debug+ -out:runme.exe
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile csharp_run
diff --git a/Examples/csharp/template/Makefile b/Examples/csharp/template/Makefile
index 43243d6d5fe..23fe2eec978 100644
--- a/Examples/csharp/template/Makefile
+++ b/Examples/csharp/template/Makefile
@@ -5,7 +5,7 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 CSHARPSRCS = *.cs
-CSHARPFLAGS= -nologo -out:runme.exe
+CSHARPFLAGS= -nologo -debug+ -out:runme.exe
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile csharp_run
diff --git a/Examples/csharp/variables/Makefile b/Examples/csharp/variables/Makefile
index 875ae0e71d1..ed15cb28e75 100644
--- a/Examples/csharp/variables/Makefile
+++ b/Examples/csharp/variables/Makefile
@@ -5,7 +5,7 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 CSHARPSRCS = *.cs
-CSHARPFLAGS= -nologo -out:runme.exe
+CSHARPFLAGS= -nologo -debug+ -out:runme.exe
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile csharp_run
diff --git a/configure.ac b/configure.ac
index f4d734e78e5..fbf74774a72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1755,7 +1755,7 @@ if test -z "$CSHARPBIN" ; then
         echo "mcs is not a working Mono C# compiler"
       fi
     fi
-    if test "mcs" = "$CSHARPCOMPILER" || test "gmcs" = "$CSHARPCOMPILER"; then
+    if test "mcs" = "$CSHARPCOMPILER" || test "gmcs" = "$CSHARPCOMPILER" || test "mono-csc" = "$CSHARPCOMPILER"; then
         AC_CHECK_PROGS(CSHARPCILINTERPRETER, mono) # Mono JIT
         CSHARPCILINTERPRETER_FLAGS="--debug"
     else