seed r513 - in trunk: . doc modules/canvas modules/sqlite

[hortont svn gnome org]

Author: hortont
Date: Sat Dec 20 05:31:35 2008
New Revision: 513
URL: http://svn.gnome.org/viewvc/seed?rev=513&view=rev

Log:
Initial conditional module compilation patch, and adding a reminder to the docs....


Modified:
   trunk/configure.ac
   trunk/doc/runtime.html
   trunk/modules/canvas/Makefile.am
   trunk/modules/sqlite/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Dec 20 05:31:35 2008
@@ -61,6 +61,16 @@
     AC_DEFINE(HAVE_LIBREADLINE, 1, [have readline]),
     AC_MSG_ERROR([readline not found]))
 
+dnl =========================canvas module=====================================
+AC_TRY_CPP([#include <cairo/cairo.h>], have_cairo_h=yes, have_cairo_h=no)
+AM_CONDITIONAL(BUILD_CANVAS_MODULE, test "x$have_cairo_h" = "xyes")
+AC_SUBST(BUILD_CANVAS_MODULE)
+
+dnl =========================sqlite module=====================================
+AC_TRY_CPP([#include <sqlite3.h>], have_sqlite3_h=yes, have_sqlite3_h=no)
+AM_CONDITIONAL(BUILD_SQLITE3_MODULE, test "x$have_sqlite3_h" = "xyes")
+AC_SUBST(BUILD_SQLITE3_MODULE)
+
 dnl =============================Debug=========================================
 AC_ARG_ENABLE(debug,
               AC_HELP_STRING([--enable-debug],
@@ -126,4 +136,8 @@
 Build Configuration:
    Debug......................$enable_debug
    Profiling/Coverage.........$enable_profile
+
+Modules:
+   SQLite.....................$have_sqlite3_h
+   Canvas.....................$have_cairo_h
 "

Modified: trunk/doc/runtime.html
==============================================================================
--- trunk/doc/runtime.html	(original)
+++ trunk/doc/runtime.html	Sat Dec 20 05:31:35 2008
@@ -218,6 +218,10 @@
 win = new Gtk.Window();
 win.signal.connect("notify::opacity", handle_opacity_change);
 </pre>
+<div class="section"><b>Signal Installation</b></div>
+<p>
+
+</p>
 <div class="section"><b>Exceptions</b></div>
 <p>
 Seed throws Javascript exceptions for errors in the GObject layer; our custom exception types are as follows:</p>

Modified: trunk/modules/canvas/Makefile.am
==============================================================================
--- trunk/modules/canvas/Makefile.am	(original)
+++ trunk/modules/canvas/Makefile.am	Sat Dec 20 05:31:35 2008
@@ -1,3 +1,5 @@
+if BUILD_CANVAS_MODULE
+
 lib_LTLIBRARIES = \
 	libcanvas.la
 
@@ -7,8 +9,6 @@
 libcanvas_la_LDFLAGS = \
 	`pkg-config --libs seed cairo`
 
-EXTRA_DIST=run-tests.js
-
 AM_CPPFLAGS = \
 	-I../../libseed/ \
 	`pkg-config --cflags seed` \
@@ -16,5 +16,7 @@
 	`pkg-config --cflags gobject-introspection-1.0` \
 	`pkg-config --cflags cairo`
 
-libdir = ${exec_prefix}/lib/seed
+endif
 
+libdir = ${exec_prefix}/lib/seed
+EXTRA_DIST=run-tests.js
\ No newline at end of file

Modified: trunk/modules/sqlite/Makefile.am
==============================================================================
--- trunk/modules/sqlite/Makefile.am	(original)
+++ trunk/modules/sqlite/Makefile.am	Sat Dec 20 05:31:35 2008
@@ -1,3 +1,5 @@
+if BUILD_SQLITE3_MODULE
+
 lib_LTLIBRARIES = \
 	libsqlite.la
 
@@ -7,13 +9,13 @@
 libsqlite_la_LDFLAGS = \
 	`pkg-config --libs seed sqlite3`
 
-EXTRA_DIST = example.js
-
 AM_CPPFLAGS = \
 	-I../../libseed/ \
 	`pkg-config --cflags seed` \
 	`pkg-config --cflags glib-2.0` -g \
 	`pkg-config --cflags gobject-introspection-1.0`
 
-libdir = ${exec_prefix}/lib/seed
+endif
 
+libdir = ${exec_prefix}/lib/seed
+EXTRA_DIST = example.js
\ No newline at end of file