diff options
| author | Steev Klimaszewski <[email protected]> | 2012-08-17 17:37:42 -0500 |
|---|---|---|
| committer | Steev Klimaszewski <[email protected]> | 2012-08-18 19:38:58 -0500 |
| commit | b8ac2f36147437b3e59a8f41f11261246acfcc4e (patch) | |
| tree | ecb04acbe1624091f5987effca5ac546816b4740 | |
| parent | f0dfa44f76c332b529d5c67ef8b2ba4639cddb09 (diff) | |
| download | libmatekbd-b8ac2f36147437b3e59a8f41f11261246acfcc4e.tar.bz2 libmatekbd-b8ac2f36147437b3e59a8f41f11261246acfcc4e.tar.xz | |
Fix building with glib >= 2.32
Glib 2.32 has split out gmodule to it's own library. Due to this, do a check for gmodule not just glib.
Also add GMODULE_LIBS to libmatekbd/Makefile.am to prevent underlinking.
Signed-off-by: Steev Klimaszewski <[email protected]>
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | libmatekbd/Makefile.am | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 3320fc8..db81cad 100644 --- a/configure.in +++ b/configure.in @@ -84,9 +84,11 @@ IT_PROG_INTLTOOL([0.35.0]) AC_CHECK_FUNCS(setlocale) PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED) +PKG_CHECK_MODULES(GMODULE, gmodule-2.0, [GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""]) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) +AC_SUBST(GMODULE_LIBS) PKG_CHECK_MODULES(MATECONF, mateconf-2.0 >= $MATECONF_REQUIRED) diff --git a/libmatekbd/Makefile.am b/libmatekbd/Makefile.am index 74ae112..1bcfcd2 100644 --- a/libmatekbd/Makefile.am +++ b/libmatekbd/Makefile.am @@ -36,6 +36,8 @@ libmatekbd_la_LIBADD = $(common_LIBADD) libmatekbdui_la_LDFLAGS = $(common_LDFLAGS) libmatekbdui_la_LIBADD = libmatekbd.la \ $(common_LIBADD) \ + $(GLIB_LIBS) \ + $(GMODULE_LIBS) \ $(GTK_LIBS) libmatekbd_la_SOURCES = \ |