diff options
| author | Micael Karlberg <[email protected]> | 2011-04-12 13:31:22 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-04-12 13:31:22 +0200 |
| commit | 7263707193d974050f485bd034e91ce4c3c7cb8f (patch) | |
| tree | 42ae12b4c3234d1428fc09a4195546bf6237fa3c /erts/configure.in | |
| parent | 057911fd21db849ff4f6a9fa28674002945f725f (diff) | |
| parent | 47fc3df88eada4b07d8805dbc7fd418f6fac1c11 (diff) | |
| download | otp-7263707193d974050f485bd034e91ce4c3c7cb8f.tar.gz otp-7263707193d974050f485bd034e91ce4c3c7cb8f.tar.bz2 otp-7263707193d974050f485bd034e91ce4c3c7cb8f.zip | |
Merge branch 'dev' into bmk/snmp/manager/request_override_options
Diffstat (limited to 'erts/configure.in')
| -rw-r--r-- | erts/configure.in | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/erts/configure.in b/erts/configure.in index a4c3ffb5c4..31d1d55b8a 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -1793,7 +1793,7 @@ AC_CHECK_FUNCS([getipnodebyname getipnodebyaddr gethostbyname2]) AC_CHECK_FUNCS([ieee_handler fpsetmask finite isnan isinf res_gethostbyname dlopen \ pread pwrite writev memmove strerror strerror_r strncasecmp \ - gethrtime localtime_r gmtime_r mmap mremap memcpy mallopt \ + gethrtime localtime_r gmtime_r inet_pton mmap mremap memcpy mallopt \ sbrk _sbrk __sbrk brk _brk __brk \ flockfile fstat strlcpy strlcat setsid posix2time setlocale nl_langinfo poll]) @@ -2399,9 +2399,15 @@ if test "$cross_compiling" != "yes" && test X${enable_hipe} != Xno; then if test -z "$M4"; then enable_hipe=no AC_MSG_NOTICE([HiPE disabled as no valid m4 is found in PATH]) + elif test "$enable_halfword_emulator" = "yes"; then + if test X${enable_hipe} = Xyes; then + AC_MSG_ERROR([HiPE can not be combined with halfword emulator (yet)]) + else + AC_MSG_NOTICE([HiPE auto-disabled on halfword emulator]) + fi else case "$ARCH-$OPSYS" in - x86-linux|amd64-linux|x86-darwin*|amd64-darwin*|ppc-linux|ppc-darwin|arm-linux|amd64-freebsd|x86-freebsd|x86-sol2|amd64-sol2|ultrasparc-linux) + x86-linux|amd64-linux|x86-darwin*|amd64-darwin*|ppc-linux|ppc64-linux|ppc-darwin|arm-linux|amd64-freebsd|x86-freebsd|x86-sol2|amd64-sol2|ultrasparc-linux) enable_hipe=yes ;; esac |