Mercurial Mercurial > upstream > oracle > sfw-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
usr/src/cmd/emacs/augment/patch/xft.patch
author Cyril Plisko <cyril.plisko@grigale.com>
Mon, 21 Mar 2011 01:49:39 -0800
changeset 72 82bde2a81435
permissions -rw-r--r--
Import sfw build 162 Bugs Fixed ---------- 7021535 remove bison runtime bits from SUNWgccruntime 7023530 remove even more things from sfw 7023710 net-ssleay 1.35 in SFW does not build with OpenSSL 1.0.0 7024341 emacs doesn't build on 160
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
72
82bde2a81435 Import sfw build 162
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     1
 
--- emacs-23.1/configure.orig	Thu Mar  3 12:13:44 2011
82bde2a81435 Import sfw build 162
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     2
 
+++ emacs-23.1/configure	Thu Mar  3 12:14:37 2011
82bde2a81435 Import sfw build 162
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     3
 
@@ -12863,6 +12863,7 @@
82bde2a81435 Import sfw build 162
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     4
 
             { echo "$as_me:$LINENO: checking XFT_LIBS" >&5
82bde2a81435 Import sfw build 162
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     5
 
 echo $ECHO_N "checking XFT_LIBS... $ECHO_C" >&6; }
82bde2a81435 Import sfw build 162
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     6
 
             XFT_LIBS=`$PKG_CONFIG --libs "xft >= 0.13.0"|sed -e 's,///*,/,g'`
82bde2a81435 Import sfw build 162
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     7
 
+            XFT_LIBS='-R/usr/lib -lXft -lXrender -lfontconfig -lfreetype -lX11  '
82bde2a81435 Import sfw build 162
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     8
 
             { echo "$as_me:$LINENO: result: $XFT_LIBS" >&5
82bde2a81435 Import sfw build 162
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     9
 
 echo "${ECHO_T}$XFT_LIBS" >&6; }
82bde2a81435 Import sfw build 162
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    10
 
         else
upstream/oracle/sfw-gate