[Dotgnu-pnet-commits] CVS: pnetlib/Xsharp Makefile.am,1.3,1.4 XsharpSupport.c,1.8,1.9

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/Xsharp
In directory subversions:/tmp/cvs-serv17058/Xsharp

Modified Files:
        Makefile.am XsharpSupport.c 
Log Message:


Add the "--enable-xft" option to configure, to explicitly enable
Xft support - we can't auto-detect because some versions of
libXft are broken.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Xsharp/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.am 2 Jul 2003 11:51:21 -0000       1.3
--- Makefile.am 8 Jul 2003 03:17:36 -0000       1.4
***************
*** 6,10 ****
  
  libXsharpSupport_la_SOURCES = XsharpSupport.c
! libXsharpSupport_la_LDFLAGS = $(X_LIBS) $(X_PRE_LIBS) $(X11_LIB) 
$(X_EXTRA_LIBS)
  
  AM_CFLAGS = $(X_CFLAGS)
--- 6,11 ----
  
  libXsharpSupport_la_SOURCES = XsharpSupport.c
! libXsharpSupport_la_LDFLAGS = $(X_LIBS) $(X_PRE_LIBS) $(XFT_LIB) \
!                                                         $(X11_LIB) 
$(X_EXTRA_LIBS)
  
  AM_CFLAGS = $(X_CFLAGS)

Index: XsharpSupport.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Xsharp/XsharpSupport.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** XsharpSupport.c     8 Jul 2003 03:03:17 -0000       1.8
--- XsharpSupport.c     8 Jul 2003 03:17:36 -0000       1.9
***************
*** 21,27 ****
  #if !defined(X_DISPLAY_MISSING) && HAVE_SELECT
  
- /* XFT support doesn't work yet */
- /*#define     USE_XFT_EXTENSION       1*/
- 
  #include <X11/Xlib.h>
  #include <X11/Xutil.h>
--- 21,24 ----