diff options
| author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2014-12-07 21:33:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-12-09 09:12:07 +0000 |
| commit | fe95c62b39dae4cb907addfba5c73bb847f1301d (patch) | |
| tree | fa16928e95a1d036036fc69192630297485cbc90 /configure.ac | |
| parent | 127b0926b5ceff0dcb44e7b7ac4ecbc479f44d97 (diff) | |
Bump minimum gtk version to 2.10
That is the version available in RHEL 5. The configure change for
telepathy has been changed for consistency only.
Change-Id: I664901dd2bbcc75f6f6fb84940f3fa85d69f57dd
Reviewed-on: https://gerrit.libreoffice.org/13369
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 7964508a55f2..0fcfbc186f47 100644 --- a/configure.ac +++ b/configure.ac @@ -10051,20 +10051,14 @@ ENABLE_SYSTRAY_GTK="" if test "$test_gtk" = "yes"; then if test "$ENABLE_GTK" = "TRUE"; then - PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages])) + PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10.0 gdk-pixbuf-xlib-2.0 >= 2.2 ,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages])) GTK_CFLAGS=$(printf '%s' "$GTK_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") PKG_CHECK_MODULES(GTHREAD, gthread-2.0,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages])) BUILD_TYPE="$BUILD_TYPE GTK" GTHREAD_CFLAGS=$(printf '%s' "$GTK_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") - AC_MSG_CHECKING([whether to enable the systray quickstarter]) if test "x$enable_systray" = "xyes"; then - AC_MSG_RESULT([yes]) - PKG_CHECK_MODULES( GTK210, gtk+-2.0 >= 2.10.0, - [ ENABLE_SYSTRAY_GTK="TRUE" ], - [ ENABLE_SYSTRAY_GTK="" ]) - else - AC_MSG_RESULT([no]) + ENABLE_SYSTRAY_GTK="TRUE" fi AC_MSG_CHECKING([whether to enable Gtk print dialog support]) @@ -10116,7 +10110,7 @@ if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_telepathy" = "yes"; ENABLE_TELEPATHY="TRUE" AC_DEFINE(ENABLE_TELEPATHY) AC_MSG_RESULT([yes]) - PKG_CHECK_MODULES( TELEPATHY, telepathy-glib >= 0.18.0 glib-2.0 gobject-2.0 gthread-2.0 gio-2.0 gtk+-2.0 >= 2.4 ) + PKG_CHECK_MODULES( TELEPATHY, telepathy-glib >= 0.18.0 glib-2.0 gobject-2.0 gthread-2.0 gio-2.0 gtk+-2.0 >= 2.10 ) TELEPATHY_CFLAGS=$(printf '%s' "$TELEPATHY_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") else AC_MSG_RESULT([no]) |