Commit: dc6b3cce1db130758b29526e57564a56e049326c - trjp_sawfish (git)

Japanese translation of message catalog for Sawfish Window-Manager

Commit MetaInfo

• Revision: dc6b3cce1db130758b29526e57564a56e049326c (tree)
• Time: 2002-11-09 13:48:13
• Author: John Harper <jsh@unfa...>
• Commiter: John Harper

Log Message

use pkg-config to look for xft.pc before searching by hand. This is

2002-11-08 John Harper <[e-mail]>

* configure.in, Makedefs.in: use pkg-config to look for xft.pc
before searching by hand. This is because Xft2 (which has the
xft.pc may not be recognized by the hand-crafted tests)

Change Summary

• modified: ChangeLog
• modified: Makedefs.in
• modified: configure.in

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
[phone]  John Harper  <[e-mail]>
+
+	* configure.in, Makedefs.in: use pkg-config to look for xft.pc
+	before searching by hand. This is because Xft2 (which has the
+	xft.pc may not be recognized by the hand-crafted tests)
+
 2002-11-03  John Harper  <[e-mail]>
 
 	* po/sawfish.pot: rebuilt

--- a/Makedefs.in
+++ b/Makedefs.in
@@ -52,7 +52,7 @@ LDFLAGS=@LDFLAGS@
 LIBS=@LIBS@
 #LIBOBJS=@LIBOBJS@
 LIBOBJS=
-X11_CFLAGS=@X_CFLAGS@
+X11_CFLAGS=@X_CFLAGS@ @XFT_CFLAGS@
 X11_LIBS=@X_PRE_LIBS@ -lX11 @X_LIBS@ @X_EXTRA_LIBS@
 EXTRA_X11_LIBS=@XINERAMA_LIBS@ @XFT_LIBS@ -lXext
 IMLIB_CFLAGS=@IMLIB_CFLAGS@

--- a/configure.in
+++ b/configure.in
@@ -91,19 +91,28 @@ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
 
 AC_CHECK_HEADERS(X11/SM/SMlib.h X11/extensions/Xdbe.h)
 
+dnl Checks for X extensions/libraries
 XINERAMA_LIBS=""
+XFT_LIBS=""
+XFT_CFLAGS=""
+
 AC_SUBST(XINERAMA_LIBS)
+AC_SUBST(XFT_LIBS)
+AC_SUBST(XFT_CFLAGS)
+
 AC_CHECK_LIB(Xinerama, XineramaQueryScreens,
 	     [XINERAMA_LIBS="-lXinerama"
 	      AC_CHECK_HEADERS(X11/extensions/Xinerama.h)],
 	     [],[$X_LIBS -lX11 -lXext])
 
-XFT_LIBS=""
-AC_SUBST(XFT_LIBS)
-AC_CHECK_LIB(Xft, XftDrawCreate,
-	     [XFT_LIBS="-lXft -lXrender"
-	     AC_CHECK_HEADERS(X11/Xft/Xft.h)],
-	     [], [$X_LIBS -lX11 -lXext])
+dnl Try using pkg-config first, since it looks like Xft2 may fail our
+dnl hand-crafted tests
+PKG_CHECK_MODULES(XFT, xft >= 1.0,
+ [AC_CHECK_HEADERS(X11/Xft/Xft.h)],
+ [AC_CHECK_LIB(Xft, XftDrawCreate,
+	       [XFT_LIBS="-lXft -lXrender"
+	       AC_CHECK_HEADERS(X11/Xft/Xft.h)],
+	       [], [$X_LIBS -lX11 -lXext])])
 
 CPPFLAGS="${_cppflags}"