Mercurial > emacs
changeset 62293:f020f9769645
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.
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
|---|---|
| date | Fri, 13 May 2005 08:54:23 +0000 |
| parents | 3c46f9593ea1 |
| children | 70e1a2342c4f |
| files | configure.in |
| diffstat | 1 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Fri May 13 08:53:17 2005 +0000 +++ b/configure.in Fri May 13 08:54:23 2005 +0000 @@ -1694,6 +1694,13 @@ 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 @@ 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 @@ 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