coretext: replace CT attr reads with freetype lookups

[libass] / configure.ac

diff --git a/configure.ac b/configure.ac
index d4c3f3bceaa1a756bc6ddce56022fd761c662e07..4c03edffb4b57269130920866d084319dd5f6c88 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(libass, 0.13.7)
+AC_INIT(libass, 0.14.0)
 AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([m4])
 # Disable Fortran checks
@@ -49,8 +49,6 @@ AC_ARG_ENABLE([harfbuzz], AS_HELP_STRING([--disable-harfbuzz],
     [disable HarfBuzz support @<:@default=check@:>@]))
 AC_ARG_ENABLE([asm], AS_HELP_STRING([--disable-asm],
     [disable compiling with ASM @<:@default=check@:>@]))
-AC_ARG_ENABLE([rasterizer], AS_HELP_STRING([--disable-rasterizer],
-    [disable internal rasterizer @<:@default=enabled@:>@]))
 AC_ARG_ENABLE([large-tiles], AS_HELP_STRING([--enable-large-tiles],
     [use larger tiles in the rasterizer (better performance, slightly worse quality) @<:@default=disabled@:>@]))
 
@@ -58,20 +56,20 @@ AS_IF([test x$enable_asm != xno], [
     AS_CASE([$host],
         [i?86-*], [
             INTEL=true
-            AS=yasm
+            AS=nasm
             X86=true
             BITS=32
             BITTYPE=32
             ASFLAGS="$ASFLAGS -DARCH_X86_64=0" ],
         [x86_64-*-gnux32|amd64-*-gnux32], [
-            AS=yasm
+            AS=nasm
             INTEL=true
             X64=true
             BITS=64
             BITTYPE=x32
             ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -DPIC" ],
         [x86_64-*|amd64-*], [
-            AS=yasm
+            AS=nasm
             INTEL=true
             X64=true
             BITS=64
@@ -79,10 +77,10 @@ AS_IF([test x$enable_asm != xno], [
             ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -DPIC" ],
         )
     AS_IF([test x$INTEL = xtrue], [
-        AC_CHECK_PROG([yasm_check], [$AS], [yes])
-        AS_IF([test x$yasm_check != xyes], [
-            AC_MSG_WARN(yasm was not found; ASM functions are disabled.)
-            AC_MSG_WARN(Install yasm for a significantly faster libass build.)
+        AC_CHECK_PROG([nasm_check], [$AS], [yes])
+        AS_IF([test x$nasm_check != xyes], [
+            AC_MSG_WARN(nasm was not found; ASM functions are disabled.)
+            AC_MSG_WARN(Install nasm for a significantly faster libass build.)
             enable_asm=no
         ], [
             AS_CASE([$host],
@@ -106,8 +104,8 @@ AS_IF([test x$enable_asm != xno], [
             ], [
                 AC_MSG_RESULT([no])
                 VER=`($AS --version || echo no assembler) 2>/dev/null | head -n 1`
-                AC_MSG_WARN([yasm is too old (found $VER); ASM functions are disabled.])
-                AC_MSG_WARN([Install yasm-1.2.0 or later for a significantly faster libass build.])
+                AC_MSG_WARN([nasm is too old (found $VER); ASM functions are disabled.])
+                AC_MSG_WARN([Install nasm-2.10 or later for a significantly faster libass build.])
                 enable_asm=no
             ])
             rm conftest.asm conftest.o > /dev/null 2>&1
@@ -156,26 +154,36 @@ PKG_CHECK_MODULES([FONTCONFIG], fontconfig >= 2.10.92, [
        fontconfig=true
     ], [fontconfig=false])
 fi
+AM_CONDITIONAL([FONTCONFIG], [test x$fontconfig = xtrue])
 
 if test x$enable_coretext != xno; then
-OLDLIBS="$LIBS"
-# Linking to CoreText directly only works from Mountain Lion and iOS6. In
-# earlier OS releases CoreText was part of the ApplicationServices umbrella
-# framework.
-LIBS="$LIBS -framework CoreText -framework CoreFoundation -framework CoreGraphics"
+# Linking to CoreText directly only works from Mountain Lion and iOS.
+# In earlier OS X releases CoreText was part of the ApplicationServices
+# umbrella framework.
 AC_MSG_CHECKING([for CORETEXT])
-AC_LINK_IFELSE([
+AC_COMPILE_IFELSE([
   AC_LANG_PROGRAM(
-    [[#include <CoreText/CoreText.h>]],
-    [[CTFontCreateWithFontDescriptor(NULL, 0.0, NULL);]],)
+    [[#include <ApplicationServices/ApplicationServices.h>]],
+    [[CTFontDescriptorCopyAttribute(NULL, kCTFontURLAttribute);]])
   ], [
-    AC_DEFINE(CONFIG_CORETEXT, 1, [found CoreText in System library])
+    LIBS="$LIBS -framework ApplicationServices -framework CoreFoundation"
+    AC_DEFINE(CONFIG_CORETEXT, 1, [found CoreText in ApplicationServices framework])
     coretext=true
     AC_MSG_RESULT([yes])
   ], [
-    LIBS="$OLDLIBS"
-    coretext=false
-    AC_MSG_RESULT([no])
+    AC_COMPILE_IFELSE([
+      AC_LANG_PROGRAM(
+        [[#include <CoreText/CoreText.h>]],
+        [[CTFontDescriptorCopyAttribute(NULL, kCTFontURLAttribute);]])
+      ], [
+        LIBS="$LIBS -framework CoreText -framework CoreFoundation"
+        AC_DEFINE(CONFIG_CORETEXT, 1, [found CoreText framework])
+        coretext=true
+        AC_MSG_RESULT([yes])
+      ], [
+        coretext=false
+        AC_MSG_RESULT([no])
+      ])
   ])
 fi
 AM_CONDITIONAL([CORETEXT], [test x$coretext = xtrue])