HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3459 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2009-01-11 17:40:40 +00:00
parent d711304927
commit ceb7edc8f1
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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,

2
configure.in
View File

@ -135,6 +135,8 @@ AC_SUBST(GTK_LIBS)
# 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

6
src/Makefile.am
View File

@ -72,7 +72,7 @@ geany_include_HEADERS = \
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 @@ if MINGW
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 @@ else
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)"\" \

1
src/utils.c
View File

@ -43,6 +43,7 @@
#endif
#include <glib/gstdio.h>
#include <gio/gio.h>
#include "prefs.h"
#include "support.h"

4
wscript
View File

@ -185,7 +185,7 @@ def configure(conf):
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 @@ def build(bld):
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