aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2003-01-22 19:56:44 +0000
committerAndreas Schwab2003-01-22 19:56:44 +0000
commit12bf22e02b833bcb65967337b1692ab595ddf9c6 (patch)
tree5dc0a570881bcdacea87d7ed2c92a9c9cd5887f4
parentac1242e60e37f8b35a7566752a6a8ac2d3abc65a (diff)
downloademacs-12bf22e02b833bcb65967337b1692ab595ddf9c6.tar.gz
emacs-12bf22e02b833bcb65967337b1692ab595ddf9c6.zip
Set HAVE_MENUS=yes when HAVE_CARBON=yes instead of
redefining it explicitly in src/config.in.
-rw-r--r--ChangeLog5
-rw-r--r--configure.in3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e074f3ed6bc..b78d78c4102 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12003-01-22 Andreas Schwab <schwab@suse.de>
2
3 * configure.in: Set HAVE_MENUS=yes when HAVE_CARBON=yes instead of
4 redefining it explicitly in src/config.in.
5
12003-01-22 Markus Rost <rost@math.ohio-state.edu> 62003-01-22 Markus Rost <rost@math.ohio-state.edu>
2 7
3 * Makefile.in (bootstrap): Make bootstrap-after. 8 * 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
2139 * ) carbon_appdir=${carbon_appdir_x} ;; 2139 * ) carbon_appdir=${carbon_appdir_x} ;;
2140 esac 2140 esac
2141 fi 2141 fi
2142 # We also have mouse menus.
2143 HAVE_MENUS=yes
2142fi 2144fi
2143 2145
2144### Use session management (-lSM -lICE) if available 2146### Use session management (-lSM -lICE) if available
@@ -2604,7 +2606,6 @@ AH_BOTTOM([
2604#ifdef HAVE_CARBON 2606#ifdef HAVE_CARBON
2605#define HAVE_WINDOW_SYSTEM 2607#define HAVE_WINDOW_SYSTEM
2606#define HAVE_MOUSE 2608#define HAVE_MOUSE
2607#define HAVE_MENUS
2608#endif 2609#endif
2609 2610
2610/* Define USER_FULL_NAME to return a string 2611/* Define USER_FULL_NAME to return a string