--- projects/libstatgrab/configure.in	2006/12/01 14:21:16	1.91
+++ projects/libstatgrab/configure.in	2010/06/09 15:16:41	1.102
@@ -2,16 +2,15 @@
 # Process this file with autoconf to produce a configure script.
 #
 # configure.in for libstatgrab
-# $Id: configure.in,v 1.91 2006/12/01 14:21:16 tdb Exp $
+# $Id: configure.in,v 1.102 2010/06/09 15:16:41 tdb Exp $
 #
 
 # Change these to change the package name and version
-AC_INIT(libstatgrab, 0.14, bugs@i-scream.org)
-AM_INIT_AUTOMAKE(libstatgrab, 0.14)
-AM_MAINTAINER_MODE
+AC_INIT(libstatgrab, 0.18, bugs@i-scream.org)
+AM_INIT_AUTOMAKE(libstatgrab, 0.18)
 
 # Revision number (automatically updated)
-AC_REVISION($Revision: 1.91 $)
+AC_REVISION($Revision: 1.102 $)
 
 # Might work with older autoconfs... but tested on 2.57
 AC_PREREQ(2.57)
@@ -52,6 +51,12 @@ AC_CHECK_MEMBER(struct statvfs.f_fstypename,
                 [],
                 [#include <sys/statvfs.h>])
 
+# FreeBSD 9 (and others) uses utmpx rather than utmp
+AC_CHECK_MEMBER(struct utmpx.ut_type,
+                [AC_DEFINE(HAVE_UTMPX, , [utmpx])],
+                [],
+                [#include <utmpx.h>])
+
 # Check for sys/loadavg.h
 AC_CHECK_HEADERS([sys/loadavg.h])
 
@@ -78,11 +83,13 @@ solaris2.[[6-7]])
 	BIN_PERM="4755"
 	LINKFLAGS="-lkstat -lsocket -lnsl"
 	AC_CHECK_LIB(devinfo, di_init, [LINKFLAGS="$LINKFLAGS -ldevinfo"])
+	AC_CHECK_LIB(m, fabs, [SAIDARLIBS="$SAIDARLIBS -lm"])
 	;;
 solaris2.*)
 	AC_CHECK_HEADERS([kstat.h],,[AC_MSG_ERROR([need kstat.h])])
 	AC_DEFINE(SOLARIS, , [Building on Solaris 2.x])
 	LINKFLAGS="-lkstat -ldevinfo -lsocket -lnsl"
+	AC_CHECK_LIB(m, fabs, [SAIDARLIBS="$SAIDARLIBS -lm"])
 	;;
 hpux11.11*)
 	AC_DEFINE(HPUX, , [Building on HP-UX 11.11])
@@ -95,10 +102,10 @@ freebsd4.*)
 	BIN_PERM="2755"
 	LINKFLAGS="-lkvm -ldevstat"
 	;;
-freebsd[[5-7]].*)
+freebsd[[5-9]].*)
 	AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
 	AC_DEFINE(FREEBSD, , [Building on FreeBSD])
-	AC_DEFINE(FREEBSD5, , [Building on FreeBSD 5.x - 7.x])
+	AC_DEFINE(FREEBSD5, , [Building on FreeBSD 5.x - 9.x])
 	LINKFLAGS="-ldevstat"
 	;;
 netbsdelf1*)
@@ -122,11 +129,17 @@ dragonfly*)
 	BIN_PERM="2755"
 	LINKFLAGS="-lkvm -ldevstat"
 	;;
-linux-gnu)
+linux-gnu*)
 	AC_DEFINE(LINUX, , [Building on GNU/Linux])
 	AM_CONDITIONAL(SETUIDBINS, true)
 	BIN_OWNER="root"
 	BIN_PERM="4755"
+	;;
+kfreebsd*-gnu*)
+	AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
+	AC_DEFINE(FREEBSD, , [Building on FreeBSD])
+	AC_DEFINE(FREEBSD5, , [Building on FreeBSD 5.x - 9.x])
+	LINKFLAGS="-ldevstat"
 	;;
 cygwin)
 	AC_DEFINE(CYGWIN, , [Building on Cygwin])