Author: mkestner
Date: 2005-12-13 10:33:28 -0500 (Tue, 13 Dec 2005)
New Revision: 54298

Modified:
   trunk/gtk-sharp/ChangeLog
   trunk/gtk-sharp/Makefile.include
   trunk/gtk-sharp/configure.in.in
   trunk/gtk-sharp/gdk/Gdk.metadata
Log:

2005-12-13  Mike Kestner  <[EMAIL PROTECTED]>

        * configure.in.in : check for mono-cairo.pc.
        * Makefile.include : use AC_SUBST for cairo ref.
        * gdk/Gdk.metadata : s/Cairo.Graphics/Cairo.Context.


Modified: trunk/gtk-sharp/ChangeLog
===================================================================
--- trunk/gtk-sharp/ChangeLog   2005-12-13 15:26:00 UTC (rev 54297)
+++ trunk/gtk-sharp/ChangeLog   2005-12-13 15:33:28 UTC (rev 54298)
@@ -1,3 +1,9 @@
+2005-12-13  Mike Kestner  <[EMAIL PROTECTED]>
+
+       * configure.in.in : check for mono-cairo.pc.
+       * Makefile.include : use AC_SUBST for cairo ref.
+       * gdk/Gdk.metadata : s/Cairo.Graphics/Cairo.Context.
+
 2005-12-12  Mike Kestner  <[EMAIL PROTECTED]>
 
        * gnomevfs/Gnomevfs.metadata : mark some const strings.

Modified: trunk/gtk-sharp/Makefile.include
===================================================================
--- trunk/gtk-sharp/Makefile.include    2005-12-13 15:26:00 UTC (rev 54297)
+++ trunk/gtk-sharp/Makefile.include    2005-12-13 15:33:28 UTC (rev 54298)
@@ -54,14 +54,12 @@
        done
 
 build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
-build_references = $(addprefix /r:, $(references)) $(CAIRO_REFERENCE)
+build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS)
 
 if PLATFORM_WIN32
 GAPI_CDECL_INSERT=$(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY)
-CAIRO_REFERENCE=
 else
 GAPI_CDECL_INSERT=
-CAIRO_REFERENCE=/r:Mono.Cairo.dll
 endif
 
 $(ASSEMBLY): generated-stamp $(SNK) $(build_sources) $(references)

Modified: trunk/gtk-sharp/configure.in.in
===================================================================
--- trunk/gtk-sharp/configure.in.in     2005-12-13 15:26:00 UTC (rev 54297)
+++ trunk/gtk-sharp/configure.in.in     2005-12-13 15:33:28 UTC (rev 54298)
@@ -152,6 +152,13 @@
 AC_SUBST(LIB_SUFFIX)
 AC_SUBST(GENERATED_SOURCES)
 
+PKG_CHECK_MODULES(MONO_CAIRO, mono-cairo >= $MONO_REQUIRED_VERSION, 
has_mono_cairo=true, has_mono_cairo=false)
+AC_SUBST(MONO_CAIRO_LIBS)
+
+if test "x$has_mono_cairo" = "xfalse" -a "x$API_VERSION" = "x2.8.0.0"; then
+       AC_MSG_ERROR([You need to install Mono.Cairo.dll and its pkgconfig file 
or set PKG_CONFIG_PATH to find it.])
+fi
+
 [EMAIL PROTECTED]@
 
 PKG_CHECK_MODULES(GLIB, gobject-2.0 >= $GTK_REQUIRED_VERSION)

Modified: trunk/gtk-sharp/gdk/Gdk.metadata
===================================================================
--- trunk/gtk-sharp/gdk/Gdk.metadata    2005-12-13 15:26:00 UTC (rev 54297)
+++ trunk/gtk-sharp/gdk/Gdk.metadata    2005-12-13 15:33:28 UTC (rev 54298)
@@ -183,6 +183,6 @@
   <attr path="/api/namespace/[EMAIL PROTECTED]'GdkRgbCmap']/[EMAIL 
PROTECTED]'NColors']" name="writeable">false</attr>
   <attr path="/api/namespace/[EMAIL PROTECTED]'GdkTimeCoord']/[EMAIL 
PROTECTED]'axes']" name="array_len">128</attr>
   <attr path="/api/namespace/[EMAIL PROTECTED]'GdkWindowObject']" 
name="hidden">1</attr>
-  <add-node path="/api"><symbol type="manual" cname="cairo_t" 
name="Cairo.Graphics"/></add-node>
+  <add-node path="/api"><symbol type="manual" cname="cairo_t" 
name="Cairo.Context"/></add-node>
 </metadata>
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to