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.36 by tdb, Thu Oct 9 22:56:41 2003 UTC vs.
Revision 1.59 by tdb, Sat Feb 14 19:21:36 2004 UTC

# Line 6 | Line 6
6   #
7  
8   # Change these to change the package name and version
9 < AC_INIT(libstatgrab, 0.6.1, bugs@i-scream.org)
10 < AM_INIT_AUTOMAKE(libstatgrab, 0.6.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 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])
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])
72          AC_DEFINE(FREEBSD, , [Building on FreeBSD])
73          AM_CONDITIONAL(SETGIDBINS, true)
74          LINKFLAGS="-lkvm -ldevstat"
75          ;;
76   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)
64 <        LINKFLAGS="-lkvm -ldevstat"
80 >        LINKFLAGS="-ldevstat"
81          ;;
82 + netbsdelf*)
83 +        AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
84 +        AC_DEFINE(NETBSD, , [Building on NetBSD])
85 +        ;;
86 + openbsd*)
87 +        AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
88 +        AC_DEFINE(OPENBSD, , [Building on OpenBSD])
89 +        ;;
90   linux-gnu)
91          AC_DEFINE(LINUX, , [Building on GNU/Linux])
92          ;;
93 + cygwin)
94 +        AC_DEFINE(CYGWIN, , [Building on Cygwin])
95 +        ;;
96   *)
97          AC_MSG_ERROR([Cannot build on unknown OS: $host_os])
98          ;;
# Line 134 | Line 161 | AC_ARG_ENABLE(manpages,
161   )
162  
163   # Check if the user wants to turn off setgid binaries
137 # (only really relevant on FreeBSD)
164   AC_ARG_ENABLE(setgid-binaries,
165          [  --disable-setgid-binaries     disable binaries being setgid],
166          [
# Line 144 | Line 170 | AC_ARG_ENABLE(setgid-binaries,
170          ]
171   )
172  
173 < # User specified pkgconfig dir
174 < AC_ARG_WITH([pkgconfig-dir],
175 <        [  --with-pkgconfig-dir=PATH     pkgconfig lib directory (PREFIX/lib/pkgconfig)],
176 <        [ PKGCONFIG_DIR=$withval ],
177 <        [ PKGCONFIG_DIR="\$(libdir)/pkgconfig" ]
173 > # Check if the user wants to turn off setuid binaries
174 > AC_ARG_ENABLE(setuid-binaries,
175 >        [  --disable-setuid-binaries     disable binaries being setuid],
176 >        [
177 >                if test "x$enableval" = "xno" ; then
178 >                        AM_CONDITIONAL(SETUIDBINS, false)
179 >                fi
180 >        ]
181   )
153 AC_SUBST(PKGCONFIG_DIR)
182  
183   # The LIBS and CPPFLAGS that saidar needs
184   AC_SUBST(SAIDARLIBS)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines