mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-02 04:40:29 +02:00
* configure.in: When checking for struct linger, #include
<sys/types.h> as well as <sys/socket.h>. I've never known <sys/types.h> to cause any portability problems, and Solaris's <sys/socket.h> needs it. * configure: Rebuilt.
This commit is contained in:
parent
805df3e8af
commit
b3310939fc
2 changed files with 21 additions and 17 deletions
34
libguile/configure
vendored
34
libguile/configure
vendored
|
@ -2427,12 +2427,14 @@ else
|
|||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2429 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
int main() {
|
||||
struct linger lgr; lgr.l_linger = 100
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
scm_cv_struct_linger="yes"
|
||||
else
|
||||
|
@ -2462,7 +2464,7 @@ FD_SETTER=""
|
|||
|
||||
if test "x$FD_SETTER" = x; then
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2466 "configure"
|
||||
#line 2468 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
|
||||
|
@ -2470,7 +2472,7 @@ int main() {
|
|||
stdout->_file = 1
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
FD_SETTER="((F)->_file = (D))"
|
||||
else
|
||||
|
@ -2482,7 +2484,7 @@ fi
|
|||
|
||||
if test "x$FD_SETTER" = x; then
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2486 "configure"
|
||||
#line 2488 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
|
||||
|
@ -2490,7 +2492,7 @@ int main() {
|
|||
stdout->_fileno
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
FD_SETTER="((F)->_fileno = (D))"
|
||||
else
|
||||
|
@ -2519,19 +2521,19 @@ EOF
|
|||
#--------------------------------------------------------------------
|
||||
|
||||
echo $ac_n "checking how to get buffer char count from FILE structure""... $ac_c" 1>&6
|
||||
echo "configure:2523: checking how to get buffer char count from FILE structure" >&5
|
||||
echo "configure:2525: checking how to get buffer char count from FILE structure" >&5
|
||||
if eval "test \"`echo '$''{'scm_cv_struct_file_count'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2528 "configure"
|
||||
#line 2530 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
int main() {
|
||||
FILE *f = stdin; f->_cnt = 0
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
scm_cv_struct_file_count="_cnt"
|
||||
else
|
||||
|
@ -2539,14 +2541,14 @@ else
|
|||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2543 "configure"
|
||||
#line 2545 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
int main() {
|
||||
FILE *f = stdin; f->_r = 0
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
scm_cv_struct_file_count="_r"
|
||||
else
|
||||
|
@ -2554,14 +2556,14 @@ else
|
|||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2558 "configure"
|
||||
#line 2560 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
int main() {
|
||||
FILE *f = stdin; f->readCount = 0
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
scm_cv_struct_file_count="readCount"
|
||||
else
|
||||
|
@ -2588,14 +2590,14 @@ if eval "test \"`echo '$''{'scm_cv_struct_file_gptr'+set}'`\" = set"; then
|
|||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2592 "configure"
|
||||
#line 2594 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
int main() {
|
||||
FILE *f = stdin; f->_gptr = f->egptr;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
scm_cv_struct_file_gptr=1
|
||||
else
|
||||
|
@ -2618,14 +2620,14 @@ if eval "test \"`echo '$''{'scm_cv_struct_file_readptr'+set}'`\" = set"; then
|
|||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2622 "configure"
|
||||
#line 2624 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
int main() {
|
||||
FILE *f = stdin; f->_IO_read_ptr = f->_IO_read_end;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
scm_cv_struct_file_readptr=1
|
||||
else
|
||||
|
|
|
@ -94,7 +94,9 @@ AC_TRY_RUN(main () { exit (sizeof(float) != sizeof(long)); },
|
|||
|
||||
AC_MSG_CHECKING(for struct linger)
|
||||
AC_CACHE_VAL(scm_cv_struct_linger,
|
||||
AC_TRY_COMPILE([#include <sys/socket.h>],
|
||||
AC_TRY_COMPILE([
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>],
|
||||
[struct linger lgr; lgr.l_linger = 100],
|
||||
scm_cv_struct_linger="yes",
|
||||
scm_cv_struct_linger="no"))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue