--- projects/libstatgrab/configure.in	2004/01/19 17:01:21	1.49
+++ projects/libstatgrab/configure.in	2004/02/12 23:28:20	1.55
@@ -2,15 +2,15 @@
 # Process this file with autoconf to produce a configure script.
 #
 # configure.in for libstatgrab
-# $Id: configure.in,v 1.49 2004/01/19 17:01:21 tdb Exp $
+# $Id: configure.in,v 1.55 2004/02/12 23:28:20 tdb Exp $
 #
 
 # Change these to change the package name and version
-AC_INIT(libstatgrab, 0.8.2, bugs@i-scream.org)
-AM_INIT_AUTOMAKE(libstatgrab, 0.8.2)
+AC_INIT(libstatgrab, 0.9, bugs@i-scream.org)
+AM_INIT_AUTOMAKE(libstatgrab, 0.9)
 
 # Revision number (automatically updated)
-AC_REVISION($Revision: 1.49 $)
+AC_REVISION($Revision: 1.55 $)
 
 # Might work with older autoconfs... but tested on 2.57
 AC_PREREQ(2.57)
@@ -40,6 +40,12 @@ AC_CHECK_MEMBER(struct disk_sysctl.dk_rbytes,
                 [],
                 [#include <sys/disk.h>])
 
+# Check for sys/loadavg.h
+AC_CHECK_HEADERS([sys/loadavg.h])
+
+# Check for libdevinfo.h
+AC_CHECK_HEADERS([libdevinfo.h])
+
 # Default needing setgid/setuid to false
 AM_CONDITIONAL(SETGIDBINS, false)
 AM_CONDITIONAL(SETUIDBINS, false)
@@ -51,9 +57,10 @@ case $host_os in
 solaris2.[[6-7]])
 	AC_CHECK_HEADERS([kstat.h],,[AC_MSG_ERROR([need kstat.h])])
 	AC_DEFINE(SOLARIS, , [Building on Solaris 2.x])
-	AC_DEFINE(SOL7, , [Building on Solaris 2.7])
+	AC_DEFINE(SOL7, , [Building on Solaris 2.6 or 2.7])
 	AM_CONDITIONAL(SETUIDBINS, true)
-	LINKFLAGS="-lkstat -ldevinfo"
+	LINKFLAGS="-lkstat"
+	AC_CHECK_LIB(devinfo, di_init, [LINKFLAGS="$LINKFLAGS -ldevinfo"])
 	;;
 solaris2.*)
 	AC_CHECK_HEADERS([kstat.h],,[AC_MSG_ERROR([need kstat.h])])
@@ -77,6 +84,12 @@ freebsd5.*)
 netbsdelf*)
 	AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
 	AC_DEFINE(NETBSD, , [Building on NetBSD])
+	AM_CONDITIONAL(SETGIDBINS, true)
+	LINKFLAGS="-lkvm"
+	;;
+openbsd*)
+	AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
+	AC_DEFINE(OPENBSD, , [Building on OpenBSD])
 	AM_CONDITIONAL(SETGIDBINS, true)
 	LINKFLAGS="-lkvm"
 	;;