diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-07-24 18:20:29 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-07-24 18:20:29 -0500 |
| commit | c69973f9c525f8c3c8681374111f2c0f839005d3 (patch) | |
| tree | 235011fef0089588806a7022024ae9f1fb6a4fc0 | |
| parent | 38ab0ef8b7c9edc7d2a12bf411faa541872b0b43 (diff) | |
| parent | 242a3396401cbd2136374236ea98808cefaae675 (diff) | |
| download | ayatana-indicator-session-c69973f9c525f8c3c8681374111f2c0f839005d3.tar.gz ayatana-indicator-session-c69973f9c525f8c3c8681374111f2c0f839005d3.tar.bz2 ayatana-indicator-session-c69973f9c525f8c3c8681374111f2c0f839005d3.zip | |
merge lp:~charlesk/indicator-session/lp-1023533 to raise configure.ac's glib requirement to match the API level needed in the source code
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 05983f0..5968927 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) # Dependencies ########################### +GLIB_REQUIRED_VERSION=2.33 GTK_REQUIRED_VERSION=3.0 INDICATOR_REQUIRED_VERSION=0.3.19 DBUSMENUGTK_REQUIRED_VERSION=0.5.90 @@ -36,14 +37,16 @@ DBUSTEST_REQUIRED_VERSION=0.0.5 DBUSMENUGLIB_REQUIRED_VERSION=0.1.1 -PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= $GTK_REQUIRED_VERSION +PKG_CHECK_MODULES(APPLET, glib-2.0 >= $GLIB_REQUIRED_VERSION + gtk+-3.0 >= $GTK_REQUIRED_VERSION indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) AC_SUBST(APPLET_CFLAGS) AC_SUBST(APPLET_LIBS) -PKG_CHECK_MODULES(SESSIONSERVICE, dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION +PKG_CHECK_MODULES(SESSIONSERVICE, glib-2.0 >= $GLIB_REQUIRED_VERSION + dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION dbus-glib-1 gio-unix-2.0 |