[Emacs-diffs] Changes to emacs/configure.in [emacs-unicode-2]

[Miles Bader]

Index: emacs/configure.in
diff -c emacs/configure.in:1.351.2.8 emacs/configure.in:1.351.2.9
*** emacs/configure.in:1.351.2.8        Fri Oct 22 10:13:47 2004
--- emacs/configure.in  Thu Nov  4 08:55:39 2004
***************
*** 1967,1973 ****
  
    dnl  GTK scrollbars resemble toolkit scrollbars a lot, so to avoid
    dnl  a lot if #ifdef:s, say we have toolkit scrollbars.
!   with_toolkit_scroll_bars=yes
  
    dnl  Check if we can use multiple displays with this GTK version.
    dnl  If gdk_display_open exists, assume all others are there also.
--- 1967,1975 ----
  
    dnl  GTK scrollbars resemble toolkit scrollbars a lot, so to avoid
    dnl  a lot if #ifdef:s, say we have toolkit scrollbars.
!   if test "$with_toolkit_scroll_bars" != no; then
!     with_toolkit_scroll_bars=yes
!   fi
  
    dnl  Check if we can use multiple displays with this GTK version.
    dnl  If gdk_display_open exists, assume all others are there also.
***************
*** 1977,1982 ****
--- 1979,1999 ----
      AC_DEFINE(HAVE_GTK_MULTIDISPLAY, 1,
                [Define to 1 if GTK can handle more than one display.])
    fi
+   dnl  Check if we have the old file selection dialog.
+   dnl  If gdk_display_open exists, assume all others are there also.
+   HAVE_GTK_FILE_SELECTION=no
+   AC_CHECK_FUNCS(gtk_file_selection_new, HAVE_GTK_FILE_SELECTION=yes)
+ 
+   dnl  Check if we have the new file chooser dialog
+   dnl  If gdk_display_open exists, assume all others are there also.
+   HAVE_GTK_FILE_CHOOSER=no
+   AC_CHECK_FUNCS(gtk_file_chooser_dialog_new, HAVE_GTK_FILE_CHOOSER=yes)
+ 
+   if test "$HAVE_GTK_FILE_SELECTION" = yes \
+      && test "$HAVE_GTK_FILE_CHOOSER" = yes;  then
+     AC_DEFINE(HAVE_GTK_FILE_BOTH, 1,
+               [Define to 1 if GTK has both file selection and chooser 
dialog.])
+   fi
  fi
  
  dnl Do not put whitespace before the #include statements below.