X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=configure.ac;h=17185929430b8600ab1759389e18d5d4129e949e;hb=034b7e1b0a4bc5ab6ea8473c5be1d0431fb64d6c;hp=fa880056a90b0b70c56d91220fc3916eae4c9c56;hpb=5d8cc54e0272cd4c54b9fd9de1cc76bb6a1ec4c0;p=rodin%2Fchimara.git

diff --git a/configure.ac b/configure.ac
index fa88005..1718592 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,24 +24,35 @@ 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)
 
+### DECLARE COMPILERS #########################################################
+
+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
+
 ### DECLARE PROGRAMS ##########################################################
 
-AC_PROG_CC                 # C compiler
-AM_PROG_CC_C_O             # Automake requires this for per-target CFLAGS
-AC_PROG_INSTALL            # Install
+AC_PROG_INSTALL              # Install
 m4_defun([_LT_AC_LANG_CXX_CONFIG], [:]) # Disable unnecessary Libtool checks
 m4_defun([_LT_AC_LANG_F77_CONFIG], [:]) # to save time (1.5 only)
-LT_INIT                    # Libtool 2.2.6 and up
-#LT_INIT([dlopen])         # Should call it this way, but
-#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
-PKG_PROG_PKG_CONFIG        # pkg_config
-GTK_DOC_CHECK(1.9)         # Gtk-Doc
+LT_INIT                      # Libtool 2.2.6 and up
+#LT_INIT([dlopen])           # Should call it this way, but
+#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
+PKG_PROG_PKG_CONFIG          # pkg_config
+GTK_DOC_CHECK(1.9)           # Gtk-Doc
+# Other utilities used in this package's various make scripts
+AC_PROG_AWK
+AC_PATH_PROG([PERL], [perl]) # Perl
 
 ### TYPES #####################################################################
 
+AC_TYPE_UINT8_T
+AC_TYPE_UINT16_T
 AC_TYPE_INT32_T
 AC_TYPE_UINT32_T
 
@@ -76,6 +87,12 @@ PKG_CHECK_MODULES([TEST], [
 	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
@@ -89,10 +106,13 @@ 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