diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-05-11 10:35:05 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-05-11 10:35:05 +0200 |
| commit | 5e27065ab2d3f12f84b07fd547d4cc44de410954 (patch) | |
| tree | a6a77b5061f589e7f770dbb527f9bfcbc4c7bbb4 /erts/configure.in | |
| parent | 56e271a7d63dbc76962c875e34fe3584e9110675 (diff) | |
| parent | 428492feee831f610a7651fd98c9f4d75e34e726 (diff) | |
| download | otp-5e27065ab2d3f12f84b07fd547d4cc44de410954.tar.gz otp-5e27065ab2d3f12f84b07fd547d4cc44de410954.tar.bz2 otp-5e27065ab2d3f12f84b07fd547d4cc44de410954.zip | |
Merge branch 'aw/native-cpu_sup/OTP-12730'
* aw/native-cpu_sup/OTP-12730:
erts: Fix configure.in
os_mon: rename send() to sendi() in cpu_sup.c
os_mon: cpu_sup should use native sysctl/libkvm calls on BSD
Diffstat (limited to 'erts/configure.in')
| -rw-r--r-- | erts/configure.in | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/erts/configure.in b/erts/configure.in index 4c0d981df1..8a9bf30433 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -4687,18 +4687,30 @@ AC_SUBST(os_mon_programs) AC_SUBST(CPU_SUP_LIBS) AC_CHECK_LIB(kstat, kstat_open, [ - os_mon_programs="$os_mon_programs cpu_sup" + use_cpu_sup=yes CPU_SUP_LIBS="$CPU_SUP_LIBS -lkstat" ]) +AC_CHECK_LIB(kvm, kvm_open, [ + use_cpu_sup=yes + CPU_SUP_LIBS="$CPU_SUP_LIBS -lkvm" + ]) + case $host_os in solaris2*) os_mon_programs="$os_mon_programs ferrule mod_syslog" ;; + darwin*) + use_cpu_sup=yes ;; + openbsd*) + use_cpu_sup=yes ;; linux*) - os_mon_programs="$os_mon_programs cpu_sup" ;; + use_cpu_sup=yes ;; esac - +if test "$use_cpu_sup" = "yes"; then + os_mon_programs="$os_mon_programs cpu_sup" +fi + AC_ARG_WITH(javac, AS_HELP_STRING([--with-javac=JAVAC], [specify Java compiler to use]) AS_HELP_STRING([--with-javac], [use a Java compiler if found (default)]) |