$NetBSD: patch-aa,v 1.4 2002/04/14 10:00:49 rh Exp $ --- configure.in.orig Fri Apr 27 00:00:26 2001 +++ configure.in Sun Apr 7 17:27:29 2002 @@ -144,7 +144,7 @@ dnl Check for LDAP libraries _SAVEDLIBS="$LIBS" AC_CHECK_LIB(ldap,main,,,-llber) -if test "$ac_cv_lib_ldap_main" = "yes"; then +if false; then LDAPLIBS="-lldap -llber"\ LDAPINCLUDE="-I/usr/include/ldap" AC_SUBST(LDAPLIBS) @@ -260,6 +260,9 @@ AC_TYPE_SIZE_T AC_TYPE_SIGNAL +dnl Checks for library functions. +AC_CHECK_FUNCS(select socket strdup strstr strtod strtol strtoul) + dnl EXTRA_LIBRARIES="libgetopt.a libsnprintf.a" dnl noinst_LIBRARIES="libgetopt.a libsnprintf.a" dnl libgetopt_a_SOURCES="getopt.c getopt1.c" @@ -283,9 +286,6 @@ AC_CHECK_FUNC(vsnprintf,,LIBS="$LIBS -lsnprintf" DEPLIBS="$DEPLIBS libsnprintf.a") -dnl Checks for library functions. -AC_CHECK_FUNCS(select socket strdup strstr strtod strtol strtoul) - AC_MSG_CHECKING(for type of socket size) AC_TRY_COMPILE([#include #include @@ -395,7 +395,7 @@ AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s") AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxco 'rss command'") AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s") - 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'" dnl BSD-like mode in RH 6.1 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 @@ -596,7 +596,7 @@ if test -n "$ac_cv_path_PATH_TO_NSLOOKUP" then AC_MSG_CHECKING("nslookup syntax") - 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 AC_MSG_RESULT("$PATH_TO_NSLOOKUP") AC_DEFINE_UNQUOTED(NSLOOKUP_COMMAND,"$PATH_TO_NSLOOKUP") @@ -621,7 +621,7 @@ fi AC_PATH_PROG(PATH_TO_SNMPGET,snmpget) -if test -f "$PATH_TO_SNMPGET" +if false; then AC_DEFINE_UNQUOTED(PATH_TO_SNMPGET,"$PATH_TO_SNMPGET") EXTRAS="$EXTRAS check_hpjd check_snmp"