1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-05 11:45:45 +00:00

* src/configure.ac: Check for GTK 2 features only on GTK 2

This commit is contained in:
Alexander Gramiak 2019-04-20 20:16:20 -06:00
parent 75e68b8777
commit 6a373e4742

View File

@ -2795,22 +2795,25 @@ if test "${HAVE_GTK}" = "yes"; then
with_toolkit_scroll_bars=yes
fi
dnl Check if we have the old file selection dialog declared and
dnl in the link library. In 2.x it may be in the library,
dnl but not declared if deprecated featured has been selected out.
dnl AC_CHECK_DECL checks for a macro, so check for GTK_TYPE_FILE_SELECTION.
HAVE_GTK_FILE_SELECTION=no
AC_CHECK_DECL(GTK_TYPE_FILE_SELECTION, HAVE_GTK_FILE_SELECTION=yes,
HAVE_GTK_FILE_SELECTION=no, [AC_INCLUDES_DEFAULT
term_header=gtkutil.h
if test "${USE_GTK_TOOLKIT}" = GTK2; then
dnl Check if we have the old file selection dialog declared and
dnl in the link library. In 2.x it may be in the library,
dnl but not declared if deprecated featured has been selected out.
dnl AC_CHECK_DECL checks for a macro, so check for GTK_TYPE_FILE_SELECTION.
HAVE_GTK_FILE_SELECTION=no
AC_CHECK_DECL(GTK_TYPE_FILE_SELECTION, HAVE_GTK_FILE_SELECTION=yes,
HAVE_GTK_FILE_SELECTION=no, [AC_INCLUDES_DEFAULT
#include <gtk/gtk.h>])
if test "$HAVE_GTK_FILE_SELECTION" = yes; then
AC_CHECK_FUNCS(gtk_file_selection_new)
if test "$HAVE_GTK_FILE_SELECTION" = yes; then
AC_CHECK_FUNCS(gtk_file_selection_new)
fi
dnl This procedure causes a bug on certain Ubuntu GTK+2 builds
AC_CHECK_FUNCS(gtk_window_set_has_resize_grip)
fi
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