summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-01-30 18:43:59 -0800
committerGlenn Morris <rgm@gnu.org>2012-01-30 18:43:59 -0800
commit8d8939e85800f1f8957190d27f6a308d5d2d8c53 (patch)
treefa80259629076934c65766d3d3bb212e3b99bfc3
parente58e988add7efd6cdc0b04887d917e3213f97f7b (diff)
downloademacs-8d8939e85800f1f8957190d27f6a308d5d2d8c53.tar.gz
* configure.in: Allow Emacs to actually be built with xaw scroll-bars.
-rw-r--r--ChangeLog4
-rw-r--r--configure.in2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a085fbba9b..54f5a809e5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-31 Glenn Morris <rgm@gnu.org>
+
+ * configure.in: Allow Emacs to actually be built with xaw scroll-bars.
+
2012-01-30 Eli Zaretskii <eliz@gnu.org>
* lib/makefile.w32-in ($(BLD)/sha1.$(O) $(BLD)/sha256.$(O)
diff --git a/configure.in b/configure.in
index 889aac44b46..7ec17a176d6 100644
--- a/configure.in
+++ b/configure.in
@@ -2249,7 +2249,7 @@ if test "${with_toolkit_scroll_bars}" != "no"; then
AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
HAVE_XAW3D=no
USE_TOOLKIT_SCROLL_BARS=yes
- elif test "${HAVE_XAW3D}" = "yes"; then
+ elif test "${HAVE_XAW3D}" = "yes" || test "${USE_X_TOOLKIT}" = "LUCID"; then
AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
USE_TOOLKIT_SCROLL_BARS=yes
fi