summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.lib26
1 files changed, 13 insertions, 13 deletions
diff --git a/config.lib b/config.lib
index c38f4af67..fce063fbf 100644
--- a/config.lib
+++ b/config.lib
@@ -786,34 +786,34 @@ make_cflags_and_ldflags() {
fi
fi
- if [ -n "$freetype_config" ]; then
- CFLAGS="$CFLAGS -DWITH_FREETYPE"
- CFLAGS="$CFLAGS `$freetype_config --cflags | tr '\n\r' ' '`"
+ if [ -n "$fontconfig_config" ]; then
+ CFLAGS="$CFLAGS -DWITH_FONTCONFIG"
+ CFLAGS="$CFLAGS `$fontconfig_config --cflags | tr '\n\r' ' '`"
if [ "$enable_static" != "0" ]; then
if [ "$os" = "OSX" ]; then
- LIBS="$LIBS `$freetype_config --prefix`/lib/libfreetype.a"
+ LIBS="$LIBS `$fontconfig_config --variable=prefix`/lib/libfontconfig.a"
else
- # Is it possible to do static with freetype, if so: how?
- LIBS="$LIBS `$freetype_config --libs | tr '\n\r' ' '`"
+ LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' ' '`"
fi
else
- LIBS="$LIBS `$freetype_config --libs | tr '\n\r' ' '`"
+ LIBS="$LIBS `$fontconfig_config --libs | tr '\n\r' ' '`"
fi
fi
- if [ -n "$fontconfig_config" ]; then
- CFLAGS="$CFLAGS -DWITH_FONTCONFIG"
- CFLAGS="$CFLAGS `$fontconfig_config --cflags | tr '\n\r' ' '`"
+ if [ -n "$freetype_config" ]; then
+ CFLAGS="$CFLAGS -DWITH_FREETYPE"
+ CFLAGS="$CFLAGS `$freetype_config --cflags | tr '\n\r' ' '`"
if [ "$enable_static" != "0" ]; then
if [ "$os" = "OSX" ]; then
- LIBS="$LIBS `$fontconfig_config --variable=prefix`/lib/libfontconfig.a"
+ LIBS="$LIBS `$freetype_config --prefix`/lib/libfreetype.a"
else
- LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' ' '`"
+ # Is it possible to do static with freetype, if so: how?
+ LIBS="$LIBS `$freetype_config --libs | tr '\n\r' ' '`"
fi
else
- LIBS="$LIBS `$fontconfig_config --libs | tr '\n\r' ' '`"
+ LIBS="$LIBS `$freetype_config --libs | tr '\n\r' ' '`"
fi
fi