From b012a3149cf7612c5756fd079daea0d733ffdb7c Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Sun, 13 Apr 2008 17:44:54 +0000
Subject: [PATCH] Freetype/Fontconfig were pushed under two conditionals
 beacuse on Darwin we use Freetype to list fonts (it uses native features). 
 When support for glibc iconv was added the case broke and set $build_linux,
 the conditional for the fontconfig font lister was $build_default which no
 longer got triggered.  Puts the font listers under
 FONTLISTER_(FONTCONFIG|FREETYPE) conditional upon $build_darwin being no/yes.

Originally committed to SVN as r2180.
---
 aegisub/Makefile.am | 7 +++++--
 configure.in        | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/aegisub/Makefile.am b/aegisub/Makefile.am
index c375333b6..076cc92f8 100644
--- a/aegisub/Makefile.am
+++ b/aegisub/Makefile.am
@@ -122,11 +122,14 @@ UNIVCHARSET = charset_detect.cpp text_file_reader.cpp
 endif
 
 if BUILD_DARWIN
-  FONT_LISTER = font_file_lister_freetype.cpp
   BEVEL_BUTTON = macosx/bevelButton.cpp
 endif
 
-if BUILD_DEFAULT
+if FONTLISTER_FREETYPE
+  FONT_LISTER = font_file_lister_freetype.cpp
+endif
+
+if FONTLISTER_FONTCONFIG
   FONT_LISTER = font_file_lister_fontconfig.cpp
 endif
 
diff --git a/configure.in b/configure.in
index a0e4caee4..3f30df8b9 100644
--- a/configure.in
+++ b/configure.in
@@ -64,6 +64,8 @@ esac
 AM_CONDITIONAL([BUILD_DARWIN], [test "$build_darwin" = "yes"])
 AM_CONDITIONAL([BUILD_DEFAULT], [test "$build_default" = "yes"])
 
+AM_CONDITIONAL([FONTLISTER_FONTCONFIG], [test "$build_darwin" != "yes"])
+AM_CONDITIONAL([FONTLISTER_FREETYPE], [test "$build_darwin" = "yes"])
 
 
 ########################