diff options
| author | Rickard Green <[email protected]> | 2019-01-24 17:52:31 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-01-24 17:52:31 +0100 |
| commit | 49eb25c80514b1e221cc516c423bbc45ba7cc107 (patch) | |
| tree | 0d013d9a82099019e47a20804caa4675ab0b7734 /lib/erl_interface/configure.in | |
| parent | 3d909edaadcc13d42698f815662188ff35eab90a (diff) | |
| parent | 1ff44ec786828c3eeb2114cfeb5dd47e1a7fae61 (diff) | |
| download | otp-49eb25c80514b1e221cc516c423bbc45ba7cc107.tar.gz otp-49eb25c80514b1e221cc516c423bbc45ba7cc107.tar.bz2 otp-49eb25c80514b1e221cc516c423bbc45ba7cc107.zip | |
Merge branch 'maint'
* maint:
Pluggable distribution socket implementation for EI
Diffstat (limited to 'lib/erl_interface/configure.in')
| -rw-r--r-- | lib/erl_interface/configure.in | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/lib/erl_interface/configure.in b/lib/erl_interface/configure.in index 46dd995289..14f06f946f 100644 --- a/lib/erl_interface/configure.in +++ b/lib/erl_interface/configure.in @@ -77,6 +77,15 @@ AC_ARG_ENABLE(threads, esac ], [ threads_disabled=maybe ]) +AC_ARG_ENABLE(mask-real-errno, +[ --disable-mask-real-errno do not mask real 'errno'], +[ case "$enableval" in + no) mask_real_errno=no ;; + *) mask_real_errno=yes ;; + esac ], +[ mask_real_errno=yes ]) + + dnl ---------------------------------------------------------------------- dnl Checks for programs dnl ---------------------------------------------------------------------- @@ -95,6 +104,10 @@ AC_CHECK_SIZEOF(long) AC_CHECK_SIZEOF(void *) AC_CHECK_SIZEOF(long long) +if test $mask_real_errno = yes; then + AC_DEFINE(EI_HIDE_REAL_ERRNO, 1, [Define if 'errno' should not be exposed as is in 'erl_errno']) +fi + dnl We set EI_64BIT mode when long is 8 bytes, this makes things dnl work on windows and unix correctly if test $ac_cv_sizeof_long = 8; then @@ -153,7 +166,7 @@ AC_CHECK_LIB([socket], [getpeername]) # Checks for header files. AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h malloc.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/param.h sys/socket.h sys/select.h sys/time.h unistd.h sys/types.h]) +AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h malloc.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/param.h sys/socket.h sys/select.h sys/time.h unistd.h sys/types.h sys/uio.h]) # Checks for typedefs, structures, and compiler characteristics. # fixme AC_C_CONST & AC_C_VOLATILE needed for Windows? @@ -188,7 +201,7 @@ AC_CHECK_FUNCS([dup2 gethostbyaddr gethostbyname \ gethostbyaddr_r \ gethostbyname_r gethostname writev \ gethrtime gettimeofday inet_ntoa memchr memmove memset select \ - socket strchr strerror strrchr strstr uname]) + socket strchr strerror strrchr strstr uname sysconf]) AC_CHECK_FUNC(res_gethostbyname, [], AC_CHECK_LIB(resolv, res_gethostbyname) ) @@ -250,6 +263,7 @@ AC_SUBST(EI_THREADS) case "$threads_disabled" in no|maybe) LM_CHECK_THR_LIB + ETHR_CHK_GCC_ATOMIC_OPS([]) case "$THR_LIB_NAME" in "") @@ -263,7 +277,7 @@ case "$threads_disabled" in EI_THREADS="true" THR_DEFS="$THR_DEFS -D_WIN32_WINNT=0x0600 -DWINVER=0x0600" ;; - pthread) + pthread) EI_THREADS="true" ;; *) |