SF.net SVN: geany:[3459] trunk

[eht16 at users.sourceforge.net]

Revision: 3459
          http://geany.svn.sourceforge.net/geany/?rev=3459&view=rev
Author:   eht16
Date:     2009-01-11 17:40:40 +0000 (Sun, 11 Jan 2009)

Log Message:
-----------
Fix build with GTK 2.12 by adding GIO compile and linker flags (closes #2498580).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.in
    trunk/src/Makefile.am
    trunk/src/utils.c
    trunk/wscript

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-01-09 18:22:23 UTC (rev 3458)
+++ trunk/ChangeLog	2009-01-11 17:40:40 UTC (rev 3459)
@@ -1,3 +1,10 @@
+2009-01-11  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * configure.in, wscript, src/Makefile.am, src/utils.c:
+   Fix build with GTK 2.12 by adding GIO compile and linker flags
+   (closes #2498580).
+
+
 2009-01-09  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * configure.in, win32-config.h, wscript, src/main.c, src/main.h,

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2009-01-09 18:22:23 UTC (rev 3458)
+++ trunk/configure.in	2009-01-11 17:40:40 UTC (rev 3459)
@@ -135,6 +135,8 @@
 # GIO checks
 gio_modules="gio-2.0 >= 2.16"
 PKG_CHECK_MODULES(GIO, [$gio_modules], have_gio=1, have_gio=0)
+AC_SUBST(GIO_CFLAGS)
+AC_SUBST(GIO_LIBS)
 AC_DEFINE_UNQUOTED(HAVE_GIO, $have_gio, [Whether GIO is available])
 
 # --disable-deprecated switch for GTK2 purification

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2009-01-09 18:22:23 UTC (rev 3458)
+++ trunk/src/Makefile.am	2009-01-11 17:40:40 UTC (rev 3459)
@@ -72,7 +72,7 @@
 	utils.h
 
 
-INCLUDES = -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include @GTK_CFLAGS@
+INCLUDES = -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include @GTK_CFLAGS@ @GIO_CFLAGS@
 
 # tell automake we have a C++ file so it uses the C++ linker we need for Scintilla
 nodist_EXTRA_geany_SOURCES = dummy.cxx
@@ -83,7 +83,7 @@
 
 geany_SOURCES = $(SRCS) win32.c win32.h
 
-geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ $(INTLLIBS) \
+geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ @GIO_LIBS@ $(INTLLIBS) \
 			  -lkernel32 -limm32 -lshfolder -lshell32 -lole32 -luuid -lcomdlg32 \
 			  -lcomctl32 -liberty -lwsock32 geany_private.res
 
@@ -108,7 +108,7 @@
 
 geany_SOURCES = $(SRCS) vte.c vte.h
 
-geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@  $(INTLLIBS)
+geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ @GIO_LIBS@ $(INTLLIBS)
 
 AM_CFLAGS = -DGEANY_DATADIR=\""$(datadir)"\" \
 			-DGEANY_DOCDIR=\""$(docdir)"\" \

Modified: trunk/src/utils.c
===================================================================
--- trunk/src/utils.c	2009-01-09 18:22:23 UTC (rev 3458)
+++ trunk/src/utils.c	2009-01-11 17:40:40 UTC (rev 3459)
@@ -43,6 +43,7 @@
 #endif
 
 #include <glib/gstdio.h>
+#include <gio/gio.h>
 
 #include "prefs.h"
 #include "support.h"

Modified: trunk/wscript
===================================================================
--- trunk/wscript	2009-01-09 18:22:23 UTC (rev 3458)
+++ trunk/wscript	2009-01-11 17:40:40 UTC (rev 3459)
@@ -185,7 +185,7 @@
 	else:
 		gtk_version = 'Unknown'
 	# GIO check
-	conf.check_cfg(package='gio-2.0', uselib_store='GIO', mandatory=False)
+	conf.check_cfg(package='gio-2.0', uselib_store='GIO', args='--cflags --libs', mandatory=False)
 
 	conf_define_from_opt('LIBDIR', Options.options.libdir, conf.env['PREFIX'] + '/lib')
 	conf_define_from_opt('DOCDIR', Options.options.docdir, conf.env['DATADIR'] + '/doc/geany')
@@ -301,7 +301,7 @@
 	obj.target			= 'geany'
 	obj.source			= geany_sources
 	obj.includes		= '. src/ scintilla/include/ tagmanager/include/'
-	obj.uselib			= 'GTK'
+	obj.uselib			= 'GTK GIO'
 	obj.uselib_local	= 'scintilla tagmanager'
 
 	# geanyfunctions.h


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.