summaryrefslogtreecommitdiff
path: root/net/netsaint-plugins/patches/patch-ab
blob: 2c579d72d7780105b78a8ff7f66a540e897b0856 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
$NetBSD: patch-ab,v 1.3 2002/10/02 19:58:03 wiz Exp $

--- configure.orig	Thu Apr 26 20:46:17 2001
+++ configure
@@ -2547,7 +2547,7 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-if test "$ac_cv_lib_ldap_main" = "yes"; then
+if false; then
   LDAPLIBS="-lldap -llber"\
   LDAPINCLUDE="-I/usr/include/ldap"
   
@@ -3715,11 +3715,67 @@ EOF
 
 
 
+for ac_func in select socket strdup strstr strtod strtol strtoul
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:3722: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3727 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:3750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+
 
 echo $ac_n "checking for getopt_long""... $ac_c" 1>&6
-echo "configure:3721: checking for getopt_long" >&5
+echo "configure:3777: checking for getopt_long" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3723 "configure"
+#line 3779 "configure"
 #include "confdefs.h"
 #include <getopt.h>
 #include <stdlib.h>
@@ -3859,62 +3915,6 @@ LIBS="$LIBS -lsnprintf" DEPLIBS="$DEPLIB
 fi
 
 
-for ac_func in select socket strdup strstr strtod strtol strtoul
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3866: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3871 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:3894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-
 echo $ac_n "checking for type of socket size""... $ac_c" 1>&6
 echo "configure:3920: checking for type of socket size" >&5
 cat > conftest.$ac_ext <<EOF
@@ -4271,7 +4271,7 @@ EOF
 #define RSS_FORMAT "%d %s"
 EOF
 
-	echo "      ps syntax... $PATH_TO_PS -Ao 'state command vsz rss'"
+	echo "      ps syntax... $PATH_TO_PS -waxco 'state command vsz rss uid user ppid'"
 elif ps waxno 'state comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S +COMMAND +VSZ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
 then
 	cat >> confdefs.h <<\EOF
@@ -4859,7 +4859,7 @@ if test -n "$ac_cv_path_PATH_TO_NSLOOKUP
 then
 	echo $ac_n "checking "nslookup syntax"""... $ac_c" 1>&6
 echo "configure:4862: checking "nslookup syntax"" >&5
-	if nslookup -sil 127.0.0.1 2>&1 | grep "*** Invalid option: sil" >/dev/null
+	if nslookup -sil 127.0.0.1 2>&1 | fgrep "*** Invalid option: sil" >/dev/null
 	then
 		echo "$ac_t"""$PATH_TO_NSLOOKUP"" 1>&6
 		cat >> confdefs.h <<EOF
@@ -5001,7 +5001,7 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-if test -f "$PATH_TO_SNMPGET"
+if false;
 then
 	cat >> confdefs.h <<EOF
 #define PATH_TO_SNMPGET "$PATH_TO_SNMPGET"