Mercurial > hg > openttd

changeset 6244:53911c065347 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r9047) -Fix [FS#651]: request static deps from fontconfig in OSX
author truelight <truelight@openttd.org>
date Tue, 06 Mar 2007 22:55:18 +0000
parents 85c2435ad900
children 3489dc459f82
files config.lib
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/config.lib
+++ b/config.lib
@@ -793,7 +793,8 @@
 		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