* config.in (HAVE_WINDOW_SYSTEM): Don't undef MULTI_KBOARD here...

* s/darwin.h: ... do it here.

3 files changed, 8 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e3913a65bd4..3d0007814ff 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-29  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * config.in (HAVE_WINDOW_SYSTEM): Don't undef MULTI_KBOARD here...
+        * s/darwin.h: ... do it here.
+
 2007-08-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * lisp.h (set_initial_environment): Rename from set_global_environment.
diff --git a/src/config.in b/src/config.in
index 59d4b91ed31..475cba5fda6 100644
--- a/src/config.in
+++ b/src/config.in
@@ -940,8 +940,6 @@ Boston, MA 02110-1301, USA.  */
 #ifdef HAVE_CARBON
 #define HAVE_WINDOW_SYSTEM
 #define HAVE_MOUSE
-/* XXX The MULTI_KBOARD support does not work yet on this platform. */
-#undef MULTI_KBOARD
 #endif
 
 /* Define USER_FULL_NAME to return a string
diff --git a/src/s/darwin.h b/src/s/darwin.h
index a2a3d862f80..300fb27e20e 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -38,6 +38,9 @@ Boston, MA 02110-1301, USA.  */
 #define BSD_SYSTEM
 /* #define VMS */
 
+/* XXX The MULTI_KBOARD support does not work yet on this platform. */
+#undef MULTI_KBOARD
+
 #if 0 /* Don't define DARWIN on Mac OS X because CoreFoundation.h uses
          it to distinguish Mac OS X from bare Darwin.  */
 #ifndef DARWIN