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.66 by tdb, Tue Apr 6 13:40:41 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])
80 <        AM_CONDITIONAL(SETGIDBINS, true)
72 <        LINKFLAGS="-lkvm -ldevstat"
80 >        LINKFLAGS="-ldevstat"
81          ;;
82 < netbsdelf1.*)
82 > netbsdelf1*)
83          AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
84          AC_DEFINE(NETBSD, , [Building on NetBSD])
85 +        ;;
86 + netbsdelf2*)
87 +        AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
88 +        AC_DEFINE(NETBSD, , [Building on NetBSD])
89 +        AC_DEFINE(NETBSD2, , [Building on NetBSD 2.x])
90 +        ;;
91 + openbsd*)
92 +        AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
93 +        AC_DEFINE(OPENBSD, , [Building on OpenBSD])
94 +        ;;
95 + dragonfly*)
96 +        AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
97 +        AC_DEFINE(DFBSD, , [Building on DragonFlyBSD])
98          AM_CONDITIONAL(SETGIDBINS, true)
99 <        LINKFLAGS="-lkvm"
99 >        LINKFLAGS="-lkvm -ldevstat"
100          ;;
101   linux-gnu)
102          AC_DEFINE(LINUX, , [Building on GNU/Linux])
103 +        AM_CONDITIONAL(SETUIDBINS, true)
104          ;;
105 + cygwin)
106 +        AC_DEFINE(CYGWIN, , [Building on Cygwin])
107 +        ;;
108   *)
109          AC_MSG_ERROR([Cannot build on unknown OS: $host_os])
110          ;;
# Line 148 | Line 173 | AC_ARG_ENABLE(manpages,
173   )
174  
175   # Check if the user wants to turn off setgid binaries
151 # (only really relevant on FreeBSD)
176   AC_ARG_ENABLE(setgid-binaries,
177          [  --disable-setgid-binaries     disable binaries being setgid],
178          [
179                  if test "x$enableval" = "xno" ; then
180                          AM_CONDITIONAL(SETGIDBINS, false)
181 +                fi
182 +        ]
183 + )
184 +
185 + # Check if the user wants to turn off setuid binaries
186 + AC_ARG_ENABLE(setuid-binaries,
187 +        [  --disable-setuid-binaries     disable binaries being setuid],
188 +        [
189 +                if test "x$enableval" = "xno" ; then
190 +                        AM_CONDITIONAL(SETUIDBINS, false)
191                  fi
192          ]
193   )

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines