X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=configure.ac;h=231c8b4bf81030b0bd34027072403203e9102184;hb=242069dd35a144699ff09b86411ba7bef8977da5;hp=1e494408997562ad6782d57ff9d339958dc99465;hpb=bf197c155b969096a5ee168d36c74c5bc9abbb97;p=projects%2Fchimara%2Fchimara.git

diff --git a/configure.ac b/configure.ac
index 1e49440..231c8b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,52 +7,83 @@
 # tarballname)
 AC_INIT([chimara], [0.1])
 # Sanity check to make sure we are running Autoconf from the right directory
-AC_CONFIG_SRCDIR(src/chimara-glk.c)
+AC_CONFIG_SRCDIR(libchimara/chimara-glk.c)
+# Put m4 macros in their own directory
+AC_CONFIG_MACRO_DIR(m4)
 # Initialize Automake
 AM_INIT_AUTOMAKE([-Wall])
+# Configure with --enable-silent-rules to cut down on clutter
+AM_SILENT_RULES
+
+### LIBRARY VERSIONING ########################################################
+# Only update immediately before a public release
+
+CHIMARA_CURRENT=0  # Increment if interface changes
+CHIMARA_REVISION=0 # Increment if source changes; set 0 if interface changes
+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_PROG_CC                   # C compiler
+AC_USE_SYSTEM_EXTENSIONS     # Define _GNU_SOURCE if using GCC
+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
-LT_INIT                    # Libtool
-AC_PROG_LIBTOOL            # Old way of declaring Libtool
-AM_GLIB_GNU_GETTEXT        # Use GLib gettext instead of standard
-IT_PROG_INTLTOOL([0.35.0]) # Intltool
-PKG_PROG_PKG_CONFIG        # pkg_config
-GTK_DOC_CHECK(1.9)         # Gtk-Doc
+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
+# Other utilities used in this package's various make scripts
+AC_PROG_AWK
+AC_PATH_PROG([PERL], [perl]) # Perl
+
+### TYPES #####################################################################
+
+AC_TYPE_INT32_T
+AC_TYPE_UINT32_T
 
 ### INTERNATIONALIZATION ######################################################
 
+AM_GNU_GETTEXT_VERSION([0.17])
 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
+
+AC_SUBST(GTK_REQUIRED_VERSION)
+AC_SUBST(GLIB_REQUIRED_VERSION)
+
 # Libraries needed to build Chimara library
 PKG_CHECK_MODULES([CHIMARA], [
-	glib-2.0 >= 2.6
-	gtk+-2.0 >= 2.8 
+	glib-2.0 >= $GLIB_REQUIRED_VERSION
+	gtk+-2.0 >= $GTK_REQUIRED_VERSION
 	gthread-2.0 
 	gmodule-2.0
+	pango
 ])
-AC_SUBST(CHIMARA_CFLAGS)
+CHIMARA_LIBS="$CHIMARA_LIBS -lm"
 AC_SUBST(CHIMARA_LIBS)
 # Libraries needed to build test programs
 PKG_CHECK_MODULES([TEST], [
-	gtk+-2.0 >= 2.8 
+	gtk+-2.0 >= $GTK_REQUIRED_VERSION 
 	gmodule-2.0
 ])
-AC_SUBST(TEST_CFLAGS)
-AC_SUBST(TEST_LIBS)
-
-### GTK-DOC ###################################################################
-
-# Allow gtkdocize to automatically copy the macro definition for
-# GTK_DOC_CHECK to the project.
-# AC_CONFIG_MACRO_DIR(m4)
 
 ### OUTPUT ####################################################################
 
@@ -61,7 +92,13 @@ AC_CONFIG_HEADERS([config.h])
 # List of other files for Autoconf to output
 AC_CONFIG_FILES([
 Makefile
-src/Makefile
+chimara.pc
+chimara-plugin.pc
+libchimara/Makefile
+interpreters/Makefile
+interpreters/frotz/Makefile
+interpreters/nitfol/Makefile
+tests/Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/version.xml