X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=configure.ac;h=18f9d5f55185600d774b4ae111e8b43d9bf8bd79;hb=57ceef742182d6f0d1f7844256863a37c2d80d6a;hp=3e39397a816e4847180819186250824e1633cae8;hpb=a0159df30d8b681805dbb3af07b2eb20374499e8;p=rodin%2Fchimara.git

diff --git a/configure.ac b/configure.ac
index 3e39397..18f9d5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ AC_CONFIG_MACRO_DIR(m4)
 # Initialize Automake
 AM_INIT_AUTOMAKE([-Wall])
 # Configure with --enable-silent-rules to cut down on clutter
-AM_SILENT_RULES
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 ### LIBRARY VERSIONING ########################################################
 # Only update immediately before a public release
@@ -26,8 +26,8 @@ AC_SUBST(LT_VERSION_INFO)
 
 ### DECLARE COMPILERS #########################################################
 
-AC_PROG_CC                   # C compiler
 AC_USE_SYSTEM_EXTENSIONS     # Define _GNU_SOURCE if using GCC
+AC_PROG_CC                   # C compiler
 AM_PROG_CC_C_O               # Automake requires this for per-target CFLAGS
 AC_C_INLINE                  # Define inline keyword 
 AC_PROG_YACC                 # Building nitfol requires yacc
@@ -42,12 +42,13 @@ LT_INIT                      # Libtool 2.2.6 and up
 #LT_PREREQ([2.2.6])          # ...goddamn Debian still has 1.5
 AC_PROG_LIBTOOL              # Old way of declaring Libtool
 AM_GNU_GETTEXT([external])   # Gettext, link to system libintl
-IT_PROG_INTLTOOL([0.35.0])   # Intltool
+IT_PROG_INTLTOOL    # Intltool
 PKG_PROG_PKG_CONFIG          # pkg_config
-GTK_DOC_CHECK(1.9)           # Gtk-Doc
+GTK_DOC_CHECK(1.11)          # Gtk-Doc 1.11 required
 # Other utilities used in this package's various make scripts
 AC_PROG_AWK
 AC_PATH_PROG([PERL], [perl]) # Perl
+AC_PATH_PROG([TEST], [test]) # Test
 
 ### TYPES #####################################################################
 
@@ -63,18 +64,26 @@ GETTEXT_PACKAGE=chimara
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 
-### CHECK FOR LIBRARIES #######################################################
+### ILIAD #####################################################################
+AC_ARG_ENABLE([iliad],
+  [AS_HELP_STRING([--enable-iliad],[Compiles Chimara for the iLiad])],
+  [AS_CASE([${enableval}],
+	   [yes], [iliad=true],
+	   [no], [iliad=false],
+	   [AC_MSG_ERROR([bad value ${enableval} for --enable-iliad])]
+   )],
+   [iliad=false]
+)
 
-GTK_REQUIRED_VERSION=2.8
-GLIB_REQUIRED_VERSION=2.6
+AM_CONDITIONAL([TARGET_ILIAD], [$TEST "x$iliad" = xtrue])
 
-AC_SUBST(GTK_REQUIRED_VERSION)
-AC_SUBST(GLIB_REQUIRED_VERSION)
+
+### CHECK FOR LIBRARIES #######################################################
 
 # Libraries needed to build Chimara library
 PKG_CHECK_MODULES([CHIMARA], [
-	glib-2.0 >= $GLIB_REQUIRED_VERSION
-	gtk+-2.0 >= $GTK_REQUIRED_VERSION
+	glib-2.0 
+	gtk+-2.0
 	gthread-2.0 
 	gmodule-2.0
 	pango
@@ -83,10 +92,16 @@ CHIMARA_LIBS="$CHIMARA_LIBS -lm"
 AC_SUBST(CHIMARA_LIBS)
 # Libraries needed to build test programs
 PKG_CHECK_MODULES([TEST], [
-	gtk+-2.0 >= $GTK_REQUIRED_VERSION 
+	gtk+-2.0 
 	gmodule-2.0
 ])
 
+# 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"'
+AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
+
 ### OUTPUT ####################################################################
 
 # Output platform-specific definitions to config.h
@@ -100,12 +115,16 @@ libchimara/Makefile
 interpreters/Makefile
 interpreters/frotz/Makefile
 interpreters/nitfol/Makefile
+interpreters/glulxe/Makefile
+interpreters/git/Makefile
 tests/Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/version.xml
+docs/reference/build-selector-table.pl
 po/Makefile.in
 ])
+
 # Do it
 AC_OUTPUT