AC_FUNC_GETLOADAVG: don't define SVR4 on cygwin

* lib/autoconf/functions.m4 (_AC_LIBOBJ_GETLOADAVG): Only define
SVR4 when -lkvm is required.
* THANKS: Update.
Reported by Yaakov Selkowitz.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 9b271940df23fe85dbc488a3d8d8ef8f6604b4d0..e82f811bb5cb6871455be4539ed75ea5892eafb8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-24  Eric Blake  <eblake@redhat.com>
+
+       AC_FUNC_GETLOADAVG: don't define SVR4 on cygwin
+       * lib/autoconf/functions.m4 (_AC_LIBOBJ_GETLOADAVG): Only define
+       SVR4 when -lkvm is required.
+       * THANKS: Update.
+       Reported by Yaakov Selkowitz.
+
 2010-08-23  Eric Blake  <eblake@redhat.com>
 
        AC_HEADER_STDBOOL: avoid spurious clang failure

diff --git a/THANKS b/THANKS
index c79e21e2aa515b28a0c6d9079648f02bff6644b6..748c4e428f56f3b786815984e1cd664dd41392e4 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -410,6 +410,7 @@ Werner Lemberg              wl@gnu.org
 Wilfredo Sanchez            wsanchez@apple.com
 William Pursell             bill.pursell@gmail.com
 Wolfgang Mueller            Wolfgang.Mueller@cui.unige.ch
+Yaakov Selkowitz            yselkowitz@users.sourceforge.net
 Yavor Doganov               yavor@gnu.org
 Yury Puhalsky               pooh@cryptopro.ru
 Zack Weinberg               zack@codesourcery.com

diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index 576de0285ae10cfc7a9fbff50181aa98a93c9af5..d7058c8a1971bf098ec9b5dbeda3ac7412fa61d3 100644 (file)
--- a/lib/autoconf/functions.m4
+++ b/lib/autoconf/functions.m4
@@ -672,7 +672,8 @@ AC_CHECK_FUNCS(setlocale)
 # We cannot check for <dwarf.h>, because Solaris 2 does not use dwarf (it
 # uses stabs), but it is still SVR4.  We cannot check for <elf.h> because
 # Irix 4.0.5F has the header but not the library.
-if test $ac_have_func = no && test "$ac_cv_lib_elf_elf_begin" = yes; then
+if test $ac_have_func = no && test "$ac_cv_lib_elf_elf_begin" = yes \
+    && test "$ac_cv_lib_kvm_kvm_open" = yes; then
   ac_have_func=yes
   AC_DEFINE(SVR4, 1, [Define to 1 on System V Release 4.])
 fi