diff options
| author | Oliver Buchtala <oliver.buchtala@gmail.com> | 2014-03-30 23:07:56 +0200 |
|---|---|---|
| committer | Oliver Buchtala <oliver.buchtala@gmail.com> | 2014-03-30 23:07:56 +0200 |
| commit | 158c8b673223b6738a33221225e8093263f02ed6 (patch) | |
| tree | a34f3efc2763ebd6fe1e30677278e3dde1d073d5 /configure.ac | |
| parent | e6dd12444cf70a31f731521b1b9a8509facd0a19 (diff) | |
| parent | df2c9d366da788ca90018d5ee26f7c9a531be26c (diff) | |
| download | swig-158c8b673223b6738a33221225e8093263f02ed6.tar.gz | |
Merge branch 'master' into devel
Conflicts:
.travis.yml
Examples/test-suite/common.mk
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 9b1d3205d..91ec3883a 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. dnl The macros which aren't shipped with the autotools are stored in the dnl Tools/config directory in .m4 files. -AC_INIT([swig],[3.0.0],[http://www.swig.org]) +AC_INIT([swig],[3.0.1],[http://www.swig.org]) dnl NB: When this requirement is increased to 2.60 or later, AC_PROG_SED dnl definition below can be removed @@ -1974,7 +1974,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 |