From f876084c510b45a0301f067b1c854597cb7d14e5 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Thu, 29 Jan 2009 04:15:25 +0000 Subject: [PATCH] Format FreeType detection to be the same as others. Originally committed to SVN as r2714. --- configure.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/configure.in b/configure.in index 0f23a8a0a..60dd10258 100644 --- a/configure.in +++ b/configure.in @@ -313,11 +313,7 @@ fi ############# ## Fontconfig ############# -PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= fontconfig_required_version, - AC_DEFINE(WITH_FONTCONFIG, 1, [Enable FontConfig support.]), - [AC_MSG_FAILURE([aegisub requires >= fontconfig >= fontconfig_required_version])]) -AC_SUBST(FONTCONFIG_CFLAGS) -AC_SUBST(FONTCONFIG_LIBS) +PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= fontconfig_required_version) AC_AGI_COMPILE([FontConfig], [fontconfig], [$FONTCONFIG_CFLAGS], [$FONTCONFIG_LIBS],[ #include @@ -333,6 +329,11 @@ if test "$agi_cv_with_fontconfig" = "no"; then AC_MSG_FAILURE([Please install a working Fontconfig library.]) fi +AC_DEFINE(WITH_FONTCONFIG, 1, [Enable FontConfig support.]), +AC_SUBST(FONTCONFIG_CFLAGS) +AC_SUBST(FONTCONFIG_LIBS) + + ######## ## iconv