beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

build: Ignore mono version when checking GAC

Browse source
This commit is contained in:
Hylke Bons 2015-06-27 21:21:41 +01:00
parent 291d53f4d7
commit f5be1a37cc
2 changed files with 2 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
build/m4/shamrock/mono.m4
View file

@ -50,7 +50,7 @@ AC_DEFUN([SHAMROCK_CHECK_MONO2_MODULE_NOBAIL],
_SHAMROCK_CHECK_MONO_MODULE_NOBAIL(mono-2, $1)
])
AC_DEFUN([_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES],
AC_DEFUN([SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES],
[
for asm in $(echo "$*" | cut -d, -f3- | sed 's/\,/ /g')
do
@ -66,28 +66,3 @@ AC_DEFUN([_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES],
done
])
AC_DEFUN([SHAMROCK_CHECK_MONO_1_0_GAC_ASSEMBLIES],
[
_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 1.0, $*)
])
AC_DEFUN([SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES],
[
_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 2.0, $*)
])
AC_DEFUN([SHAMROCK_CHECK_MONO2_2_0_GAC_ASSEMBLIES],
[
_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono-2, 2.0, $*)
])
AC_DEFUN([SHAMROCK_CHECK_MONO_4_0_GAC_ASSEMBLIES],
[
_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 4.0, $*)
])
AC_DEFUN([SHAMROCK_CHECK_MONO2_4_0_GAC_ASSEMBLIES],
[
_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono-2, 4.0, $*)
])

2
configure.ac
View file

@ -29,7 +29,7 @@ SHAMROCK_FIND_MONO_RUNTIME
PKG_CHECK_EXISTS([mono >= 2.8],
[SHAMROCK_FIND_MONO_4_0_COMPILER
SHAMROCK_CHECK_MONO_4_0_GAC_ASSEMBLIES([
SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES([
System
])]
)