GNOME.org
 

seed r720 - in trunk: . modules/Multiprocessing modules/example modules/sqlite

Author: hortont
Date: Wed Jan 14 04:16:21 2009
New Revision: 720
URL: http://svn.gnome.org/viewvc/seed?rev=720&view=rev

Log:
Users can now toggle the build of /any/ module with --[en|dis]able-*-module at configure time. Of course, if they don't have the required libraries, they don't get the module, too. Should leave more of a warning if readline isn't included.



Modified:
   trunk/configure.ac
   trunk/modules/Multiprocessing/Makefile.am
   trunk/modules/example/Makefile.am
   trunk/modules/sqlite/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Jan 14 04:16:21 2009
@@ -28,36 +28,34 @@
 PKG_CHECK_MODULES(libffi, libffi, have_ffi_pkgconfig=yes, have_ffi_pkgconfig=no)
 
 if test x"$have_ffi_pkgconfig" = xno ; then
-  AC_MSG_CHECKING(for ffi.h)
+	AC_MSG_CHECKING(for ffi.h)
 
-  AC_TRY_CPP([#include <ffi.h>], have_ffi_h=yes, have_ffi_h=no)
-  if test x"$have_ffi_h" = x"yes"; then
-
-    save_LIBS=$LIBS
-    if test x"$with_ffi" = x"yes" || test x"$with_ffi" = x"auto"; then
-      other_LIBS=
-    else
-      other_LIBS=$with_ffi
-    fi
-
-    AC_SEARCH_LIBS(ffi_call,ffi,,AC_MSG_ERROR([libffi not found]),$other_LIBS)
-    if test x"$ac_cv_search_ffi_call" = x"none required" ; then
-      FFI_LIBS=$other_LIBS
-    else
-      FFI_LIBS="$ac_cv_search_ffi_call $other_LIBS"
-    fi
-
-    LIBS=$save_LIBS
-  fi
-  if test x"$have_ffi_h" != x"yes" ; then
-    AC_MSG_ERROR([ffi.h not found])
-  fi
-
-  FFI_CFLAGS=
-
-  AC_MSG_RESULT([$have_ffi_h])
-  AC_SUBST(FFI_LIBS)
-  AC_SUBST(FFI_CFLAGS)
+	AC_TRY_CPP([#include <ffi.h>], have_ffi_h=yes, have_ffi_h=no)
+	if test x"$have_ffi_h" = x"yes"; then
+		save_LIBS=$LIBS
+		if test x"$with_ffi" = x"yes" || test x"$with_ffi" = x"auto"; then
+			other_LIBS=
+		else
+			other_LIBS=$with_ffi
+		fi
+
+		AC_SEARCH_LIBS(ffi_call,ffi,,AC_MSG_ERROR([libffi not found]),$other_LIBS)
+		if test x"$ac_cv_search_ffi_call" = x"none required" ; then
+			FFI_LIBS=$other_LIBS
+		else
+			FFI_LIBS="$ac_cv_search_ffi_call $other_LIBS"
+		fi
+		LIBS=$save_LIBS
+	fi
+	if test x"$have_ffi_h" != x"yes" ; then
+		AC_MSG_ERROR([ffi.h not found])
+	fi
+
+	FFI_CFLAGS=
+
+	AC_MSG_RESULT([$have_ffi_h])
+	AC_SUBST(FFI_LIBS)
+	AC_SUBST(FFI_CFLAGS)
 fi
 
 dnl =======================WebKit ContextGroup=================================
@@ -69,22 +67,69 @@
 		;;
 esac
 
-dnl ========================readline module====================================
+dnl ==============================readline=====================================
+AC_MSG_CHECKING(for readline)
 AC_TRY_CPP([#include <readline/readline.h>],
 			have_readline_h=yes,
 			have_readline_h=no)
-AM_CONDITIONAL(BUILD_READLINE_MODULE, test "x$have_readline_h" = "xyes")
-AC_SUBST(BUILD_READLINE_MODULE)
+AC_MSG_RESULT([$have_readline_h])
 
-dnl =========================canvas module=====================================
+dnl ==============================cairo========================================
+AC_MSG_CHECKING(for cairo)
 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)
+AC_MSG_RESULT([$have_cairo_h])
 
-dnl =========================sqlite module=====================================
+dnl ============================sqlite3========================================
+AC_MSG_CHECKING(for sqlite3)
 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)
+AC_MSG_RESULT([$have_sqlite3_h])
+
+dnl =============================Modules=======================================
+AC_ARG_ENABLE(canvas-module,
+			  AC_HELP_STRING([--enable-canvas-module],
+							 [enable the canvas Seed module. [default=yes]]),
+			  [want_canvas_module=$enableval],[want_canvas_module="yes"])
+
+AC_ARG_ENABLE(example-module,
+			  AC_HELP_STRING([--enable-example-module],
+							 [enable the example Seed module. [default=yes]]),
+			  [want_example_module=$enableval],[want_example_module="yes"])
+
+AC_ARG_ENABLE(multiprocessing-module,
+			  AC_HELP_STRING([--enable-multiprocessing-module],
+							 [enable the multiprocessing Seed module. [default=yes]]),
+			  [want_multiprocessing_module=$enableval],
+			  [want_multiprocessing_module="yes"])
+
+AC_ARG_ENABLE(readline-module,
+			  AC_HELP_STRING([--enable-readline-module],
+							 [enable the readline Seed module. [default=yes]]),
+			  [want_readline_module=$enableval],[want_readline_module="yes"])
+
+AC_ARG_ENABLE(sqlite-module,
+			  AC_HELP_STRING([--enable-sqlite-module],
+							 [enable the sqlite Seed module. [default=yes]]),
+			  [want_sqlite_module=$enableval],[want_sqlite_module="yes"])
+
+dnl --- Special Cases ---
+
+if test x"$have_cairo_h" != x"yes" ; then
+	want_canvas_module="no"
+fi
+
+if test x"$have_readline_h" != x"yes" ; then
+	want_readline_module="no"
+fi
+
+if test x"$have_sqlite3_h" != x"yes" ; then
+	want_sqlite_module="no"
+fi
+
+AM_CONDITIONAL(BUILD_CANVAS_MODULE, test "x$want_canvas_module" = "xyes")
+AM_CONDITIONAL(BUILD_EXAMPLE_MODULE, test "x$want_example_module" = "xyes")
+AM_CONDITIONAL(BUILD_MULTIPROCESSING_MODULE, test "x$want_multiprocessing_module" = "xyes")
+AM_CONDITIONAL(BUILD_READLINE_MODULE, test "x$want_readline_module" = "xyes")
+AM_CONDITIONAL(BUILD_SQLITE_MODULE, test "x$want_sqlite_module" = "xyes")
 
 dnl =========================turtle example====================================
 PKG_CHECK_EXISTS(gtk+-2.0, want_turtle=yes, want_turtle=no)
@@ -93,37 +138,37 @@
 
 dnl =========================Install Examples==================================
 AC_ARG_ENABLE(examples,
-              AC_HELP_STRING([--enable-examples],
-                             [build and install Javascript examples. [default=yes]]),
-                             [enable_examples=$enableval],[enable_examples="yes"])
+			  AC_HELP_STRING([--enable-examples],
+							 [install JavaScript examples. [default=yes]]),
+			  [enable_examples=$enableval],[enable_examples="yes"])
 AM_CONDITIONAL([BUILD_SEED_EXAMPLES], [test "x$enable_examples"="xyes"])
 AC_SUBST(BUILD_SEED_EXAMPLES)
 
 dnl =============================Debug=========================================
 AC_ARG_ENABLE(debug,
-              AC_HELP_STRING([--enable-debug],
-                             [build debugging code. This does not actually enable debugging, it only builds the code in. Pass --seed-debug=(misc/finalization/initialization/signal/all) to enable debugging. [default=no]]),
-              [enable_debug="yes"],[enable_debug="no"])
+			  AC_HELP_STRING([--enable-debug],
+							 [enable verbose debugging. [default=no]]),
+			  [enable_debug="yes"],[enable_debug="no"])
 
 if test "x$enable_debug" = "xyes"; then
-  SEED_DEBUG_CFLAGS="-DSEED_ENABLE_DEBUG -g"
-  CFLAGS="-O0"
+	SEED_DEBUG_CFLAGS="-DSEED_ENABLE_DEBUG -g"
+	CFLAGS="-O0"
 else
-  SEED_DEBUG_CFLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
+	SEED_DEBUG_CFLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
 fi
 
 AC_SUBST(SEED_DEBUG_CFLAGS)
 
 dnl ===========================Profiling=======================================
 AC_ARG_ENABLE(profile,
-              AC_HELP_STRING([--enable-profile],
-                             [turn on profiling [default=no]]),
-              [enable_profile="yes"],[enable_profile="no"])
+			  AC_HELP_STRING([--enable-profile],
+							 [turn on profiling [default=no]]),
+			  [enable_profile="yes"],[enable_profile="no"])
 
 if test "x$enable_profile" = "xyes"; then
