diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2024-08-28 12:38:18 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2024-08-28 21:34:22 +0100 |
| commit | b68561dd7925dfee1836f75d3fa8d33fff5c2498 (patch) | |
| tree | b9fa2f7eb2f02368e42c10b25e20d8f851b5f049 | |
| parent | 51b0fef4e6ee01ed2509bd54a448d2564a89c518 (diff) | |
| download | gcc-b68561dd7925dfee1836f75d3fa8d33fff5c2498.zip gcc-b68561dd7925dfee1836f75d3fa8d33fff5c2498.tar.gz gcc-b68561dd7925dfee1836f75d3fa8d33fff5c2498.tar.bz2 | |
libstdc++: Fix autoconf check for O_NONBLOCK in <fcntl.h>
I misused the AC_CHECK_DECL macro, assuming that it behaved like
AC_CHECK_DECLS and always defined a HAVE_xxx macro if the decl was
found. Instead, the [action-if-found] shell commands are needed to
defined HAVE_O_NONBLOCK explicitly.
libstdc++-v3/ChangeLog:
* configure.ac: Fix check for O_NONBLOCK.
* config.h.in: Regenerate.
* configure: Regenerate.
| -rw-r--r-- | libstdc++-v3/config.h.in | 3 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 2 | ||||
| -rw-r--r-- | libstdc++-v3/configure.ac | 5 |
3 files changed, 9 insertions, 1 deletions
diff --git a/libstdc++-v3/config.h.in b/libstdc++-v3/config.h.in index 486ba45..91e9200 100644 --- a/libstdc++-v3/config.h.in +++ b/libstdc++-v3/config.h.in @@ -302,6 +302,9 @@ /* Define if openat is available in <fcntl.h>. */ #undef HAVE_OPENAT +/* Define if O_NONBLOCK is defined in <fcntl.h> */ +#undef HAVE_O_NONBLOCK + /* Define if poll is available in <poll.h>. */ #undef HAVE_POLL diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 305675e..005c4a2 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -54132,6 +54132,8 @@ if test "$ac_cv_have_decl_F_GETFL$ac_cv_have_decl_F_SETFL" = yesyes ; then " if test "x$ac_cv_have_decl_O_NONBLOCK" = xyes; then : +$as_echo "#define HAVE_O_NONBLOCK 1" >>confdefs.h + fi fi diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index 4049f54..a3b257f 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac @@ -554,7 +554,10 @@ AC_CHECK_HEADERS([fcntl.h sys/ioctl.h sys/socket.h sys/uio.h poll.h netdb.h arpa AC_CHECK_DECL(F_GETFL,,,[#include <fcntl.h>]) AC_CHECK_DECL(F_SETFL,,,[#include <fcntl.h>]) if test "$ac_cv_have_decl_F_GETFL$ac_cv_have_decl_F_SETFL" = yesyes ; then - AC_CHECK_DECL(O_NONBLOCK,,,[#include <fcntl.h>]) + AC_CHECK_DECL(O_NONBLOCK, + AC_DEFINE(HAVE_O_NONBLOCK,1,[Define if O_NONBLOCK is defined in <fcntl.h>]), + [], + [#include <fcntl.h>]) fi # For Transactional Memory TS |