From 4bd34ee32fc209fe3a889e94ea46096b01430271 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Tue, 8 Nov 2011 06:06:43 +0000
Subject: [PATCH] Actually compile ffms and libass providers when they're
 enabled

Originally committed to SVN as r5838.
---
 aegisub/configure.in | 6 ++++++
 aegisub/src/Makefile | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/aegisub/configure.in b/aegisub/configure.in
index 854876e9f..3d605f96a 100644
--- a/aegisub/configure.in
+++ b/aegisub/configure.in
@@ -681,6 +681,9 @@ AC_ARG_WITH(ffms,[  --without-ffms          build without ffms2 A/V provider. (d
 if test "$with_ffms" != "no"; then
   PKG_CHECK_MODULES(FFMS, ffms2 >= ffms_required_version, [with_ffms="yes"], [with_ffms="no"])
 fi
+if test "$with_ffms" != "no"; then
+  AC_DEFINE(WITH_FFMPEGSOURCE, 1, [Enable FFMS2 support])
+fi
 
 AC_SUBST(with_ffms)
 
@@ -692,6 +695,9 @@ AC_ARG_WITH(libass,[  --without-libass        build without libass support (defa
 if test "$with_libass" != "no"; then
   PKG_CHECK_MODULES(LIBASS, libass >= libass_required_version, [with_libass="yes"], [with_libass="no"])
 fi
+if test "$with_libass" != "no"; then
+  AC_DEFINE(WITH_LIBASS, 1, [Enable libass support])
+fi
 
 AC_SUBST(with_libass)
 
diff --git a/aegisub/src/Makefile b/aegisub/src/Makefile
index 0fc65eaf9..2c3547567 100644
--- a/aegisub/src/Makefile
+++ b/aegisub/src/Makefile
@@ -60,8 +60,8 @@ SRC_OPT += audio_provider_ffmpegsource.cpp video_provider_ffmpegsource.cpp ffmpe
 audio_provider_ffmpegsource.o video_provider_ffmpegsource.o ffmpegsource_common.o: \
 	CXXFLAGS += $(CFLAGS_FFMS)
 ffmpegsource_common.o: CXXFLAGS += -D__STDC_FORMAT_MACROS
-LDFLAGS += $(LDFLAGS_FFMPEGSOURCE)
-LDFLAGS_POST += $(LDFLAGS_FFMPEGSOURCE)
+LDFLAGS += $(LDFLAGS_FFMS)
+LDFLAGS_POST += $(LDFLAGS_FFMS)
 endif