diff options
| author | Oleg Oshmyan <chortos@inbox.lv> | 2017-10-27 00:41:36 +0300 |
|---|---|---|
| committer | Oleg Oshmyan <chortos@inbox.lv> | 2017-10-27 01:01:24 +0300 |
| commit | 4043d68f687a483c7d6aca6d1a6258568f3dfd3a (patch) | |
| tree | 57894353e693dc7c444e15ecb2ae6e049e4e2f9b | |
| parent | 68f25e2c26de2c5c3624bf0fe6d12a0e9c35e861 (diff) | |
| download | libass-4043d68f687a483c7d6aca6d1a6258568f3dfd3a.tar.bz2 libass-4043d68f687a483c7d6aca6d1a6258568f3dfd3a.tar.xz | |
Completely exclude ass_fontconfig.c from build when it is disabled
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | libass/Makefile.am | 7 | ||||
| -rw-r--r-- | libass/ass_fontconfig.c | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index cc223d9..28f4b59 100644 --- a/configure.ac +++ b/configure.ac @@ -156,6 +156,7 @@ 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" diff --git a/libass/Makefile.am b/libass/Makefile.am index 12991dc..b72ab67 100644 --- a/libass/Makefile.am +++ b/libass/Makefile.am @@ -17,6 +17,7 @@ SRC_INTEL = x86/rasterizer.asm x86/blend_bitmaps.asm x86/blur.asm x86/cpuid.asm x86/cpuid.h SRC_INTEL64 = x86/be_blur.asm +SRC_FONTCONFIG = ass_fontconfig.c ass_fontconfig.h SRC_DIRECTWRITE = ass_directwrite.c ass_directwrite.h dwrite_c.h SRC_CORETEXT = ass_coretext.c ass_coretext.h @@ -24,7 +25,7 @@ lib_LTLIBRARIES = libass.la libass_la_SOURCES = ass.h ass.c ass_types.h ass_utils.h ass_utils.c \ ass_compat.h ass_string.h ass_string.c ass_strtod.c \ ass_library.h ass_library.c ass_cache.h ass_cache.c ass_cache_template.h \ - ass_font.h ass_font.c ass_fontselect.h ass_fontselect.c ass_fontconfig.h ass_fontconfig.c \ + ass_font.h ass_font.c ass_fontselect.h ass_fontselect.c \ ass_render.h ass_render.c ass_render_api.c \ ass_parse.h ass_parse.c ass_shaper.h ass_shaper.c \ ass_outline.h ass_outline.c ass_drawing.h ass_drawing.c \ @@ -34,6 +35,10 @@ libass_la_SOURCES = ass.h ass.c ass_types.h ass_utils.h ass_utils.c \ libass_la_LDFLAGS = -no-undefined -version-info $(LIBASS_LT_CURRENT):$(LIBASS_LT_REVISION):$(LIBASS_LT_AGE) libass_la_LDFLAGS += -export-symbols $(srcdir)/libass.sym +if FONTCONFIG +libass_la_SOURCES += $(SRC_FONTCONFIG) +endif + if DIRECTWRITE libass_la_SOURCES += $(SRC_DIRECTWRITE) endif diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c index 552931f..e87dba9 100644 --- a/libass/ass_fontconfig.c +++ b/libass/ass_fontconfig.c @@ -19,8 +19,6 @@ #include "config.h" #include "ass_compat.h" -#ifdef CONFIG_FONTCONFIG - #include <stdio.h> #include <stdlib.h> #include <sys/types.h> @@ -322,5 +320,3 @@ ass_fontconfig_add_provider(ASS_Library *lib, ASS_FontSelector *selector, return provider; } - -#endif |