fi
fi
+HAVE_CARBON=no
+if test "${with_carbon}" != no; then
+ AC_CHECK_HEADER(Carbon/Carbon.h, HAVE_CARBON=yes)
+fi
+if test "${window_system}" = x11 && test "${HAVE_CARBON}" = yes; then
+ if test "${with_carbon+set}" != set \
+ && test "${carbon_appdir_x+set}" != set; then
+ HAVE_CARBON=no
+ fi
+fi
+if test "${HAVE_CARBON}" = yes; then
+ window_system=mac
+fi
+
case "${window_system}" in
x11 )
HAVE_X_WINDOWS=yes
* ) USE_X_TOOLKIT=maybe ;;
esac
;;
- none )
+ mac | none )
HAVE_X_WINDOWS=no
HAVE_X11=no
USE_X_TOOLKIT=none
esac
fi
-HAVE_CARBON=no
-if test "${HAVE_X11}" != "yes"; then
- if test "${with_carbon}" != "no"; then
- AC_CHECK_HEADER(Carbon/Carbon.h, HAVE_CARBON=yes)
- fi
-fi
-
### Compute the unexec source name from the object name.
UNEXEC_SRC="`echo ${unexec} | sed 's/\.o/.c/'`"
### Use Mac OS X Carbon API to implement GUI.
if test "${HAVE_CARBON}" = "yes"; then
AC_DEFINE(HAVE_CARBON, 1, [Define to 1 if you are using the Carbon API on Mac OS X.])
- window_system=mac
## Specify the install directory
carbon_appdir=
if test "${carbon_appdir_x}" != ""; then