[hyena/gtk3: 1/13] First changes to autotools to link against 3.x

[Gabriel Burt <gburt src gnome org>]

commit 3c4c55f00fe72aca514722a0b4fe8428b6e0b906
Author: Andrés G. Aragoneses <knocte gmail com>
Date:   Thu Apr 21 13:06:27 2011 +0200

    First changes to autotools to link against 3.x
    
    These includes some FIXMEs for now that hardcode paths, we'll
    fix those later when gtk-sharp / cairo-sharp master stabilizes.

 Hyena.Gui/Makefile.am |    3 ++-
 configure.ac          |   14 ++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/Hyena.Gui/Makefile.am b/Hyena.Gui/Makefile.am
index 74fd6df..12cfbfc 100644
--- a/Hyena.Gui/Makefile.am
+++ b/Hyena.Gui/Makefile.am
@@ -1,7 +1,8 @@
 ASSEMBLY = Hyena.Gui
 ASSEMBLY_BUILD_FLAGS = -unsafe
 TARGET = library
-LINK = -r:ICSharpCode.SharpZipLib -r:Mono.Posix -r:System -r:System.Core -r:Mono.Cairo \
+#FIXME: not hardcode path to cairo-sharp
+LINK = -r:ICSharpCode.SharpZipLib -r:Mono.Posix -r:System -r:System.Core -r:/usr/lib/mono/gtk-sharp-3.0/cairo-sharp.dll \
 	   $(GTKSHARP_LIBS) $(GLIBSHARP_LIBS) \
 	   -r:$(DIR_BIN)/Hyena.dll
 SOURCES =  \
diff --git a/configure.ac b/configure.ac
index c2d0eeb..5fe8fab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,18 +51,20 @@ dnl Mono and gmcs
 SHAMROCK_CHECK_MONO_MODULE(1.9.1)
 SHAMROCK_FIND_MONO_2_0_COMPILER
 SHAMROCK_FIND_MONO_RUNTIME
+
+
 SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([	
-	Mono.Cairo
 	Mono.Posix
 	ICSharpCode.SharpZipLib
-])
+])dnl FIXME:seems like cairo-sharp hasn't got .pc files yet: cairo-sharp
+
 
 dnl package checks, common for all configs
-PKG_CHECK_MODULES([GTKSHARP], [gtk-sharp-2.0])
-PKG_CHECK_MODULES([GLIBSHARP], [glib-sharp-2.0])
+PKG_CHECK_MODULES([GTKSHARP], [gtk-sharp-3.0])
+PKG_CHECK_MODULES([GLIBSHARP], [glib-sharp-3.0])
 
 dnl See if Gtk# is recent enought to enable managed widget a11y
-PKG_CHECK_MODULES(GTKSHARP_A11Y, gtk-sharp-2.0 >= 2.12.10, gtksharp_with_a11y=yes, gtksharp_with_a11y=no)
+#PKG_CHECK_MODULES(GTKSHARP_A11Y, gtk-sharp-3.0 >= 4.0, gtksharp_with_a11y=yes, gtksharp_with_a11y=no)
 AM_CONDITIONAL(ENABLE_ATK, test "x$gtksharp_with_a11y" = "xyes")
 
 AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, false)
@@ -115,7 +117,7 @@ cat <<EOF
 ${PACKAGE}-${VERSION}
 
 Unit Tests:        ${do_tests} (requires nunit >= ${NUNIT_REQUIRED})
-Custom a11y:       ${gtksharp_with_a11y} (requires gtk-sharp >= 2.12.10)
+Custom a11y:       ${gtksharp_with_a11y} (requires gtk-sharp >= TBD)
 
 EOF