[geany/geany-plugins] bbb442: GeanyLua: explicitly link GModule

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Frank Lanitz <frank at frank.uvena.de>
Date:        Thu, 12 Apr 2012 16:09:31
Commit:      bbb4422c319779161f5e85cdf252a5078b9f5d93
             https://github.com/geany/geany-plugins/commit/bbb4422c319779161f5e85cdf252a5078b9f5d93

Log Message:
-----------
GeanyLua: explicitly link GModule

Explicit linking of GModule is now required since GIO stopped publicly
depending on it.


Modified Paths:
--------------
    build/geanylua.m4
    geanylua/Makefile.am
    geanylua/wscript_build
    geanylua/wscript_configure

Modified: build/geanylua.m4
1 files changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -16,6 +16,7 @@ AC_DEFUN([GP_CHECK_GEANYLUA],
     LUA_VERSION=5.1
     GP_CHECK_PLUGIN_DEPS([GeanyLua], [LUA],
                          [${LUA_PKG_NAME} >= ${LUA_VERSION}])
+    GP_CHECK_PLUGIN_DEPS([GeanyLua], [GMODULE], [gmodule-2.0])
     GP_STATUS_PLUGIN_ADD([GeanyLua], [$enable_geanylua])
 
     AC_CONFIG_FILES([


Modified: geanylua/Makefile.am
2 files changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -38,10 +38,12 @@ libgeanylua_la_SOURCES = \
 
 geanylua_la_CFLAGS = \
 	$(AM_CFLAGS) \
+	$(GMODULE_CFLAGS) \
 	$(LUA_CFLAGS)
 
 geanylua_la_LIBADD = \
 	$(COMMONLIBS) \
+	$(GMODULE_LIBS) \
 	$(LUA_LIBS)
 
 libgeanylua_la_CFLAGS = $(geanylua_la_CFLAGS)


Modified: geanylua/wscript_build
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -28,7 +28,7 @@ sources = ['geanylua.c']
 lua_sources = [ 'glspi_init.c', 'glspi_app.c', 'glspi_dlg.c',
                 'glspi_doc.c', 'glspi_kfile.c', 'glspi_run.c',
                 'glspi_sci.c', 'gsdlg_lua.c' ]
-libraries = ['LUA']
+libraries = ['LUA', 'GMODULE']
 
 build_plugin(bld, name, sources=sources, libraries=libraries)
 


Modified: geanylua/wscript_configure
6 files changed, 6 insertions(+), 0 deletions(-)
===================================================================
@@ -42,3 +42,9 @@ def try_to_find_lua_package():
 found_lua_package = try_to_find_lua_package()
 if not found_lua_package:
     raise ConfigurationError('You need Lua 5.1 for the GeanyLua plugin')
+
+check_cfg_cached(conf,
+    package='gmodule-2.0',
+    mandatory=True,
+    uselib_store='GMODULE',
+    args='--cflags --libs')


@@ Diff output truncated at 100000 characters. @@


--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).