From 044b5c411bc4fde3e3a5cf7408e6b7595e8d1075 Mon Sep 17 00:00:00 2001 From: Gregg Mattinson <gm138242@scot.canada.sun.com> Date: Fri, 19 Jul 2002 03:16:51 +0000 Subject: [PATCH] - X11/extensions/shape.h requires X11/Xutil.h. - X11/XKBlib.h requires X11/Xlib.h. - net/if.h requires sys/socket.h. - netinet/ip.h requires sys/socket.h and sys/in_systm.h. - resolv.h requires sys/socket.h. --- configure | 290 ++++++++++++++++++++++++++++++++------------ configure.ac | 37 +++++- include/config.h.in | 3 + 3 files changed, 244 insertions(+), 86 deletions(-) diff --git a/configure b/configure index 40e925fb9ba..b6086b06723 100755 --- a/configure +++ b/configure @@ -5945,22 +5945,16 @@ _ACEOF for ac_header in X11/XKBlib.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 "$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 + cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" -$ac_includes_default +#include <X11/Xlib.h> + #include <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -5975,77 +5969,16 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_header_compiler=no +eval "$as_ac_Header=no" fi rm -f 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 -#line $LINENO "configure" -#include "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=$? - egrep -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 - 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 - cat 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 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 preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; - 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: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&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 @@ -6117,7 +6050,6 @@ 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 @@ -6238,6 +6170,54 @@ 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" +#include "confdefs.h" +#include <X11/Xlib.h> + +#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 +cat 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` @@ -6250,6 +6230,9 @@ else #line $LINENO "configure" #include "confdefs.h" #include <X11/Xlib.h> + #ifdef HAVE_X11_XUTIL_H + # include <X11/Xutil.h> + #endif #include <$ac_header> _ACEOF @@ -11335,9 +11318,6 @@ done - - - @@ -11361,15 +11341,12 @@ for ac_header in \ linux/param.h \ linux/serial.h \ linux/ucdrom.h \ - net/if.h \ netdb.h \ netinet/in.h \ netinet/in_systm.h \ - netinet/ip.h \ netinet/tcp.h \ pty.h \ pwd.h \ - resolv.h \ sched.h \ scsi/sg.h \ socket.h \ @@ -11580,6 +11557,159 @@ fi +for ac_header in net/if.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" +#include "confdefs.h" +#if HAVE_SYS_SOCKET_H + # include <sys/socket.h> + #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 +cat 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 netinet/ip.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" +#include "confdefs.h" +#if HAVE_SYS_SOCKET_H + # include <sys/socket.h> + #endif + #if HAVE_NETINET_IN_SYSTM_H + # include <netinet/in_systm.h> + #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 +cat 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 resolv.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" +#include "confdefs.h" +#if HAVE_SYS_SOCKET_H + # include <sys/socket.h> + #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 +cat 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 + + + echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then diff --git a/configure.ac b/configure.ac index 3726b1f5ee2..c506d521369 100644 --- a/configure.ac +++ b/configure.ac @@ -147,8 +147,8 @@ then 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]]) - ) + AC_MSG_WARN([[Xkb extension not found, Wine will be built without it]]), + [#include <X11/Xlib.h>]) dnl *** Check for X Shm extension AC_CHECK_HEADERS(X11/extensions/XShm.h, @@ -160,6 +160,10 @@ then AC_MSG_WARN([[XShm extension not found, Wine will be built without it]]), [#include <X11/Xlib.h>]) + dnl *** Check for Xutil + AC_CHECK_HEADERS(X11/Xutil.h,,, + [#include <X11/Xlib.h>]) + dnl *** Check for X shape extension AC_CHECK_HEADERS(X11/extensions/shape.h, [ dnl *** If X11/extensions/shape.h exists... @@ -168,7 +172,10 @@ then $X_LIBS -lXext -lX11 $X_EXTRA_LIBS) ], AC_MSG_WARN([[XShape extension not found, Wine will be built without it]]), - [#include <X11/Xlib.h>]) + [#include <X11/Xlib.h> + #ifdef HAVE_X11_XUTIL_H + # include <X11/Xutil.h> + #endif]) dnl *** Check for XFree86 DGA / DGA 2.0 extension AC_CHECK_HEADERS(X11/extensions/xf86dga.h, @@ -911,15 +918,12 @@ AC_CHECK_HEADERS(\ linux/param.h \ linux/serial.h \ linux/ucdrom.h \ - net/if.h \ netdb.h \ netinet/in.h \ netinet/in_systm.h \ - netinet/ip.h \ netinet/tcp.h \ pty.h \ pwd.h \ - resolv.h \ sched.h \ scsi/sg.h \ socket.h \ @@ -963,6 +967,27 @@ AC_CHECK_HEADERS(\ ) AC_HEADER_STAT() +dnl *** Check for net/if.h +AC_CHECK_HEADERS(net/if.h,,, + [#if HAVE_SYS_SOCKET_H + # include <sys/socket.h> + #endif]) + +dnl *** Check for netinet/ip.h +AC_CHECK_HEADERS(netinet/ip.h,,, + [#if HAVE_SYS_SOCKET_H + # include <sys/socket.h> + #endif + #if HAVE_NETINET_IN_SYSTM_H + # include <netinet/in_systm.h> + #endif]) + +dnl *** Check for resolv.h +AC_CHECK_HEADERS(resolv.h,,, + [#if HAVE_SYS_SOCKET_H + # include <sys/socket.h> + #endif]) + dnl **** Check for types **** AC_C_CONST diff --git a/include/config.h.in b/include/config.h.in index 083c1f4bb9c..b4720194f45 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -590,6 +590,9 @@ /* Define to 1 if you have the <X11/Xlib.h> header file. */ #undef HAVE_X11_XLIB_H +/* Define to 1 if you have the <X11/Xutil.h> header file. */ +#undef HAVE_X11_XUTIL_H + /* Define if you have the XKB extension */ #undef HAVE_XKB -- GitLab