For some reason these didn't commit in revision [59]

git-svn-id: http://lassie.dyndns-server.com/svn/gargoyle-gtk@61 ddfedd41-794f-dd11-ae45-00112f111e67

diff --git a/chimara-plugin.pc.in b/chimara-plugin.pc.in
index 85146b5a89911e437d2956c5f9ea0b2b864c9d9a..8fe243d11080380af57ddbbfdc65e7bfea224181 100644 (file)
--- a/chimara-plugin.pc.in
+++ b/chimara-plugin.pc.in
@@ -7,7 +7,6 @@ Name: Chimara
 Description: Multi-session Glk library, with interactive fiction plugins
 Version: @PACKAGE_VERSION@
 URL: http://no.public.website.yet
-Requires: glib-2.0
 Libs: -module -shared -avoid-version -export-symbols-regex "^glk_main$$"
 Cflags: -I${includedir}/chimara
 

diff --git a/configure.ac b/configure.ac
index 649fe2a2b10e594ce1283afd7da2cd7e1204852d..191b5837cdaa7019622b647f3d06b6a35dd9ca5a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,11 @@ 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
@@ -54,8 +59,6 @@ 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 ###################################################################
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 6d1ed53e61547a84616d7357e706ec881ccbcede..66ba27518a54865d20d4178b6d47d06070895da7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -56,7 +56,6 @@ splittest_la_SOURCES = splittest.c
 splittest_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 
 multiwin_la_SOURCES = multiwin.c
-multiwin_la_CFLAGS = @GLIB_CFLAGS@
 multiwin_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 
 CLEANFILES = chimara.ui