--- projects/libstatgrab/configure.in	2003/11/10 21:07:04	1.43
+++ projects/libstatgrab/configure.in	2004/01/06 17:02:48	1.48
@@ -2,15 +2,15 @@
 # Process this file with autoconf to produce a configure script.
 #
 # configure.in for libstatgrab
-# $Id: configure.in,v 1.43 2003/11/10 21:07:04 tdb Exp $
+# $Id: configure.in,v 1.48 2004/01/06 17:02:48 tdb Exp $
 #
 
 # Change these to change the package name and version
-AC_INIT(libstatgrab, 0.7.1, bugs@i-scream.org)
-AM_INIT_AUTOMAKE(libstatgrab, 0.7.1)
+AC_INIT(libstatgrab, 0.8.1, bugs@i-scream.org)
+AM_INIT_AUTOMAKE(libstatgrab, 0.8.1)
 
 # Revision number (automatically updated)
-AC_REVISION($Revision: 1.43 $)
+AC_REVISION($Revision: 1.48 $)
 
 # Might work with older autoconfs... but tested on 2.57
 AC_PREREQ(2.57)
@@ -40,8 +40,9 @@ AC_CHECK_MEMBER(struct disk_sysctl.dk_rbytes,
                 [],
                 [#include <sys/disk.h>])
 
-# Default needing setgid to false
+# Default needing setgid/setuid to false
 AM_CONDITIONAL(SETGIDBINS, false)
+AM_CONDITIONAL(SETUIDBINS, false)
 
 # Set things up for different OS's
 # We define the name of the OS so the code can act accordingly
@@ -51,12 +52,14 @@ 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])
-	LINKFLAGS="-lkstat"
+	AM_CONDITIONAL(SETUIDBINS, true)
+	LINKFLAGS="-lkstat -ldevinfo"
 	;;
 solaris2.*)
 	AC_CHECK_HEADERS([kstat.h],,[AC_MSG_ERROR([need kstat.h])])
 	AC_DEFINE(SOLARIS, , [Building on Solaris 2.x])
-	LINKFLAGS="-lkstat"
+	AM_CONDITIONAL(SETUIDBINS, true)
+	LINKFLAGS="-lkstat -ldevinfo"
 	;;
 freebsd4.*)
 	AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
@@ -81,7 +84,6 @@ linux-gnu)
 	AC_DEFINE(LINUX, , [Building on GNU/Linux])
 	;;
 cygwin)
-	AC_DEFINE(LINUX, , [Building on GNU/Linux])
 	AC_DEFINE(CYGWIN, , [Building on Cygwin])
 	;;
 *)
@@ -152,12 +154,21 @@ AC_ARG_ENABLE(manpages,
 )
 
 # Check if the user wants to turn off setgid binaries
-# (only really relevant on FreeBSD)
 AC_ARG_ENABLE(setgid-binaries,
 	[  --disable-setgid-binaries     disable binaries being setgid],
 	[
 		if test "x$enableval" = "xno" ; then
 			AM_CONDITIONAL(SETGIDBINS, false)
+		fi
+	]
+)
+
+# Check if the user wants to turn off setuid binaries
+AC_ARG_ENABLE(setuid-binaries,
+	[  --disable-setuid-binaries     disable binaries being setuid],
+	[
+		if test "x$enableval" = "xno" ; then
+			AM_CONDITIONAL(SETUIDBINS, false)
 		fi
 	]
 )