diff options
| -rw-r--r-- | configure.ac | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 9d39bdd76bd..b4a9b306912 100644 --- a/configure.ac +++ b/configure.ac @@ -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 -#include <gtk/gtk.h>]) - if test "$HAVE_GTK_FILE_SELECTION" = yes; then - AC_CHECK_FUNCS(gtk_file_selection_new) - fi + term_header=gtkutil.h + + if test "${USE_GTK_TOOLKIT}" = GTK2; then - dnl This procedure causes a bug on certain Ubuntu GTK+2 builds - AC_CHECK_FUNCS(gtk_window_set_has_resize_grip) + 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) + fi - term_header=gtkutil.h + dnl This procedure causes a bug on certain Ubuntu GTK+2 builds + AC_CHECK_FUNCS(gtk_window_set_has_resize_grip) + fi fi |