Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Explicitly depend on GModule

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.
  • Loading branch information...
commit 7b2f0fe5aef6c389738f4a861cc19dfec5ce2c42 1 parent e5ae146
@b4n b4n authored
Showing with 5 additions and 3 deletions.
  1. +1 −1  configure.ac
  2. +4 −2 wscript
View
2  configure.ac
@@ -57,7 +57,7 @@ GEANY_CHECK_REVISION([dnl force debug mode for a SVN working copy
# 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])
AC_SUBST([GTK_CFLAGS])
AC_SUBST([GTK_LIBS])
View
6 wscript
@@ -132,6 +132,8 @@ def configure(conf):
mandatory=True, args='--cflags --libs')
conf.check_cfg(package='glib-2.0', atleast_version='2.20.0', uselib_store='GLIB',
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)
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')
@@ -255,7 +257,7 @@ def build(bld):
includes = ['.', 'src/', 'scintilla/include', 'tagmanager/include'],
defines = 'G_LOG_DOMAIN="%s"' % plugin_name,
target = plugin_name,
- uselib = ['GTK', 'GLIB'],
+ uselib = ['GTK', 'GLIB', 'GMODULE'],
install_path = instpath)
@@ -311,7 +313,7 @@ def build(bld):
includes = ['.', 'scintilla/include/', 'tagmanager/include/'],
defines = ['G_LOG_DOMAIN="Geany"', 'GEANY_PRIVATE'],
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'])
# geanyfunctions.h

3 comments on commit 7b2f0fe

@eht16
Owner

Should we maybe add gmodule also to the requirements in geany.pc.in?
Not sure whether it is appropriate there.

@b4n
Owner

I don't think we expose anything from it in our headers, so it's not strictly needed.

@eht16
Owner

Ok, fine.

Please sign in to comment.
Something went wrong with that request. Please try again.