commit 72f4d6fd2957b85d389027c7ad7aa7a101bfaae1 Author: Christophe Fergeau <cferg...@mandriva.com> Date: Sun Mar 28 21:27:03 2010 +0200
[mono] don't fail configure if gtk-sharp isn't found Disable mono bindings build if gdk-sharp or glib-sharp can't be found by pkg-config m4/mono.m4 | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) --- diff --git a/m4/mono.m4 b/m4/mono.m4 index 2b8415b..9b6b30a 100644 --- a/m4/mono.m4 +++ b/m4/mono.m4 @@ -45,12 +45,13 @@ AC_DEFUN([SHAMROCK_CHECK_MONO_MODULE], AC_DEFUN([CHECK_GLIB_GTK_SHARP], [ + found_gtksharp="yes" PKG_CHECK_MODULES(GDKSHARP, - gdk-sharp-2.0 >= $GTK_SHARP_MIN_VERSION) + gdk-sharp-2.0 >= $GTK_SHARP_MIN_VERSION, [], found_gtksharp="no") AC_SUBST(GDKSHARP_LIBS) PKG_CHECK_MODULES(GLIBSHARP, - glib-sharp-2.0 >= $GTK_SHARP_MIN_VERSION) + glib-sharp-2.0 >= $GTK_SHARP_MIN_VERSION, [], found_gtksharp="no") AC_SUBST(GLIBSHARP_LIBS) ]) @@ -74,7 +75,9 @@ AC_DEFUN([LIBGPOD_CHECK_MONO], SHAMROCK_FIND_MONO_2_0_COMPILER SHAMROCK_FIND_MONO_RUNTIME CHECK_GLIB_GTK_SHARP - + if test "X$found_gtksharp" != "Xyes"; then + with_mono="no" + fi fi AM_CONDITIONAL(HAVE_MONO, test x$with_mono = xyes) ]) ------------------------------------------------------------------------------ This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first _______________________________________________ gtkpod-cvs2 mailing list gtkpod-cvs2@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2