Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Mon, 02 Apr 2012 13:05:23 Commit: 7b2f0fe5aef6c389738f4a861cc19dfec5ce2c42 https://github.com/geany/geany/commit/7b2f0fe5aef6c389738f4a861cc19dfec5ce2c...
Log Message: ----------- 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.
Modified Paths: -------------- configure.ac wscript
Modified: configure.ac 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -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])
Modified: wscript 6 files changed, 4 insertions(+), 2 deletions(-) =================================================================== @@ -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
@@ Diff output truncated at 100000 characters. @@
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).