-  SEED_PROFILE_CFLAGS="-fprofile-arcs -ftest-coverage"
-  SEED_PROFILE_LDFLAGS="-lgcov"
-  CFLAGS="-O0"
+	SEED_PROFILE_CFLAGS="-fprofile-arcs -ftest-coverage"
+	SEED_PROFILE_LDFLAGS="-lgcov"
+	CFLAGS="-O0"
 fi
 
 AC_SUBST(SEED_PROFILE_CFLAGS)
@@ -201,9 +246,11 @@
    Install examples...........$enable_examples
 
 Modules:
-   SQLite.....................$have_sqlite3_h
-   Canvas.....................$have_cairo_h
-   readline...................$have_readline_h
+   Canvas.....................$want_canvas_module
+   example............... ....$want_example_module
+   multiprocessing............$want_multiprocessing_module
+   readline...................$want_readline_module
+   SQLite.....................$want_sqlite_module
 
 Examples:
    Turtle.....................$want_turtle

Modified: trunk/modules/Multiprocessing/Makefile.am
==============================================================================
--- trunk/modules/Multiprocessing/Makefile.am	(original)
+++ trunk/modules/Multiprocessing/Makefile.am	Wed Jan 14 04:16:21 2009
@@ -1,3 +1,5 @@
+if BUILD_MULTIPROCESSING_MODULE
+
 lib_LTLIBRARIES = \
 	libmultiprocessing.la
 
