From b267327b67753e9c3f222d099aad824513badd71 Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Wed, 28 Oct 2009 00:41:23 +0000
Subject: [PATCH] Merge r3745.

Originally committed to SVN as r3747.
---
 aegisub/libass/Makefile.am | 2 +-
 aegisub/libass/config.h    | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 aegisub/libass/config.h

diff --git a/aegisub/libass/Makefile.am b/aegisub/libass/Makefile.am
index 92a1e194b..228ba957d 100644
--- a/aegisub/libass/Makefile.am
+++ b/aegisub/libass/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LIBRARIES = libass_aegisub.a
 
-AM_CPPFLAGS = -I../src @FREETYPE_CFLAGS@ -DCONFIG_ICONV -DCONFIG_FONTCONFIG @FONTCONFIG_CFLAGS@ @ICONV_CFLAGS@
+AM_CPPFLAGS = @FREETYPE_CFLAGS@ -DCONFIG_ICONV -DCONFIG_FONTCONFIG @FONTCONFIG_CFLAGS@ @ICONV_CFLAGS@
 
 if BUILD_DARWIN
 AM_CPPFLAGS += -DBUILD_DARWIN
diff --git a/aegisub/libass/config.h b/aegisub/libass/config.h
new file mode 100644
index 000000000..e69de29bb