Add res_query checks

CHANGES

@@ -1,6 +1,9 @@
 OpenLDAP 2.0 Change Log
 
 OpenLDAP 2.0.18 Engineering
+	Fixed -llber ber_bvecadd bug (ITS#1398)
+	Build environment
+		Updated req_query detection
 
 OpenLDAP 2.0.17 Release
 	Fixed ldbm BerkeleyDB2 compat bug (ITS#1390)

configure.in

@@ -706,8 +706,15 @@ fi
 
 dnl ----------------------------------------------------------------
 dnl Check for resolver routines
+dnl	  need to check for both res_query and __res_query
+dnl   need to check -lc, -lbind, and -lresolv
 ol_link_dnssrv=no
 AC_CHECK_FUNC(res_query,:)
+if test $ac_cv_func_res_query = no ; then 
+	AC_CHECK_FUNC(__res_query,:)
+	ac_cv_func_res_query=$ac_cv_func___res_query
+fi
+
 if test $ac_cv_func_res_query = no ; then 
 	AC_CHECK_LIB(bind, res_query)
 	ac_cv_func_res_query=$ac_cv_lib_bind_res_query
@@ -723,6 +730,11 @@ if test $ac_cv_func_res_query = no ; then
 	ac_cv_func_res_query=$ac_cv_lib_resolv_res_query
 fi
 
+if test $ac_cv_func_res_query = no ; then 
+	AC_CHECK_LIB(resolv, __res_query)
+	ac_cv_func_res_query=$ac_cv_lib_resolv___res_query
+fi
+
 if test "$ac_cv_func_res_query" = yes ; then
 	AC_DEFINE(HAVE_RES_QUERY,1,
 		[define if you have res_query()])
@@ -2063,6 +2075,7 @@ AC_CHECK_FUNCS(		\
 	strtoul			\
 	strspn			\
 	sysconf			\
+	usleep			\
 	waitpid			\
 	wait4			\
 	write			\

include/portable.h.in

@@ -316,6 +316,9 @@
 /* Define if you have the thr_yield function.  */
 #undef HAVE_THR_YIELD
 
+/* Define if you have the usleep function.  */
+#undef HAVE_USLEEP
+
 /* Define if you have the vsnprintf function.  */
 #undef HAVE_VSNPRINTF