# HG changeset patch # User diego # Date 1286113797 0 # Node ID b5aa0248bdc21c1178c5a63447b2f565f881c262 # Parent eff60552602b733120be2318cf51436f8e034c89 Simplify some X11 checks with the help of statement_check_broken(). diff -r eff60552602b -r b5aa0248bdc2 configure --- a/configure Sun Oct 03 13:45:29 2010 +0000 +++ b/configure Sun Oct 03 13:49:57 2010 +0000 @@ -4309,12 +4309,7 @@ int main(void) { DPMSQueryExtension(0, 0, 0); return 0; } EOF cc_check -lXdpms && _xdpms3=yes - cat > $TMPC < -#include -int main(void) { DPMSQueryExtension(0, 0, 0); return 0; } -EOF - cc_check -lXext && _xdpms4=yes + statement_check_broken X11/Xlib.h X11/extensions/dpms.h 'DPMSQueryExtension(0, 0, 0)' -lXext && _xdpms4=yes fi if test "$_xdpms4" = yes ; then def_xdpms='#define CONFIG_XDPMS 1' @@ -4333,16 +4328,8 @@ echocheck "Xv" if test "$_xv" = auto ; then - cat > $TMPC < -#include -int main(void) { - XvGetPortAttribute(0, 0, 0, 0); - XvQueryPortAttributes(0, 0, 0); - return 0; } -EOF _xv=no - cc_check -lXv && _xv=yes + statement_check_broken X11/Xlib.h X11/extensions/Xvlib.h 'XvGetPortAttribute(0, 0, 0, 0)' -lXv && _xv=yes fi if test "$_xv" = yes ; then @@ -4432,13 +4419,8 @@ # If you run into problems, remove '-lXxf86vm'. echocheck "Xxf86vm" if test "$_vm" = auto ; then - cat > $TMPC < -#include -int main(void) { XF86VidModeQueryExtension(0, 0, 0); return 0; } -EOF _vm=no - cc_check -lXxf86vm && _vm=yes + statement_check_broken X11/Xlib.h X11/extensions/xf86vmode.h 'XF86VidModeQueryExtension(0, 0, 0)' -lXxf86vm && _vm=yes fi if test "$_vm" = yes ; then def_vm='#define CONFIG_XF86VM 1' @@ -4470,22 +4452,12 @@ echocheck "DGA" if test "$_dga2" = auto && test "$_x11" = yes ; then - cat > $TMPC << EOF -#include -#include -int main(void) { XDGASetViewport(0, 0, 0, 0, 0); return 0; } -EOF _dga2=no - cc_check -lXxf86dga && _dga2=yes + statement_check_broken X11/Xlib.h X11/extensions/xf86dga.h 'XDGASetViewport(0, 0, 0, 0, 0)' -lXxf86dga && _dga2=yes fi if test "$_dga1" = auto && test "$_dga2" = no && test "$_vm" = yes ; then - cat > $TMPC << EOF -#include -#include -int main(void) { XF86DGASetViewPort(0, 0, 0, 0); return 0; } -EOF _dga1=no - cc_check -lXxf86dga -lXxf86vm && _dga1=yes + statement_check_broken X11/Xlib.h X11/extensions/xf86dga.h 'XF86DGASetViewPort(0, 0, 0, 0)' -lXxf86dga -lXxf86vm && _dga1=yes fi _dga=no