[patch] xawtv-3.95-underlinking.patch

xawtv-3.95-underlinking.patch (text/plain), 1.21 KB, created by Ted Tanberry on 2014-01-29 21:48:22 UTC

--- Makefile.in
+++ Makefile.in
@@ -29,7 +29,7 @@
 # for CFLAGS
 WARN_FLAGS	:= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
 LFS_FLAGS	:= -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-X11_FLAGS	:= @X_CFLAGS@ @XFT_FLAGS@ -I/usr/X11R6/include/X11/fonts
+X11_FLAGS	:= @X_CFLAGS@ @XFT_CFLAGS@ -I/usr/X11R6/include/X11/fonts
 LIB_FLAGS	:= -I. -I./vbistuff -I./x11 \
 		   -I$(srcdir)/jwz -I$(srcdir)/common -I$(srcdir)/console \
 		   -I$(srcdir)/x11 -I$(srcdir)/structs \

--- configure.ac
+++ configure.ac
@@ -136,15 +136,7 @@
   XFT_FLAGS=""
   XFT_LIBS=""
   if test "$enable_xft" != "no"; then
-    AC_MSG_CHECKING(for Xft)
-    if test -x "`which pkg-config 2>/dev/null`" && pkg-config xft; then
-      XFT_FLAGS="`pkg-config --cflags xft`"
-      XFT_LIBS="`pkg-config --libs xft`"
-      AC_DEFINE(HAVE_XFT,1,"have xft")
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
-    fi
+    PKG_CHECK_MODULES([XFT], [xft fontconfig], [AC_DEFINE([HAVE_XFT], [1], ["have xft"])])
   fi
 else
   ATHENA=""
@@ -161,7 +153,7 @@
 AC_SUBST(SUBS)
 AC_SUBST(TOOLS)
 AC_SUBST(LDLIBS)
-AC_SUBST(XFT_FLAGS)
+AC_SUBST(XFT_CFLAGS)
 AC_SUBST(XFT_LIBS)
 
 AC_CHECK_LIB(jpeg, jpeg_start_compress, JPEG="found",,)