diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2009-05-28 06:54:05 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2009-05-28 06:54:05 +0000 |
| commit | c42901517ebdf6f3657fb451296acbd58158b241 (patch) | |
| tree | 658319a566e102e082f17a910febee699e97f3c1 | |
| parent | ed551672a1e3565dd544244af7f22a4f2af4c433 (diff) | |
| download | navit-c42901517ebdf6f3657fb451296acbd58158b241.tar.gz | |
Add:Build:Added configure option for fontconfig
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@2295 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | configure.in | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/configure.in b/configure.in index a6811a006..da0d7a00d 100644 --- a/configure.in +++ b/configure.in @@ -38,6 +38,7 @@ samplemap=yes; samplemap_reason=default binding_dbus=yes; binding_dbus_reason=default binding_python=yes; binding_python_reason=default font_freetype=yes; font_freetype_reason=default +fontconfig=yes; fontconfig_reason=default gui_gtk=no; gui_gtk_reason=default gui_win32=no; gui_win32_reason=default gui_internal=yes; gui_internal_reason=default @@ -290,14 +291,17 @@ AC_SUBST(FREETYPE2_CFLAGS) AC_SUBST(FREETYPE2_LIBS) AM_CONDITIONAL(FONT_FREETYPE, test "x${font_freetype}" = "xyes") -PKG_CHECK_MODULES(FONTCONFIG, [fontconfig], [fontconfig_pkgconfig=yes], [fontconfig_pkgconfig=no]) -if test "x$fontconfig_pkgconfig" = "xyes"; then +AC_ARG_ENABLE(fontconfig, [ --disable-fontconfig don't add fontconfig support], fontconfig=$enableval;fontconfig_reason="configure parameter") +if test "x${fontconfig}" = "xyes"; then + PKG_CHECK_MODULES(FONTCONFIG, [fontconfig], [fontconfig=yes], [fontconfig=no]) +fi +if test "x$fontconfig" = "xyes"; then AC_DEFINE(HAVE_FONTCONFIG, 1, [Define to 1 if you have fontconfig]) fi AC_SUBST(FONTCONFIG_CFLAGS) AC_SUBST(FONTCONFIG_LIBS) -AM_CONDITIONAL(FONTS, test "x${font_freetype}" = "xyes" -a "x$fontconfig_pkgconfig" != "xyes") +AM_CONDITIONAL(FONTS, test "x${font_freetype}" = "xyes" -a "x$fontconfig" != "xyes") PKG_CHECK_MODULES(IMLIB2, [imlib2], [imlib2_pkgconfig=yes], [imlib2_pkgconfig=no]) if test "x$imlib2_pkgconfig" = "xyes"; then |