Removed check for union semun; cleaned up a bit.
This commit is contained in:
parent
1ae869c9a3
commit
2487ccea81
|
@ -3420,42 +3420,6 @@ EOF
|
|||
|
||||
fi
|
||||
|
||||
|
||||
echo $ac_n "checking "for union semun"""... $ac_c" 1>&6
|
||||
echo "configure:3426: checking "for union semun"" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_union_semun'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3431 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <sys/sem.h>
|
||||
int main() {
|
||||
union semun foo
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_c_union_semun="yes"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
ac_cv_c_union_semun="no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
fi
|
||||
|
||||
echo "$ac_t""$ac_cv_c_union_semun" 1>&6
|
||||
if test "$ac_cv_c_union_semun" = "yes"
|
||||
then
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HAVE_UNION_SEMUN 1
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$ac_cv_prog_LN_S" = "ln -s"; then : ; else LN_S=cp ; fi
|
||||
|
||||
|
||||
|
@ -3463,7 +3427,7 @@ if test "x${GCC}" = "xyes"
|
|||
then
|
||||
CFLAGS="$CFLAGS -Wall"
|
||||
echo $ac_n "checking "for gcc strength-reduce bug"""... $ac_c" 1>&6
|
||||
echo "configure:3467: checking "for gcc strength-reduce bug"" >&5
|
||||
echo "configure:3431: checking "for gcc strength-reduce bug"" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_gcc_strength_bug'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3471,7 +3435,7 @@ else
|
|||
ac_cv_c_gcc_strength_bug="yes"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3475 "configure"
|
||||
#line 3439 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main(void) {
|
||||
|
@ -3482,7 +3446,7 @@ int main(void) {
|
|||
exit( Array[1] != -2 );
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:3486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:3450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
ac_cv_c_gcc_strength_bug="no"
|
||||
else
|
||||
|
@ -3505,7 +3469,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking "whether external symbols need an underscore prefix"""... $ac_c" 1>&6
|
||||
echo "configure:3509: checking "whether external symbols need an underscore prefix"" >&5
|
||||
echo "configure:3473: checking "whether external symbols need an underscore prefix"" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_extern_prefix'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3517,14 +3481,14 @@ _ac_test:
|
|||
.long 0
|
||||
EOF
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3521 "configure"
|
||||
#line 3485 "configure"
|
||||
#include "confdefs.h"
|
||||
extern int ac_test;
|
||||
int main() {
|
||||
if (ac_test) return 1
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:3492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
ac_cv_c_extern_prefix="yes"
|
||||
else
|
||||
|
@ -3548,7 +3512,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking "whether assembler accepts .string"""... $ac_c" 1>&6
|
||||
echo "configure:3552: checking "whether assembler accepts .string"" >&5
|
||||
echo "configure:3516: checking "whether assembler accepts .string"" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_asm_string'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3558,14 +3522,14 @@ cat > conftest_asm.s <<EOF
|
|||
.string "test"
|
||||
EOF
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3562 "configure"
|
||||
#line 3526 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:3533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
ac_cv_c_asm_string="yes"
|
||||
else
|
||||
|
@ -3593,21 +3557,21 @@ LDSHARED=""
|
|||
if test "$LIB_TARGET" = "libwine.so.1.0"
|
||||
then
|
||||
echo $ac_n "checking "whether we can build a Linux dll"""... $ac_c" 1>&6
|
||||
echo "configure:3597: checking "whether we can build a Linux dll"" >&5
|
||||
echo "configure:3561: checking "whether we can build a Linux dll"" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_dll_linux'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
saved_cflags=$CFLAGS
|
||||
CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,conftest.so.1.0"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3604 "configure"
|
||||
#line 3568 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
return 1
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:3575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
ac_cv_c_dll_linux="yes"
|
||||
else
|
||||
|
@ -3628,21 +3592,21 @@ echo "$ac_t""$ac_cv_c_dll_linux" 1>&6
|
|||
LDSHARED="\$(CC) -shared -Wl,-soname,libwine.so"
|
||||
else
|
||||
echo $ac_n "checking "whether we can build a NetBSD dll"""... $ac_c" 1>&6
|
||||
echo "configure:3632: checking "whether we can build a NetBSD dll"" >&5
|
||||
echo "configure:3596: checking "whether we can build a NetBSD dll"" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_dll_netbsd'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
saved_cflags=$CFLAGS
|
||||
CFLAGS="$CFLAGS -fPIC -Bshareable -Bforcearchive"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3639 "configure"
|
||||
#line 3603 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
return 1
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:3610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
ac_cv_c_dll_netbsd="yes"
|
||||
else
|
||||
|
@ -3674,7 +3638,7 @@ fi
|
|||
|
||||
wine_cv_libc_reentrant=no
|
||||
echo $ac_n "checking "for reentrant libc: __errno_location"""... $ac_c" 1>&6
|
||||
echo "configure:3678: checking "for reentrant libc: __errno_location"" >&5
|
||||
echo "configure:3642: checking "for reentrant libc: __errno_location"" >&5
|
||||
if eval "test \"`echo '$''{'wine_cv_libc_r__errno_location'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3682,14 +3646,14 @@ else
|
|||
wine_cv_libc_r__errno_location=yes
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3686 "configure"
|
||||
#line 3650 "configure"
|
||||
#include "confdefs.h"
|
||||
int myerrno = 0;
|
||||
char buf[256];
|
||||
int *__errno_location(){return &myerrno;}
|
||||
main(){connect(0,buf,255); exit(!myerrno);}
|
||||
EOF
|
||||
if { (eval echo configure:3693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:3657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
wine_cv_libc_r__errno_location=yes
|
||||
else
|
||||
|
@ -3714,7 +3678,7 @@ EOF
|
|||
wine_cv_libc_reentrant=__errno_location
|
||||
fi
|
||||
echo $ac_n "checking "for reentrant libc: __error"""... $ac_c" 1>&6
|
||||
echo "configure:3718: checking "for reentrant libc: __error"" >&5
|
||||
echo "configure:3682: checking "for reentrant libc: __error"" >&5
|
||||
if eval "test \"`echo '$''{'wine_cv_libc_r__error'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3722,14 +3686,14 @@ else
|
|||
wine_cv_libc_r__error=yes
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3726 "configure"
|
||||
#line 3690 "configure"
|
||||
#include "confdefs.h"
|
||||
int myerrno = 0;
|
||||
char buf[256];
|
||||
int *__error(){return &myerrno;}
|
||||
main(){connect(0,buf,255); exit(!myerrno);}
|
||||
EOF
|
||||
if { (eval echo configure:3733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:3697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
wine_cv_libc_r__error=yes
|
||||
else
|
||||
|
@ -3754,7 +3718,7 @@ EOF
|
|||
wine_cv_libc_reentrant=__error
|
||||
fi
|
||||
echo $ac_n "checking "for reentrant libc: ___errno"""... $ac_c" 1>&6
|
||||
echo "configure:3758: checking "for reentrant libc: ___errno"" >&5
|
||||
echo "configure:3722: checking "for reentrant libc: ___errno"" >&5
|
||||
if eval "test \"`echo '$''{'wine_cv_libc_r___errno'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3762,14 +3726,14 @@ else
|
|||
wine_cv_libc_r___errno=yes
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3766 "configure"
|
||||
#line 3730 "configure"
|
||||
#include "confdefs.h"
|
||||
int myerrno = 0;
|
||||
char buf[256];
|
||||
int *___errno(){return &myerrno;}
|
||||
main(){connect(0,buf,255); exit(!myerrno);}
|
||||
EOF
|
||||
if { (eval echo configure:3773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:3737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
wine_cv_libc_r___errno=yes
|
||||
else
|
||||
|
@ -3805,7 +3769,7 @@ fi
|
|||
if test "$have_x" = "yes" -a "$wine_cv_libc_reentrant" != "no"
|
||||
then
|
||||
echo $ac_n "checking "for reentrant X libraries"""... $ac_c" 1>&6
|
||||
echo "configure:3809: checking "for reentrant X libraries"" >&5
|
||||
echo "configure:3773: checking "for reentrant X libraries"" >&5
|
||||
if eval "test \"`echo '$''{'wine_cv_x_reentrant'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3850,15 +3814,31 @@ EOF
|
|||
fi
|
||||
|
||||
|
||||
for ac_func in rfork clone _lwp_create getpagesize memmove sendmsg sigaltstack strerror stricmp tcgetattr timegm usleep wait4 waitpid vfscanf
|
||||
for ac_func in \
|
||||
_lwp_create \
|
||||
clone \
|
||||
getpagesize \
|
||||
memmove \
|
||||
rfork \
|
||||
sendmsg \
|
||||
sigaltstack \
|
||||
strerror \
|
||||
stricmp \
|
||||
tcgetattr \
|
||||
timegm \
|
||||
usleep \
|
||||
vfscanf \
|
||||
wait4 \
|
||||
waitpid \
|
||||
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:3857: checking for $ac_func" >&5
|
||||
echo "configure:3837: checking for $ac_func" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3862 "configure"
|
||||
#line 3842 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
|
@ -3881,7 +3861,7 @@ $ac_func();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:3865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_$ac_func=yes"
|
||||
else
|
||||
|
@ -3905,21 +3885,53 @@ else
|
|||
fi
|
||||
done
|
||||
|
||||
for ac_hdr in wctype.h sys/syscall.h syscall.h sys/param.h sys/vfs.h sys/mount.h sys/statfs.h float.h linux/cdrom.h linux/ucdrom.h sys/cdio.h sys/filio.h sys/modem.h strings.h sys/strtio.h dlfcn.h unistd.h sys/sockio.h net/if.h netinet/in.h sys/file.h libio.h curses.h ncurses.h elf.h arpa/nameser.h resolv.h sys/lwp.h ucontext.h
|
||||
|
||||
|
||||
for ac_hdr in \
|
||||
arpa/nameser.h \
|
||||
curses.h \
|
||||
dlfcn.h \
|
||||
elf.h \
|
||||
float.h \
|
||||
libio.h \
|
||||
linux/cdrom.h \
|
||||
linux/ucdrom.h \
|
||||
ncurses.h \
|
||||
net/if.h \
|
||||
netinet/in.h \
|
||||
resolv.h \
|
||||
strings.h \
|
||||
sys/cdio.h \
|
||||
sys/file.h \
|
||||
sys/filio.h \
|
||||
sys/lwp.h \
|
||||
sys/modem.h \
|
||||
sys/mount.h \
|
||||
sys/param.h \
|
||||
sys/sockio.h \
|
||||
sys/statfs.h \
|
||||
sys/strtio.h \
|
||||
sys/syscall.h \
|
||||
sys/vfs.h \
|
||||
syscall.h \
|
||||
ucontext.h \
|
||||
unistd.h \
|
||||
wctype.h \
|
||||
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:3913: checking for $ac_hdr" >&5
|
||||
echo "configure:3925: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3918 "configure"
|
||||
#line 3930 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:3923: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:3935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
@ -3946,12 +3958,12 @@ fi
|
|||
done
|
||||
|
||||
echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
|
||||
echo "configure:3950: checking whether stat file-mode macros are broken" >&5
|
||||
echo "configure:3962: checking whether stat file-mode macros are broken" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3955 "configure"
|
||||
#line 3967 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
@ -4001,13 +4013,15 @@ EOF
|
|||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
echo $ac_n "checking for working const""... $ac_c" 1>&6
|
||||
echo "configure:4006: checking for working const" >&5
|
||||
echo "configure:4020: checking for working const" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4011 "configure"
|
||||
#line 4025 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
|
@ -4056,7 +4070,7 @@ ccp = (char const *const *) p;
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4060: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:4074: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_c_const=yes
|
||||
else
|
||||
|
@ -4077,12 +4091,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
|
||||
echo "configure:4081: checking for ANSI C header files" >&5
|
||||
echo "configure:4095: checking for ANSI C header files" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4086 "configure"
|
||||
#line 4100 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
#include <stdarg.h>
|
||||
|
@ -4090,7 +4104,7 @@ else
|
|||
#include <float.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:4094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:4108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
@ -4107,7 +4121,7 @@ rm -f conftest*
|
|||
if test $ac_cv_header_stdc = yes; then
|
||||
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4111 "configure"
|
||||
#line 4125 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <string.h>
|
||||
EOF
|
||||
|
@ -4125,7 +4139,7 @@ fi
|
|||
if test $ac_cv_header_stdc = yes; then
|
||||
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4129 "configure"
|
||||
#line 4143 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
EOF
|
||||
|
@ -4146,7 +4160,7 @@ if test "$cross_compiling" = yes; then
|
|||
:
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4150 "configure"
|
||||
#line 4164 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <ctype.h>
|
||||
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
|
||||
|
@ -4157,7 +4171,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
|
|||
exit (0); }
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:4161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:4175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
|
@ -4181,12 +4195,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for size_t""... $ac_c" 1>&6
|
||||
echo "configure:4185: checking for size_t" >&5
|
||||
echo "configure:4199: checking for size_t" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4190 "configure"
|
||||
#line 4204 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#if STDC_HEADERS
|
||||
|
@ -4214,7 +4228,7 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking size of long long""... $ac_c" 1>&6
|
||||
echo "configure:4218: checking size of long long" >&5
|
||||
echo "configure:4232: checking size of long long" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4222,7 +4236,7 @@ else
|
|||
ac_cv_sizeof_long_long=0
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4226 "configure"
|
||||
#line 4240 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
main()
|
||||
|
@ -4233,7 +4247,7 @@ main()
|
|||
exit(0);
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:4237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:4251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
ac_cv_sizeof_long_long=`cat conftestval`
|
||||
else
|
||||
|
@ -4254,66 +4268,15 @@ EOF
|
|||
|
||||
|
||||
|
||||
if test $ac_cv_func_sendmsg = no; then
|
||||
echo $ac_n "checking for sendmsg in -lsocket""... $ac_c" 1>&6
|
||||
echo "configure:4260: checking for sendmsg in -lsocket" >&5
|
||||
ac_lib_var=`echo socket'_'sendmsg | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lsocket $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4268 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char sendmsg();
|
||||
|
||||
int main() {
|
||||
sendmsg()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
LIBS="$ac_save_LIBS"
|
||||
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \
|
||||
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
|
||||
cat >> confdefs.h <<EOF
|
||||
#define $ac_tr_lib 1
|
||||
EOF
|
||||
|
||||
LIBS="-lsocket $LIBS"
|
||||
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
||||
if test "$ac_cv_header_sys_vfs_h" = "yes"
|
||||
then
|
||||
echo $ac_n "checking "whether sys/vfs.h defines statfs"""... $ac_c" 1>&6
|
||||
echo "configure:4312: checking "whether sys/vfs.h defines statfs"" >&5
|
||||
echo "configure:4275: checking "whether sys/vfs.h defines statfs"" >&5
|
||||
if eval "test \"`echo '$''{'wine_cv_sys_vfs_has_statfs'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4317 "configure"
|
||||
#line 4280 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
|
@ -4330,7 +4293,7 @@ int main() {
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:4297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
wine_cv_sys_vfs_has_statfs=yes
|
||||
else
|
||||
|
@ -4357,12 +4320,12 @@ fi
|
|||
if test "$ac_cv_header_sys_statfs_h" = "yes"
|
||||
then
|
||||
echo $ac_n "checking "whether sys/statfs.h defines statfs"""... $ac_c" 1>&6
|
||||
echo "configure:4361: checking "whether sys/statfs.h defines statfs"" >&5
|
||||
echo "configure:4324: checking "whether sys/statfs.h defines statfs"" >&5
|
||||
if eval "test \"`echo '$''{'wine_cv_sys_statfs_has_statfs'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4366 "configure"
|
||||
#line 4329 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
|
@ -4377,7 +4340,7 @@ int main() {
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:4344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
wine_cv_sys_statfs_has_statfs=yes
|
||||
else
|
||||
|
@ -4404,12 +4367,12 @@ fi
|
|||
if test "$ac_cv_header_sys_mount_h" = "yes"
|
||||
then
|
||||
echo $ac_n "checking "whether sys/mount.h defines statfs"""... $ac_c" 1>&6
|
||||
echo "configure:4408: checking "whether sys/mount.h defines statfs"" >&5
|
||||
echo "configure:4371: checking "whether sys/mount.h defines statfs"" >&5
|
||||
if eval "test \"`echo '$''{'wine_cv_sys_mount_has_statfs'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4413 "configure"
|
||||
#line 4376 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
|
@ -4424,7 +4387,7 @@ int main() {
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:4391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
wine_cv_sys_mount_has_statfs=yes
|
||||
else
|
||||
|
@ -4450,7 +4413,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking "for statfs.f_bfree"""... $ac_c" 1>&6
|
||||
echo "configure:4454: checking "for statfs.f_bfree"" >&5
|
||||
echo "configure:4417: checking "for statfs.f_bfree"" >&5
|
||||
if eval "test \"`echo '$''{'wine_cv_statfs_bfree'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4459,7 +4422,7 @@ else
|
|||
wine_cv_statfs_bfree=no
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4463 "configure"
|
||||
#line 4426 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
|
@ -4486,7 +4449,7 @@ int main() {
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:4453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
wine_cv_statfs_bfree=yes
|
||||
else
|
||||
|
@ -4510,7 +4473,7 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking "for statfs.f_bavail"""... $ac_c" 1>&6
|
||||
echo "configure:4514: checking "for statfs.f_bavail"" >&5
|
||||
echo "configure:4477: checking "for statfs.f_bavail"" >&5
|
||||
if eval "test \"`echo '$''{'wine_cv_statfs_bavail'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4519,7 +4482,7 @@ else
|
|||
wine_cv_statfs_bavail=no
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4523 "configure"
|
||||
#line 4486 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
|
@ -4546,7 +4509,7 @@ int main() {
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:4513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
wine_cv_statfs_bavail=yes
|
||||
else
|
||||
|
@ -4571,7 +4534,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking "for working sigaltstack"""... $ac_c" 1>&6
|
||||
echo "configure:4575: checking "for working sigaltstack"" >&5
|
||||
echo "configure:4538: checking "for working sigaltstack"" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_working_sigaltstack'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4580,7 +4543,7 @@ else
|
|||
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4584 "configure"
|
||||
#line 4547 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
@ -4618,7 +4581,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:4622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:4585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
ac_cv_c_working_sigaltstack="yes"
|
||||
else
|
||||
|
@ -4645,12 +4608,12 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking "for msg_accrights in struct msghdr"""... $ac_c" 1>&6
|
||||
echo "configure:4649: checking "for msg_accrights in struct msghdr"" >&5
|
||||
echo "configure:4612: checking "for msg_accrights in struct msghdr"" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_msg_accrights'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4654 "configure"
|
||||
#line 4617 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
|
@ -4658,7 +4621,7 @@ int main() {
|
|||
struct msghdr hdr; hdr.msg_accrights=0
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:4625: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_c_msg_accrights="yes"
|
||||
else
|
||||
|
|
75
configure.in
75
configure.in
|
@ -232,17 +232,6 @@ then
|
|||
AC_DEFINE(HAVE_OSS)
|
||||
fi
|
||||
|
||||
dnl **** Check for union semun ****
|
||||
|
||||
AC_CACHE_CHECK("for union semun", ac_cv_c_union_semun,
|
||||
AC_TRY_COMPILE([#include <sys/types.h>
|
||||
#include <sys/sem.h>],[union semun foo],
|
||||
ac_cv_c_union_semun="yes", ac_cv_c_union_semun="no"))
|
||||
if test "$ac_cv_c_union_semun" = "yes"
|
||||
then
|
||||
AC_DEFINE(HAVE_UNION_SEMUN)
|
||||
fi
|
||||
|
||||
dnl **** If ln -s doesn't work, use cp instead ****
|
||||
if test "$ac_cv_prog_LN_S" = "ln -s"; then : ; else LN_S=cp ; fi
|
||||
|
||||
|
@ -445,21 +434,67 @@ then
|
|||
AC_DEFINE(NO_REENTRANT_X11)
|
||||
fi
|
||||
|
||||
dnl **** Check for functions and header files ****
|
||||
dnl **** Check for functions ****
|
||||
|
||||
AC_CHECK_FUNCS(rfork clone _lwp_create getpagesize memmove sendmsg sigaltstack strerror stricmp tcgetattr timegm usleep wait4 waitpid vfscanf)
|
||||
AC_CHECK_HEADERS(wctype.h sys/syscall.h syscall.h sys/param.h sys/vfs.h sys/mount.h sys/statfs.h float.h linux/cdrom.h linux/ucdrom.h sys/cdio.h sys/filio.h sys/modem.h strings.h sys/strtio.h dlfcn.h unistd.h sys/sockio.h net/if.h netinet/in.h sys/file.h libio.h curses.h ncurses.h elf.h arpa/nameser.h resolv.h sys/lwp.h ucontext.h)
|
||||
AC_CHECK_FUNCS(\
|
||||
_lwp_create \
|
||||
clone \
|
||||
getpagesize \
|
||||
memmove \
|
||||
rfork \
|
||||
sendmsg \
|
||||
sigaltstack \
|
||||
strerror \
|
||||
stricmp \
|
||||
tcgetattr \
|
||||
timegm \
|
||||
usleep \
|
||||
vfscanf \
|
||||
wait4 \
|
||||
waitpid \
|
||||
)
|
||||
|
||||
dnl **** Check for header files ****
|
||||
|
||||
AC_CHECK_HEADERS(\
|
||||
arpa/nameser.h \
|
||||
curses.h \
|
||||
dlfcn.h \
|
||||
elf.h \
|
||||
float.h \
|
||||
libio.h \
|
||||
linux/cdrom.h \
|
||||
linux/ucdrom.h \
|
||||
ncurses.h \
|
||||
net/if.h \
|
||||
netinet/in.h \
|
||||
resolv.h \
|
||||
strings.h \
|
||||
sys/cdio.h \
|
||||
sys/file.h \
|
||||
sys/filio.h \
|
||||
sys/lwp.h \
|
||||
sys/modem.h \
|
||||
sys/mount.h \
|
||||
sys/param.h \
|
||||
sys/sockio.h \
|
||||
sys/statfs.h \
|
||||
sys/strtio.h \
|
||||
sys/syscall.h \
|
||||
sys/vfs.h \
|
||||
syscall.h \
|
||||
ucontext.h \
|
||||
unistd.h \
|
||||
wctype.h \
|
||||
)
|
||||
AC_HEADER_STAT()
|
||||
|
||||
dnl **** Check for types ****
|
||||
|
||||
AC_C_CONST()
|
||||
AC_TYPE_SIZE_T()
|
||||
AC_CHECK_SIZEOF(long long,0)
|
||||
|
||||
dnl **** Check for sendmsg in -lsocket if not found above ****
|
||||
|
||||
if test $ac_cv_func_sendmsg = no; then
|
||||
AC_CHECK_LIB(socket,sendmsg)
|
||||
fi
|
||||
|
||||
dnl **** statfs checks ****
|
||||
|
||||
if test "$ac_cv_header_sys_vfs_h" = "yes"
|
||||
|
|
|
@ -9,9 +9,6 @@
|
|||
/* Define to use .string instead of .ascii */
|
||||
#undef HAVE_ASM_STRING
|
||||
|
||||
/* Define if union semun is defined in sys/sem.h */
|
||||
#undef HAVE_UNION_SEMUN
|
||||
|
||||
/* Define if struct msghdr contains msg_accrights */
|
||||
#undef HAVE_MSGHDR_ACCRIGHTS
|
||||
|
||||
|
|
|
@ -21,9 +21,6 @@
|
|||
/* Define to use .string instead of .ascii */
|
||||
#undef HAVE_ASM_STRING
|
||||
|
||||
/* Define if union semun is defined in sys/sem.h */
|
||||
#undef HAVE_UNION_SEMUN
|
||||
|
||||
/* Define if struct msghdr contains msg_accrights */
|
||||
#undef HAVE_MSGHDR_ACCRIGHTS
|
||||
|
||||
|
|
Loading…
Reference in New Issue