[Dotgnu-pnet-commits] CVS: pnetlib ChangeLog,1.1128,1.1129 configure.in,1.84,1.85

[Rhys Weatherley <address@hidden>]

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

Modified Files:
        ChangeLog configure.in 
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: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/ChangeLog,v
retrieving revision 1.1128
retrieving revision 1.1129
diff -C2 -r1.1128 -r1.1129
*** ChangeLog   8 Jul 2003 03:03:17 -0000       1.1128
--- ChangeLog   8 Jul 2003 03:17:34 -0000       1.1129
***************
*** 15,18 ****
--- 15,23 ----
        is destroyed.
  
+       * configure.in, Xsharp/Makefile.am, Xsharp/XsharpSupport.c:
+       add the "--enable-xft" option to configure, to explicitly enable
+       Xft support - we can't auto-detect because some versions of
+       libXft are broken.
+ 
  2003-07-07  Gopal.V  <address@hidden>
        

Index: configure.in
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/configure.in,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -r1.84 -r1.85
*** configure.in        7 Jul 2003 01:37:41 -0000       1.84
--- configure.in        8 Jul 2003 03:17:36 -0000       1.85
***************
*** 18,21 ****
--- 18,22 ----
  AC_SUBST(PNET_PATH)
  AC_SUBST(X11_LIB)
+ AC_SUBST(XFT_LIB)
  
  dnl Checks for programs.
***************
*** 34,37 ****
--- 35,47 ----
  fi
  
+ dnl Option to enable the Xft library for Freetype font support.
+ AC_ARG_ENABLE(xft,
+ [  --enable-xft            Enable Xft for Freetype font support],
+ [case "${enableval}" in
+   yes) xft=true ;;
+   no)  xft=false ;;
+   *) AC_MSG_ERROR(bad value ${enableval} for --enable-xft) ;;
+ esac],[xft=false])
+ 
  dnl Check for file extensions.
  AC_EXEEXT
***************
*** 45,54 ****
  AC_CHECK_FUNCS(select)
  
! dnl Determine if we should add -lX11 to the link line of 
"libXsharpSupport.so".
  if test "x$no_x" = "xyes" ; then
        X11_LIB=
  else
        X11_LIB=-lX11
  fi
  
  dnl The --with-pnet option can be used to specify the location of
--- 55,74 ----
  AC_CHECK_FUNCS(select)
  
! dnl Determine if we should add -lX11 and -lXft to the link line
! dnl of "libXsharpSupport.so".
  if test "x$no_x" = "xyes" ; then
        X11_LIB=
+       XFT_LIB=
  else
        X11_LIB=-lX11
+       if test x$xft = xtrue ; then
+               XFT_LIB=-lXft
+               AC_DEFINE(USE_XFT_EXTENSION)
+       else
+               XFT_LIB=
+       fi
  fi
+ 
+ dnl Determine if we should add -lXft to the link line of 
"libXsharpSupport.so".
  
  dnl The --with-pnet option can be used to specify the location of