Fixed ordering of the application of the styles

[rodin/chimara.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 51a5cf2d215e65c4cf011cb6876a0bc866be4975..81677ccaf92e1936506ca3e593179a373bbdea2f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 # Initialize Autoconf 
 # Args: (human-readable package name, package version, bug report address, 
 # tarballname)
-AC_INIT([chimara], [0.1])
+AC_INIT([chimara], [0.9])
 # Sanity check to make sure we are running Autoconf from the right directory
 AC_CONFIG_SRCDIR(libchimara/chimara-glk.c)
 # Put m4 macros in their own directory
@@ -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
@@ -24,10 +24,20 @@ CHIMARA_AGE=0 # Increment if interfaces added; set 0 if removed
 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
+AC_SUBST(GTK_REQUIRED_VERSION)
+AC_SUBST(GLIB_REQUIRED_VERSION)
+AC_SUBST(GTK_DOC_REQUIRED_VERSION)
+
 ### 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 +52,14 @@ 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([0.40.0])   # Intltool
 PKG_PROG_PKG_CONFIG          # pkg_config
-GTK_DOC_CHECK(1.9)           # Gtk-Doc
+GTK_DOC_CHECK($GTK_DOC_REQUIRED_VERSION) 
 # 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
+AC_PATH_PROG([ECHO], [echo]) # Echo
 
 ### TYPES #####################################################################
 
@@ -63,13 +75,37 @@ GETTEXT_PACKAGE=chimara
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 
-### CHECK FOR LIBRARIES #######################################################
-
-GTK_REQUIRED_VERSION=2.8
-GLIB_REQUIRED_VERSION=2.6
+### 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]
+)
+
+AM_CONDITIONAL([TARGET_ILIAD], [$TEST "x$iliad" = xtrue])
+
+### RPM CONFIGURATION ##########################################################
+# --enable-rpm requires rpm and rpmbuild
+AC_PATH_PROG([RPMBUILD], [rpmbuild], [notfound])
+AC_ARG_ENABLE([rpm],
+       [AS_HELP_STRING([--enable-rpm],[Configure for building RPM package [no] (requires rpm and rpmbuild)])],
+       [AS_CASE([${enableval}],
+               [yes], [AS_IF(
+                       [$TEST "x$RPMBUILD" = xnotfound],
+                               [AC_MSG_ERROR([rpmbuild is required for --enable-rpm])],
+                       [rpm=true])],
+               [no],  [rpm=false],
+               [AC_MSG_ERROR([bad value ${enableval} for --enable-rpm])]
+       )],
+       [rpm=false]
+)
+AM_CONDITIONAL([BUILDING_RPM], [$TEST "x$rpm" = xtrue])
 
-AC_SUBST(GTK_REQUIRED_VERSION)
-AC_SUBST(GLIB_REQUIRED_VERSION)
+### CHECK FOR LIBRARIES #######################################################
 
 # Libraries needed to build Chimara library
 PKG_CHECK_MODULES([CHIMARA], [
@@ -83,10 +119,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 
-       gmodule-2.0
+       gtk+-2.0 >= $GTK_REQUIRED_VERSION
+       gmodule-2.0 >= $GLIB_REQUIRED_VERSION
 ])
 
+# 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
@@ -96,6 +138,7 @@ AC_CONFIG_FILES([
 Makefile
 chimara.pc
 chimara-plugin.pc
+chimara.spec
 libchimara/Makefile
 interpreters/Makefile
 interpreters/frotz/Makefile
@@ -103,12 +146,14 @@ interpreters/nitfol/Makefile
 interpreters/glulxe/Makefile
 interpreters/git/Makefile
 tests/Makefile
+player/Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/version.xml
 docs/reference/build-selector-table.pl
 po/Makefile.in
 ])
+
 # Do it
 AC_OUTPUT