diff options
| author | Suzuki, Toshiya (鈴木俊哉) <mpsuzuki@hiroshima-u.ac.jp> | 2006-05-19 22:11:50 +0000 |
|---|---|---|
| committer | Suzuki, Toshiya (鈴木俊哉) <mpsuzuki@hiroshima-u.ac.jp> | 2006-05-19 22:11:50 +0000 |
| commit | 8cfa8bd51ac9017f84eeb7e12e749e25e0ba6891 (patch) | |
| tree | 3256467a9826d9d30dd38eca8deac19d5adedd44 | |
| parent | 47200605535b04657d0793725c99e19ee6634519 (diff) | |
| download | freetype2-8cfa8bd51ac9017f84eeb7e12e749e25e0ba6891.tar.gz | |
* remove Carbon dependency of Darwin, if configured with no option
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | builds/unix/configure.raw | 8 |
2 files changed, 13 insertions, 0 deletions
@@ -1,5 +1,10 @@ 2006-05-19 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> + * build/unix/configure.raw: Add a fallback to disable Carbon + dependency, if configured with no options on Mac OS X. + +2006-05-19 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> + * src/base/ftmac.c (open_face_from_buffer): Deallocate stream when its content cannot be parsed as supported font. This fixes the second part of Savannah bug #16590. diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index f1f217cc3..9d205daed 100644 --- a/builds/unix/configure.raw +++ b/builds/unix/configure.raw @@ -150,6 +150,14 @@ if test x$with_old_mac_fonts = xyes; then [AC_MSG_RESULT([not found]) LDFLAGS="${orig_LDFLAGS}" CFLAGS="$CFLAGS -DDARWIN_NO_CARBON"]) +else + case x$target_os in + xdarwin*) + dnl AC_MSG_WARN([target system is MacOS but configured to build without Carbon]) + CFLAGS="$CFLAGS -DDARWIN_NO_CARBON" + ;; + *) ;; + esac fi |