Moved to updated gettext and did some tweaking for make distcheck

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

diff --git a/configure.ac b/configure.ac
index ed398402fa8a8ddd2dbf54f865f83d085b5378cd..fa880056a90b0b70c56d91220fc3916eae4c9c56 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,26 +7,47 @@
 # 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 PROGRAMS ##########################################################
 
 AC_PROG_CC                 # C compiler
 AM_PROG_CC_C_O             # Automake requires this for per-target CFLAGS
 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 Fedora 10 still has 1.5
+#LT_PREREQ([2.2.6])        # ...goddamn Debian still has 1.5
 AC_PROG_LIBTOOL            # Old way of declaring Libtool
-AM_GLIB_GNU_GETTEXT        # Use GLib gettext instead of standard
+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
 
+### 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])
@@ -45,20 +66,15 @@ PKG_CHECK_MODULES([CHIMARA], [
        gtk+-2.0 >= $GTK_REQUIRED_VERSION
        gthread-2.0 
        gmodule-2.0
+       pango
 ])
+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
 ])
-# GLib CFLAGS for plugins
-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= $GLIB_REQUIRED_VERSION])
-
-### GTK-DOC ###################################################################
-
-# Allow gtkdocize to automatically copy the macro definition for
-# GTK_DOC_CHECK to the project.
-# AC_CONFIG_MACRO_DIR(m4)
 
 ### OUTPUT ####################################################################
 
@@ -69,7 +85,11 @@ AC_CONFIG_FILES([
 Makefile
 chimara.pc
 chimara-plugin.pc
-src/Makefile
+libchimara/Makefile
+interpreters/Makefile
+interpreters/frotz/Makefile
+interpreters/nitfol/Makefile
+tests/Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/version.xml