diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index c616f3a..d67ad0e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(libass, 0.17.1) +AC_INIT(libass, m4_normalize(m4_include([RELEASEVERSION]))) AM_INIT_AUTOMAKE([foreign subdir-objects]) AC_CONFIG_MACRO_DIR([m4]) LT_INIT @@ -80,21 +80,18 @@ PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 9.17.3], [ pkg_requires="freetype2 >= 9.17.3" CFLAGS="$CFLAGS $FREETYPE_CFLAGS" LIBS="$LIBS $FREETYPE_LIBS" - AC_DEFINE(CONFIG_FREETYPE, 1, [found freetype2 via pkg-config]) ]) PKG_CHECK_MODULES([FRIBIDI], [fribidi >= 0.19.1], [ pkg_requires="fribidi >= 0.19.1, ${pkg_requires}" CFLAGS="$CFLAGS $FRIBIDI_CFLAGS" LIBS="$LIBS $FRIBIDI_LIBS" - AC_DEFINE(CONFIG_FRIBIDI, 1, [found fribidi via pkg-config]) ]) PKG_CHECK_MODULES([HARFBUZZ], [harfbuzz >= 1.2.3], [ pkg_requires="harfbuzz >= 1.2.3, ${pkg_requires}" CFLAGS="$CFLAGS $HARFBUZZ_CFLAGS" LIBS="$LIBS $HARFBUZZ_LIBS" - AC_DEFINE(CONFIG_HARFBUZZ, 1, [found harfbuzz via pkg-config]) ]) libpng=false @@ -260,7 +257,7 @@ AS_IF([test "x$enable_asm" != xno], [ ASFLAGS="$ASFLAGS -DARCH_X86_64=1" ], [aarch64-*|aarch64_be-*], [ - cpu_family="arm64" + cpu_family="aarch64" BITS=64 BITTYPE=64 ], @@ -316,7 +313,7 @@ AS_IF([test "x$enable_asm" != xno], [ rm conftest.asm conftest.o > /dev/null 2>&1 ]) ], - [arm64], [ + [aarch64], [ AS_CASE([$host], [*darwin*], [ CCASFLAGS="$CCASFLAGS -DPREFIX" @@ -356,7 +353,7 @@ AS_IF([test "x$enable_shared" != xno], [ AM_CONDITIONAL([ASM], [test "x$can_asm" = xtrue]) AM_CONDITIONAL([X86], [test "x$cpu_family" = xx86]) AM_CONDITIONAL([X86_64], [test "x$cpu_family" = xx86 && test "x$BITS" = x64]) -AM_CONDITIONAL([AARCH64], [test "x$cpu_family" = xarm64]) +AM_CONDITIONAL([AARCH64], [test "x$cpu_family" = xaarch64]) AM_CONDITIONAL([ENABLE_LARGE_TILES], [test "x$enable_large_tiles" = xyes]) |