- (ugly) fix for the 'Xmd.h' problem
- fix the detection of DGA 2 in configure script
This commit is contained in:
parent
74341020f4
commit
7be462dd31
|
@ -153,7 +153,9 @@ then
|
||||||
AC_CHECK_HEADERS(X11/Xlib.h X11/extensions/xf86dga.h)
|
AC_CHECK_HEADERS(X11/Xlib.h X11/extensions/xf86dga.h)
|
||||||
if test "$ac_cv_header_X11_Xlib_h" = "yes" -a "$ac_cv_header_X11_extensions_xf86dga_h" = "yes"
|
if test "$ac_cv_header_X11_Xlib_h" = "yes" -a "$ac_cv_header_X11_extensions_xf86dga_h" = "yes"
|
||||||
then
|
then
|
||||||
AC_CHECK_LIB(Xxf86dga,XDGAQueryExtension,AC_DEFINE(HAVE_LIBXXF86DGA2) X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga",,$X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
|
AC_CHECK_LIB(Xxf86dga,
|
||||||
|
XDGAQueryExtension,
|
||||||
|
AC_DEFINE(HAVE_LIBXXF86DGA2) AC_DEFINE(HAVE_LIBXXF86DGA) X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga",,$X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
|
||||||
if test "$ac_cv_lib_Xxf86dga_XDGAQueryExtension" = "no"
|
if test "$ac_cv_lib_Xxf86dga_XDGAQueryExtension" = "no"
|
||||||
then
|
then
|
||||||
AC_CHECK_LIB(Xxf86dga,XF86DGAQueryExtension,AC_DEFINE(HAVE_LIBXXF86DGA) X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga",,$X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
|
AC_CHECK_LIB(Xxf86dga,XF86DGAQueryExtension,AC_DEFINE(HAVE_LIBXXF86DGA) X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga",,$X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
|
||||||
|
|
|
@ -17,8 +17,10 @@
|
||||||
#undef CALLBACK
|
#undef CALLBACK
|
||||||
#undef WINAPI
|
#undef WINAPI
|
||||||
|
|
||||||
|
#define XMD_H /* This is to prevent the Xmd.h inclusion bug to happen :-/ */
|
||||||
#include <GL/gl.h>
|
#include <GL/gl.h>
|
||||||
#include <GL/glx.h>
|
#include <GL/glx.h>
|
||||||
|
#undef XMD_H
|
||||||
|
|
||||||
#undef APIENTRY
|
#undef APIENTRY
|
||||||
#undef CALLBACK
|
#undef CALLBACK
|
||||||
|
|
Loading…
Reference in New Issue