2002-04-30 Andrew Choi <akochoi@shaw.ca>

        * configure.in: Provide documentation string when defining
        variable HAVE_CARBON.  Also define HAVE_WINDOW_SYSTEM, HAVE_MOUSE,
        and HAVE_MENUS in AH_BOTTOM if HAVE_CARBON is defined.

1 files changed, 11 insertions, 12 deletions

diff --git a/src/config.in b/src/config.in
index e54ecc659a1..52ae7052744 100644
--- a/src/config.in
+++ b/src/config.in
@@ -89,6 +89,9 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the `bcopy' function. */
 #undef HAVE_BCOPY
 
+/* Define to 1 if you are using the Carbon API on Mac OS X. */
+#undef HAVE_CARBON
+
 /* Define to 1 if you have the `cbrt' function. */
 #undef HAVE_CBRT
 
@@ -717,18 +720,6 @@ Boston, MA 02111-1307, USA.  */
 /* Define as `fork' if `vfork' does not work. */
 #undef vfork
 
-/* Define if we should use the Carbon API on Mac OS X.  */
-#undef HAVE_CARBON
-
-#ifdef HAVE_CARBON
-#define HAVE_WINDOW_SYSTEM
-#define HAVE_MOUSE
-#define HAVE_MENUS
-#endif
-
-/* Define if we have the session management (SM) library.  */
-#undef HAVE_X_SM
-
 /* Define to empty if the keyword `volatile' does not work. Warning: valid
    code using `volatile' can become incorrect without. Disable with care. */
 #undef volatile
@@ -741,6 +732,14 @@ Boston, MA 02111-1307, USA.  */
 #define HAVE_MOUSE
 #endif
 
+/* If we're using the Carbon API on Mac OS X, define a few more
+   variables as well.  */
+#ifdef HAVE_CARBON
+#define HAVE_WINDOW_SYSTEM
+#define HAVE_MOUSE
+#define HAVE_MENUS
+#endif
+
 /* Define USER_FULL_NAME to return a string
    that is the user's full name.
    It can assume that the variable `pw'