From f244dee1a1c80002fceec54545e58f7e3ff13178 Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Tue, 24 Jun 1997 02:16:31 +0000 Subject: [PATCH] Revert Marcus's changes; will re-apply when we get papers. --- ChangeLog | 18 --- acconfig.h | 3 - configure | 315 ++++++++++------------------------------ configure.in | 29 +--- ice-9/ChangeLog | 4 - ice-9/boot-9.scm | 4 +- libguile/ChangeLog | 30 ---- libguile/net_db.c | 22 +-- libguile/posix.c | 9 +- libguile/scmconfig.h.in | 21 --- libguile/scmsigs.c | 2 - libguile/simpos.c | 2 +- libguile/socket.c | 20 +-- libguile/stime.c | 8 +- 14 files changed, 93 insertions(+), 394 deletions(-) diff --git a/ChangeLog b/ChangeLog index f140252e6..9063c9dc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,21 +1,3 @@ -Mon Jun 23 20:34:48 1997 Jim Blandy - - Changes to compile under gnu-win32, from Marcus Daniels: - * configure.in: When sys/un.h exists, define HAVE_UNIX_DOMAIN_SOCKETS - to indicate that Unix domain sockets will work. - Check for socketpair, getgroups, setwent, pause, and tzset - (cygwin currently lacks these them). - Check for sethostent endhostent getnetent setnetent endnetent - getprotoent endprotoent getservent endservent getnetbyaddr - getnetbyname inet_lnaof inet_makeaddr inet_netof (cygwin currently - lacks them). In the case of cygwin, temporarily prefix these - functions with "cygwin32_", the way that netdb.h does. - Don't define HAVE_REGCOMP unless both regcomp and regex.h are - available (cygwin b18 came distributed without a working regex.h - file). - * acconfig.h (HAVE_UNIX_DOMAIN_SOCKETS): Add this. - * configure: Regenerated. - Sun Jun 22 15:43:07 1997 Jim Blandy Try to detect when people are using one version of libguile and a diff --git a/acconfig.h b/acconfig.h index cfde7b0ea..e7f263c14 100644 --- a/acconfig.h +++ b/acconfig.h @@ -71,6 +71,3 @@ /* Define if the operating system can restart system calls. */ #undef HAVE_RESTARTS - -/* Define if the system supports Unix-domain (file-domain) sockets. */ -#undef HAVE_UNIX_DOMAIN_SOCKETS diff --git a/configure b/configure index 93d03e55d..24fafd83f 100755 --- a/configure +++ b/configure @@ -1695,7 +1695,7 @@ EOF fi -for ac_hdr in libc.h limits.h malloc.h memory.h string.h regex.h sys/ioctl.h sys/select.h sys/time.h sys/timeb.h sys/times.h sys/types.h sys/utime.h time.h unistd.h utime.h +for ac_hdr in libc.h limits.h malloc.h memory.h string.h sys/ioctl.h sys/select.h sys/time.h sys/timeb.h sys/times.h sys/types.h sys/utime.h time.h unistd.h utime.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -2519,178 +2519,21 @@ fi done - -ac_safe=`echo "sys/un.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for sys/un.h""... $ac_c" 1>&6 -echo "configure:2526: checking for sys/un.h" >&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 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2536: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - have_sys_un_h=1 -else - echo "$ac_t""no" 1>&6 -fi - -if test -n "$have_sys_un_h" ; then -cat >> confdefs.h <<\EOF -#define HAVE_UNIX_DOMAIN_SOCKETS 1 -EOF - -fi - -for ac_func in socketpair getgroups setpwent pause tzset -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2567: 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 < -/* 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 $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:2595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -fi -done - - -cp confdefs.h confdefs.h.bak -for func in sethostent endhostent getnetent setnetent endnetent getprotoent endprotoent getservent endservent getnetbyaddr getnetbyname inet_lnaof inet_makeaddr inet_netof ; do -cp confdefs.h.bak confdefs.h -cat >> confdefs.h << EOF -#ifdef __CYGWIN32__ -#define $func cygwin32_$func -#endif -EOF -echo $ac_n "checking for $func""... $ac_c" 1>&6 -echo "configure:2629: checking for $func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* 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 $func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$func) || defined (__stub___$func) -choke me -#else -$func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:2657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* - eval "ac_cv_func_$func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$func=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 -fi - -done -cp confdefs.h.bak confdefs.h - - echo $ac_n "checking for restartable system calls""... $ac_c" 1>&6 -echo "configure:2681: checking for restartable system calls" >&5 +echo "configure:2524: checking for restartable system calls" >&5 if eval "test \"`echo '$''{'scm_cv_restarts'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test $ac_cv_func_sigaction = yes; then cat > conftest.$ac_ext < int main() { int a = SA_RESTART ; return 0; } EOF -if { (eval echo configure:2694: \"$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_restarts=yes else @@ -2713,16 +2556,15 @@ EOF fi -if test "$ac_cv_header_regex_h" = yes; then - for ac_func in regcomp +for ac_func in regcomp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2721: checking for $ac_func" >&5 +echo "configure:2563: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2769,17 +2611,16 @@ else fi done -fi for ac_func in inet_aton putenv strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2778: checking for $ac_func" >&5 +echo "configure:2619: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2832,19 +2673,19 @@ done # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:2836: checking for working alloca.h" >&5 +echo "configure:2677: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -2865,12 +2706,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2869: checking for alloca" >&5 +echo "configure:2710: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -2925,12 +2766,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2929: checking whether alloca needs Cray hooks" >&5 +echo "configure:2770: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2959: checking for $ac_func" >&5 +echo "configure:2800: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3010,7 +2851,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:3014: checking stack direction for C alloca" >&5 +echo "configure:2855: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3018,7 +2859,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -3060,12 +2901,12 @@ fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:3064: checking for st_rdev in struct stat" >&5 +echo "configure:2905: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3073,7 +2914,7 @@ int main() { struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:3077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2918: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -3094,12 +2935,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:3098: checking for st_blksize in struct stat" >&5 +echo "configure:2939: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3107,7 +2948,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:3111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -3131,12 +2972,12 @@ fi # We could use AC_STRUCT_ST_BLOCKS here, but that adds fileblocks.o to # LIBOBJS, which we don't need. This seems more direct. echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:3135: checking for st_blocks in struct stat" >&5 +echo "configure:2976: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3144,7 +2985,7 @@ int main() { struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:3148: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -3165,12 +3006,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:3169: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:3010: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3178,7 +3019,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:3182: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -3199,12 +3040,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:3203: checking for tm_zone in struct tm" >&5 +echo "configure:3044: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@ -3212,7 +3053,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:3216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -3232,12 +3073,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:3236: checking for tzname" >&5 +echo "configure:3077: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ @@ -3247,7 +3088,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:3251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -3270,12 +3111,12 @@ fi echo $ac_n "checking whether we need POSIX to get struct utimbuf""... $ac_c" 1>&6 -echo "configure:3274: checking whether we need POSIX to get struct utimbuf" >&5 +echo "configure:3115: checking whether we need POSIX to get struct utimbuf" >&5 if eval "test \"`echo '$''{'guile_cv_struct_utimbuf_needs_posix'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3132: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3320,13 +3161,13 @@ if test "$cross_compiling" = yes; then echo "configure: warning: Guessing that stack grows down -- see scmconfig.h.in" 1>&2 else cat > conftest.$ac_ext <= ((unsigned long)&x)); } main () { int q; aux((unsigned long)&q); } EOF -if { (eval echo configure:3330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define SCM_STACK_GROWS_UP 1 @@ -3349,11 +3190,11 @@ EOF echo "configure: warning: Guessing that sizeof(long) == sizeof(float) -- see scmconfig.h.in" 1>&2 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define SCM_SINGLES 1 @@ -3368,12 +3209,12 @@ fi echo $ac_n "checking for struct linger""... $ac_c" 1>&6 -echo "configure:3372: checking for struct linger" >&5 +echo "configure:3213: checking for struct linger" >&5 if eval "test \"`echo '$''{'scm_cv_struct_linger'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3382,7 +3223,7 @@ int main() { struct linger lgr; lgr.l_linger = 100 ; return 0; } EOF -if { (eval echo configure:3386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_linger="yes" else @@ -3409,19 +3250,19 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking how to set a stream file descriptor""... $ac_c" 1>&6 -echo "configure:3413: checking how to set a stream file descriptor" >&5 +echo "configure:3254: checking how to set a stream file descriptor" >&5 if eval "test \"`echo '$''{'scm_cv_fd_setter'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { stdout->_file = 1 ; return 0; } EOF -if { (eval echo configure:3425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_fd_setter="_file" else @@ -3429,14 +3270,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { stdout->_fileno = 1 ; return 0; } EOF -if { (eval echo configure:3440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_fd_setter="_fileno" else @@ -3474,19 +3315,19 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking how to get buffer char count from FILE structure""... $ac_c" 1>&6 -echo "configure:3478: checking how to get buffer char count from FILE structure" >&5 +echo "configure:3319: 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 < int main() { FILE *f = stdin; f->_cnt = 0 ; return 0; } EOF -if { (eval echo configure:3490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_file_count="_cnt" else @@ -3494,14 +3335,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { FILE *f = stdin; f->_r = 0 ; return 0; } EOF -if { (eval echo configure:3505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3346: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_file_count="_r" else @@ -3509,14 +3350,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { FILE *f = stdin; f->readCount = 0 ; return 0; } EOF -if { (eval echo configure:3520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_file_count="readCount" else @@ -3543,14 +3384,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 < int main() { FILE *f = stdin; f->_gptr = f->egptr; ; return 0; } EOF -if { (eval echo configure:3554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_file_gptr=1 else @@ -3573,14 +3414,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 < int main() { FILE *f = stdin; f->_IO_read_ptr = f->_IO_read_end; ; return 0; } EOF -if { (eval echo configure:3584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_file_readptr=1 else @@ -3610,7 +3451,7 @@ fi echo $ac_n "checking "threads package type"""... $ac_c" 1>&6 -echo "configure:3614: checking "threads package type"" >&5 +echo "configure:3455: checking "threads package type"" >&5 if eval "test \"`echo '$''{'cy_cv_threads_package'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3669,7 +3510,7 @@ if test "$use_threads" != no; then LDFLAGS="-L$use_threads/lib" LIBS="-lgthreads -lmalloc" cat > conftest.$ac_ext < int main() { @@ -3678,7 +3519,7 @@ pthread_equal(NULL,NULL); ; return 0; } EOF -if { (eval echo configure:3682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* threads_package=FSU else @@ -3690,7 +3531,7 @@ rm -f conftest* if test "$threads_package" = unknown; then LIBS="-lpthread" cat > conftest.$ac_ext < int main() { @@ -3699,7 +3540,7 @@ pthread_equal(NULL,NULL); ; return 0; } EOF -if { (eval echo configure:3703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* threads_package=MIT else @@ -3711,7 +3552,7 @@ rm -f conftest* if test "$threads_package" = unknown; then LIBS="-lpthreads" cat > conftest.$ac_ext < int main() { @@ -3720,7 +3561,7 @@ pthread_equal(NULL,NULL); ; return 0; } EOF -if { (eval echo configure:3724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* threads_package=PCthreads else @@ -3800,7 +3641,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3804: checking for $ac_word" >&5 +echo "configure:3645: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3859,7 +3700,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:3863: checking host system type" >&5 +echo "configure:3704: checking host system type" >&5 host_alias=$host case "$host_alias" in diff --git a/configure.in b/configure.in index b7f842738..9c4542750 100644 --- a/configure.in +++ b/configure.in @@ -45,7 +45,7 @@ AC_HEADER_STDC AC_HEADER_DIRENT AC_HEADER_TIME AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS(libc.h limits.h malloc.h memory.h string.h regex.h sys/ioctl.h sys/select.h sys/time.h sys/timeb.h sys/times.h sys/types.h sys/utime.h time.h unistd.h utime.h) +AC_CHECK_HEADERS(libc.h limits.h malloc.h memory.h string.h sys/ioctl.h sys/select.h sys/time.h sys/timeb.h sys/times.h sys/types.h sys/utime.h time.h unistd.h utime.h) GUILE_HEADER_LIBC_WITH_UNISTD AC_TYPE_GETGROUPS @@ -88,29 +88,6 @@ fi AC_CHECK_FUNCS(ctermid ftime getcwd geteuid gethostent gettimeofday lstat mkdir mknod nice readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction strftime strptime symlink sync tcgetpgrp tcsetpgrp times uname waitpid) -dnl - -AC_CHECK_HEADER(sys/un.h, have_sys_un_h=1) -if test -n "$have_sys_un_h" ; then -AC_DEFINE(HAVE_UNIX_DOMAIN_SOCKETS) -fi - -AC_CHECK_FUNCS(socketpair getgroups setpwent pause tzset) - -cp confdefs.h confdefs.h.bak -for func in sethostent endhostent getnetent setnetent endnetent getprotoent endprotoent getservent endservent getnetbyaddr getnetbyname inet_lnaof inet_makeaddr inet_netof ; do -cp confdefs.h.bak confdefs.h -cat >> confdefs.h << EOF -#ifdef __CYGWIN32__ -#define $func cygwin32_$func -#endif -EOF -AC_CHECK_FUNC($func) -done -cp confdefs.h.bak confdefs.h - -dnl - AC_CACHE_CHECK([for restartable system calls], scm_cv_restarts, if test $ac_cv_func_sigaction = yes; then [AC_TRY_COMPILE([#include ], @@ -124,9 +101,7 @@ if test $scm_cv_restarts = yes; then AC_DEFINE(HAVE_RESTARTS) fi -if test "$ac_cv_header_regex_h" = yes; then - AC_CHECK_FUNCS(regcomp, [LIBOBJS="regex-posix.o $LIBOBJS"]) -fi +AC_CHECK_FUNCS(regcomp, [LIBOBJS="regex-posix.o $LIBOBJS"]) AC_REPLACE_FUNCS(inet_aton putenv strerror) diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog index b4adbe6a6..c0e660af4 100644 --- a/ice-9/ChangeLog +++ b/ice-9/ChangeLog @@ -1,9 +1,5 @@ Mon Jun 23 16:13:38 1997 Jim Blandy - Changes to compile under gnu-win32, from Marcus Daniels: - * boot-9.scm (load-user-init): If HOME is unset, provide - a default of /. - * boot-9.scm (make-list): Remove the definition of this function from the (ice-9 common-list) module; make the `init' argument optional in the scm module's definition, to match the deleted diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm index 0b8e75576..eb7b656c9 100644 --- a/ice-9/boot-9.scm +++ b/ice-9/boot-9.scm @@ -811,8 +811,8 @@ (if (not (eq? (stat:type stats) 'directory)) path))) (lambda dummy #f)))) - (let ((path (or (has-init? (or (getenv "HOME") "/")) - (has-init? (passwd:dir (getpw (getuid))))))) + (let ((path (or (has-init? (getenv "HOME")) + (has-init? (passwd:dir (getpw (getuid))))))) (if path (primitive-load path)))) diff --git a/libguile/ChangeLog b/libguile/ChangeLog index 04e30020e..4da943fdd 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,35 +1,5 @@ Mon Jun 23 18:44:49 1997 Jim Blandy - Changes to compile under gnu-win32, from Marcus Daniels: - * stime.c (tzset): If tzset isn't provided, make it a NOP. - (scm_localtime): Change SCM_EOF to SCM_EOL. - (scm_mktime): Likewise. - * socket.c: Don't include sys/un.h unless autoconf tells - us Unix domain sockets are available. - (scm_fill_sockaddr): Ignore Unix domain code. - (scm_addr_vector): Likewise. - (scm_init_addr_buffer): Likewise. - (scm_socketpair): Don't include unless socketpair was - found during autoconf. - * simpos.c (SYSTNAME): Treat cygwin like Unix. - * scmsigs.c (scm_pause): Don't include unless pause was found - during autoconf. - * posix.c (scm_getgroups): Don't include unless support function - was found during autoconf (in this case, getgroups). - (scm_setpwent): For setpwent. - (scm_setegid): For setegid. - * net_db.c (scm_inet_netof): Don't include unless support - function was found during autoconf (in this case, inet_netof). - (scm_lnaof): For inet_lnaof. - (scm_inet_makeaddr): For inet_makeaddr. - (scm_getnet): For getnetent, getnetbyname, getnetbyaddr. - (scm_getproto): For getprotoent. - (scm_getserv): For getservent. - (scm_sethost): For sethostent, endhostent. - (scm_setnet): For setnetent, endnetent. - (scm_setproto): For setprotoent, endprotoent. - (scm_setserv): For setservent, endservent. - * Makefile.am (libpath.h): Include the values of all the standard Makefile directory variables. Print a message, but don't print all the commands. diff --git a/libguile/net_db.c b/libguile/net_db.c index 3bf47cdca..198b95f4a 100644 --- a/libguile/net_db.c +++ b/libguile/net_db.c @@ -109,7 +109,6 @@ scm_inet_ntoa (inetid) return answer; } -#ifdef HAVE_INET_NETOF SCM_PROC (s_inet_netof, "inet-netof", 1, 0, 0, scm_inet_netof); SCM @@ -120,9 +119,7 @@ scm_inet_netof (address) addr.s_addr = htonl (scm_num2ulong (address, (char *) SCM_ARG1, s_inet_netof)); return scm_ulong2num ((unsigned long) inet_netof (addr)); } -#endif -#ifdef HAVE_INET_LNAOF SCM_PROC (s_lnaof, "inet-lnaof", 1, 0, 0, scm_lnaof); SCM @@ -133,9 +130,8 @@ scm_lnaof (address) addr.s_addr = htonl (scm_num2ulong (address, (char *) SCM_ARG1, s_lnaof)); return scm_ulong2num ((unsigned long) inet_lnaof (addr)); } -#endif -#ifdef HAVE_INET_MAKEADDR + SCM_PROC (s_inet_makeaddr, "inet-makeaddr", 2, 0, 0, scm_inet_makeaddr); SCM @@ -152,7 +148,6 @@ scm_inet_makeaddr (net, lna) addr = inet_makeaddr (netnum, lnanum); return scm_ulong2num (ntohl (addr.s_addr)); } -#endif /* !!! Doesn't take address format. @@ -249,7 +244,6 @@ scm_gethost (name) doesn't seem quite right (what if errno gets set as part of healthy operation?), but it seems to work okay. We'll see. */ -#if defined(HAVE_GETNETENT) && defined(HAVE_GETNETBYNAME) && defined(HAVE_GETNETBYADDR) SCM_PROC (s_getnet, "getnet", 0, 1, 0, scm_getnet); SCM @@ -299,9 +293,7 @@ scm_getnet (name) ve[3] = scm_ulong2num (entry->n_net + 0L); return ans; } -#endif -#ifdef HAVE_GETPROTOENT SCM_PROC (s_getproto, "getproto", 0, 1, 0, scm_getproto); SCM @@ -350,7 +342,7 @@ scm_getproto (name) ve[2] = SCM_MAKINUM (entry->p_proto + 0L); return ans; } -#endif + static SCM scm_return_entry SCM_P ((struct servent *entry)); @@ -371,7 +363,6 @@ scm_return_entry (entry) return ans; } -#ifdef HAVE_GETSERVENT SCM_PROC (s_getserv, "getserv", 0, 2, 0, scm_getserv); SCM @@ -415,9 +406,7 @@ scm_getserv (name, proto) SCM_ALLOW_INTS; return scm_return_entry (entry); } -#endif -#if defined(HAVE_SETHOSTENT) && defined(HAVE_ENDHOSTENT) SCM_PROC (s_sethost, "sethost", 0, 1, 0, scm_sethost); SCM @@ -430,9 +419,7 @@ scm_sethost (arg) sethostent (SCM_NFALSEP (arg)); return SCM_UNSPECIFIED; } -#endif -#if defined(HAVE_SETNETENT) && defined(HAVE_ENDNETENT) SCM_PROC (s_setnet, "setnet", 0, 1, 0, scm_setnet); SCM @@ -445,9 +432,7 @@ scm_setnet (arg) setnetent (SCM_NFALSEP (arg)); return SCM_UNSPECIFIED; } -#endif -#if defined(HAVE_SETPROTOENT) && defined(HAVE_ENDPROTOENT) SCM_PROC (s_setproto, "setproto", 0, 1, 0, scm_setproto); SCM @@ -460,9 +445,7 @@ scm_setproto (arg) setprotoent (SCM_NFALSEP (arg)); return SCM_UNSPECIFIED; } -#endif -#if defined(HAVE_SETSERVENT) && defined(HAVE_ENDSERVENT) SCM_PROC (s_setserv, "setserv", 0, 1, 0, scm_setserv); SCM @@ -475,7 +458,6 @@ scm_setserv (arg) setservent (SCM_NFALSEP (arg)); return SCM_UNSPECIFIED; } -#endif void diff --git a/libguile/posix.c b/libguile/posix.c index 048ac55bc..c763f4da8 100644 --- a/libguile/posix.c +++ b/libguile/posix.c @@ -207,7 +207,7 @@ scm_pipe () } -#ifdef HAVE_GETGROUPS + SCM_PROC (s_getgroups, "getgroups", 0, 0, 0, scm_getgroups); SCM @@ -240,7 +240,7 @@ scm_getgroups() return ans; } } -#endif + SCM_PROC (s_getpwuid, "getpw", 0, 1, 0, scm_getpwuid); @@ -299,7 +299,7 @@ scm_getpwuid (user) } -#ifdef HAVE_SETPWENT + SCM_PROC (s_setpwent, "setpw", 0, 1, 0, scm_setpwent); SCM @@ -312,7 +312,6 @@ scm_setpwent (arg) setpwent (); return SCM_UNSPECIFIED; } -#endif @@ -573,7 +572,6 @@ scm_seteuid (id) return SCM_UNSPECIFIED; } -#ifdef HAVE_SETEGID SCM_PROC (s_setegid, "setegid", 1, 0, 0, scm_setegid); SCM @@ -593,7 +591,6 @@ scm_setegid (id) return SCM_UNSPECIFIED; } -#endif SCM_PROC (s_getpgrp, "getpgrp", 0, 0, 0, scm_getpgrp); SCM diff --git a/libguile/scmconfig.h.in b/libguile/scmconfig.h.in index 8789f7884..38e1080f6 100644 --- a/libguile/scmconfig.h.in +++ b/libguile/scmconfig.h.in @@ -155,9 +155,6 @@ /* Define if the operating system can restart system calls. */ #undef HAVE_RESTARTS -/* Define if the system supports Unix-domain (file-domain) sockets. */ -#undef HAVE_UNIX_DOMAIN_SOCKETS - /* Define if you have the ctermid function. */ #undef HAVE_CTERMID @@ -170,9 +167,6 @@ /* Define if you have the geteuid function. */ #undef HAVE_GETEUID -/* Define if you have the getgroups function. */ -#undef HAVE_GETGROUPS - /* Define if you have the gethostent function. */ #undef HAVE_GETHOSTENT @@ -194,9 +188,6 @@ /* Define if you have the nice function. */ #undef HAVE_NICE -/* Define if you have the pause function. */ -#undef HAVE_PAUSE - /* Define if you have the putenv function. */ #undef HAVE_PUTENV @@ -227,9 +218,6 @@ /* Define if you have the setpgid function. */ #undef HAVE_SETPGID -/* Define if you have the setpwent function. */ -#undef HAVE_SETPWENT - /* Define if you have the setsid function. */ #undef HAVE_SETSID @@ -239,9 +227,6 @@ /* Define if you have the sigaction function. */ #undef HAVE_SIGACTION -/* Define if you have the socketpair function. */ -#undef HAVE_SOCKETPAIR - /* Define if you have the strerror function. */ #undef HAVE_STRERROR @@ -266,9 +251,6 @@ /* Define if you have the times function. */ #undef HAVE_TIMES -/* Define if you have the tzset function. */ -#undef HAVE_TZSET - /* Define if you have the uname function. */ #undef HAVE_UNAME @@ -293,9 +275,6 @@ /* Define if you have the header file. */ #undef HAVE_NDIR_H -/* Define if you have the header file. */ -#undef HAVE_REGEX_H - /* Define if you have the header file. */ #undef HAVE_STRING_H diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c index 6440419fd..57456e0fd 100644 --- a/libguile/scmsigs.c +++ b/libguile/scmsigs.c @@ -329,7 +329,6 @@ scm_alarm (i) return SCM_MAKINUM (j); } -#ifdef HAVE_PAUSE SCM_PROC(s_pause, "pause", 0, 0, 0, scm_pause); SCM @@ -338,7 +337,6 @@ scm_pause () pause (); return SCM_UNSPECIFIED; } -#endif SCM_PROC(s_sleep, "sleep", 1, 0, 0, scm_sleep); diff --git a/libguile/simpos.c b/libguile/simpos.c index 9973e5ff5..69117ecae 100644 --- a/libguile/simpos.c +++ b/libguile/simpos.c @@ -104,7 +104,7 @@ scm_getenv(nam) #ifdef vms # define SYSTNAME "VMS" #endif -#if defined (unix) || defined (__unix) || defined(__CYGWIN32__) +#if defined (unix) || defined (__unix) # define SYSTNAME "UNIX" #endif #ifdef MWC diff --git a/libguile/socket.c b/libguile/socket.c index 935f31587..64eb02d42 100644 --- a/libguile/socket.c +++ b/libguile/socket.c @@ -57,9 +57,7 @@ #endif #include #include -#ifdef UNIX_DOMAIN_SOCKETS #include -#endif #include #include #include @@ -119,7 +117,6 @@ scm_socket (family, style, proto) -#ifdef HAVE_SOCKETPAIR SCM_PROC (s_socketpair, "socketpair", 3, 0, 0, scm_socketpair); SCM @@ -148,7 +145,7 @@ scm_socketpair (family, style, proto) SCM_ALLOW_INTS; return scm_cons (a, b); } -#endif + SCM_PROC (s_getsockopt, "getsockopt", 3, 0, 0, scm_getsockopt); @@ -352,7 +349,6 @@ scm_fill_sockaddr (fam, address, args, which_arg, proc, size) *size = sizeof (struct sockaddr_in); return (struct sockaddr *) soka; } -#ifdef UNIX_DOMAIN_SOCKETS case AF_UNIX: { struct sockaddr_un *soka; @@ -367,7 +363,6 @@ scm_fill_sockaddr (fam, address, args, which_arg, proc, size) *size = sizeof (struct sockaddr_un); return (struct sockaddr *) soka; } -#endif default: scm_out_of_range (proc, SCM_MAKINUM (fam)); } @@ -451,7 +446,6 @@ scm_addr_vector (address, proc) short int fam = address->sa_family; SCM result; SCM *ve; -#ifdef UNIX_DOMAIN_SOCKETS if (fam == AF_UNIX) { struct sockaddr_un *nad = (struct sockaddr_un *) address; @@ -461,9 +455,7 @@ scm_addr_vector (address, proc) ve[1] = scm_makfromstr (nad->sun_path, (scm_sizet) strlen (nad->sun_path), 0); } - else -#endif - if (fam == AF_INET) + else if (fam == AF_INET) { struct sockaddr_in *nad = (struct sockaddr_in *) address; result = scm_make_vector (SCM_MAKINUM (3), SCM_UNSPECIFIED, SCM_BOOL_F); @@ -488,13 +480,7 @@ static void scm_init_addr_buffer SCM_P ((void)); static void scm_init_addr_buffer () { - scm_addr_buffer_size = -#ifdef UNIX_DOMAIN_SOCKETS - (int) sizeof (struct sockaddr_un) -#else - 0 -#endif - ; + scm_addr_buffer_size = (int) sizeof (struct sockaddr_un); if (sizeof (struct sockaddr_in) > scm_addr_buffer_size) scm_addr_buffer_size = (int) sizeof (struct sockaddr_in); scm_addr_buffer = scm_must_malloc (scm_addr_buffer_size, "address buffer"); diff --git a/libguile/stime.c b/libguile/stime.c index eee6271ee..37042f8a5 100644 --- a/libguile/stime.c +++ b/libguile/stime.c @@ -160,10 +160,6 @@ scm_get_internal_real_time() } #endif -#ifndef HAVE_TZSET -/* GNU-WIN32's cygwin.dll doesn't have this. */ -#define tzset() -#endif static long scm_my_base = 0; @@ -319,7 +315,7 @@ scm_localtime (SCM time, SCM zone) strcpy (zname, ptr); # else scm_misc_error (s_localtime, "Not fully implemented on this platform", - SCM_EOL); + SCM_EOF); # endif #endif } @@ -430,7 +426,7 @@ scm_mktime (SCM sbd_time, SCM zone) strcpy (zname, ptr); # else scm_misc_error (s_localtime, "Not fully implemented on this platform", - SCM_EOL); + SCM_EOF); # endif #endif }