[xine-cvs] CVS: xine-ui/m4 xft.m4,1.1,1.2

[Michael R. <mr...@us...>]

Update of /cvsroot/xine/xine-ui/m4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5487/m4

Modified Files:
	xft.m4 
Log Message:
allow building without pkgconfig, when xft is found directly


Index: xft.m4
===================================================================
RCS file: /cvsroot/xine/xine-ui/m4/xft.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xft.m4	15 Jan 2004 23:22:33 -0000	1.1
+++ xft.m4	12 Feb 2004 18:44:56 -0000	1.2
@@ -25,7 +25,14 @@
 [
 
   if test "x$PKG_CONFIG" = "xno" ; then
-    ifelse([$2], , :, [$2])
+    AC_PATH_PROG(XFT_CONFIG, xft-config, no)
+    if test "x$XFT_CONFIG" = "xno" ; then
+      ifelse([$2], , :, [$2])
+    else
+      XFT_CFLAGS=`$XFT_CONFIG --cflags`
+      XFT_LIBS=`$XFT_CONFIG --libs`
+      ifelse([$1], , :, [$1])
+    fi
   else
     XFT_CFLAGS=`$PKG_CONFIG --cflags xft`
     XFT_LIBS=`$PKG_CONFIG --libs xft`