diff options
author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-02 00:52:47 +0000 |
---|---|---|
committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-02 00:52:47 +0000 |
commit | 486a658daa3ca8226610cbc679e96ff75a762912 (patch) | |
tree | e56b714b4fa5fc8c813f106e97160f6cccea38d2 | |
parent | 6263563e1af7c952fe90ee2f3830afe7111330ec (diff) | |
download | classpath-486a658daa3ca8226610cbc679e96ff75a762912.tar.gz |
Backport loadavg patch from main branch.
2008-02-27 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac:
Check for sys/loadavg.h.
* native/jni/java-lang/gnu_java_lang_management_VMOperatingSystemMXBeanImpl.c:
Include sys/loadavg.h if found.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | configure.ac | 4 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2008-02-27 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * configure.ac: + Check for sys/loadavg.h. + * native/jni/java-lang/gnu_java_lang_management_VMOperatingSystemMXBeanImpl.c: + Include sys/loadavg.h if found. + 2008-06-02 Andrew John Hughes <gnu_andrew@member.fsf.org> * include/Makefile.am: Don't delete headers diff --git a/configure.ac b/configure.ac index ccae37adc..34f0757b9 100644 --- a/configure.ac +++ b/configure.ac @@ -373,6 +373,7 @@ if test "x${COMPILE_JNI}" = xyes; then dnl BSD_COMP is defined; just including sys/filio.h is simpler. dnl Check for crt_externs.h on Darwin. dnl Check for netinet/in_systm.h, netinet/ip.h and net/if.h for Windows CE. + dnl Check for sys/loadavg.h for getloadavg() on Solaris 9. AC_CHECK_HEADERS([unistd.h sys/types.h sys/config.h sys/ioctl.h \ asm/ioctls.h \ inttypes.h stdint.h utime.h sys/utime.h sys/filio.h \ @@ -384,7 +385,8 @@ if test "x${COMPILE_JNI}" = xyes; then magic.h \ sys/event.h sys/epoll.h \ ifaddrs.h \ - netinet/in_systm.h netinet/ip.h net/if.h]) + netinet/in_systm.h netinet/ip.h net/if.h \ + sys/loadavg.h]) AC_EGREP_HEADER(uint32_t, stdint.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, [Define to 1 if you have uint32_t])) AC_EGREP_HEADER(uint32_t, inttypes.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, [Define to 1 if you have uint32_t])) |