diff options
| author | Stefano Karapetsas <[email protected]> | 2013-07-26 14:11:52 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-07-26 14:11:52 +0200 |
| commit | f897ed4e51af4f6e6072632e2218ba88f49d6186 (patch) | |
| tree | a0363d0c91ef6691997c6238b3688ad7eb62e5f7 | |
| parent | 30e2ebbb240aef037cd0da49db067f9493407d59 (diff) | |
| download | mate-panel-f897ed4e51af4f6e6072632e2218ba88f49d6186.tar.bz2 mate-panel-f897ed4e51af4f6e6072632e2218ba88f49d6186.tar.xz | |
Add support for libcanberra GTK3 in configure
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 292abd2a..6ae299c7 100644 --- a/configure.ac +++ b/configure.ac @@ -83,9 +83,11 @@ AC_MSG_RESULT([$with_gtk]) case "$with_gtk" in 2.0) GTK_API_VERSION=2.0 GTK_REQUIRED=2.19.7 + LIBCANBERRA_API_VERSION= ;; 3.0) GTK_API_VERSION=3.0 GTK_REQUIRED=3.0.0 + LIBCANBERRA_API_VERSION=-gtk3 ;; esac @@ -94,7 +96,7 @@ dnl pkg-config dependency checks PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-$GTK_API_VERSION) 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+-$GTK_API_VERSION >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED mate-desktop-2.0 >= $LIBMATE_DESKTOP_REQUIRED gio-2.0 >= $GLIB_REQUIRED libmate-menu >= $LIBMATE_MENU_REQUIRED libcanberra-gtk dbus-glib-1 >= $DBUS_GLIB_REQUIRED) +PKG_CHECK_MODULES(PANEL, $GMODULE_ADD gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED mate-desktop-2.0 >= $LIBMATE_DESKTOP_REQUIRED gio-2.0 >= $GLIB_REQUIRED libmate-menu >= $LIBMATE_MENU_REQUIRED libcanberra-gtk$LIBCANBERRA_API_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED) AC_SUBST(PANEL_CFLAGS) AC_SUBST(PANEL_LIBS) |