ref: 6eb116ef8ac266d40d05cbac263ae9a951c30caa
parent: 1f8f46758ed233010f946ba1f5a8c93473082b6d
author: Werner Lemberg <[email protected]>
date: Sun May 11 03:12:26 EDT 2003
* builds/unix/aclocal.m4: Comment out definition of `allow_undefined_flag' for Darwin 1.3. * builds/unix/configure.ac: Add option --with-old-mac-fonts. * builds/unix/ltmain.sh: Fix version numbering for Darwin 1.3. * builds/unix/configure: Regenerated. * include/freetype/config/ftconfig.h: Fix conditions for defining `FT_MACINTOSH'. * src/base/ftbase.c: Include `ftmac.c' conditionally. * src/base/ftmac.c: Handle __GNUC__.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,17 @@
-2003-15-07 YAMANO-UCHI Hidetoshi <[email protected]>
+2003-05-10 Dan Williams <[email protected]>
+
+ * builds/unix/aclocal.m4: Comment out definition of
+ `allow_undefined_flag' for Darwin 1.3.
+ * builds/unix/configure.ac: Add option --with-old-mac-fonts.
+ * builds/unix/ltmain.sh: Fix version numbering for Darwin 1.3.
+ * builds/unix/configure: Regenerated.
+
+ * include/freetype/config/ftconfig.h: Fix conditions for defining
+ `FT_MACINTOSH'.
+ * src/base/ftbase.c: Include `ftmac.c' conditionally.
+ * src/base/ftmac.c: Handle __GNUC__.
+
+2003-05-07 YAMANO-UCHI Hidetoshi <[email protected]>
* src/cid/cidload.c (is_alpha): Removed.
(cid_parse_dict): Use `cid_parser_skip_alpha' instead of `is_alpha'.
--- a/builds/unix/aclocal.m4
+++ b/builds/unix/aclocal.m4
@@ -1574,7 +1574,7 @@
allow_undefined_flag='-undefined suppress'
;;
*) # Darwin 1.3 on
- allow_undefined_flag='-flat_namespace -undefined suppress'
+# allow_undefined_flag='-undefined suppress'
;;
esac
# FIXME: Relying on posixy $() will cause problems for
--- a/builds/unix/configure
+++ b/builds/unix/configure
@@ -1009,6 +1009,7 @@
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--without-zlib use internal zlib instead of system-wide
+ --with-old-mac-fonts allow Mac resource-based fonts to be used
--with-gnu-ld assume the C compiler uses GNU ld default=no
--with-pic try to use only PIC/non-PIC objects default=use both
@@ -4471,9 +4472,24 @@
fi
+# Check whether --with-old-mac-fonts or --without-old-mac-fonts was given.
+if test "${with_old_mac_fonts+set}" = set; then+ withval="$with_old_mac_fonts"
+fi;
+if test x$with_old_mac_fonts = xyes; then
+ CFLAGS="$CFLAGS -DTARGET_API_MAC_CARBON"
+ LDFLAGS="$LDFLAGS -Xlinker -framework -Xlinker CoreServices \
+ -Xlinker -framework -Xlinker ApplicationServices"
+else
+ CFLAGS="$CFLAGS -DDARWIN_NO_CARBON"
+fi
+
+
+
+
# Check whether --enable-shared or --disable-shared was given.
if test "${enable_shared+set}" = set; thenenableval="$enable_shared"
@@ -5622,7 +5638,7 @@
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5625 "configure"' > conftest.$ac_ext
+ echo '#line 5641 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
@@ -6136,7 +6152,7 @@
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:6139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then+if { (eval echo configure:6155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
if test -s out/conftest.err; then
@@ -6698,7 +6714,7 @@
allow_undefined_flag='-undefined suppress'
;;
*) # Darwin 1.3 on
- allow_undefined_flag='-flat_namespace -undefined suppress'
+# allow_undefined_flag='-undefined suppress'
;;
esac
# FIXME: Relying on posixy $() will cause problems for
@@ -7910,7 +7926,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7913 "configure"
+#line 7929 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8008,7 +8024,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8011 "configure"
+#line 8027 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
--- a/builds/unix/configure.ac
+++ b/builds/unix/configure.ac
@@ -92,6 +92,18 @@
LDFLAGS="$LDFLAGS $LIBZ"
SYSTEM_ZLIB=yes
fi
+
+dnl Whether to use Mac OS resource-based fonts or not
+AC_ARG_WITH(old-mac-fonts,
+ [ --with-old-mac-fonts allow Mac resource-based fonts to be used])
+if test x$with_old_mac_fonts = xyes; then
+ CFLAGS="$CFLAGS -DTARGET_API_MAC_CARBON"
+ LDFLAGS="$LDFLAGS -Xlinker -framework -Xlinker CoreServices \
+ -Xlinker -framework -Xlinker ApplicationServices"
+else
+ CFLAGS="$CFLAGS -DDARWIN_NO_CARBON"
+fi
+
AC_SUBST(LIBZ)
AC_SUBST(CFLAGS)
AC_SUBST(LDFLAGS)
--- a/builds/unix/ltmain.sh
+++ b/builds/unix/ltmain.sh
@@ -2275,15 +2275,28 @@
case $version_type in
none) ;;
- darwin)
- # Like Linux, but with the current version available in
- # verstring for coding it into the library header
- major=.`expr $current - $age`
- versuffix="$major.$age.$revision"
- # Darwin ld doesn't like 0 for these options...
- minor_current=`expr $current + 1`
- verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
- ;;
+ darwin* | rhapsody*)
+ case "$host_os" in
+ darwin1.[012])
+ # Like Linux, but with the current version available in
+ # verstring for coding it into the library header
+ major=.`expr $current - $age`
+ versuffix="$major.$age.$revision"
+ # Darwin ld doesn't like 0 for these options...
+ minor_current=`expr $current + 1`
+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ ;;
+ *)
+ # Like Linux, but with the current version available in
+ # verstring for coding it into the library header
+ major=`expr $current - $age`
+ versuffix="$major.$age.$revision"
+ compatage=`expr $age - 1`
+ compatver="$major.$compatage.0"
+ verstring="-compatibility_version $compatver -current_version $versuffix"
+ ;;
+ esac
+ ;;
freebsd-aout)
major=".$current"
--- a/include/freetype/config/ftconfig.h
+++ b/include/freetype/config/ftconfig.h
@@ -108,7 +108,8 @@
/* This is the only necessary change, so it is defined here instead */
/* providing a new configuration file. */
/* */
-#if defined( __APPLE__ ) || ( defined( __MWERKS__ ) && defined( macintosh ) )
+#if ( defined( __APPLE__ ) && !defined ( DARWIN_NO_CARBON ) ) || \
+ ( defined( __MWERKS__ ) && defined( macintosh ) )
#define FT_MACINTOSH 1
#endif
--- a/src/base/ftbase.c
+++ b/src/base/ftbase.c
@@ -30,5 +30,8 @@
#include "ftobjs.c"
#include "ftnames.c"
+#if defined( __APPLE__ ) && !defined ( DARWIN_NO_CARBON )
+#include "ftmac.c"
+#endif
/* END */
--- a/src/base/ftmac.c
+++ b/src/base/ftmac.c
@@ -62,15 +62,20 @@
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_INTERNAL_STREAM_H
+
+#ifdef __GNUC__
+#include "../truetype/ttobjs.h"
+#include "../type1/t1objs.h"
+#include <Carbon/Carbon.h>
+#else
#include "truetype/ttobjs.h"
#include "type1/t1objs.h"
-
#include <Resources.h>
#include <Fonts.h>
#include <Errors.h>
#include <Files.h>
#include <TextUtils.h>
-
+#endif
#include FT_MAC_H