From 5da0b16f48dbeaa11269febeefb69eee79b39ac7 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Sat, 22 Mar 2008 08:24:21 +0000 Subject: [PATCH] Move WITH_INTERNAL_LIBASS beove WITH_LIBASS for clarity. Originally committed to SVN as r2101. --- aegisub/Makefile.am | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/aegisub/Makefile.am b/aegisub/Makefile.am index 6744730b0..63f24d163 100644 --- a/aegisub/Makefile.am +++ b/aegisub/Makefile.am @@ -12,9 +12,6 @@ aegisub_CPPFLAGS = @FREETYPE_CFLAGS@ aegisub_LDFLAGS = @GL_LIBS@ @PTHREAD_LIBS@ @WX_LIBS@ LIBS += @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ -if WITH_INTERNAL_LIBASS -aegisub_LDFLAGS += @FONTCONFIG_LIBS@ -endif #XXX: fix this so it's generated by configure and put into acconf.h #BUILDINFO := -DBUILD_CREDIT=verm -DBUILD_SVN_REVISION=0 @@ -57,6 +54,10 @@ aegisub_LDFLAGS += @AVFORMAT_LDFLAGS@ @AVCODEC_LDFLAGS@ @SWSCALE_LDFLAGS@ aegisub_LDADD += libaudiovideo_ffmpeg.a endif +if WITH_INTERNAL_LIBASS +aegisub_LDFLAGS += @FONTCONFIG_LIBS@ +endif + if HAVE_LIBASS noinst_LIBRARIES += libsubtitle_ass.a libsubtitle_ass_a_SOURCES = subtitles_provider_libass.cpp