@@ -16,6 +18,8 @@
 
 AM_LDFLAGS = $(SEED_PROFILE_LDFLAGS)
 
+endif
+
 EXTRA_DIST = fork.js bi.js
 
 libdir = ${exec_prefix}/lib/seed

Modified: trunk/modules/example/Makefile.am
==============================================================================
--- trunk/modules/example/Makefile.am	(original)
+++ trunk/modules/example/Makefile.am	Wed Jan 14 04:16:21 2009
@@ -1,3 +1,5 @@
+if BUILD_EXAMPLE_MODULE
+
 lib_LTLIBRARIES = \
 	libexample.la
 
@@ -16,5 +18,7 @@
 
 AM_LDFLAGS = $(SEED_PROFILE_LDFLAGS)
 
+endif
+
 libdir = ${exec_prefix}/lib/seed
 

Modified: trunk/modules/sqlite/Makefile.am
==============================================================================
--- trunk/modules/sqlite/Makefile.am	(original)
+++ trunk/modules/sqlite/Makefile.am	Wed Jan 14 04:16:21 2009
@@ -1,4 +1,4 @@
-if BUILD_SQLITE3_MODULE
+if BUILD_SQLITE_MODULE
 
 lib_LTLIBRARIES = \
 	libsqlite.la
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]