--- projects/libstatgrab/configure.in	2005/09/24 13:29:21	1.87
+++ projects/libstatgrab/configure.in	2010/02/20 18:15:51	1.100
@@ -2,15 +2,15 @@
 # Process this file with autoconf to produce a configure script.
 #
 # configure.in for libstatgrab
-# $Id: configure.in,v 1.87 2005/09/24 13:29:21 tdb Exp $
+# $Id: configure.in,v 1.100 2010/02/20 18:15:51 tdb Exp $
 #
 
 # Change these to change the package name and version
-AC_INIT(libstatgrab, 0.13, bugs@i-scream.org)
-AM_INIT_AUTOMAKE(libstatgrab, 0.13)
+AC_INIT(libstatgrab, 0.17, bugs@i-scream.org)
+AM_INIT_AUTOMAKE(libstatgrab, 0.17)
 
 # Revision number (automatically updated)
-AC_REVISION($Revision: 1.87 $)
+AC_REVISION($Revision: 1.100 $)
 
 # Might work with older autoconfs... but tested on 2.57
 AC_PREREQ(2.57)
@@ -51,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])
 
@@ -77,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])
@@ -94,17 +102,17 @@ 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*)
 	AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
 	AC_DEFINE(NETBSD, , [Building on NetBSD])
 	;;
-netbsdelf2*)
+netbsdelf[[2-3]]*)
 	AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
 	AC_DEFINE(NETBSD, , [Building on NetBSD])
 	AC_DEFINE(NETBSD2, , [Building on NetBSD 2.x])
@@ -121,7 +129,7 @@ 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"
@@ -149,7 +157,7 @@ AC_ARG_WITH([curses-prefix],
                         SAIDARLIBS="-L${withval}/lib ${SAIDARLIBS}"
                 fi
                 if test -d "$withval/include"; then
-                        SAIDARCPPFLAGS="-I${withval}/include -I${withval}/include/ncurses ${SAIRDARCPPFLAGS}"
+                        SAIDARCPPFLAGS="-I${withval}/include ${SAIRDARCPPFLAGS}"
                 fi
         ]
 )