ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/libstatgrab/configure.in
(Generate patch)

Comparing projects/libstatgrab/configure.in (file contents):
Revision 1.41 by tdb, Wed Oct 22 14:41:35 2003 UTC vs.
Revision 1.64 by tdb, Sun Apr 4 11:28:45 2004 UTC

# Line 6 | Line 6
6   #
7  
8   # Change these to change the package name and version
9 < AC_INIT(libstatgrab, 0.7.1, bugs@i-scream.org)
10 < AM_INIT_AUTOMAKE(libstatgrab, 0.7.1)
9 > AC_INIT(libstatgrab, 0.9.1, bugs@i-scream.org)
10 > AM_INIT_AUTOMAKE(libstatgrab, 0.9.1)
11  
12   # Revision number (automatically updated)
13   AC_REVISION($Revision$)
# Line 40 | Line 40 | AC_CHECK_MEMBER(struct disk_sysctl.dk_rbytes,
40                  [],
41                  [#include <sys/disk.h>])
42  
43 < # Default needing setgid to false
43 > # Check for sys/loadavg.h
44 > AC_CHECK_HEADERS([sys/loadavg.h])
45 >
46 > # Check for libdevinfo.h
47 > AC_CHECK_HEADERS([libdevinfo.h])
48 >
49 > # Default needing setgid/setuid to false
50   AM_CONDITIONAL(SETGIDBINS, false)
51 + AM_CONDITIONAL(SETUIDBINS, false)
52  
53   # Set things up for different OS's
54   # We define the name of the OS so the code can act accordingly
# Line 50 | Line 57 | case $host_os in
57   solaris2.[[6-7]])
58          AC_CHECK_HEADERS([kstat.h],,[AC_MSG_ERROR([need kstat.h])])
59          AC_DEFINE(SOLARIS, , [Building on Solaris 2.x])
60 <        AC_DEFINE(SOL7, , [Building on Solaris 2.7])
61 <        LINKFLAGS="-lkstat"
60 >        AC_DEFINE(SOL7, , [Building on Solaris 2.6 or 2.7])
61 >        AM_CONDITIONAL(SETUIDBINS, true)
62 >        LINKFLAGS="-lkstat -lsocket -lnsl"
63 >        AC_CHECK_LIB(devinfo, di_init, [LINKFLAGS="$LINKFLAGS -ldevinfo"])
64          ;;
65   solaris2.*)
66          AC_CHECK_HEADERS([kstat.h],,[AC_MSG_ERROR([need kstat.h])])
67          AC_DEFINE(SOLARIS, , [Building on Solaris 2.x])
68 <        LINKFLAGS="-lkstat"
68 >        LINKFLAGS="-lkstat -ldevinfo -lsocket -lnsl"
69          ;;
70   freebsd4.*)
71          AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
# Line 68 | Line 77 | freebsd5.*)
77          AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
78          AC_DEFINE(FREEBSD, , [Building on FreeBSD])
79          AC_DEFINE(FREEBSD5, , [Building on FreeBSD 5.x])
71        AM_CONDITIONAL(SETGIDBINS, true)
80          LINKFLAGS="-lkvm -ldevstat"
81          ;;
82 < netbsdelf1.*)
82 > netbsdelf*)
83          AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
84          AC_DEFINE(NETBSD, , [Building on NetBSD])
77        AM_CONDITIONAL(SETGIDBINS, true)
85          LINKFLAGS="-lkvm"
86          ;;
87 + openbsd*)
88 +        AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
89 +        AC_DEFINE(OPENBSD, , [Building on OpenBSD])
90 +        LINKFLAGS="-lkvm"
91 +        ;;
92 + dragonfly*)
93 +        AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
94 +        AC_DEFINE(DFBSD, , [Building on DragonFlyBSD])
95 +        AM_CONDITIONAL(SETGIDBINS, true)
96 +        LINKFLAGS="-lkvm -ldevstat"
97 +        ;;
98   linux-gnu)
99          AC_DEFINE(LINUX, , [Building on GNU/Linux])
100 +        AM_CONDITIONAL(SETUIDBINS, true)
101          ;;
102 + cygwin)
103 +        AC_DEFINE(CYGWIN, , [Building on Cygwin])
104 +        ;;
105   *)
106          AC_MSG_ERROR([Cannot build on unknown OS: $host_os])
107          ;;
# Line 148 | Line 170 | AC_ARG_ENABLE(manpages,
170   )
171  
172   # Check if the user wants to turn off setgid binaries
151 # (only really relevant on FreeBSD)
173   AC_ARG_ENABLE(setgid-binaries,
174          [  --disable-setgid-binaries     disable binaries being setgid],
175          [
176                  if test "x$enableval" = "xno" ; then
177                          AM_CONDITIONAL(SETGIDBINS, false)
178 +                fi
179 +        ]
180 + )
181 +
182 + # Check if the user wants to turn off setuid binaries
183 + AC_ARG_ENABLE(setuid-binaries,
184 +        [  --disable-setuid-binaries     disable binaries being setuid],
185 +        [
186 +                if test "x$enableval" = "xno" ; then
187 +                        AM_CONDITIONAL(SETUIDBINS, false)
188                  fi
189          ]
190   )

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines