Corrected inclusion of `sys/swap.h'.

Define `HAVE_LIBKSTAT' again if it's present..

diff --git a/configure.in b/configure.in
index e6cb528c18338d27ab955587b531758e5c421f13..db5a4ceb7263fa14203c3bd52eb8ce9ab902d338 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -181,6 +181,9 @@ AC_CHECK_HEADERS(IOKit/storage/IOBlockStorageDriver.h)
 # For load module
 AC_CHECK_HEADERS(sys/loadavg.h)
 
+# For the swap module
+AC_CHECK_HEADERS(sys/swap.h)
+
 # For users module
 AC_CHECK_HEADERS(utmp.h)
 AC_CHECK_HEADERS(utmpx.h)
@@ -483,11 +486,11 @@ fi
 
 if test "x$with_kstat" = "xyes"
 then
-       AC_CHECK_LIB(kstat, kstat_open, [with_kstat="yes"], [with_kstat="no (libkstat not found)"])
+       AC_CHECK_LIB(kstat, kstat_open,, [with_kstat="no (libkstat not found)"])
 fi
 if test "x$with_kstat" = "xyes"
 then
-       AC_CHECK_LIB(devinfo, di_init, [with_devinfo="yes"], [with_devinfo="no (not found)"])
+       AC_CHECK_LIB(devinfo, di_init,, [with_devinfo="no (not found)"])
        AC_CHECK_HEADERS(kstat.h,, [with_kstat="no (kstat.h not found)"])
 fi
 if test "x$with_kstat" = "xyes"

diff --git a/src/swap.c b/src/swap.c
index 5812b59c6f626465ec9ab38a017336baf26d403b..089150329bc3e59704e21e33b5344375b92cddb3 100644 (file)
--- a/src/swap.c
+++ b/src/swap.c
@@ -32,9 +32,9 @@
 # define SWAP_HAVE_READ 0
 #endif
 
-#ifdef KERNEL_SOLARIS
-#include <sys/swap.h>
-#endif /* KERNEL_SOLARIS */
+#if HAVE_SYS_SWAP_H
+# include <sys/swap.h>
+#endif
 
 #undef  MAX
 #define MAX(x,y) ((x) > (y) ? (x) : (y))