diff options
| author | Alexander Gramiak <agrambot@gmail.com> | 2019-04-07 19:02:03 -0600 |
|---|---|---|
| committer | Alexander Gramiak <agrambot@gmail.com> | 2019-04-14 19:15:45 -0600 |
| commit | fc0f469fb5b5eb28ca4d9948190be6cb1bd8156e (patch) | |
| tree | a872db9e55d150d03c7378b599d860214cab28b5 /configure.ac | |
| parent | 5c2f94a182a1154766154040eb5b4b39275fd3b6 (diff) | |
| download | emacs-fc0f469fb5b5eb28ca4d9948190be6cb1bd8156e.tar.gz | |
Bump minimum GTK versions to 2.24 and 3.10
* configure.ac: Bump required GTK 2 and GTK 3 versions and the
associated GLib versions. Remove obsolete AC_CHECK_FUNCS calls. These
check for functions available in later GTK 2 versions. These checks
and can safely be removed with the exception of
gtk_window_set_has_resize_grip, which according to a comment in
gtkutil.c causes an issue in Ubuntu's GTK 2.
* src/gtkutil.c:
* src/xfns.c:
* src/xterm.c:
* src/xterm.h: Remove now unused conditional blocks. Use HAVE_GTK3
instead of GTK_CHECK_VERSION where now applicable. Remove checks of
now always true USE_GTK_TOOLTIP.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 34 |
1 files changed, 6 insertions, 28 deletions
diff --git a/configure.ac b/configure.ac index cff9a274226..3cebf3d78c4 100644 --- a/configure.ac +++ b/configure.ac @@ -2688,8 +2688,8 @@ check_gtk2=no gtk3_pkg_errors= if test "${opsys}" != "mingw32"; then if test "${with_gtk3}" = "yes" || test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then - GLIB_REQUIRED=2.28 - GTK_REQUIRED=3.0 + GLIB_REQUIRED=2.37.5 + GTK_REQUIRED=3.10 GTK_MODULES="gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" dnl Checks for libraries. @@ -2716,8 +2716,8 @@ if test "${opsys}" != "mingw32"; then fi if test "${with_gtk2}" = "yes" || test "$check_gtk2" = "yes"; then - GLIB_REQUIRED=2.10 - GTK_REQUIRED=2.10 + GLIB_REQUIRED=2.28 + GTK_REQUIRED=2.24 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" dnl Checks for libraries. @@ -2804,30 +2804,8 @@ if test "${HAVE_GTK}" = "yes"; then AC_CHECK_FUNCS(gtk_file_selection_new) fi - dnl Same as above for gtk_handle_box. - HAVE_GTK_HANDLE_BOX=no - AC_CHECK_DECL(GTK_TYPE_HANDLE_BOX, HAVE_GTK_HANDLE_BOX=yes, - HAVE_GTK_HANDLE_BOX=no, [AC_INCLUDES_DEFAULT -#include <gtk/gtk.h>]) - if test "$HAVE_GTK_HANDLE_BOX" = yes; then - AC_CHECK_FUNCS(gtk_handle_box_new) - fi - - dnl Same as above for gtk_tearoff_menu_item. - HAVE_GTK_TEAROFF_MENU_ITEM=no - AC_CHECK_DECL(GTK_TYPE_TEAROFF_MENU_ITEM, HAVE_GTK_TEAROFF_MENU_ITEM=yes, - HAVE_GTK_TEAROFF_MENU_ITEM=no, [AC_INCLUDES_DEFAULT -#include <gtk/gtk.h>]) - if test "$HAVE_GTK_TEAROFF_MENU_ITEM" = yes; then - AC_CHECK_FUNCS(gtk_tearoff_menu_item_new) - fi - - dnl Check for functions introduced in 2.14 and later. - AC_CHECK_FUNCS(gtk_widget_get_window gtk_widget_set_has_window \ - gtk_dialog_get_action_area gtk_widget_get_sensitive \ - gtk_widget_get_mapped gtk_adjustment_get_page_size \ - gtk_orientable_set_orientation \ - gtk_window_set_has_resize_grip) + dnl This procedure causes a bug on certain Ubuntu GTK+2 builds + AC_CHECK_FUNCS(gtk_window_set_has_resize_grip) term_header=gtkutil.h fi |