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.55 by tdb, Thu Feb 12 23:28:20 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.9, bugs@i-scream.org)
10 > AM_INIT_AUTOMAKE(libstatgrab, 0.9)
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 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 44 | 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])
73          AC_DEFINE(FREEBSD, , [Building on FreeBSD])
74          AM_CONDITIONAL(SETGIDBINS, true)
75          LINKFLAGS="-lkvm -ldevstat"
76          ;;
77   freebsd5.*)
78 +        AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
79          AC_DEFINE(FREEBSD, , [Building on FreeBSD])
80          AC_DEFINE(FREEBSD5, , [Building on FreeBSD 5.x])
81          AM_CONDITIONAL(SETGIDBINS, true)
82          LINKFLAGS="-lkvm -ldevstat"
83          ;;
84 + netbsdelf*)
85 +        AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
86 +        AC_DEFINE(NETBSD, , [Building on NetBSD])
87 +        AM_CONDITIONAL(SETGIDBINS, true)
88 +        LINKFLAGS="-lkvm"
89 +        ;;
90 + openbsd*)
91 +        AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
92 +        AC_DEFINE(OPENBSD, , [Building on OpenBSD])
93 +        AM_CONDITIONAL(SETGIDBINS, true)
94 +        LINKFLAGS="-lkvm"
95 +        ;;
96   linux-gnu)
97          AC_DEFINE(LINUX, , [Building on GNU/Linux])
98          ;;
99 + cygwin)
100 +        AC_DEFINE(CYGWIN, , [Building on Cygwin])
101 +        ;;
102   *)
103          AC_MSG_ERROR([Cannot build on unknown OS: $host_os])
104          ;;
# Line 134 | Line 167 | AC_ARG_ENABLE(manpages,
167   )
168  
169   # Check if the user wants to turn off setgid binaries
137 # (only really relevant on FreeBSD)
170   AC_ARG_ENABLE(setgid-binaries,
171          [  --disable-setgid-binaries     disable binaries being setgid],
172          [
# Line 144 | Line 176 | AC_ARG_ENABLE(setgid-binaries,
176          ]
177   )
178  
179 < # User specified pkgconfig dir
180 < AC_ARG_WITH([pkgconfig-dir],
181 <        [  --with-pkgconfig-dir=PATH     pkgconfig lib directory (PREFIX/lib/pkgconfig)],
182 <        [ PKGCONFIG_DIR=$withval ],
183 <        [ PKGCONFIG_DIR="\$(libdir)/pkgconfig" ]
179 > # Check if the user wants to turn off setuid binaries
180 > AC_ARG_ENABLE(setuid-binaries,
181 >        [  --disable-setuid-binaries     disable binaries being setuid],
182 >        [
183 >                if test "x$enableval" = "xno" ; then
184 >                        AM_CONDITIONAL(SETUIDBINS, false)
185 >                fi
186 >        ]
187   )
153 AC_SUBST(PKGCONFIG_DIR)
188  
189   # The LIBS and CPPFLAGS that saidar needs
190   AC_SUBST(SAIDARLIBS)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines