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

Explicitly depend on GModule

Browse Source 
GIO used to bring GModule, but it became a private dependency since
GIO 2.31.  So, add explicit checks for GModule so we still build with
GLib/GIO >= 2.31.

Closes #3483388.
This commit is contained in:
Colomban Wendling 2012-04-02 14:56:19 +02:00
parent e5ae146730
commit 7b2f0fe5ae
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -57,7 +57,7 @@ GEANY_CHECK_REVISION([dnl force debug mode for a SVN working copy
# GTK/GLib/GIO checks # GTK/GLib/GIO checks
gtk_modules="gtk+-2.0 >= 2.16 glib-2.0 >= 2.20 gio-2.0 >= 2.20" gtk_modules="gtk+-2.0 >= 2.16 glib-2.0 >= 2.20 gio-2.0 >= 2.20 gmodule-2.0"
PKG_CHECK_MODULES([GTK], [$gtk_modules]) PKG_CHECK_MODULES([GTK], [$gtk_modules])
AC_SUBST([GTK_CFLAGS]) AC_SUBST([GTK_CFLAGS])
AC_SUBST([GTK_LIBS]) AC_SUBST([GTK_LIBS])

6
wscript
View File

@ -132,6 +132,8 @@ def configure(conf):
mandatory=True, args='--cflags --libs') mandatory=True, args='--cflags --libs')
conf.check_cfg(package='glib-2.0', atleast_version='2.20.0', uselib_store='GLIB', conf.check_cfg(package='glib-2.0', atleast_version='2.20.0', uselib_store='GLIB',
mandatory=True, args='--cflags --libs') mandatory=True, args='--cflags --libs')
conf.check_cfg(package='gmodule-2.0', uselib_store='GMODULE',
mandatory=True, args='--cflags --libs')
conf.check_cfg(package='gio-2.0', uselib_store='GIO', args='--cflags --libs', mandatory=True) conf.check_cfg(package='gio-2.0', uselib_store='GIO', args='--cflags --libs', mandatory=True)
gtk_version = conf.check_cfg(modversion='gtk+-2.0', uselib_store='GTK') or 'Unknown' gtk_version = conf.check_cfg(modversion='gtk+-2.0', uselib_store='GTK') or 'Unknown'
conf.check_cfg(package='gthread-2.0', uselib_store='GTHREAD', args='--cflags --libs') conf.check_cfg(package='gthread-2.0', uselib_store='GTHREAD', args='--cflags --libs')
@ -255,7 +257,7 @@ def build(bld):
includes = ['.', 'src/', 'scintilla/include', 'tagmanager/include'], includes = ['.', 'src/', 'scintilla/include', 'tagmanager/include'],
defines = 'G_LOG_DOMAIN="%s"' % plugin_name, defines = 'G_LOG_DOMAIN="%s"' % plugin_name,
target = plugin_name, target = plugin_name,
uselib = ['GTK', 'GLIB'], uselib = ['GTK', 'GLIB', 'GMODULE'],
install_path = instpath) install_path = instpath)
@ -311,7 +313,7 @@ def build(bld):
includes = ['.', 'scintilla/include/', 'tagmanager/include/'], includes = ['.', 'scintilla/include/', 'tagmanager/include/'],
defines = ['G_LOG_DOMAIN="Geany"', 'GEANY_PRIVATE'], defines = ['G_LOG_DOMAIN="Geany"', 'GEANY_PRIVATE'],
linkflags = [] if is_win32 else ['-Wl,--export-dynamic'], linkflags = [] if is_win32 else ['-Wl,--export-dynamic'],
uselib = ['GTK', 'GLIB', 'GIO', 'GTHREAD', 'WIN32', 'SUNOS_SOCKET'], uselib = ['GTK', 'GLIB', 'GMODULE', 'GIO', 'GTHREAD', 'WIN32', 'SUNOS_SOCKET'],
use = ['scintilla', 'tagmanager', 'mio']) use = ['scintilla', 'tagmanager', 'mio'])
# geanyfunctions.h # geanyfunctions.h