From: Andreas Schwab <schwab@suse.de>
Date: Wed, 22 Jan 2003 19:56:44 +0000 (+0000)
Subject: Set HAVE_MENUS=yes when HAVE_CARBON=yes instead of
X-Git-Tag: ttn-vms-21-2-B4~11527
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=12bf22e02b833bcb65967337b1692ab595ddf9c6;p=emacs.git

Set HAVE_MENUS=yes when HAVE_CARBON=yes instead of
redefining it explicitly in src/config.in.
---

diff --git a/ChangeLog b/ChangeLog
index e074f3ed6bc..b78d78c4102 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-22  Andreas Schwab  <schwab@suse.de>
+
+	* configure.in: Set HAVE_MENUS=yes when HAVE_CARBON=yes instead of
+	redefining it explicitly in src/config.in.
+
 2003-01-22  Markus Rost  <rost@math.ohio-state.edu>
 
 	* Makefile.in (bootstrap): Make bootstrap-after.
diff --git a/configure.in b/configure.in
index b3c517fc8be..01522660caf 100644
--- a/configure.in
+++ b/configure.in
@@ -2139,6 +2139,8 @@ if test "${HAVE_CARBON}" = "yes"; then
       * ) carbon_appdir=${carbon_appdir_x} ;;
     esac
   fi
+  # We also have mouse menus.
+  HAVE_MENUS=yes
 fi
 
 ### Use session management (-lSM -lICE) if available
@@ -2604,7 +2606,6 @@ AH_BOTTOM([
 #ifdef HAVE_CARBON
 #define HAVE_WINDOW_SYSTEM
 #define HAVE_MOUSE
-#define HAVE_MENUS
 #endif
 
 /* Define USER_FULL_NAME to return a string