Use GParamSpecFlags for the flags property

[projects/chimara/chimara.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4b63d120c8e51a996573abca339be201246142f9..06bb494b7d16e8845ac24364cd23851e0f2eff09 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -26,11 +26,9 @@ LT_VERSION_INFO="$CHIMARA_CURRENT:$CHIMARA_REVISION:$CHIMARA_AGE"
 AC_SUBST(LT_VERSION_INFO)
 
 ### REQUIREMENTS ##############################################################
-# Recommended GTK version: at least 2.12
-# Recommended Glib version: at least 2.16
-GTK_REQUIRED_VERSION=2.6
-GLIB_REQUIRED_VERSION=2.6
-GTK_DOC_REQUIRED_VERSION=1.9
+GTK_REQUIRED_VERSION=3.2
+GLIB_REQUIRED_VERSION=2.16
+GTK_DOC_REQUIRED_VERSION=1.12
 AC_SUBST(GTK_REQUIRED_VERSION)
 AC_SUBST(GLIB_REQUIRED_VERSION)
 AC_SUBST(GTK_DOC_REQUIRED_VERSION)
@@ -77,26 +75,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 
 GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
-### ILIAD #####################################################################
-AC_ARG_ENABLE([iliad],
-       [AS_HELP_STRING([--enable-iliad=@<:@yes/no@:>@],
-               [Compiles Chimara for the iLiad @<:@default=no@:>@])],
-       [],
-       [enable_iliad=no])
-AM_CONDITIONAL(TARGET_ILIAD, $TEST "x$enable_iliad" = xyes)
-
-### BUILD WITHOUT RECENT FILES MANAGER #########################################
-# (to work around a bug on OS X)
-AC_ARG_ENABLE([recent],
-       [AS_HELP_STRING([--disable-recent],
-               [Omit recent files menu (to work around a bug on OS X])],
-       [],
-       [enable_recent=yes])
-AS_IF([$TEST "x$enable_recent" = "xyes"],
-       [OPEN_RECENT_MENU_ITEM="<menuitem action=\"recent\"/>"],
-       [OPEN_RECENT_MENU_ITEM="<!--  <menuitem action=\"recent\"/>-->"])
-AC_SUBST(OPEN_RECENT_MENU_ITEM)
-
 ### RPM CONFIGURATION ##########################################################
 # --enable-rpm requires rpm and rpmbuild
 AC_PATH_PROG([RPMBUILD], [rpmbuild], [notfound])
@@ -130,7 +108,7 @@ AM_CONDITIONAL(BUILDING_VAPI, $TEST "x$VAPIGEN" != xnotfound)
 # Libraries needed to build Chimara library
 PKG_CHECK_MODULES([CHIMARA], [
        glib-2.0 >= $GLIB_REQUIRED_VERSION
-       gtk+-2.0 >= $GTK_REQUIRED_VERSION
+       gtk+-3.0 >= $GTK_REQUIRED_VERSION
        gthread-2.0 
        gmodule-2.0
        pango
@@ -141,14 +119,19 @@ AC_SUBST(CHIMARA_LIBS)
 # Libraries needed to build Chimara player
 PKG_CHECK_MODULES([PLAYER], [
        glib-2.0 >= $GLIB_REQUIRED_VERSION
-       gtk+-2.0 >= $GTK_REQUIRED_VERSION
+       gtk+-3.0 >= $GTK_REQUIRED_VERSION
        gmodule-2.0
-       libgda-4.0
-       libsoup-2.4
+])
+# Libraries needed to build interpreter plugins
+PKG_CHECK_MODULES([PLUGIN], [
+       glib-2.0  dnl Any version will do
+       gtk+-3.0
+       libpeas-1.0
+       libpeas-gtk-1.0
 ])
 # Libraries needed to build test programs
 PKG_CHECK_MODULES([TEST], [
-       gtk+-2.0 >= $GTK_REQUIRED_VERSION
+       gtk+-3.0 >= $GTK_REQUIRED_VERSION
        gmodule-2.0 >= $GLIB_REQUIRED_VERSION
 ])
 
@@ -174,7 +157,7 @@ AS_IF([$TEST "x$with_gstreamer" != xno], [
 # Plugin flags; include '-module' in each Makefile.am, because AC_SUBSTed
 # variables are black boxes to Automake, so it has to know about it being a
 # module in the makefile itself.
-PLUGIN_LIBTOOL_FLAGS='-avoid-version -shared -export-symbols-regex "^glk"'
+PLUGIN_LIBTOOL_FLAGS='-avoid-version -shared -export-symbols-regex "(^glk|peas_register_types)"'
 AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
 
 ### OUTPUT ####################################################################
@@ -189,19 +172,14 @@ chimara-plugin.pc
 chimara.spec
 libchimara/Makefile
 interpreters/Makefile
-interpreters/frotz/Makefile
-interpreters/nitfol/Makefile
-interpreters/glulxe/Makefile
-interpreters/git/Makefile
 tests/Makefile
 player/Makefile
-player/chimara.menus
+player/config.py
 docs/Makefile
 docs/reference/Makefile
 docs/reference/version.xml
 docs/reference/build-selector-table.pl
 po/Makefile.in
-babel/Makefile
 ])
 
 # Do it