diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | src/config.in | 23 |
4 files changed, 28 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog index fba9567d9df..740644b406e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/configure b/configure index 2d81a9c66f6..ee57aa03a52 100755 --- a/configure +++ b/configure @@ -9166,7 +9166,8 @@ fi fi if test "${HAVE_CARBON}" = "yes"; then - cat >>confdefs.h <<\_ACEOF + +cat >>confdefs.h <<\_ACEOF #define HAVE_CARBON 1 _ACEOF diff --git a/configure.in b/configure.in index 65d54abab24..2d48555015a 100644 --- a/configure.in +++ b/configure.in @@ -1994,7 +1994,7 @@ if test "${with_carbon}" != "no"; then 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 @@ AH_BOTTOM([ #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' 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' |