Mercurial > emacs
changeset 45053:6ff64f2aa959
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.
| author | Andrew Choi <akochoi@shaw.ca> |
|---|---|
| date | Wed, 01 May 2002 04:30:59 +0000 |
| parents | 8357077d84d7 |
| children | a25f9d4a291c |
| files | ChangeLog configure configure.in src/config.in |
| diffstat | 4 files changed, 28 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed May 01 00:54:10 2002 +0000 +++ b/ChangeLog Wed May 01 04:30:59 2002 +0000 @@ -1,3 +1,9 @@ +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. + 2002-04-28 Colin Walters <walters@verbum.org> * configure.in: Delete configure check for access to the game
--- a/configure Wed May 01 00:54:10 2002 +0000 +++ b/configure Wed May 01 04:30:59 2002 +0000 @@ -9166,7 +9166,8 @@ fi if test "${HAVE_CARBON}" = "yes"; then - cat >>confdefs.h <<\_ACEOF + +cat >>confdefs.h <<\_ACEOF #define HAVE_CARBON 1 _ACEOF
--- a/configure.in Wed May 01 00:54:10 2002 +0000 +++ b/configure.in Wed May 01 04:30:59 2002 +0000 @@ -1994,7 +1994,7 @@ fi if test "${HAVE_CARBON}" = "yes"; then - AC_DEFINE(HAVE_CARBON) + AC_DEFINE(HAVE_CARBON, 1, [Define to 1 if you are using the Carbon API on Mac OS X.]) fi ### Use session management (-lSM -lICE) if available @@ -2410,6 +2410,14 @@ #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'
--- a/src/config.in Wed May 01 00:54:10 2002 +0000 +++ b/src/config.in Wed May 01 04:30:59 2002 +0000 @@ -89,6 +89,9 @@ /* 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 @@ /* 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 @@ #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'