diff options
| author | Andres G. Aragoneses <knocte@gmail.com> | 2013-01-12 21:24:22 +0000 |
|---|---|---|
| committer | Andres G. Aragoneses <knocte@gmail.com> | 2013-01-12 21:24:22 +0000 |
| commit | 4c590128f4ef00cdb0e833574d25441a578644f6 (patch) | |
| tree | 66a11f46dda4351c4679bc4fdc22ea2026d33da5 | |
| parent | be00cb6234e5d5881c7414ac1a3a505321b9d2b1 (diff) | |
build: test dmcs before gmcs when trying to find the compiler (bnc#798267)
In the previous improvement that had been done [1] in this mono.m4 macro
to find the 4.0 profile compiler in case it's mature enough (mono 2.8),
the scenario in which both compilers could be installed was not considered.
Now in this case, a higher version of the compiler (dmcs) will be used.
[1] http://git.gnome.org/browse/banshee/commit/?id=3d3f7899465ee46e634b53c236401f612dac1492
Fixes BNC#798267 (https://bugzilla.novell.com/show_bug.cgi?id=798267)
| -rw-r--r-- | build/m4/shamrock/mono.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/m4/shamrock/mono.m4 b/build/m4/shamrock/mono.m4 index 309e163c4..1338a39e4 100644 --- a/build/m4/shamrock/mono.m4 +++ b/build/m4/shamrock/mono.m4 @@ -10,11 +10,11 @@ AC_DEFUN([SHAMROCK_FIND_MONO_2_0_COMPILER], AC_DEFUN([SHAMROCK_FIND_MONO_2_0_COMPILER_OR_HIGHER], [ - SHAMROCK_FIND_PROGRAM(MCS, gmcs) + if pkg-config --atleast-version=2.8 mono; then + SHAMROCK_FIND_PROGRAM(MCS, dmcs) + fi if test "x$MCS" = "x" ; then - if pkg-config --atleast-version=2.8 mono; then - SHAMROCK_FIND_PROGRAM(MCS, dmcs) - fi + SHAMROCK_FIND_PROGRAM(MCS, gmcs) fi if test "x$MCS" = "x" ; then |