aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2015-05-05 16:40:41 +0200
committerBjörn-Egil Dahlberg <[email protected]>2015-05-05 17:10:16 +0200
commit428492feee831f610a7651fd98c9f4d75e34e726 (patch)
tree6872a4eda1c95edc5fa0d3f812176b68d637fd90
parenta13e075a25d27e690e68f9205e9d546559f3a294 (diff)
downloadotp-428492feee831f610a7651fd98c9f4d75e34e726.tar.gz
otp-428492feee831f610a7651fd98c9f4d75e34e726.tar.bz2
otp-428492feee831f610a7651fd98c9f4d75e34e726.zip
erts: Fix configure.in
Don't repeat cpu_sup in os_mon_programs - some OS gets confused, i.e. illumos.
-rw-r--r--erts/configure.in15
1 files changed, 9 insertions, 6 deletions
diff --git a/erts/configure.in b/erts/configure.in
index c41a5bec5a..e6ba48f169 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -4701,12 +4701,12 @@ 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, [
- os_mon_programs="$os_mon_programs cpu_sup"
+ use_cpu_sup=yes
CPU_SUP_LIBS="$CPU_SUP_LIBS -lkvm"
])
@@ -4714,14 +4714,17 @@ case $host_os in
solaris2*)
os_mon_programs="$os_mon_programs ferrule mod_syslog" ;;
darwin*)
- os_mon_programs="$os_mon_programs cpu_sup" ;;
+ use_cpu_sup=yes ;;
openbsd*)
- os_mon_programs="$os_mon_programs cpu_sup" ;;
+ 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)])