From 7ff12568b842739fa5caa980fbb11bebc91f7822 Mon Sep 17 00:00:00 2001 From: Rein Klazes Date: Tue, 9 Nov 2004 20:16:35 +0000 Subject: [PATCH] Add a first AC_CHECK_HEADERS, forcing checking of the default includes even when building wine without X11. --- configure | 1390 +++++++++++++++++++++++++++++----------------------------- configure.ac | 205 ++++----- 2 files changed, 800 insertions(+), 795 deletions(-) diff --git a/configure b/configure index fa067a99a6e..6f7d0b2b60b 100755 --- a/configure +++ b/configure @@ -6939,13 +6939,9 @@ OPENGLFILES="" GLU32FILES="" OPENGL_LIBS="" -if test "$have_x" = "yes" -then - XLIB="-lXext -lX11" - ac_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - echo "$as_me:$LINENO: checking for ANSI C header files" >&5 + +echo "$as_me:$LINENO: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7182,7 +7178,197 @@ done -for ac_header in X11/Xlib.h + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +for ac_header in \ + arpa/inet.h \ + arpa/nameser.h \ + cups/cups.h \ + direct.h \ + elf.h \ + float.h \ + fontconfig/fontconfig.h \ + getopt.h \ + gif_lib.h \ + ieeefp.h \ + io.h \ + jack/jack.h \ + jpeglib.h \ + lcms.h \ + libio.h \ + libutil.h \ + link.h \ + linux/cdrom.h \ + linux/compiler.h \ + linux/hdreg.h \ + linux/input.h \ + linux/ioctl.h \ + linux/joystick.h \ + linux/major.h \ + linux/param.h \ + linux/serial.h \ + linux/ucdrom.h \ + machine/cpu.h \ + mntent.h \ + netdb.h \ + netinet/in.h \ + netinet/in_systm.h \ + netinet/tcp.h \ + netinet/tcp_fsm.h \ + openssl/des.h \ + openssl/md2.h \ + openssl/rc2.h \ + openssl/rc4.h \ + openssl/rsa.h \ + openssl/ssl.h \ + process.h \ + pthread.h \ + pty.h \ + pwd.h \ + regex.h \ + sched.h \ + scsi/sg.h \ + scsi/scsi.h \ + scsi/scsi_ioctl.h \ + socket.h \ + stdint.h \ + strings.h \ + sys/cdio.h \ + sys/elf32.h \ + sys/errno.h \ + sys/epoll.h \ + sys/exec_elf.h \ + sys/file.h \ + sys/filio.h \ + sys/inttypes.h \ + sys/ioctl.h \ + sys/ipc.h \ + sys/link.h \ + sys/lwp.h \ + sys/mman.h \ + sys/modem.h \ + sys/msg.h \ + sys/param.h \ + sys/poll.h \ + sys/ptrace.h \ + sys/reg.h \ + sys/scsiio.h \ + sys/shm.h \ + sys/signal.h \ + sys/socket.h \ + sys/sockio.h \ + sys/statfs.h \ + sys/statvfs.h \ + sys/strtio.h \ + sys/syscall.h \ + sys/sysctl.h \ + sys/time.h \ + sys/times.h \ + sys/uio.h \ + sys/un.h \ + sys/v86.h \ + sys/v86intr.h \ + sys/vfs.h \ + sys/vm86.h \ + sys/wait.h \ + syscall.h \ + termios.h \ + unistd.h \ + utime.h \ + valgrind/memcheck.h + do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -7326,31 +7512,13 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF +fi +done - - - - - - - - -for ac_header in X11/XKBlib.h \ - X11/Xutil.h \ - X11/extensions/shape.h \ - X11/extensions/XInput.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 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5 +echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6 +if test "${ac_cv_header_stat_broken+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -7359,164 +7527,89 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include - #ifdef HAVE_X11_XUTIL_H - # include - #endif +#include +#include -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (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); }; } && - { 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.err 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 +#if defined(S_ISBLK) && defined(S_IFDIR) +# if S_ISBLK (S_IFDIR) +You lose. +# endif +#endif +#if defined(S_ISBLK) && defined(S_IFCHR) +# if S_ISBLK (S_IFCHR) +You lose. +# endif +#endif - 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 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lX11 $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#if defined(S_ISLNK) && defined(S_IFREG) +# if S_ISLNK (S_IFREG) +You lose. +# endif +#endif -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" +#if defined(S_ISSOCK) && defined(S_IFREG) +# if S_ISSOCK (S_IFREG) +You lose. +# endif #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XkbQueryExtension (); -int -main () -{ -XkbQueryExtension (); - ; - return 0; -} + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (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); }; } && - { ac_try='test -s conftest$ac_exeext' - { (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 - ac_cv_lib_X11_XkbQueryExtension=yes +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "You lose" >/dev/null 2>&1; then + ac_cv_header_stat_broken=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_X11_XkbQueryExtension=no + ac_cv_header_stat_broken=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest* + fi -echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XkbQueryExtension" >&5 -echo "${ECHO_T}$ac_cv_lib_X11_XkbQueryExtension" >&6 -if test $ac_cv_lib_X11_XkbQueryExtension = yes; then +echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5 +echo "${ECHO_T}$ac_cv_header_stat_broken" >&6 +if test $ac_cv_header_stat_broken = yes; then cat >>confdefs.h <<\_ACEOF -#define HAVE_XKB 1 +#define STAT_MACROS_BROKEN 1 _ACEOF fi - fi - 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 + +if test "$have_x" = "yes" +then + XLIB="-lXext -lX11" + ac_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + + +for ac_header in X11/Xlib.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + 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 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXext $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XShmQueryExtension (); -int -main () -{ -XShmQueryExtension (); - ; - return 0; -} +$ac_includes_default +#include <$ac_header> _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -7529,119 +7622,202 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { 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 - ac_cv_lib_Xext_XShmQueryExtension=yes + ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xext_XShmQueryExtension=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShmQueryExtension" >&5 -echo "${ECHO_T}$ac_cv_lib_Xext_XShmQueryExtension" >&6 -if test $ac_cv_lib_Xext_XShmQueryExtension = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBXXSHM 1 -_ACEOF - +ac_header_compiler=no fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 - fi - - 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 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXext $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XShapeQueryExtension (); -int -main () -{ -XShapeQueryExtension (); - ; - return 0; -} +#include <$ac_header> _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (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); }; } && - { ac_try='test -s conftest$ac_exeext' - { (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 - ac_cv_lib_Xext_XShapeQueryExtension=yes + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xext_XShapeQueryExtension=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + ac_header_preproc=no fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5 -echo "${ECHO_T}$ac_cv_lib_Xext_XShapeQueryExtension" >&6 -if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBXSHAPE 1 +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to wine-devel@winehq.org ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +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 + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + + + + + + + + + + + +for ac_header in X11/XKBlib.h \ + X11/Xutil.h \ + X11/extensions/shape.h \ + X11/extensions/XInput.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 +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 +/* 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>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (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); }; } && + { 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.err 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 - fi +done - if test "$ac_cv_header_X11_extensions_xf86dga_h" = "yes" + + if test "$ac_cv_header_X11_XKBlib_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 "$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 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lXxf86dga $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" +LIBS="-lX11 $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -7655,11 +7831,11 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char XDGAQueryExtension (); +char XkbQueryExtension (); int main () { -XDGAQueryExtension (); +XkbQueryExtension (); ; return 0; } @@ -7685,36 +7861,38 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_Xxf86dga_XDGAQueryExtension=yes + ac_cv_lib_X11_XkbQueryExtension=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xxf86dga_XDGAQueryExtension=no +ac_cv_lib_X11_XkbQueryExtension=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86dga_XDGAQueryExtension" >&5 -echo "${ECHO_T}$ac_cv_lib_Xxf86dga_XDGAQueryExtension" >&6 -if test $ac_cv_lib_Xxf86dga_XDGAQueryExtension = yes; then +echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XkbQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_X11_XkbQueryExtension" >&6 +if test $ac_cv_lib_X11_XkbQueryExtension = yes; then cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBXXF86DGA2 1 +#define HAVE_XKB 1 _ACEOF - X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga" +fi -else - echo "$as_me:$LINENO: checking for XF86DGAQueryExtension in -lXxf86dga" >&5 -echo $ECHO_N "checking for XF86DGAQueryExtension in -lXxf86dga... $ECHO_C" >&6 -if test "${ac_cv_lib_Xxf86dga_XF86DGAQueryExtension+set}" = set; then + fi + + 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 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lXxf86dga $X_LIBS -lXext -lX11 $X_EXTRA_LIBS - $LIBS" +LIBS="-lXext $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -7728,11 +7906,11 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char XF86DGAQueryExtension (); +char XShmQueryExtension (); int main () { -XF86DGAQueryExtension (); +XShmQueryExtension (); ; return 0; } @@ -7758,43 +7936,38 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_Xxf86dga_XF86DGAQueryExtension=yes + ac_cv_lib_Xext_XShmQueryExtension=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xxf86dga_XF86DGAQueryExtension=no +ac_cv_lib_Xext_XShmQueryExtension=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86dga_XF86DGAQueryExtension" >&5 -echo "${ECHO_T}$ac_cv_lib_Xxf86dga_XF86DGAQueryExtension" >&6 -if test $ac_cv_lib_Xxf86dga_XF86DGAQueryExtension = yes; then +echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShmQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xext_XShmQueryExtension" >&6 +if test $ac_cv_lib_Xext_XShmQueryExtension = yes; then cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBXXF86DGA 1 +#define HAVE_LIBXXSHM 1 _ACEOF - X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga" - -fi - - fi fi - if test "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes" + if test "$ac_cv_header_X11_extensions_shape_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 "$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 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lXxf86vm $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" +LIBS="-lXext $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -7808,11 +7981,11 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char XF86VidModeQueryExtension (); +char XShapeQueryExtension (); int main () { -XF86VidModeQueryExtension (); +XShapeQueryExtension (); ; return 0; } @@ -7838,52 +8011,63 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes + ac_cv_lib_Xext_XShapeQueryExtension=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no +ac_cv_lib_Xext_XShapeQueryExtension=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 -echo "${ECHO_T}$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6 -if test $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension = yes; then +echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xext_XShapeQueryExtension" >&6 +if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBXXF86VM 1 +#define HAVE_LIBXSHAPE 1 _ACEOF - X_PRE_LIBS="$X_PRE_LIBS -lXxf86vm" - fi fi - if test "$ac_cv_header_X11_extensions_Xrandr_h" = "yes" + if test "$ac_cv_header_X11_extensions_xf86dga_h" = "yes" then - cat >conftest.$ac_ext <<_ACEOF + 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" +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char XDGAQueryExtension (); int main () { -static typeof(XRRSetScreenConfigAndRate) * func; +XDGAQueryExtension (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -7896,17 +8080,234 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest$ac_exeext' { (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 - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBXRANDR 1 -_ACEOF - + ac_cv_lib_Xxf86dga_XDGAQueryExtension=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_Xxf86dga_XDGAQueryExtension=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86dga_XDGAQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xxf86dga_XDGAQueryExtension" >&6 +if test $ac_cv_lib_Xxf86dga_XDGAQueryExtension = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBXXF86DGA2 1 +_ACEOF + + X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga" + +else + echo "$as_me:$LINENO: checking for XF86DGAQueryExtension in -lXxf86dga" >&5 +echo $ECHO_N "checking for XF86DGAQueryExtension in -lXxf86dga... $ECHO_C" >&6 +if test "${ac_cv_lib_Xxf86dga_XF86DGAQueryExtension+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" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char XF86DGAQueryExtension (); +int +main () +{ +XF86DGAQueryExtension (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' + { (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 + ac_cv_lib_Xxf86dga_XF86DGAQueryExtension=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_Xxf86dga_XF86DGAQueryExtension=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86dga_XF86DGAQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xxf86dga_XF86DGAQueryExtension" >&6 +if test $ac_cv_lib_Xxf86dga_XF86DGAQueryExtension = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBXXF86DGA 1 +_ACEOF + + X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga" + +fi + + +fi + + fi + + 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" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char XF86VidModeQueryExtension (); +int +main () +{ +XF86VidModeQueryExtension (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' + { (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 + ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6 +if test $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBXXF86VM 1 +_ACEOF + + X_PRE_LIBS="$X_PRE_LIBS -lXxf86vm" + +fi + + fi + + if test "$ac_cv_header_X11_extensions_Xrandr_h" = "yes" + then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +int +main () +{ +static typeof(XRRSetScreenConfigAndRate) * func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (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); }; } && + { 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 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBXRANDR 1 +_ACEOF + else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -16391,405 +16792,6 @@ done - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -for ac_header in \ - arpa/inet.h \ - arpa/nameser.h \ - cups/cups.h \ - direct.h \ - elf.h \ - float.h \ - fontconfig/fontconfig.h \ - getopt.h \ - gif_lib.h \ - ieeefp.h \ - io.h \ - jack/jack.h \ - jpeglib.h \ - lcms.h \ - libio.h \ - libutil.h \ - link.h \ - linux/cdrom.h \ - linux/compiler.h \ - linux/hdreg.h \ - linux/input.h \ - linux/ioctl.h \ - linux/joystick.h \ - linux/major.h \ - linux/param.h \ - linux/serial.h \ - linux/ucdrom.h \ - machine/cpu.h \ - mntent.h \ - netdb.h \ - netinet/in.h \ - netinet/in_systm.h \ - netinet/tcp.h \ - netinet/tcp_fsm.h \ - openssl/des.h \ - openssl/md2.h \ - openssl/rc2.h \ - openssl/rc4.h \ - openssl/rsa.h \ - openssl/ssl.h \ - process.h \ - pthread.h \ - pty.h \ - pwd.h \ - regex.h \ - sched.h \ - scsi/sg.h \ - scsi/scsi.h \ - scsi/scsi_ioctl.h \ - socket.h \ - stdint.h \ - strings.h \ - sys/cdio.h \ - sys/elf32.h \ - sys/errno.h \ - sys/epoll.h \ - sys/exec_elf.h \ - sys/file.h \ - sys/filio.h \ - sys/inttypes.h \ - sys/ioctl.h \ - sys/ipc.h \ - sys/link.h \ - sys/lwp.h \ - sys/mman.h \ - sys/modem.h \ - sys/msg.h \ - sys/param.h \ - sys/poll.h \ - sys/ptrace.h \ - sys/reg.h \ - sys/scsiio.h \ - sys/shm.h \ - sys/signal.h \ - sys/socket.h \ - sys/sockio.h \ - sys/statfs.h \ - sys/statvfs.h \ - sys/strtio.h \ - sys/syscall.h \ - sys/sysctl.h \ - sys/time.h \ - sys/times.h \ - sys/uio.h \ - sys/un.h \ - sys/v86.h \ - sys/v86intr.h \ - sys/vfs.h \ - sys/vm86.h \ - sys/wait.h \ - syscall.h \ - termios.h \ - unistd.h \ - utime.h \ - valgrind/memcheck.h - -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - 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 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (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); }; } && - { 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 - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to wine-devel@winehq.org ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -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 - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -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 - -echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5 -echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6 -if test "${ac_cv_header_stat_broken+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include - -#if defined(S_ISBLK) && defined(S_IFDIR) -# if S_ISBLK (S_IFDIR) -You lose. -# endif -#endif - -#if defined(S_ISBLK) && defined(S_IFCHR) -# if S_ISBLK (S_IFCHR) -You lose. -# endif -#endif - -#if defined(S_ISLNK) && defined(S_IFREG) -# if S_ISLNK (S_IFREG) -You lose. -# endif -#endif - -#if defined(S_ISSOCK) && defined(S_IFREG) -# if S_ISSOCK (S_IFREG) -You lose. -# endif -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "You lose" >/dev/null 2>&1; then - ac_cv_header_stat_broken=yes -else - ac_cv_header_stat_broken=no -fi -rm -f conftest* - -fi -echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5 -echo "${ECHO_T}$ac_cv_header_stat_broken" >&6 -if test $ac_cv_header_stat_broken = yes; then - -cat >>confdefs.h <<\_ACEOF -#define STAT_MACROS_BROKEN 1 -_ACEOF - -fi - - - - - for ac_header in sys/mount.h sys/user.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index 6fb04fa1638..4175e358a74 100644 --- a/configure.ac +++ b/configure.ac @@ -160,6 +160,110 @@ AC_SUBST(GLU32FILES) GLU32FILES="" AC_SUBST(OPENGL_LIBS) OPENGL_LIBS="" + +dnl **** Check for header files **** + +AC_CHECK_HEADERS(\ + arpa/inet.h \ + arpa/nameser.h \ + cups/cups.h \ + direct.h \ + elf.h \ + float.h \ + fontconfig/fontconfig.h \ + getopt.h \ + gif_lib.h \ + ieeefp.h \ + io.h \ + jack/jack.h \ + jpeglib.h \ + lcms.h \ + libio.h \ + libutil.h \ + link.h \ + linux/cdrom.h \ + linux/compiler.h \ + linux/hdreg.h \ + linux/input.h \ + linux/ioctl.h \ + linux/joystick.h \ + linux/major.h \ + linux/param.h \ + linux/serial.h \ + linux/ucdrom.h \ + machine/cpu.h \ + mntent.h \ + netdb.h \ + netinet/in.h \ + netinet/in_systm.h \ + netinet/tcp.h \ + netinet/tcp_fsm.h \ + openssl/des.h \ + openssl/md2.h \ + openssl/rc2.h \ + openssl/rc4.h \ + openssl/rsa.h \ + openssl/ssl.h \ + process.h \ + pthread.h \ + pty.h \ + pwd.h \ + regex.h \ + sched.h \ + scsi/sg.h \ + scsi/scsi.h \ + scsi/scsi_ioctl.h \ + socket.h \ + stdint.h \ + strings.h \ + sys/cdio.h \ + sys/elf32.h \ + sys/errno.h \ + sys/epoll.h \ + sys/exec_elf.h \ + sys/file.h \ + sys/filio.h \ + sys/inttypes.h \ + sys/ioctl.h \ + sys/ipc.h \ + sys/link.h \ + sys/lwp.h \ + sys/mman.h \ + sys/modem.h \ + sys/msg.h \ + sys/param.h \ + sys/poll.h \ + sys/ptrace.h \ + sys/reg.h \ + sys/scsiio.h \ + sys/shm.h \ + sys/signal.h \ + sys/socket.h \ + sys/sockio.h \ + sys/statfs.h \ + sys/statvfs.h \ + sys/strtio.h \ + sys/syscall.h \ + sys/sysctl.h \ + sys/time.h \ + sys/times.h \ + sys/uio.h \ + sys/un.h \ + sys/v86.h \ + sys/v86intr.h \ + sys/vfs.h \ + sys/vm86.h \ + sys/wait.h \ + syscall.h \ + termios.h \ + unistd.h \ + utime.h \ + valgrind/memcheck.h +) +AC_HEADER_STAT() + +dnl **** Check for X11 **** + if test "$have_x" = "yes" then XLIB="-lXext -lX11" @@ -1137,107 +1241,6 @@ AC_CHECK_FUNCS(\ waitpid \ ) -dnl **** Check for header files **** - -AC_CHECK_HEADERS(\ - arpa/inet.h \ - arpa/nameser.h \ - cups/cups.h \ - direct.h \ - elf.h \ - float.h \ - fontconfig/fontconfig.h \ - getopt.h \ - gif_lib.h \ - ieeefp.h \ - io.h \ - jack/jack.h \ - jpeglib.h \ - lcms.h \ - libio.h \ - libutil.h \ - link.h \ - linux/cdrom.h \ - linux/compiler.h \ - linux/hdreg.h \ - linux/input.h \ - linux/ioctl.h \ - linux/joystick.h \ - linux/major.h \ - linux/param.h \ - linux/serial.h \ - linux/ucdrom.h \ - machine/cpu.h \ - mntent.h \ - netdb.h \ - netinet/in.h \ - netinet/in_systm.h \ - netinet/tcp.h \ - netinet/tcp_fsm.h \ - openssl/des.h \ - openssl/md2.h \ - openssl/rc2.h \ - openssl/rc4.h \ - openssl/rsa.h \ - openssl/ssl.h \ - process.h \ - pthread.h \ - pty.h \ - pwd.h \ - regex.h \ - sched.h \ - scsi/sg.h \ - scsi/scsi.h \ - scsi/scsi_ioctl.h \ - socket.h \ - stdint.h \ - strings.h \ - sys/cdio.h \ - sys/elf32.h \ - sys/errno.h \ - sys/epoll.h \ - sys/exec_elf.h \ - sys/file.h \ - sys/filio.h \ - sys/inttypes.h \ - sys/ioctl.h \ - sys/ipc.h \ - sys/link.h \ - sys/lwp.h \ - sys/mman.h \ - sys/modem.h \ - sys/msg.h \ - sys/param.h \ - sys/poll.h \ - sys/ptrace.h \ - sys/reg.h \ - sys/scsiio.h \ - sys/shm.h \ - sys/signal.h \ - sys/socket.h \ - sys/sockio.h \ - sys/statfs.h \ - sys/statvfs.h \ - sys/strtio.h \ - sys/syscall.h \ - sys/sysctl.h \ - sys/time.h \ - sys/times.h \ - sys/uio.h \ - sys/un.h \ - sys/v86.h \ - sys/v86intr.h \ - sys/vfs.h \ - sys/vm86.h \ - sys/wait.h \ - syscall.h \ - termios.h \ - unistd.h \ - utime.h \ - valgrind/memcheck.h -) -AC_HEADER_STAT() - dnl **** Checks for headers that depend on other ones **** AC_CHECK_HEADERS(sys/mount.h sys/user.h,,, -- 2.11.4.GIT