summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2007-03-06 22:55:18 +0000
committertruelight <truelight@openttd.org>2007-03-06 22:55:18 +0000
commitd0dd95d0cbef6f5991e65815246ef70b8d5e5a0c (patch)
tree95cb37428331da4ff7b636eab5afd46574fcab59
parent94ddae188a0995ce03a690382fb717ef93bb76db (diff)
downloadopenttd-d0dd95d0cbef6f5991e65815246ef70b8d5e5a0c.tar.xz
(svn r9047) -Fix [FS#651]: request static deps from fontconfig in OSX
-rw-r--r--config.lib3
1 files changed, 2 insertions, 1 deletions
diff --git a/config.lib b/config.lib
index f30a22157..f3d0b6709 100644
--- a/config.lib
+++ b/config.lib
@@ -793,7 +793,8 @@ make_cflags_and_ldflags() {
if [ "$enable_static" != "0" ]; then
if [ "$os" = "OSX" ]; then
# fontconfig_config goes via pkg-config on all systems, which doesn't know --prefix
- LIBS="$LIBS `$fontconfig_config --variable=prefix`/lib/libfontconfig.a"
+ # Also, despite the reason we link to the .a file ourself (because we can't use -static), we do need to ask pkg-config about possible other deps
+ LIBS="$LIBS `$fontconfig_config --variable=prefix`/lib/libfontconfig.a `$fontconfig_config --libs --static | sed s/-lfontconfig//`"
else
LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' ' '`"
fi