From 255b486ca7a1f21df917753faaefdd987449a106 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 15 Oct 2003 04:09:55 +0000 Subject: [PATCH] Regroup the X11 header checks to reduce the size of the generated configure a bit. --- configure | 521 ++++++--------------------------------------------- configure.ac | 93 ++++----- 2 files changed, 97 insertions(+), 517 deletions(-) diff --git a/configure b/configure index 0e68d5abbe7..12afe40af10 100755 --- a/configure +++ b/configure @@ -6831,7 +6831,23 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then _ACEOF -for ac_header in X11/XKBlib.h + + + + + + + + +for ac_header in X11/XKBlib.h \ + X11/Xutil.h \ + X11/extensions/shape.h \ + X11/extensions/XShm.h \ + X11/extensions/Xrandr.h \ + X11/extensions/Xrender.h \ + X11/extensions/Xvlib.h \ + X11/extensions/xf86dga.h \ + X11/extensions/xf86vmode.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_header" >&5 @@ -6847,6 +6863,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include + #ifdef HAVE_X11_XUTIL_H + # include + #endif #include <$ac_header> _ACEOF @@ -6877,7 +6896,15 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - echo "$as_me:$LINENO: checking for XkbQueryExtension in -lX11" >&5 + +fi + +done + + + if test "$ac_cv_header_X11_XKBlib_h" = "yes" + then + echo "$as_me:$LINENO: checking for XkbQueryExtension in -lX11" >&5 echo $ECHO_N "checking for XkbQueryExtension in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XkbQueryExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6939,63 +6966,11 @@ _ACEOF fi + fi -else - { echo "$as_me:$LINENO: WARNING: Xkb extension not found, Wine will be built without it" >&5 -echo "$as_me: WARNING: Xkb extension not found, Wine will be built without it" >&2;} -fi - -done - - - -for ac_header in X11/extensions/XShm.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_Header=no" -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - echo "$as_me:$LINENO: checking for XShmQueryExtension in -lXext" >&5 + if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" + then + echo "$as_me:$LINENO: checking for XShmQueryExtension in -lXext" >&5 echo $ECHO_N "checking for XShmQueryExtension in -lXext... $ECHO_C" >&6 if test "${ac_cv_lib_Xext_XShmQueryExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7057,119 +7032,11 @@ _ACEOF fi + fi -else - { echo "$as_me:$LINENO: WARNING: XShm extension not found, Wine will be built without it" >&5 -echo "$as_me: WARNING: XShm extension not found, Wine will be built without it" >&2;} -fi - -done - - - -for ac_header in X11/Xutil.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_Header=no" -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - -for ac_header in X11/extensions/shape.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - #ifdef HAVE_X11_XUTIL_H - # include - #endif - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_Header=no" -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - echo "$as_me:$LINENO: checking for XShapeQueryExtension in -lXext" >&5 + if test "$ac_cv_header_X11_extensions_shape_h" = "yes" + then + echo "$as_me:$LINENO: checking for XShapeQueryExtension in -lXext" >&5 echo $ECHO_N "checking for XShapeQueryExtension in -lXext... $ECHO_C" >&6 if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7231,70 +7098,17 @@ _ACEOF fi + fi -else - { echo "$as_me:$LINENO: WARNING: XShape extension not found, Wine will be built without it" >&5 -echo "$as_me: WARNING: XShape extension not found, Wine will be built without it" >&2;} -fi - -done - - - -for ac_header in X11/extensions/xf86dga.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_Header=no" -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - echo "$as_me:$LINENO: checking for XDGAQueryExtension in -lXxf86dga" >&5 + if test "$ac_cv_header_X11_extensions_xf86dga_h" = "yes" + then + echo "$as_me:$LINENO: checking for XDGAQueryExtension in -lXxf86dga" >&5 echo $ECHO_N "checking for XDGAQueryExtension in -lXxf86dga... $ECHO_C" >&6 if test "${ac_cv_lib_Xxf86dga_XDGAQueryExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lXxf86dga $X_LIBS -lXext -lX11 $X_EXTRA_LIBS - $LIBS" +LIBS="-lXxf86dga $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -7419,70 +7233,17 @@ fi fi + fi -else - { echo "$as_me:$LINENO: WARNING: DGA extension not found, Wine will be built without it" >&5 -echo "$as_me: WARNING: DGA extension not found, Wine will be built without it" >&2;} -fi - -done - - - -for ac_header in X11/extensions/xf86vmode.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_Header=no" -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - echo "$as_me:$LINENO: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 + if test "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes" + then + echo "$as_me:$LINENO: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 echo $ECHO_N "checking for XF86VidModeQueryExtension in -lXxf86vm... $ECHO_C" >&6 if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lXxf86vm $X_LIBS -lXext -lX11 $X_EXTRA_LIBS - $LIBS" +LIBS="-lXxf86vm $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -7540,70 +7301,17 @@ _ACEOF fi + fi -else - { echo "$as_me:$LINENO: WARNING: XFree86 VMODE extension not found, Wine will be built without it" >&5 -echo "$as_me: WARNING: XFree86 VMODE extension not found, Wine will be built without it" >&2;} -fi - -done - - - -for ac_header in X11/extensions/Xrandr.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_Header=no" -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5 + if test "$ac_cv_header_X11_extensions_Xrandr_h" = "yes" + then + echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5 echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6 if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lXrandr $X_LIBS -lXext -lX11 $X_EXTRA_LIBS - $LIBS" +LIBS="-lXrandr $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -7661,70 +7369,17 @@ _ACEOF fi + fi -else - { echo "$as_me:$LINENO: WARNING: Xrandr extension not found, Wine will be built without it" >&5 -echo "$as_me: WARNING: Xrandr extension not found, Wine will be built without it" >&2;} -fi - -done - - - -for ac_header in X11/extensions/Xvlib.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_Header=no" -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - echo "$as_me:$LINENO: checking for XvShmCreateImage in -lXv" >&5 + if test "$ac_cv_header_X11_extensions_Xvlib_h" = "yes" + then + echo "$as_me:$LINENO: checking for XvShmCreateImage in -lXv" >&5 echo $ECHO_N "checking for XvShmCreateImage in -lXv... $ECHO_C" >&6 if test "${ac_cv_lib_Xv_XvShmCreateImage+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lXv $X_LIBS -lXext -lX11 $X_EXTRA_LIBS - $LIBS" +LIBS="-lXv $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -7782,67 +7437,7 @@ _ACEOF fi - -else - { echo "$as_me:$LINENO: WARNING: XVideo extension not found, Wine will be built without it" >&5 -echo "$as_me: WARNING: XVideo extension not found, Wine will be built without it" >&2;} -fi - -done - - - -for ac_header in X11/extensions/Xrender.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_Header=no" -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - + fi fi diff --git a/configure.ac b/configure.ac index c879249eb13..15c84fd36e7 100644 --- a/configure.ac +++ b/configure.ac @@ -182,47 +182,47 @@ then dnl *** All of the following tests require X11/Xlib.h AC_CHECK_HEADERS(X11/Xlib.h, [ + AC_CHECK_HEADERS([X11/XKBlib.h \ + X11/Xutil.h \ + X11/extensions/shape.h \ + X11/extensions/XShm.h \ + X11/extensions/Xrandr.h \ + X11/extensions/Xrender.h \ + X11/extensions/Xvlib.h \ + X11/extensions/xf86dga.h \ + X11/extensions/xf86vmode.h],,, + [#include + #ifdef HAVE_X11_XUTIL_H + # include + #endif]) + dnl *** Check for X keyboard extension - AC_CHECK_HEADERS(X11/XKBlib.h, - [ dnl *** If X11/XKBlib.h exists... + if test "$ac_cv_header_X11_XKBlib_h" = "yes" + then AC_CHECK_LIB(X11, XkbQueryExtension, AC_DEFINE(HAVE_XKB, 1, [Define if you have the XKB extension]),, $X_LIBS -lXext -lX11 $X_EXTRA_LIBS) - ], - AC_MSG_WARN([[Xkb extension not found, Wine will be built without it]]), - [#include ]) + fi dnl *** Check for X Shm extension - AC_CHECK_HEADERS(X11/extensions/XShm.h, - [ dnl *** If X11/extensions/XShm.h exists... + if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" + then AC_CHECK_LIB(Xext, XShmQueryExtension, AC_DEFINE(HAVE_LIBXXSHM, 1, [Define if you have the X Shm extension]),, $X_LIBS -lXext -lX11 $X_EXTRA_LIBS) - ], - AC_MSG_WARN([[XShm extension not found, Wine will be built without it]]), - [#include ]) - - dnl *** Check for Xutil - AC_CHECK_HEADERS(X11/Xutil.h,,, - [#include ]) + fi dnl *** Check for X shape extension - AC_CHECK_HEADERS(X11/extensions/shape.h, - [ dnl *** If X11/extensions/shape.h exists... + if test "$ac_cv_header_X11_extensions_shape_h" = "yes" + then AC_CHECK_LIB(Xext,XShapeQueryExtension, AC_DEFINE(HAVE_LIBXSHAPE, 1, [Define if you have the X Shape extension]),, $X_LIBS -lXext -lX11 $X_EXTRA_LIBS) - ], - AC_MSG_WARN([[XShape extension not found, Wine will be built without it]]), - [#include - #ifdef HAVE_X11_XUTIL_H - # include - #endif]) + fi dnl *** Check for XFree86 DGA / DGA 2.0 extension - AC_CHECK_HEADERS(X11/extensions/xf86dga.h, - [ dnl *** If X11/extensions/xf86dga.h exists, check - dnl *** for XDGAQueryExtension()... + if test "$ac_cv_header_X11_extensions_xf86dga_h" = "yes" + then AC_CHECK_LIB(Xxf86dga, XDGAQueryExtension, [ dnl *** If found... AC_DEFINE(HAVE_LIBXXF86DGA2, 1, @@ -239,53 +239,38 @@ then $X_LIBS -lXext -lX11 $X_EXTRA_LIBS ) ], - $X_LIBS -lXext -lX11 $X_EXTRA_LIBS - ) - ], - AC_MSG_WARN([[DGA extension not found, Wine will be built without it]]), - [#include ]) + $X_LIBS -lXext -lX11 $X_EXTRA_LIBS) + fi dnl *** Check for XFree86 VMODE extension - AC_CHECK_HEADERS(X11/extensions/xf86vmode.h, - [ dnl *** If X11/extensions/xf86vmode.h exists... + if test "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes" + then AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryExtension, [ AC_DEFINE(HAVE_LIBXXF86VM, 1, [Define if you have the Xxf86vm library]) X_PRE_LIBS="$X_PRE_LIBS -lXxf86vm" ],, - $X_LIBS -lXext -lX11 $X_EXTRA_LIBS - ) - ], - AC_MSG_WARN([[XFree86 VMODE extension not found, Wine will be built without it]]), - [#include ]) + $X_LIBS -lXext -lX11 $X_EXTRA_LIBS) + fi dnl *** Check for X RandR extension - AC_CHECK_HEADERS(X11/extensions/Xrandr.h, - [ dnl *** If X11/extensions/Xrandr.h exists... + if test "$ac_cv_header_X11_extensions_Xrandr_h" = "yes" + then AC_CHECK_LIB(Xrandr, XRRSetScreenConfigAndRate, [ AC_DEFINE(HAVE_LIBXRANDR, 1, [Define if you have the Xrandr library]) X_PRE_LIBS="$X_PRE_LIBS -lXrandr" ],, - $X_LIBS -lXext -lX11 $X_EXTRA_LIBS - ) - ], - AC_MSG_WARN([[Xrandr extension not found, Wine will be built without it]]), - [#include ]) + $X_LIBS -lXext -lX11 $X_EXTRA_LIBS) + fi dnl *** Check for XVideo extension supporting XvImages - AC_CHECK_HEADERS(X11/extensions/Xvlib.h, - [ dnl *** If X11/extensions/Xvlib.h exists... + if test "$ac_cv_header_X11_extensions_Xvlib_h" = "yes" + then AC_CHECK_LIB(Xv, XvShmCreateImage, [ AC_DEFINE(HAVE_XVIDEO, 1, [Define if the X libraries support XVideo]) X_PRE_LIBS="$X_PRE_LIBS -lXv" ],, - $X_LIBS -lXext -lX11 $X_EXTRA_LIBS - ) - ], - AC_MSG_WARN([[XVideo extension not found, Wine will be built without it]]), - [#include ]) - - dnl *** Check for XRender include file - AC_CHECK_HEADERS(X11/extensions/Xrender.h,,,[#include ]) + $X_LIBS -lXext -lX11 $X_EXTRA_LIBS) + fi ] ) dnl *** End of X11/Xlib.h check