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.71 by tdb, Mon Jun 21 21:41:45 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.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 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 disk stats])],
40 >                [],
41 >                [#include <sys/disk.h>])
42 >
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 > # NetBSD 2.0 uses statvfs rather than statfs
50 > AC_CHECK_MEMBER(struct statvfs.f_fstypename,
51 >                [AC_DEFINE(HAVE_STATVFS, , [NetBSD 2.0 statvfs])],
52 >                [],
53 >                [#include <sys/statvfs.h>])
54 >
55 > # Check for sys/loadavg.h
56 > AC_CHECK_HEADERS([sys/loadavg.h])
57 >
58 > # Check for libdevinfo.h
59 > AC_CHECK_HEADERS([libdevinfo.h])
60 >
61 > # Default needing setgid/setuid to false
62   AM_CONDITIONAL(SETGIDBINS, false)
63 + AM_CONDITIONAL(SETUIDBINS, false)
64  
65   # Set things up for different OS's
66   # We define the name of the OS so the code can act accordingly
# Line 44 | Line 69 | case $host_os in
69   solaris2.[[6-7]])
70          AC_CHECK_HEADERS([kstat.h],,[AC_MSG_ERROR([need kstat.h])])
71          AC_DEFINE(SOLARIS, , [Building on Solaris 2.x])
72 <        AC_DEFINE(SOL7, , [Building on Solaris 2.7])
73 <        LINKFLAGS="-lkstat"
72 >        AC_DEFINE(SOL7, , [Building on Solaris 2.6 or 2.7])
73 >        AM_CONDITIONAL(SETUIDBINS, true)
74 >        BIN_OWNER="root"
75 >        BIN_PERM="4755"
76 >        LINKFLAGS="-lkstat -lsocket -lnsl"
77 >        AC_CHECK_LIB(devinfo, di_init, [LINKFLAGS="$LINKFLAGS -ldevinfo"])
78          ;;
79   solaris2.*)
80          AC_CHECK_HEADERS([kstat.h],,[AC_MSG_ERROR([need kstat.h])])
81          AC_DEFINE(SOLARIS, , [Building on Solaris 2.x])
82 <        LINKFLAGS="-lkstat"
82 >        LINKFLAGS="-lkstat -ldevinfo -lsocket -lnsl"
83          ;;
84   freebsd4.*)
85 +        AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
86          AC_DEFINE(FREEBSD, , [Building on FreeBSD])
87          AM_CONDITIONAL(SETGIDBINS, true)
88 +        BIN_GROUP="kmem"
89 +        BIN_PERM="2755"
90          LINKFLAGS="-lkvm -ldevstat"
91          ;;
92   freebsd5.*)
93 +        AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
94          AC_DEFINE(FREEBSD, , [Building on FreeBSD])
95          AC_DEFINE(FREEBSD5, , [Building on FreeBSD 5.x])
96 +        LINKFLAGS="-ldevstat"
97 +        ;;
98 + netbsdelf1*)
99 +        AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
100 +        AC_DEFINE(NETBSD, , [Building on NetBSD])
101 +        ;;
102 + netbsdelf2*)
103 +        AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
104 +        AC_DEFINE(NETBSD, , [Building on NetBSD])
105 +        AC_DEFINE(NETBSD2, , [Building on NetBSD 2.x])
106 +        ;;
107 + openbsd*)
108 +        AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
109 +        AC_DEFINE(OPENBSD, , [Building on OpenBSD])
110 +        ;;
111 + dragonfly*)
112 +        AC_DEFINE(ALLBSD, , [Building on a BSD-derived system])
113 +        AC_DEFINE(DFBSD, , [Building on DragonFlyBSD])
114          AM_CONDITIONAL(SETGIDBINS, true)
115 +        BIN_GROUP="kmem"
116 +        BIN_PERM="2755"
117          LINKFLAGS="-lkvm -ldevstat"
118          ;;
119   linux-gnu)
120          AC_DEFINE(LINUX, , [Building on GNU/Linux])
121 +        AM_CONDITIONAL(SETUIDBINS, true)
122 +        BIN_OWNER="root"
123 +        BIN_PERM="4755"
124          ;;
125 + cygwin)
126 +        AC_DEFINE(CYGWIN, , [Building on Cygwin])
127 +        ;;
128   *)
129          AC_MSG_ERROR([Cannot build on unknown OS: $host_os])
130          ;;
# Line 134 | Line 193 | AC_ARG_ENABLE(manpages,
193   )
194  
195   # Check if the user wants to turn off setgid binaries
137 # (only really relevant on FreeBSD)
196   AC_ARG_ENABLE(setgid-binaries,
197          [  --disable-setgid-binaries     disable binaries being setgid],
198          [
# Line 144 | Line 202 | AC_ARG_ENABLE(setgid-binaries,
202          ]
203   )
204  
205 < # User specified pkgconfig dir
206 < AC_ARG_WITH([pkgconfig-dir],
207 <        [  --with-pkgconfig-dir=PATH     pkgconfig lib directory (PREFIX/lib/pkgconfig)],
208 <        [ PKGCONFIG_DIR=$withval ],
209 <        [ PKGCONFIG_DIR="\$(libdir)/pkgconfig" ]
205 > # Check if the user wants to turn off setuid binaries
206 > AC_ARG_ENABLE(setuid-binaries,
207 >        [  --disable-setuid-binaries     disable binaries being setuid],
208 >        [
209 >                if test "x$enableval" = "xno" ; then
210 >                        AM_CONDITIONAL(SETUIDBINS, false)
211 >                fi
212 >        ]
213   )
153 AC_SUBST(PKGCONFIG_DIR)
214  
215 + # Check if the user would prefer not to include compatibility code
216 + AM_CONDITIONAL(DEPRECATED, true)
217 + AC_ARG_ENABLE(deprecated,
218 +        [  --disable-deprecated    disable inclusion of pre-0.10 compatibility code],
219 +        [
220 +                if test "x$enableval" = "xno" ; then
221 +                        AM_CONDITIONAL(DEPRECATED, false)
222 +                fi
223 +        ]
224 + )
225 +
226   # The LIBS and CPPFLAGS that saidar needs
227   AC_SUBST(SAIDARLIBS)
228   AC_SUBST(SAIDARCPPFLAGS)
# Line 159 | Line 230 | AC_SUBST(SAIDARCPPFLAGS)
230   # The flags needed to link to libstatgrab
231   # (ie. our dependencies)
232   AC_SUBST(LINKFLAGS)
233 +
234 + # Ownership and permissions possibly needed for binaries
235 + AC_SUBST(BIN_OWNER)
236 + AC_SUBST(BIN_GROUP)
237 + AC_SUBST(BIN_PERM)
238  
239   # And finish by changing these files
240   AC_CONFIG_FILES([Makefile src/Makefile src/libstatgrab/Makefile src/statgrab/Makefile docs/Makefile examples/Makefile libstatgrab.pc src/statgrab/statgrab-make-mrtg-config src/statgrab/statgrab-make-mrtg-index src/saidar/Makefile])

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines