From 841ec898d33c5fb834fdd6740d52b57c4e19fca6 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Fri, 1 Feb 2013 15:26:03 -0800
Subject: [PATCH] Add ICU to the configure script

---
 aegisub/Makefile.inc.in | 2 ++
 aegisub/configure.ac    | 3 +++
 aegisub/src/Makefile    | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/aegisub/Makefile.inc.in b/aegisub/Makefile.inc.in
index a5d90b69f..fea71edae 100644
--- a/aegisub/Makefile.inc.in
+++ b/aegisub/Makefile.inc.in
@@ -85,6 +85,7 @@ CFLAGS_FREETYPE    = @FREETYPE_CFLAGS@
 CFLAGS_GL          = @GL_CFLAGS@
 CFLAGS_HUNSPELL    = @HUNSPELL_CFLAGS@
 CFLAGS_ICONV       = @ICONV_CFLAGS@
+CFLAGS_ICU         = @ICU_I18N_CFLAGS@
 CFLAGS_LIBASS      = @LIBASS_CFLAGS@
 CFLAGS_LIBCURL     = @LIBCURL_CFLAGS@
 CFLAGS_LUA         = @LUA_CFLAGS@
@@ -103,6 +104,7 @@ LIBS_FREETYPE      = @FREETYPE_LIBS@
 LIBS_GL            = @GL_LIBS@
 LIBS_HUNSPELL      = @HUNSPELL_LIBS@
 LIBS_ICONV         = @ICONV_LIBS@
+LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
 LIBS_LIBASS        = @LIBASS_LIBS@
 LIBS_LIBCURL       = @LIBCURL_LIBS@
 LIBS_LIBPULSE      = @LIBPULSE_LIBS@
diff --git a/aegisub/configure.ac b/aegisub/configure.ac
index 95531541b..bffa5d669 100644
--- a/aegisub/configure.ac
+++ b/aegisub/configure.ac
@@ -251,6 +251,9 @@ BOOST_FILESYSTEM
 BOOST_LOCALE
 BOOST_REGEX
 
+PKG_CHECK_MODULES(ICU_UC, icu-uc)
+PKG_CHECK_MODULES(ICU_I18N, icu-i18n)
+
 ########
 ## iconv
 ########
diff --git a/aegisub/src/Makefile b/aegisub/src/Makefile
index 47444593f..8227f95fe 100644
--- a/aegisub/src/Makefile
+++ b/aegisub/src/Makefile
@@ -5,7 +5,7 @@ PROGRAM_INSTALL = yes
 
 PRECOMPILED_HEADER_NAME=agi_pre.h
 
-AEGISUB_CFLAGS = -I. -I.. -Iinclude -I../libaegisub/include -I../build -DAEGISUB $(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_PROFILE)
+AEGISUB_CFLAGS = -I. -I.. -Iinclude -I../libaegisub/include -I../build -DAEGISUB $(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_PROFILE) $(CFLAGS_ICU)
 
 CFLAGS += $(AEGISUB_CFLAGS)
 CXXFLAGS += $(AEGISUB_CFLAGS) -D__STDC_FORMAT_MACROS $(CXXFLAGS_WX)
@@ -14,7 +14,7 @@ LIBS := -L../libaegisub -laegisub $(LIBS)
 LIBS += $(LIBS_CCMALLOC) $(LIBS_EFENCE) $(LIBS_GL)
 LIBS += $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE)
 LIBS += $(LIBS_FONTCONFIG) $(LIBS_FFTW3)
-LIBS += $(LIBS_UCHARDET) $(LIBS_BOOST)
+LIBS += $(LIBS_UCHARDET) $(LIBS_BOOST) $(LIBS_ICU)
 
 LDFLAGS += $(LDFLAGS_CCMALLOC)