diff options
| author | Fabián Ezequiel Gallina <fgallina@gnu.org> | 2015-01-28 01:03:45 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina <fgallina@gnu.org> | 2015-01-28 01:03:45 -0300 |
| commit | 294127e7d59a5d23a32561716a1b192db410e12f (patch) | |
| tree | 4bc4f9690295e76ab4d220c474d37478a22740a8 /configure.ac | |
| parent | 358a8b34ac954ca147de9ececa4a51a21e60c97e (diff) | |
| parent | 24aacfc9058dfff1331a64f50ced2ca4d6f25824 (diff) | |
| download | emacs-294127e7d59a5d23a32561716a1b192db410e12f.tar.gz | |
Merge from origin/emacs-24
24aacfc Improve documentation of buttons (Bug#19628)
52ae3db doc/lispref/text.texi (Clickable Text): Improve indexing. (Bug#19629)
310f707 lisp/button.el (button-activate, push-button): Doc fix. (Bug#19628)
3ee38f2 Disallow w32 builds --without-toolkit-scroll-bars.
e6518fc Fix display of images in R2L screen lines
b0af674 Use u+05f4 in TUTORIAL.he.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index cd011b9720b..5776e4ef8ed 100644 --- a/configure.ac +++ b/configure.ac @@ -1938,6 +1938,9 @@ CM_OBJ="cm.o" XARGS_LIMIT= if test "${HAVE_W32}" = "yes"; then AC_DEFINE(HAVE_NTGUI, 1, [Define to use native MS Windows GUI.]) + if test "$with_toolkit_scroll_bars" = "no"; then + AC_MSG_ERROR([Non-toolkit scroll bars are not implemented for w32 build.]) + fi AC_CHECK_TOOL(WINDRES, [windres], [AC_MSG_ERROR([No resource compiler found.])]) W32_OBJ="w32fns.o w32menu.o w32reg.o w32font.o w32term.o" |