From 7e9f898c34eb0bebcec27e7447ab29a19481d622 Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Sun, 4 Jan 2009 07:01:20 +0000
Subject: [PATCH] * Add -I../aegisub to libass/Makefile.am * Remove res.h from
 config/config_unix.h * Add posix/res.h to config.h (temp)

Originally committed to SVN as r2624.
---
 aegisub/config.h             | 1 +
 aegisub/config/config_unix.h | 2 --
 libass/Makefile.am           | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/aegisub/config.h b/aegisub/config.h
index 72ba9438c..a687ee086 100644
--- a/aegisub/config.h
+++ b/aegisub/config.h
@@ -10,5 +10,6 @@
 
 // Unix specific settings and defines.
 #include "config/config_unix.h"
+#include "posix/res.h"
 
 #endif // __WINDOWS__
diff --git a/aegisub/config/config_unix.h b/aegisub/config/config_unix.h
index 69a55ff24..ed2a2f0d0 100644
--- a/aegisub/config/config_unix.h
+++ b/aegisub/config/config_unix.h
@@ -24,7 +24,5 @@
 //typedef uint64_t __uint64;
 #define abs64 llabs
 
-#include "res.h"
-
 #endif /* _DEFINES_H */
 
diff --git a/libass/Makefile.am b/libass/Makefile.am
index bb290e5e5..f410e52f9 100644
--- a/libass/Makefile.am
+++ b/libass/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LIBRARIES = libass_aegisub.a
 
-AM_CPPFLAGS = @FREETYPE_CFLAGS@ -DCONFIG_ICONV -DCONFIG_FONTCONFIG @FONTCONFIG_CFLAGS@ @ICONV_CFLAGS@
+AM_CPPFLAGS = -I../aegisub @FREETYPE_CFLAGS@ -DCONFIG_ICONV -DCONFIG_FONTCONFIG @FONTCONFIG_CFLAGS@ @ICONV_CFLAGS@
 
 if BUILD_DARWIN
 AM_CPPFLAGS += -DBUILD_DARWIN