From 3f110101aa4c4da5ca664d69f41e36ed18658609 Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Sat, 8 Jan 2011 17:46:46 +0000
Subject: [PATCH] Ensure the proper cflags are set for common/charset_conv.cpp
 in libaegisub.  Also fix iconv include path on *bsd.

Originally committed to SVN as r5145.
---
 aegisub/configure.in        | 1 +
 aegisub/libaegisub/Makefile | 1 +
 2 files changed, 2 insertions(+)

diff --git a/aegisub/configure.in b/aegisub/configure.in
index 22990e53b..26bdc1b41 100644
--- a/aegisub/configure.in
+++ b/aegisub/configure.in
@@ -72,6 +72,7 @@ case "$target_or_host" in
 
   *-*-*bsd*)
     build_bsd="yes"
+	ICONV_CFLAGS="-I/usr/local/include"
   ;;
 
   *)
diff --git a/aegisub/libaegisub/Makefile b/aegisub/libaegisub/Makefile
index 1e9e7d5da..3f7c589e3 100644
--- a/aegisub/libaegisub/Makefile
+++ b/aegisub/libaegisub/Makefile
@@ -16,6 +16,7 @@ CXXFLAGS += -I/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/CoreServi
 LDFLAGS += -L../universalchardet -luniversalchardet
 endif
 
+common/charset_conv.o: CXXFLAGS += $(CFLAGS_ICONV)
 
 SRC = \
 	common/charset.cpp \