patches/firefox-02-font_Xft.diff
author dcarbery
Fri, 24 Nov 2006 16:37:59 +0000
branch217update
changeset 19096 d542fc2c823e
parent 7769 28f643ae9fa8
permissions -rw-r--r--
Merged trunk changes r9797:9829 into 217update branch.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7769
28f643ae9fa8 Bump yelp to 2.15.5, remove firefix-10-gecko.m4.diff, as yelp contains local version
mattk
parents:
diff changeset
     1
--- firefox/browser/app/Makefile.in.orig	2005-12-02 14:53:52.942177000 +0000
28f643ae9fa8 Bump yelp to 2.15.5, remove firefix-10-gecko.m4.diff, as yelp contains local version
mattk
parents:
diff changeset
     2
+++ firefox/browser/app/Makefile.in	2005-12-02 14:54:04.545631000 +0000
28f643ae9fa8 Bump yelp to 2.15.5, remove firefix-10-gecko.m4.diff, as yelp contains local version
mattk
parents:
diff changeset
     3
@@ -87,6 +87,7 @@
28f643ae9fa8 Bump yelp to 2.15.5, remove firefix-10-gecko.m4.diff, as yelp contains local version
mattk
parents:
diff changeset
     4
 	$(XPCOM_LIBS) \
28f643ae9fa8 Bump yelp to 2.15.5, remove firefix-10-gecko.m4.diff, as yelp contains local version
mattk
parents:
diff changeset
     5
 	$(NSPR_LIBS) \
28f643ae9fa8 Bump yelp to 2.15.5, remove firefix-10-gecko.m4.diff, as yelp contains local version
mattk
parents:
diff changeset
     6
 	$(TK_LIBS) \
28f643ae9fa8 Bump yelp to 2.15.5, remove firefix-10-gecko.m4.diff, as yelp contains local version
mattk
parents:
diff changeset
     7
+	-lfontconfig -L/usr/openwin/lib -lXft \
28f643ae9fa8 Bump yelp to 2.15.5, remove firefix-10-gecko.m4.diff, as yelp contains local version
mattk
parents:
diff changeset
     8
 	$(NULL)
28f643ae9fa8 Bump yelp to 2.15.5, remove firefix-10-gecko.m4.diff, as yelp contains local version
mattk
parents:
diff changeset
     9
 
28f643ae9fa8 Bump yelp to 2.15.5, remove firefix-10-gecko.m4.diff, as yelp contains local version
mattk
parents:
diff changeset
    10
 # Add explicit X11 dependency when building against X11 toolkits