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"])
 
 
 ########################