X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=configure.ac;h=ad95022df928a1280b58e607b5e34dc59e90ca26;hb=c6009981145d784b85990702617018ebc5d6cc8a;hp=1e494408997562ad6782d57ff9d339958dc99465;hpb=3c678195610789166e1133575789f25da8f1a291;p=rodin%2Fchimara.git

diff --git a/configure.ac b/configure.ac
index 1e49440..ad95022 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
 # 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)
 # Initialize Automake
 AM_INIT_AUTOMAKE([-Wall])
 
@@ -16,13 +16,22 @@ AM_INIT_AUTOMAKE([-Wall])
 AC_PROG_CC                 # C compiler
 AM_PROG_CC_C_O             # Automake requires this for per-target CFLAGS
 AC_PROG_INSTALL            # Install
-LT_INIT                    # Libtool
+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
 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
 
+### TYPES #####################################################################
+
+AC_TYPE_INT32_T
+AC_TYPE_UINT32_T
+
 ### INTERNATIONALIZATION ######################################################
 
 GETTEXT_PACKAGE=chimara
@@ -31,22 +40,27 @@ 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 ###################################################################
 
@@ -61,7 +75,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