diff options
| author | Marcel Dijkstra <[email protected]> | 2012-05-16 04:03:15 +0200 |
|---|---|---|
| committer | Marcel Dijkstra <[email protected]> | 2012-05-16 04:03:15 +0200 |
| commit | d3b927a321242e36abdb1e4acc488cde7899800e (patch) | |
| tree | 01bb1b526e9fed73013ac059b007f7ed942532b6 | |
| parent | b3fabe6bbdf380e7d3202677c1d0899b47cbff8e (diff) | |
| download | mate-panel-d3b927a321242e36abdb1e4acc488cde7899800e.tar.bz2 mate-panel-d3b927a321242e36abdb1e4acc488cde7899800e.tar.xz | |
only depend on gmodule-2.0 if it exists
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index aab62fad..cd0e868c 100644 --- a/configure.ac +++ b/configure.ac @@ -61,7 +61,6 @@ LIBMATE_DESKTOP_REQUIRED=1.1.0 GDK_PIXBUF_REQUIRED=2.7.1 PANGO_REQUIRED=1.15.4 GLIB_REQUIRED=2.25.12 -GMODULE_REQUIRED=2.0.0 GTK_REQUIRED=2.19.7 LIBWNCK_REQUIRED=2.19.5 MATECONF_REQUIRED=1.1.0 @@ -77,7 +76,8 @@ dnl pkg-config dependency checks PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-2.0) -PKG_CHECK_MODULES(PANEL, gmodule-2.0 >= $GMODULE_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED mate-desktop-2.0 >= $LIBMATE_DESKTOP_REQUIRED mateconf-2.0 >= $MATECONF_REQUIRED libmate-menu >= $LIBMATE_MENU_REQUIRED libcanberra-gtk dbus-glib-1 >= $DBUS_GLIB_REQUIRED) +PKG_CHECK_MODULES(GMODULE, gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""]) +PKG_CHECK_MODULES(PANEL, $GMODULE_ADD gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED mate-desktop-2.0 >= $LIBMATE_DESKTOP_REQUIRED mateconf-2.0 >= $MATECONF_REQUIRED libmate-menu >= $LIBMATE_MENU_REQUIRED libcanberra-gtk dbus-glib-1 >= $DBUS_GLIB_REQUIRED) AC_SUBST(PANEL_CFLAGS) AC_SUBST(PANEL_LIBS) |