]>
Commit | Line | Data |
---|---|---|
04ea07b9 AM |
1 | diff -ur net-snmp-5.3.org/configure.in net-snmp-5.3/configure.in |
2 | --- net-snmp-5.3.org/configure.in 2005-12-28 18:20:56.000000000 +0100 | |
66aaff90 | 3 | +++ net-snmp-5.3/configure.in 2006-01-09 01:07:39.031490000 +0100 |
79789c07 JB |
4 | @@ -1704,11 +1704,11 @@ |
5 | if test "x$sec" = "xksm" -a "xyes" = "x$already_checked_krb5"; then | |
6 | continue | |
7 | fi | |
8 | - already_checked_krb5=yes | |
9 | ||
10 | if test x$sec != xksm; then | |
11 | rebuilt_new_with_security="$rebuilt_new_with_security $sec" | |
12 | else | |
13 | + already_checked_krb5=yes | |
14 | if test no = $trykrb5; then | |
15 | AC_MSG_NOTICE([configured not to use krb5. disabling ksm]) | |
16 | continue | |
66aaff90 AM |
17 | @@ -2661,23 +2661,6 @@ |
18 | LIBS="${LIBS} -ladm" | |
19 | AGENTLIBS="${AGENTLIBS} -ladm")) | |
20 | ||
21 | -case $target_os in | |
22 | - aix*) # AIX perfstat library, needed for CPU/memory statistics | |
23 | - AC_CHECK_HEADERS(libperfstat.h, | |
24 | - AC_CHECK_LIB(perfstat, perfstat_cpu_total, AC_DEFINE(HAVE_PERFSTAT) | |
25 | - AGENTLIBS="${AGENTLIBS} -lperfstat"), AC_MSG_ERROR([ | |
26 | - | |
27 | -*** To monitor CPU/memory values in AIX you need to install | |
28 | -*** libperfstat which can be found in bos.perf | |
29 | -])) | |
30 | - ;; | |
31 | - hpux*) # HP-UX agent needs open_mib | |
32 | - AC_CHECK_LIB(nm, open_mib, AC_DEFINE(HAVE_LIBNM) | |
33 | - AGENTLIBS="${AGENTLIBS} -lnm") | |
34 | - ;; | |
35 | - *) | |
36 | - ;; | |
37 | -esac | |
38 | # WIN32 | |
39 | # (mingw32 must link winsock explicitly) | |
40 | AC_CHECK_HEADERS(winsock.h,[ | |
41 | @@ -2880,7 +2863,7 @@ | |
544e9189 JB |
42 | |
43 | AC_MSG_RESULT([$ac_cv_type_ssize_t]) | |
44 | if test $ac_cv_type_ssize_t = yes; then | |
45 | - AC_DEFINE(HAVE_SSIZE_T) | |
46 | + AC_DEFINE(HAVE_SSIZE_T,,[have ssize_t]) | |
47 | fi | |
48 | ||
49 | # Check ps args | |
d613e3af JB |
50 | --- net-snmp-5.4/agent/mibgroup/Makefile.in.orig 2006-09-13 19:00:27.000000000 +0200 |
51 | +++ net-snmp-5.4/agent/mibgroup/Makefile.in 2006-12-02 11:51:38.369040000 +0100 | |
52 | @@ -22,9 +22,13 @@ | |
53 | .c.o: | |
54 | $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< | |
55 | ||
56 | -OBJS = @mib_module_list_o@ | |
57 | -LOBJS = @mib_module_list_lo@ | |
58 | -SRCS = @mib_module_list_c@ | |
59 | +@mib_module_list_o@ | |
60 | +@mib_module_list_lo@ | |
61 | +@mib_module_list_c@ | |
62 | + | |
63 | +OBJS = $(mib_module_list_o) | |
64 | +LOBJS = $(mib_module_list_lo) | |
65 | +SRCS = $(mib_module_list_c) | |
66 | ||
67 | all: standardall $(LOBJS) | |
68 | ||
69 | --- net-snmp-5.4/agent/mibgroup/ucd-snmp/disk.c.orig 2006-09-15 02:48:41.000000000 +0200 | |
70 | +++ net-snmp-5.4/agent/mibgroup/ucd-snmp/disk.c 2006-12-02 12:03:27.889382250 +0100 | |
71 | @@ -229,7 +229,7 @@ | |
72 | static void | |
73 | disk_parse_config(const char *token, char *cptr) | |
74 | { | |
75 | -#if HAVE_FSTAB_H || HAVE_GETMNTENT || HAVE_STATFS | |
76 | +#if HAVE_FSTAB_H || defined(HAVE_GETMNTENT) || HAVE_STATFS | |
77 | char tmpbuf[1024]; | |
78 | char path[STRMAX]; | |
79 | int minpercent; | |
80 | @@ -296,7 +296,7 @@ | |
81 | static void | |
82 | disk_parse_config_all(const char *token, char *cptr) | |
83 | { | |
84 | -#if HAVE_FSTAB_H || HAVE_GETMNTENT || HAVE_STATFS | |
85 | +#if HAVE_FSTAB_H || defined(HAVE_GETMNTENT) || HAVE_STATFS | |
86 | char tmpbuf[1024]; | |
87 | int minpercent = DISKMINPERCENT; | |
88 | ||
89 | @@ -428,7 +428,7 @@ | |
90 | static void | |
91 | find_and_add_allDisks(int minpercent) | |
92 | { | |
93 | -#if HAVE_GETMNTENT | |
94 | +#if defined(HAVE_GETMNTENT) | |
95 | #if HAVE_SYS_MNTTAB_H | |
96 | struct mnttab mnttab; | |
97 | #else | |
98 | @@ -451,8 +451,8 @@ | |
99 | * string declared above and at the end of the routine return it | |
100 | * to the caller | |
101 | */ | |
102 | -#if HAVE_FSTAB_H || HAVE_GETMNTENT || HAVE_STATFS | |
103 | -#if HAVE_GETMNTENT | |
104 | +#if HAVE_FSTAB_H || defined(HAVE_GETMNTENT) || HAVE_STATFS | |
105 | +#if defined(HAVE_GETMNTENT) | |
106 | #if HAVE_SETMNTENT | |
107 | mntfp = setmntent(ETC_MNTTAB, "r"); | |
108 | while (NULL != (mntent = getmntent(mntfp))) { | |
109 | @@ -522,7 +522,7 @@ | |
110 | static char * | |
111 | find_device(char *path) | |
112 | { | |
113 | -#if HAVE_GETMNTENT | |
114 | +#if defined(HAVE_GETMNTENT) | |
115 | #if HAVE_SYS_MNTTAB_H | |
116 | struct mnttab mnttab; | |
117 | #else | |
118 | @@ -548,8 +548,8 @@ | |
119 | * string declared above and at the end of the routine return it | |
120 | * to the caller | |
121 | */ | |
122 | -#if HAVE_FSTAB_H || HAVE_GETMNTENT || HAVE_STATFS | |
123 | -#if HAVE_GETMNTENT | |
124 | +#if HAVE_FSTAB_H || defined(HAVE_GETMNTENT) || HAVE_STATFS | |
125 | +#if defined(HAVE_GETMNTENT) | |
126 | #if HAVE_SETMNTENT | |
127 | mntfp = setmntent(ETC_MNTTAB, "r"); | |
128 | while (NULL != (mntent = getmntent(mntfp))) |