Add void* userdata support for gobjects

[gnome.seed] / configure.ac

diff --git a/configure.ac b/configure.ac
index 642b8f3..e809a27 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,10 @@
 AC_PREREQ(2.59)
-AC_INIT(seed, 2.27.91)
+AC_INIT(seed, 2.31.1.1)
 
 AM_INIT_AUTOMAKE([1.7 -Wno-portability])
 AM_MAINTAINER_MODE
 AC_CONFIG_HEADERS([config.h])
 
-AC_CONFIG_MACRO_DIR([m4])
-
 AC_CANONICAL_HOST
 
 AC_PROG_CC
@@ -14,6 +12,9 @@ AM_PROG_CC_C_O
 AC_PROG_LIBTOOL
 PKG_PROG_PKG_CONFIG
 
+# Use AM_SILENT_RULES if present
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
 changequote(,)dnl
 ensureflag() {
   flag="$1"; shift
@@ -71,18 +72,16 @@ fi
 AC_SUBST(FFI_LDFLAGS)
 AC_SUBST(FFI_CFLAGS)
 
-dnl =======================WebKit ContextGroup=================================
-case "$host_os" in
-       darwin*)
-               ;;
-       *)
-               save_LIBS=$LIBS
-               LIBS=`pkg-config --libs webkit-1.0`
-               AC_CHECK_LIB(webkit-1.0, JSContextGroupCreate,,
-                                        AC_MSG_ERROR([The installed version of WebKit is too old. Seed requires WebKit SVN revision 35442 or greater.]))
-               LIBS=$save_LIBS
-               ;;
-esac
+dnl ==============================WebKit=======================================
+save_LIBS=$LIBS
+LIBS=`pkg-config --libs webkit-1.0`
+AC_CHECK_LIB(webkit-1.0, JSContextGroupCreate,,
+                        AC_MSG_ERROR([The installed version of WebKit is too old. Seed requires WebKit SVN revision 35442 or greater.]))
+LIBS=$save_LIBS
+
+PKG_CHECK_MODULES(WEBKIT, webkit-1.0)
+AC_SUBST(WEBKIT_CFLAGS)
+AC_SUBST(WEBKIT_LDFLAGS)
 
 dnl =========================Introspection=====================================
 PKG_CHECK_MODULES(GOBJECT_INTROSPECTION, gobject-introspection-1.0 >= 0.6.3)
@@ -113,8 +112,6 @@ fi
 AM_CONDITIONAL(BUILD_CANVAS_MODULE, test "x$want_canvas_module" = "xyes")
 AC_SUBST(BUILD_CANVAS_MODULE)
 
-
-
 dnl ==== readline ====
 AC_ARG_ENABLE(readline-module,
                          AC_HELP_STRING([--enable-readline-module],
@@ -302,29 +299,6 @@ fi
 AM_CONDITIONAL(BUILD_MPFR_MODULE, test "x$want_mpfr_module" = "xyes")
 AC_SUBST(BUILD_MPFR_MODULE)
 
-dnl =========================turtle example====================================
-AC_ARG_ENABLE(turtle-example,
-                         AC_HELP_STRING([--enable-turtle-example],
-                                                        [enable the turtle graphics example. [default=yes]]),
-                         [want_turtle_example=$enableval],[want_turtle_example="yes"])
-
-if test x"$want_turtle_example" == x"yes" ; then
-       PKG_CHECK_MODULES(GTK, gtk+-2.0)
-       AC_SUBST(GTK_CFLAGS)
-       AC_SUBST(GTK_LIBS)
-fi
-
-AM_CONDITIONAL(BUILD_TURTLE_EXAMPLE, test "x$want_turtle_example" = "xyes")
-AC_SUBST(BUILD_TURTLE_EXAMPLE)
-
-dnl =========================Install Examples==================================
-AC_ARG_ENABLE(examples,
-                         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 ===========================Profiling=======================================
 AC_ARG_ENABLE(profile,
                          AC_HELP_STRING([--enable-profile],
@@ -371,33 +345,12 @@ fi
 
 AC_SUBST(SEED_DEBUG_CFLAGS)
 
-dnl ===========================Darwin Build====================================
-SEED_OSX_CFLAGS=
-SEED_OSX_LDFLAGS=
-
-case "$host_os" in
-       darwin*)
-               SEED_OSX_CFLAGS="-F/Applications/WebKit.app/Contents/Frameworks/10.5 -framework JavaScriptCore"
-               SEED_OSX_LDFLAGS="-F/Applications/WebKit.app/Contents/Frameworks/10.5 -framework JavaScriptCore"
-               ;;
-       *)
-               PKG_CHECK_MODULES(WEBKIT, webkit-1.0)
-               AC_SUBST(WEBKIT_CFLAGS)
-               AC_SUBST(WEBKIT_LDFLAGS)
-       ;;
-
-
-esac
-AC_SUBST(SEED_OSX_CFLAGS)
-AC_SUBST(SEED_OSX_LDFLAGS)
-
 AC_CHECK_HEADERS(pty.h)
 
 dnl =============================gtk-doc=======================================
 GTK_DOC_CHECK(1.9)
 
 dnl =============================Output========================================
-SHAVE_INIT([scripts],[enable])
 AC_CONFIG_FILES([
 seed.pc
 Makefile
@@ -419,13 +372,9 @@ doc/modules/sandbox/Makefile
 
 doc/mapping/mapping.html
 
-scripts/shave
-scripts/shave-libtool
-
 libseed/Makefile
 po/Makefile.in
 src/Makefile
-extensions/Seed.js
 extensions/Makefile
 tests/Makefile
 tests/javascript/Makefile
@@ -440,17 +389,6 @@ doc/tutorial-standalone/Makefile
 doc/reference/Makefile
 doc/reference/version.xml
 doc/mapping/Makefile
-examples/Makefile
-examples/clutter-pad/Makefile
-examples/clutter-pad/examples/Makefile
-examples/clutter-shader/Makefile
-examples/glib/Makefile
-examples/browser/Makefile
-examples/turtle/Makefile
-examples/opengl/Makefile
-examples/twitter/Makefile
-examples/dbus/Makefile
-examples/xml/Makefile
 modules/Makefile
 modules/example/Makefile
 modules/sqlite/Makefile
@@ -481,7 +419,6 @@ Build Configuration:
 
 Installation:
    Prefix.....................$prefix
-   Install examples...........$enable_examples
 
 Modules:
    Canvas.....................$want_canvas_module
@@ -496,9 +433,6 @@ Modules:
    gettext....................$want_gettext_module
    mpfr.......................$want_mpfr_module
    ffi........................$want_ffi_module
-
-C Examples:
-   Turtle.....................$want_turtle_example
 "
 
 if test "x$want_readline_module" != "xyes"; then