summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-08-19 14:38:19 -0700
committerStefano Karapetsas <[email protected]>2012-08-19 14:38:19 -0700
commit35c8125877e60b0c3279dd15b26bf0e85df5b136 (patch)
treeecb04acbe1624091f5987effca5ac546816b4740
parent3527f5115ef526a0d77fad0ce63156650d4281be (diff)
parentb8ac2f36147437b3e59a8f41f11261246acfcc4e (diff)
downloadlibmatekbd-35c8125877e60b0c3279dd15b26bf0e85df5b136.tar.bz2
libmatekbd-35c8125877e60b0c3279dd15b26bf0e85df5b136.tar.xz
Merge pull request #3 from steev/master
Fix underlinking issues
-rw-r--r--configure.in4
-rw-r--r--libmatekbd/Makefile.am2
2 files changed, 6 insertions, 0 deletions
diff --git a/configure.in b/configure.in
index b308af0..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)
@@ -128,6 +130,8 @@ AC_ARG_ENABLE([tests],
AM_CONDITIONAL(BUILD_TESTS, test "$enable_tests" = "yes")
+AC_SEARCH_LIBS([sqrt], [m])
+
AC_OUTPUT([
Makefile
libmatekbd.pc
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 = \