From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 20 Jan 2015 16:26:28 +0000 (+0200)
Subject: Disallow w32 builds --without-toolkit-scroll-bars.
X-Git-Tag: emacs-24.4.90~50
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3ee38f2000944d50adb2c65bd1af11c464c87950;p=emacs.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 714be97e2fa..4abd9d6e047 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-20  Eli Zaretskii  <eliz@gnu.org>
+
+	* 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  <eggert@cs.ucla.edu>
 
 	* .gitattributes: New file.
diff --git a/configure.ac b/configure.ac
index bae020e7338..9c8df9dcdb5 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"