diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-01-16 11:40:59 -0800 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-01-18 19:28:30 -0800 |
commit | 17aa1f2305da0952ad594c7329d08aba21f13ac8 (patch) | |
tree | 944a48fdf271834aa863c5a9e704b22d116efdbf | |
parent | a9228fcc676aacf9a760dd94891c89f9bc82b20d (diff) |
Update to xf86bigfontproto >= 1.2.0 header name
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 <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | src/Font.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 7bd2775a..a41d6424 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, @@ -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" |