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.43 by tdb, Mon Nov 10 21:07:04 2003 UTC vs.
Revision 1.56 by tdb, Sat Feb 14 12:20:02 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, bugs@i-scream.org)
10 > AM_INIT_AUTOMAKE(libstatgrab, 0.9)
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])
60 >        AC_DEFINE(SOL7, , [Building on Solaris 2.6 or 2.7])
61 >        AM_CONDITIONAL(SETUIDBINS, true)
62          LINKFLAGS="-lkstat"
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 >        AM_CONDITIONAL(SETUIDBINS, true)
69 >        LINKFLAGS="-lkstat -ldevinfo"
70          ;;
71   freebsd4.*)
72          AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
# Line 74 | Line 84 | freebsd5.*)
84   netbsdelf*)
85          AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
86          AC_DEFINE(NETBSD, , [Building on NetBSD])
77        AM_CONDITIONAL(SETGIDBINS, true)
78        LINKFLAGS="-lkvm"
87          ;;
88 + openbsd*)
89 +        AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
90 +        AC_DEFINE(OPENBSD, , [Building on OpenBSD])
91 +        ;;
92   linux-gnu)
93          AC_DEFINE(LINUX, , [Building on GNU/Linux])
94          ;;
95   cygwin)
84        AC_DEFINE(LINUX, , [Building on GNU/Linux])
96          AC_DEFINE(CYGWIN, , [Building on Cygwin])
97          ;;
98   *)
# Line 152 | Line 163 | AC_ARG_ENABLE(manpages,
163   )
164  
165   # Check if the user wants to turn off setgid binaries
155 # (only really relevant on FreeBSD)
166   AC_ARG_ENABLE(setgid-binaries,
167          [  --disable-setgid-binaries     disable binaries being setgid],
168          [
169                  if test "x$enableval" = "xno" ; then
170                          AM_CONDITIONAL(SETGIDBINS, false)
171 +                fi
172 +        ]
173 + )
174 +
175 + # Check if the user wants to turn off setuid binaries
176 + AC_ARG_ENABLE(setuid-binaries,
177 +        [  --disable-setuid-binaries     disable binaries being setuid],
178 +        [
179 +                if test "x$enableval" = "xno" ; then
180 +                        AM_CONDITIONAL(SETUIDBINS, false)
181                  fi
182          ]
183   )

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines