173 lines
5.1 KiB
Text
173 lines
5.1 KiB
Text
$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"
|