diff options
author | Werner Lemberg <wl@gnu.org> | 2003-05-11 07:12:26 +0000 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2003-05-11 07:12:26 +0000 |
commit | 6eb116ef8ac266d40d05cbac263ae9a951c30caa (patch) | |
tree | fbfdf8a19d101405833b618276ba47229799e428 /builds | |
parent | 1f8f46758ed233010f946ba1f5a8c93473082b6d (diff) | |
download | freetype2-6eb116ef8ac266d40d05cbac263ae9a951c30caa.tar.gz |
* 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__.
Diffstat (limited to 'builds')
-rw-r--r-- | builds/unix/aclocal.m4 | 2 | ||||
-rw-r--r-- | builds/unix/configure | 26 | ||||
-rw-r--r-- | builds/unix/configure.ac | 12 | ||||
-rw-r--r-- | builds/unix/ltmain.sh | 31 |
4 files changed, 56 insertions, 15 deletions
diff --git a/builds/unix/aclocal.m4 b/builds/unix/aclocal.m4 index bb44b8ddc..e63092a42 100644 --- a/builds/unix/aclocal.m4 +++ b/builds/unix/aclocal.m4 @@ -1574,7 +1574,7 @@ else 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 diff --git a/builds/unix/configure b/builds/unix/configure index a16cb4b3d..088fa76c1 100644 --- a/builds/unix/configure +++ b/builds/unix/configure @@ -1009,6 +1009,7 @@ Optional Packages: --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,6 +4472,21 @@ if test x$with_zlib != xno && test -n "$LIBZ"; then 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 + + + @@ -5622,7 +5638,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes 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 @@ chmod -w . 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 @@ else 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 @@ else 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 @@ else 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 diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac index cc035046b..e7ac82a01 100644 --- a/builds/unix/configure.ac +++ b/builds/unix/configure.ac @@ -92,6 +92,18 @@ if test x$with_zlib != xno && test -n "$LIBZ"; then 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) diff --git a/builds/unix/ltmain.sh b/builds/unix/ltmain.sh index 7e0c9f487..8b50e5319 100644 --- a/builds/unix/ltmain.sh +++ b/builds/unix/ltmain.sh @@ -2275,15 +2275,28 @@ compiler." 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" |