Clears compile-time warning of: "X11/extensions/xf86bigfstr.h", line 1: #warning: "xf86bigfstr.h is obsolete and may be removed in the future." "X11/extensions/xf86bigfstr.h", line 2: #warning: "include <X11/extensions/xf86bigfproto.h> for the protocol defines."
Requires xf86bigfontproto >= 1.2.0 if --disable-xf86bigfont is not passed to configure. Also removes unnecessary AC_SUBST of BIGFONT_CFLAGS & BIGFONT_LIBS that PKG_CHECK_MODULES does automatically Signed-off-by: Alan Coopersmith <[email protected]> --- configure.ac | 4 +--- src/Font.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 7bd2775..a41d642 100644 --- a/configure.ac +++ b/configure.ac @@ -364,10 +364,8 @@ AC_ARG_ENABLE(xf86bigfont, [Disable XF86BigFont extension support]), [XF86BIGFONT=$enableval],[XF86BIGFONT="yes"]) if test "x$XF86BIGFONT" = "xyes"; then - PKG_CHECK_MODULES(BIGFONT, xf86bigfontproto, + PKG_CHECK_MODULES(BIGFONT, [xf86bigfontproto >= 1.2.0], AC_DEFINE(XF86BIGFONT,1,[Enable XF86BIGFONT extension]),XF86BIGFONT="no") - AC_SUBST(BIGFONT_CFLAGS) - AC_SUBST(BIGFONT_LIBS) fi AC_ARG_ENABLE(xkb, diff --git a/src/Font.c b/src/Font.c index 6a4c1e2..7f56f68 100644 --- a/src/Font.c +++ b/src/Font.c @@ -44,7 +44,7 @@ authorization from the X Consortium and the XFree86 Project. #include <stdio.h> #include <stdlib.h> -#include <X11/extensions/xf86bigfstr.h> +#include <X11/extensions/xf86bigfproto.h> #endif #include "Xlcint.h" -- 1.7.3.2 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
