From: Eric Blake Date: Tue, 24 Aug 2010 13:41:41 +0000 (-0600) Subject: AC_FUNC_GETLOADAVG: don't define SVR4 on cygwin X-Git-Tag: v2.68~56 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a3024065070d715b15d2b10b357e522c0855e3c;p=thirdparty%2Fautoconf.git 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 --- diff --git a/ChangeLog b/ChangeLog index 9b271940..e82f811b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-08-24 Eric Blake + + 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 AC_HEADER_STDBOOL: avoid spurious clang failure diff --git a/THANKS b/THANKS index c79e21e2..748c4e42 100644 --- 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 576de028..d7058c8a 100644 --- a/lib/autoconf/functions.m4 +++ b/lib/autoconf/functions.m4 @@ -672,7 +672,8 @@ AC_CHECK_FUNCS(setlocale) # We cannot check for , because Solaris 2 does not use dwarf (it # uses stabs), but it is still SVR4. We cannot check for 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