From 3458ee2893ec18ba5b5b79768606b35ea7fb10cb Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Mon, 21 Dec 2015 20:57:19 +0000 Subject: [PATCH] configure: Support and use Mono 4.5 compiler Signed-off-by: Jo Shields [adjusted the patch to the new upstream build code] Signed-off-by: Andrew Shadura --- build/m4/shamrock/mono.m4 | 6 +++++- configure.ac | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build/m4/shamrock/mono.m4 b/build/m4/shamrock/mono.m4 index 393eaa36..89813059 100755 --- a/build/m4/shamrock/mono.m4 +++ b/build/m4/shamrock/mono.m4 @@ -13,6 +13,11 @@ AC_DEFUN([SHAMROCK_FIND_MONO_4_0_COMPILER], SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, dmcs) ]) +AC_DEFUN([SHAMROCK_FIND_MONO_4_5_COMPILER], +[ + SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, mcs) +]) + AC_DEFUN([SHAMROCK_FIND_MONO_RUNTIME], [ SHAMROCK_FIND_PROGRAM_OR_BAIL(MONO, mono) @@ -65,4 +70,3 @@ AC_DEFUN([SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES], fi done ]) - diff --git a/configure.ac b/configure.ac index 884429d8..4c9f1af5 100755 --- a/configure.ac +++ b/configure.ac @@ -24,12 +24,12 @@ SHAMROCK_EXPAND_DATADIR AC_PROG_INSTALL -dnl Mono and gmcs -SHAMROCK_CHECK_MONO_MODULE(2.8) +dnl Mono and mcs +SHAMROCK_CHECK_MONO_MODULE(3.2.8) SHAMROCK_FIND_MONO_RUNTIME -PKG_CHECK_EXISTS([mono >= 2.8], -[SHAMROCK_FIND_MONO_4_0_COMPILER +PKG_CHECK_EXISTS([mono >= 3.2.8], +[SHAMROCK_FIND_MONO_4_5_COMPILER SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES([ System ])]