tech-x11 archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Enabling Xft for xdm
Is there a reason not to enable Xft for xdm?
The attached patch adds Xft for xdm.
--
Kind regards,
Yorick Hardy
Index: external/mit/xorg/bin/xdm/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/bin/xdm/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- external/mit/xorg/bin/xdm/Makefile 2 Jan 2009 23:25:57 -0000 1.4
+++ external/mit/xorg/bin/xdm/Makefile 29 Apr 2009 15:17:56 -0000
@@ -26,10 +26,12 @@
-DDEF_AUTH_DIR=\"${XDMVARDIR}\" \
-DDEF_GREETER_LIB=\"${XDMGREETERLIB}\"
-LDADD+= -lXau -lXdmcp -lXinerama -lXpm -lXmu
-LDADD+= -lXt -lSM -lICE -lXext -lX11 -lcrypt
-DPADD+= ${LIBXAU} ${LIBXDMCP} ${LIBXINERAMA} ${LIBXPM} ${LIBXMU}
-DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
${LIBCRYPT}
+LDADD+= -lXau -lXdmcp -lXft -lXinerama -lXpm
+LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11
+LDADD+= -lcrypt -lfreetype
+DPADD+= ${LIBXAU} ${LIBXDMCP} ${LIBXFT} ${LIBXINERAMA} ${LIBXPM}
+DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT}
${LIBX11}
+DPADD+= ${LIBCRYPT} ${LIBFREETYPE}
.if (${USE_PAM} != "no")
LDADD+= -lpam ${PAM_STATIC_LDADD}
@@ -47,6 +49,7 @@
.include "Makefile.xdm"
CPPFLAGS.resource.c+= -DDEF_CHOOSER=\"${XDMCHOOSERPATH}\"
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2
X11MANCPP= yes
X11EXTRAMANDEFS+= -DARC4_RANDOM \
Index: external/mit/xorg/bin/xdm/Makefile.xdm
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/bin/xdm/Makefile.xdm,v
retrieving revision 1.2
diff -u -r1.2 Makefile.xdm
--- external/mit/xorg/bin/xdm/Makefile.xdm 2 Jan 2009 23:25:57 -0000
1.2
+++ external/mit/xorg/bin/xdm/Makefile.xdm 29 Apr 2009 15:18:06 -0000
@@ -10,7 +10,7 @@
CPPFLAGS+= -DBINDIR=\"${X11BINDIR}\" -DXDMDIR=\"${XDMDIR}\" \
-DHASXDMAUTH ${X11FLAGS.CONNECTION} -DGREET_USER_STATIC \
-DFRAGILE_DEV_MEM -DARC4_RANDOM \
- -DXPM -DUSE_XINERAMA -DHAS_SETPROCTITLE \
+ -DXPM -DUSE_XFT -DUSE_XINERAMA -DHAS_SETPROCTITLE \
-DHAS_GETIFADDRS -UIPv6 -DHAS_MKSTEMP \
-I${X11SRCDIR.xdm} \
${X11FLAGS.VERSION}
Home |
Main Index |
Thread Index |
Old Index