diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-12 18:00:15 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-12 18:00:15 -0700 |
| commit | 9ca9d19206114788da85c81a5aba2525baef80cb (patch) | |
| tree | c66ba3dbd195708d0150e6418a5d230a617ea0d1 | |
| parent | 26b3ee9b9fd5a58ef7812ecabebd78bd10d57878 (diff) | |
Use Xxf86dga.h & xf86dgaproto.h if present, to avoid warnings from old headers
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | xdpyinfo.c | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 0ed78b0..5d4e904 100644 --- a/configure.ac +++ b/configure.ac @@ -69,7 +69,7 @@ if test "x$USE_DGA" != "xno" ; then PKG_CHECK_MODULES(DPY_XF86DGA, xxf86dga, [SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $DPY_XF86DGA_CFLAGS $DPY_X11_CFLAGS" - AC_CHECK_HEADERS([X11/extensions/xf86dga.h X11/extensions/xf86dgastr.h],,, + AC_CHECK_HEADERS([X11/extensions/Xxf86dga.h X11/extensions/xf86dgaproto.h X11/extensions/xf86dga.h X11/extensions/xf86dgastr.h],,, [#include <X11/Xlib.h> #include <X11/Xproto.h>]) CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) @@ -51,7 +51,8 @@ in this Software without prior written authorization from The Open Group. # define XF86VIDMODE # endif -# if HAVE_X11_EXTENSIONS_XF86DGA_H && HAVE_X11_EXTENSIONS_XF86DGASTR_H +# if (HAVE_X11_EXTENSIONS_XXF86DGA_H && HAVE_X11_EXTENSIONS_XF86DGAPROTO_H) \ + || (HAVE_X11_EXTENSIONS_XF86DGA_H && HAVE_X11_EXTENSIONS_XF86DGASTR_H) # define XFreeXDGA # endif @@ -112,8 +113,13 @@ in this Software without prior written authorization from The Open Group. # endif #endif #ifdef XFreeXDGA -#include <X11/extensions/xf86dga.h> -#include <X11/extensions/xf86dgastr.h> +# if HAVE_X11_EXTENSIONS_XXF86DGA_H && HAVE_X11_EXTENSIONS_XF86DGAPROTO_H +# include <X11/extensions/Xxf86dga.h> +# include <X11/extensions/xf86dgaproto.h> +# else +# include <X11/extensions/xf86dga.h> +# include <X11/extensions/xf86dgastr.h> +# endif #endif #ifdef XF86MISC #include <X11/extensions/xf86misc.h> |