diff options
| author | Marcel Dijkstra <[email protected]> | 2012-05-23 02:57:24 +0200 |
|---|---|---|
| committer | Marcel Dijkstra <[email protected]> | 2012-05-23 02:57:24 +0200 |
| commit | 4bbbb6c81461d139c9909e84d46b99a14178c33a (patch) | |
| tree | cbdd746c5f17b5b4231f9a118a276d7920243073 | |
| parent | e9cff2b298ff76555ebc3acffb70a6256f76ac53 (diff) | |
| download | mate-control-center-4bbbb6c81461d139c9909e84d46b99a14178c33a.tar.bz2 mate-control-center-4bbbb6c81461d139c9909e84d46b99a14178c33a.tar.xz | |
only depend on gmodule-2.0 if it exists
| -rw-r--r-- | capplets/common/Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/capplets/common/Makefile.am b/capplets/common/Makefile.am index 127af950..6dcd64f7 100644 --- a/capplets/common/Makefile.am +++ b/capplets/common/Makefile.am @@ -55,7 +55,8 @@ mate_theme_test_SOURCES = \ mate_theme_test_LDADD = \ libcommon.la \ - $(MATECC_CAPPLETS_LIBS) + $(MATECC_CAPPLETS_LIBS) \ + $(MATECC_LIBS) noinst_PROGRAMS = \ mate-theme-test diff --git a/configure.ac b/configure.ac index dc4847ad..eed2e43e 100644 --- a/configure.ac +++ b/configure.ac @@ -114,7 +114,9 @@ dnl ============================================== dnl Check that we meet the dependencies dnl ============================================== +PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""]) COMMON_MODULES="gtk+-2.0 >= 2.20.0 dnl + $GMODULE_ADD dnl glib-2.0 >= 2.17.4 dnl gthread-2.0 dnl gio-2.0 dnl @@ -128,7 +130,7 @@ PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1) PKG_CHECK_MODULES(MATE_DESKTOP, mate-desktop-2.0) PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0) PKG_CHECK_MODULES(MARCO, libmarco-private >= 1.1.0) -PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 mateconf-2.0 gtk+-2.0) +PKG_CHECK_MODULES(TYPING, $GMODULE_ADD glib-2.0 > 2.11 mateconf-2.0 gtk+-2.0) PKG_CHECK_MODULES(GSD_DBUS, mate-settings-daemon) PKG_CHECK_MODULES(GIO, gio-2.0) @@ -137,7 +139,7 @@ gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-2.0` GTK_ENGINE_DIR="$gtk_lib_dir/gtk-2.0/$gtk_binary_version/engines" AC_SUBST(GTK_ENGINE_DIR) -PKG_CHECK_MODULES(GLIB, glib-2.0) +PKG_CHECK_MODULES(GLIB, glib-2.0 $GMODULE_ADD) dnl dnl Check dependencies of libslab |