Commit 6a373e47 authored by Alexander Gramiak's avatar Alexander Gramiak

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

parent 75e68b87
Pipeline #1381 passed with stage
in 51 minutes and 55 seconds
...@@ -2795,22 +2795,25 @@ if test "${HAVE_GTK}" = "yes"; then ...@@ -2795,22 +2795,25 @@ if test "${HAVE_GTK}" = "yes"; then
with_toolkit_scroll_bars=yes with_toolkit_scroll_bars=yes
fi fi
dnl Check if we have the old file selection dialog declared and term_header=gtkutil.h
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. if test "${USE_GTK_TOOLKIT}" = GTK2; then
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
dnl This procedure causes a bug on certain Ubuntu GTK+2 builds dnl Check if we have the old file selection dialog declared and
AC_CHECK_FUNCS(gtk_window_set_has_resize_grip) 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 fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment