Permalink
Browse files

2010-05-11 Mike Kestner <mkestner@novell.com>

	* configure.in.in: work around removal of Mono.GetOptions.dll
	in mono trunk (2.8).

svn path=/trunk/gnome-sharp/; revision=157186
  • Loading branch information...
1 parent c310878 commit 3fbff7259b7b54d95388f10b81041d891713dd59 @mkestner mkestner committed May 12, 2010
Showing with 15 additions and 2 deletions.
  1. +5 −0 ChangeLog
  2. +10 −2 configure.in.in
View
@@ -1,3 +1,8 @@
+2010-05-11 Mike Kestner <mkestner@novell.com>
+
+ * configure.in.in: work around removal of Mono.GetOptions.dll
+ in mono trunk (2.8).
+
2009-03-16 Mike Kestner <mkestner@novell.com>
* Makefile.include: parallel make fix.
View
@@ -87,8 +87,16 @@ BUILD_GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0`
AC_SUBST(BUILD_GTK_CFLAGS)
AC_SUBST(BUILD_GTK_LIBS)
-MONO_REQUIRED_VERSION=1.0
+enable_monogetoptions=no
+MONO_REQUIRED_VERSION=2.7
PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
+if test "x$has_mono" = "xfalse" ; then
+ MONO_REQUIRED_VERSION=1.0
+ PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
+ if test "x$has_mono" = "xtrue" ; then
+ enable_monogetoptions=yes
+ fi
+fi
AC_PATH_PROG(GACUTIL, gacutil, no)
if test "x$GACUTIL" = "xno" ; then
@@ -194,7 +202,7 @@ AC_SUBST(GNOME_LIBS)
AM_CONDITIONAL(ENABLE_LIBART, test "x$enable_libart" = "xyes")
AM_CONDITIONAL(ENABLE_GNOMEVFS, test "x$enable_gnomevfs" = "xyes")
AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_gnome" = "xyes")
-AM_CONDITIONAL(ENABLE_MONOGETOPTIONS, test "x$has_mono" = "xtrue")
+AM_CONDITIONAL(ENABLE_MONOGETOPTIONS, test "x$enable_monogetoptions" = "xyes")
AC_SUBST(CFLAGS)

0 comments on commit 3fbff72

Please sign in to comment.