diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 46 |
1 files changed, 38 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index acc2a24..fad3309 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT(seed, 3.2.0) +AC_INIT(seed, 3.8.1) AM_INIT_AUTOMAKE([1.7 -Wno-portability]) AM_MAINTAINER_MODE([enable]) @@ -90,14 +90,10 @@ AS_CASE([$with_webkit], AC_CHECK_LIB(javascriptcoregtk-3.0, JSContextGroupCreate,WEBKIT_PC=javascriptcoregtk-3.0)) ], [1.0], [ - save_LIBS=$LIBSma - LIBS=`pkg-config --libs webkit-1.0` - WEBKIT_PC=webkitgtk-1.0 - AC_CHECK_LIB(webkitgtk-1.0, JSContextGroupCreate,, + AC_CHECK_LIB(webkitgtk-1.0, JSContextGroupCreate,WEBKIT_PC=webkitgtk-1.0, AC_CHECK_LIB(javascriptcoregtk-1.0, JSContextGroupCreate,WEBKIT_PC=javascriptcoregtk-1.0, AC_CHECK_LIB(webkit-1.0, JSContextGroupCreate,WEBKIT_PC=webkit-1.0, AC_MSG_ERROR([The installed version of WebKit is too old. Seed requires WebKit SVN revision 35442 or greater.])))) - LIBS=$save_LIBS ], [AC_MSG_ERROR([Invalid argument for --with-webkit])] @@ -129,6 +125,9 @@ AC_SUBST(GNOME_JS_DIR) dnl ========================GThread============================================ PKG_CHECK_MODULES(GTHREAD, gthread-2.0) +dnl ========================GIO================================================ +PKG_CHECK_MODULES(GIO, gio-2.0) + dnl =============================Modules======================================= dnl ==== canvas ==== AC_ARG_ENABLE(canvas-module, @@ -189,6 +188,35 @@ fi AM_CONDITIONAL(BUILD_SQLITE_MODULE, test "x$want_sqlite_module" = "xyes") AC_SUBST(BUILD_SQLITE_MODULE) + +dnl ==== xorg ==== +AC_ARG_ENABLE(xorg-module, + AC_HELP_STRING([--enable-xorg-module], + [enable the xorg Seed module. [default=no]]), + [want_xorg_module=$enableval],[want_xorg_module="no"]) + +if test x"$want_xorg_module" = x"yes" ; then + + PKG_CHECK_MODULES(LIBXSS, [xscrnsaver], [ + AC_DEFINE(USE_LIBXSS, 1, [Use XScreenSaver for idleness]) + AC_SUBST(LIBXSS_CFLAGS) + AC_SUBST(LIBXSS_LIBS) + ] , [ + echo "" + echo "configure: error: " + echo "XScreenSaver development headers not found." + echo "Use --enable-xorg-module=no if you do not need it." + echo "If you're using debian or ubuntu, install it by" + echo "\"sudo apt-get install libxss-dev\"" + echo "" + exit -1 + ]) +fi + +AM_CONDITIONAL(BUILD_XORG_MODULE, test "x$want_xorg_module" = "xyes") +AC_SUBST(BUILD_XORG_MODULE) + + dnl ==== Example ==== AC_ARG_ENABLE(example-module, AC_HELP_STRING([--enable-example-module], @@ -389,10 +417,10 @@ AC_ARG_ENABLE(debug, if test "x$enable_debug" = "xyes"; then SEED_DEBUG_CFLAGS="-DSEED_ENABLE_DEBUG -g" - CFLAGS="-O0 -Wall" + CFLAGS="$CFLAGS -O0 -Wall" else SEED_DEBUG_CFLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS" - CFLAGS="-Wall" + CFLAGS="$CFLAGS -Wall" if test "x$need_debug" = "xyes"; then AC_MSG_ERROR([debug must be enabled in order to enable profiling.]) @@ -448,6 +476,7 @@ doc/mapping/Makefile modules/Makefile modules/example/Makefile modules/sqlite/Makefile +modules/xorg/Makefile modules/canvas/Makefile modules/readline/Makefile modules/multiprocessing/Makefile @@ -483,6 +512,7 @@ Modules: multiprocessing............$want_multiprocessing_module readline...................$want_readline_module SQLite.....................$want_sqlite_module + XOrg.......................$want_xorg_module DBus.......................$want_dbus_module libxml.....................$want_libxml_module cairo......................$want_cairo_module |