diff options
| author | Mike Gran <spk121@yahoo.com> | 2022-09-15 14:50:32 -0700 |
|---|---|---|
| committer | Mike Gran <spk121@yahoo.com> | 2022-10-14 08:40:23 -0700 |
| commit | e9db8a29e472e2c0899344394dd9cf471e9ed514 (patch) | |
| tree | 629084767d7648c1a896a931821b9784531dbf77 /acinclude.m4 | |
| parent | df8e772f3c5f8c998b074a2821320544da8fb088 (diff) | |
| download | guile-e9db8a29e472e2c0899344394dd9cf471e9ed514.tar.gz | |
Remove special logic for the obscure CMU C library's libc.h
* acinclude.m4 (GUILE_HEADER_LIBC_WITH_UNISTD): removed
* configure.ac: remove GUILE_HEADER_LIBC_WITH_UNISTD, don't check for libc.h
* libguile/filesys.c [LIBC_H_WITH_UNISTD_H]: remove libc.h inclusion
* libguile/posix.c [LIBC_H_WITH_UNISTD_H]: remove libc.h inclusion
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index dd8f0bff5..2c5355a36 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -44,51 +44,6 @@ struct utime blah; fi]) - - -dnl -dnl Apparently, at CMU they have a weird version of libc.h that is -dnl installed in /usr/local/include and conflicts with unistd.h. -dnl In these situations, we should not #include libc.h. -dnl This test arranges to #define LIBC_H_WITH_UNISTD_H iff libc.h is -dnl present on the system, and is safe to #include. -dnl -AC_DEFUN([GUILE_HEADER_LIBC_WITH_UNISTD], - [ - AC_CHECK_HEADERS(libc.h unistd.h) - AC_CACHE_CHECK( - [whether libc.h and unistd.h can be included together], - guile_cv_header_libc_with_unistd, - [ - if test "$ac_cv_header_libc_h" = "no"; then - guile_cv_header_libc_with_unistd="no" - elif test "$ac_cv_header_unistd_h" = "no"; then - guile_cv_header_libc_with_unistd="yes" - else - AC_TRY_COMPILE( - [ -# include <libc.h> -# include <unistd.h> - ], - [], - [guile_cv_header_libc_with_unistd=yes], - [guile_cv_header_libc_with_unistd=no] - ) - fi - ] - ) - if test "$guile_cv_header_libc_with_unistd" = yes; then - AC_DEFINE([LIBC_H_WITH_UNISTD_H], 1, - [Define this if we should include <libc.h> when we've already - included <unistd.h>. On some systems, they conflict, and libc.h - should be omitted. See GUILE_HEADER_LIBC_WITH_UNISTD in - aclocal.m4.]) - fi - ] -) - - - dnl This is needed when we want to check for the same function repeatedly dnl with other parameters, such as libraries, varying. dnl |