diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2005-05-13 08:54:23 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2005-05-13 08:54:23 +0000 |
| commit | de0a3247ca629356262b000a0a368bcb32f70bc6 (patch) | |
| tree | 00ce638a08272a361c0da6016ca9588b93a44f3a /configure.in | |
| parent | ef7c480ddf4314de7f809a2b7048afe71220f86e (diff) | |
Don't check HAVE_CARBON if HAVE_X11 is set to yes. Check HAVE_CARBON
before USE_TOOLKIT_SCROLL_BARS. Define USE_TOOLKIT_SCROLL_BARS by
default if HAVE_CARBON is set to yes.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/configure.in b/configure.in index e384ed68b5..181b86007d 100644 --- a/configure.in +++ b/configure.in @@ -1694,6 +1694,13 @@ if test "${opsys}" = "hpux9shr"; then 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/'`" @@ -2155,6 +2162,9 @@ if test "${with_toolkit_scroll_bars}" != "no"; then elif test "${HAVE_GTK}" = "yes"; then AC_DEFINE(USE_TOOLKIT_SCROLL_BARS) USE_TOOLKIT_SCROLL_BARS=yes + elif test "${HAVE_CARBON}" = "yes"; then + AC_DEFINE(USE_TOOLKIT_SCROLL_BARS) + USE_TOOLKIT_SCROLL_BARS=yes fi fi @@ -2308,15 +2318,10 @@ if test "${HAVE_X11}" = "yes"; then fi fi -### Use Mac OS X Carbon API to implement GUI. -HAVE_CARBON=no -if test "${with_carbon}" != "no"; then - AC_CHECK_HEADER(Carbon/Carbon.h, HAVE_CARBON=yes) -fi - dnl Check for malloc/malloc.h on darwin AC_CHECK_HEADER(malloc/malloc.h, AC_DEFINE(HAVE_MALLOC_MALLOC_H, 1, [Define to 1 if you have the <malloc/malloc.h> header file.])) +### 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 |