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.35 by tdb, Thu Oct 9 10:37:41 2003 UTC vs.
Revision 1.50 by tdb, Tue Feb 10 12:14:38 2004 UTC

# Line 6 | Line 6
6   #
7  
8   # Change these to change the package name and version
9 < AC_INIT(libstatgrab, 0.6, bugs@i-scream.org)
10 < AM_INIT_AUTOMAKE(libstatgrab, 0.6)
9 > AC_INIT(libstatgrab, 0.8.2, bugs@i-scream.org)
10 > AM_INIT_AUTOMAKE(libstatgrab, 0.8.2)
11  
12   # Revision number (automatically updated)
13   AC_REVISION($Revision$)
# Line 34 | Line 34 | AC_FUNC_MALLOC
34   AC_FUNC_REALLOC
35   AC_CHECK_FUNCS(atoll)
36  
37 < # Default needing setgid to false
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])],
40 >                [],
41 >                [#include <sys/disk.h>])
42 >
43 > # Check for loadavg.h
44 > AC_CHECK_HEADERS([sys/loadavg.h])
45 >
46 > # Default needing setgid/setuid to false
47   AM_CONDITIONAL(SETGIDBINS, false)
48 + AM_CONDITIONAL(SETUIDBINS, false)
49  
50   # Set things up for different OS's
51   # We define the name of the OS so the code can act accordingly
# Line 45 | Line 55 | solaris2.[[6-7]])
55          AC_CHECK_HEADERS([kstat.h],,[AC_MSG_ERROR([need kstat.h])])
56          AC_DEFINE(SOLARIS, , [Building on Solaris 2.x])
57          AC_DEFINE(SOL7, , [Building on Solaris 2.7])
58 <        LINKFLAGS="-lkstat"
58 >        AM_CONDITIONAL(SETUIDBINS, true)
59 >        LINKFLAGS="-lkstat -ldevinfo"
60          ;;
61   solaris2.*)
62          AC_CHECK_HEADERS([kstat.h],,[AC_MSG_ERROR([need kstat.h])])
63          AC_DEFINE(SOLARIS, , [Building on Solaris 2.x])
64 <        LINKFLAGS="-lkstat"
64 >        AM_CONDITIONAL(SETUIDBINS, true)
65 >        LINKFLAGS="-lkstat -ldevinfo"
66          ;;
67   freebsd4.*)
68 +        AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
69          AC_DEFINE(FREEBSD, , [Building on FreeBSD])
70          AM_CONDITIONAL(SETGIDBINS, true)
71          LINKFLAGS="-lkvm -ldevstat"
72          ;;
73   freebsd5.*)
74 +        AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
75          AC_DEFINE(FREEBSD, , [Building on FreeBSD])
76          AC_DEFINE(FREEBSD5, , [Building on FreeBSD 5.x])
77          AM_CONDITIONAL(SETGIDBINS, true)
78          LINKFLAGS="-lkvm -ldevstat"
79          ;;
80 + netbsdelf*)
81 +        AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
82 +        AC_DEFINE(NETBSD, , [Building on NetBSD])
83 +        AM_CONDITIONAL(SETGIDBINS, true)
84 +        LINKFLAGS="-lkvm"
85 +        ;;
86   linux-gnu)
87          AC_DEFINE(LINUX, , [Building on GNU/Linux])
88          ;;
89 + cygwin)
90 +        AC_DEFINE(CYGWIN, , [Building on Cygwin])
91 +        ;;
92   *)
93          AC_MSG_ERROR([Cannot build on unknown OS: $host_os])
94          ;;
# Line 134 | Line 157 | AC_ARG_ENABLE(manpages,
157   )
158  
159   # Check if the user wants to turn off setgid binaries
137 # (only really relevant on FreeBSD)
160   AC_ARG_ENABLE(setgid-binaries,
161          [  --disable-setgid-binaries     disable binaries being setgid],
162          [
# Line 144 | Line 166 | AC_ARG_ENABLE(setgid-binaries,
166          ]
167   )
168  
169 < # User specified pkgconfig dir
170 < AC_ARG_WITH([pkgconfig-dir],
171 <        [  --with-pkgconfig-dir=PATH     pkgconfig lib directory (PREFIX/lib/pkgconfig)],
172 <        [ PKGCONFIG_DIR=$withval ],
173 <        [ PKGCONFIG_DIR="\$(libdir)/pkgconfig" ]
169 > # Check if the user wants to turn off setuid binaries
170 > AC_ARG_ENABLE(setuid-binaries,
171 >        [  --disable-setuid-binaries     disable binaries being setuid],
172 >        [
173 >                if test "x$enableval" = "xno" ; then
174 >                        AM_CONDITIONAL(SETUIDBINS, false)
175 >                fi
176 >        ]
177   )
153 AC_SUBST(PKGCONFIG_DIR)
178  
179   # The LIBS and CPPFLAGS that saidar needs
180   AC_SUBST(SAIDARLIBS)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines