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.69 by tdb, Sun Jun 20 17:00:25 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.10.1, bugs@i-scream.org)
10 > AM_INIT_AUTOMAKE(libstatgrab, 0.10.1)
11  
12   # Revision number (automatically updated)
13   AC_REVISION($Revision$)
# Line 36 | Line 36 | AC_CHECK_FUNCS(atoll)
36  
37   # Disk IO read and write statistics are only present on recent NetBSD.
38   AC_CHECK_MEMBER(struct disk_sysctl.dk_rbytes,
39 <                [AC_DEFINE(HAVE_DK_RBYTES, , [New-style NetBSD stats])],
39 >                [AC_DEFINE(HAVE_DK_RBYTES, , [New-style NetBSD disk stats])],
40                  [],
41                  [#include <sys/disk.h>])
42  
43 < # Default needing setgid to false
43 > # Disk IO read and write statistics are only present on recent OpenBSD.
44 > AC_CHECK_MEMBER(struct diskstats.ds_rbytes,
45 >                [AC_DEFINE(HAVE_DS_RBYTES, , [New-style OpenBSD disk stats])],
46 >                [],
47 >                [#include <sys/disk.h>])
48 >
49 > # Check for sys/loadavg.h
50 > AC_CHECK_HEADERS([sys/loadavg.h])
51 >
52 > # Check for libdevinfo.h
53 > AC_CHECK_HEADERS([libdevinfo.h])
54 >
55 > # Default needing setgid/setuid to false
56   AM_CONDITIONAL(SETGIDBINS, false)
57 + AM_CONDITIONAL(SETUIDBINS, false)
58  
59   # Set things up for different OS's
60   # We define the name of the OS so the code can act accordingly
# Line 50 | Line 63 | case $host_os in
63   solaris2.[[6-7]])
64          AC_CHECK_HEADERS([kstat.h],,[AC_MSG_ERROR([need kstat.h])])
65          AC_DEFINE(SOLARIS, , [Building on Solaris 2.x])
66 <        AC_DEFINE(SOL7, , [Building on Solaris 2.7])
67 <        LINKFLAGS="-lkstat"
66 >        AC_DEFINE(SOL7, , [Building on Solaris 2.6 or 2.7])
67 >        AM_CONDITIONAL(SETUIDBINS, true)
68 >        LINKFLAGS="-lkstat -lsocket -lnsl"
69 >        AC_CHECK_LIB(devinfo, di_init, [LINKFLAGS="$LINKFLAGS -ldevinfo"])
70          ;;
71   solaris2.*)
72          AC_CHECK_HEADERS([kstat.h],,[AC_MSG_ERROR([need kstat.h])])
73          AC_DEFINE(SOLARIS, , [Building on Solaris 2.x])
74 <        LINKFLAGS="-lkstat"
74 >        LINKFLAGS="-lkstat -ldevinfo -lsocket -lnsl"
75          ;;
76   freebsd4.*)
77          AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
# Line 68 | Line 83 | freebsd5.*)
83          AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
84          AC_DEFINE(FREEBSD, , [Building on FreeBSD])
85          AC_DEFINE(FREEBSD5, , [Building on FreeBSD 5.x])
86 <        AM_CONDITIONAL(SETGIDBINS, true)
72 <        LINKFLAGS="-lkvm -ldevstat"
86 >        LINKFLAGS="-ldevstat"
87          ;;
88 < netbsdelf*)
88 > netbsdelf1*)
89          AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
90          AC_DEFINE(NETBSD, , [Building on NetBSD])
91 +        ;;
92 + netbsdelf2*)
93 +        AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
94 +        AC_DEFINE(NETBSD, , [Building on NetBSD])
95 +        AC_DEFINE(NETBSD2, , [Building on NetBSD 2.x])
96 +        ;;
97 + openbsd*)
98 +        AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
99 +        AC_DEFINE(OPENBSD, , [Building on OpenBSD])
100 +        ;;
101 + dragonfly*)
102 +        AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
103 +        AC_DEFINE(DFBSD, , [Building on DragonFlyBSD])
104          AM_CONDITIONAL(SETGIDBINS, true)
105 <        LINKFLAGS="-lkvm"
105 >        LINKFLAGS="-lkvm -ldevstat"
106          ;;
107   linux-gnu)
108          AC_DEFINE(LINUX, , [Building on GNU/Linux])
109 +        AM_CONDITIONAL(SETUIDBINS, true)
110          ;;
111   cygwin)
84        AC_DEFINE(LINUX, , [Building on GNU/Linux])
112          AC_DEFINE(CYGWIN, , [Building on Cygwin])
113          ;;
114   *)
# Line 152 | Line 179 | AC_ARG_ENABLE(manpages,
179   )
180  
181   # Check if the user wants to turn off setgid binaries
155 # (only really relevant on FreeBSD)
182   AC_ARG_ENABLE(setgid-binaries,
183          [  --disable-setgid-binaries     disable binaries being setgid],
184          [
# Line 160 | Line 186 | AC_ARG_ENABLE(setgid-binaries,
186                          AM_CONDITIONAL(SETGIDBINS, false)
187                  fi
188          ]
189 + )
190 +
191 + # Check if the user wants to turn off setuid binaries
192 + AC_ARG_ENABLE(setuid-binaries,
193 +        [  --disable-setuid-binaries     disable binaries being setuid],
194 +        [
195 +                if test "x$enableval" = "xno" ; then
196 +                        AM_CONDITIONAL(SETUIDBINS, false)
197 +                fi
198 +        ]
199 + )
200 +
201 + # Check if the user would prefer not to include compatibility code
202 + AM_CONDITIONAL(DEPRECATED, true)
203 + AC_ARG_ENABLE(deprecated,
204 +        [  --disable-deprecated    disable inclusion of pre-0.10 compatibility code],
205 +        [
206 +                if test "x$enableval" = "xno" ; then
207 +                        AM_CONDITIONAL(DEPRECATED, false)
208 +                fi
209 +        ]
210   )
211  
212   # The LIBS and CPPFLAGS that saidar needs

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines