[Emacs-diffs] emacs-24 3ee38f2: Disallow w32 builds --without-toolkit-scroll-bars.

[Eli Zaretskii]

branch: emacs-24
commit 3ee38f2000944d50adb2c65bd1af11c464c87950
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Disallow w32 builds --without-toolkit-scroll-bars.
    
     configure.ac (HAVE_W32): Abort with error message if
     --without-toolkit-scroll-bars was specified.  See
     http://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00525.html
     for the details.
---
 ChangeLog    |    7 +++++++
 configure.ac |    3 +++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 714be97..4abd9d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-20  Eli Zaretskii  <address@hidden>
+
+       * configure.ac (HAVE_W32): Abort with error message if
+       --without-toolkit-scroll-bars was specified.  See
+       http://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00525.html
+       for the details.
+
 2015-01-01  Paul Eggert  <address@hidden>
 
        * .gitattributes: New file.
diff --git a/configure.ac b/configure.ac
index bae020e..9c8df9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1841,6 +1841,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"