mirror of https://github.com/odrling/Aegisub
Format FreeType detection to be the same as others.
Originally committed to SVN as r2714.
This commit is contained in:
parent
6bbb5cafaf
commit
f876084c51
11
configure.in
11
configure.in
|
@ -313,11 +313,7 @@ fi
|
||||||
#############
|
#############
|
||||||
## Fontconfig
|
## Fontconfig
|
||||||
#############
|
#############
|
||||||
PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= fontconfig_required_version,
|
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)
|
|
||||||
|
|
||||||
AC_AGI_COMPILE([FontConfig], [fontconfig], [$FONTCONFIG_CFLAGS], [$FONTCONFIG_LIBS],[
|
AC_AGI_COMPILE([FontConfig], [fontconfig], [$FONTCONFIG_CFLAGS], [$FONTCONFIG_LIBS],[
|
||||||
#include <fontconfig/fontconfig.h>
|
#include <fontconfig/fontconfig.h>
|
||||||
|
@ -333,6 +329,11 @@ if test "$agi_cv_with_fontconfig" = "no"; then
|
||||||
AC_MSG_FAILURE([Please install a working Fontconfig library.])
|
AC_MSG_FAILURE([Please install a working Fontconfig library.])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AC_DEFINE(WITH_FONTCONFIG, 1, [Enable FontConfig support.]),
|
||||||
|
AC_SUBST(FONTCONFIG_CFLAGS)
|
||||||
|
AC_SUBST(FONTCONFIG_LIBS)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
########
|
########
|
||||||
## iconv
|
## iconv
|
||||||
|
|
Loading…
Reference in New Issue