diff --git a/configure.in b/configure.in
index 49854e8..2949c87 100644
--- a/configure.in
+++ b/configure.in
@@ -9,7 +9,9 @@ AC_PROG_LIBTOOL
 AC_PROG_CC
 
 AC_HEADER_STDC
-AC_CHECK_HEADERS(sys/time.h)
+AC_CHECK_HEADERS([sys/time.h errno.h])
+
+dnl scsh includes (scheme48.h)
 
 AC_ARG_WITH(scsh-includes, 
             AC_HELP_STRING([--with-scsh-includes=DIR],  
@@ -36,41 +38,91 @@ AC_ARG_WITH(ldap-prefix,
 AC_SUBST(LDFLAGS, "$LDFLAGS -L${ldap_lib}")
 AC_SUBST(CFLAGS, "$CFLAGS -I${ldap_include}")
 
-AC_CHECK_LIB(ldap, ldap_init, [], AC_MSG_FAILURE("Could not find ldap library"))
-AC_CHECK_HEADER([ldap.h], [], AC_MSG_FAILURE("Could not find ldap.h"))
+dnl Check for LDAP libraries and headers
 
-AC_CHECK_FUNC([ldap_open], [],
+AC_CHECK_HEADER([ldap.h], [], AC_MSG_FAILURE("Could not find ldap.h"))
+AC_CHECK_HEADER([lber.h], [], AC_MSG_FAILURE("Could not find lber.h"))
+
+AC_CHECK_LIB(ldap, ldap_init, [AC_SUBST(LIBS, "-lldap $LIBS")], 
+	AC_MSG_FAILURE("Could not find ldap library"))
+AC_CHECK_LIB(lber, ber_free, [AC_SUBST(LIBS, "-llber $LIBS")],
+	AC_MSG_FAILURE("Could not find lber library"))
+AC_SUBST(LIBS)
+
+dnl Check for functions
+
+AC_CHECK_FUNC([ldap_init], [],
 	      AC_MSG_FAILURE("Could not find ldap_open()"))
-AC_CHECK_FUNC([ldap_bind_s], [], 
-              AC_MSG_FAILURE("Could not find ldap_bind_s()"))
 AC_CHECK_FUNC([ldap_simple_bind_s], [], 
 	      AC_MSG_FAILURE("Could not find ldap_simple_bind_s()"))
+AC_CHECK_FUNC([ldap_sasl_bind_s], [], 
+	      AC_MSG_FAILURE("Could not find ldap_sasl_bind_s()"))
 AC_CHECK_FUNC([ldap_unbind_s], [], 
 	      AC_MSG_FAILURE("Could not find ldap_unbind_s()"))
+AC_CHECK_FUNC([ldap_err2string], [], 
+	      AC_MSG_FAILURE("Could not find ldap_err2string()"))
 AC_CHECK_FUNC([ldap_result2error], [], 
               AC_MSG_FAILURE("Could not find ldap_result2error()"))
 AC_CHECK_FUNC([ldap_memfree], [], 
 	      AC_MSG_FAILURE("Could not find ldap_memfree()"))
 AC_CHECK_FUNC([ldap_msgfree], [], 
               AC_MSG_FAILURE("Could not find ldap_msgfree()"))
+AC_CHECK_FUNC([ber_free], [], 
+              AC_MSG_FAILURE("Could not find ber_free()"))
 AC_CHECK_FUNC([ldap_search_s], [], 
               AC_MSG_FAILURE("Could not find ldap_search_s()"))
 AC_CHECK_FUNC([ldap_search_st], [], 
               AC_MSG_FAILURE("Could not find ldap_search_st()"))
+AC_CHECK_FUNC([ldap_compare_s], [], 
+              AC_MSG_FAILURE("Could not find ldap_compare_s()"))
 AC_CHECK_FUNC([ldap_count_entries], [], 
               AC_MSG_FAILURE("Could not find ldap_count_entries()"))
 AC_CHECK_FUNC([ldap_first_entry], [], 
               AC_MSG_FAILURE("Could not find ldap_first_entry()"))
 AC_CHECK_FUNC([ldap_next_entry], [], 
               AC_MSG_FAILURE("Could not find ldap_next_entry()"))
+AC_CHECK_FUNC([ldap_first_message], [], 
+              AC_MSG_FAILURE("Could not find ldap_first_message()"))
+AC_CHECK_FUNC([ldap_next_message], [], 
+              AC_MSG_FAILURE("Could not find ldap_next_message()"))
+AC_CHECK_FUNC([ldap_count_messages], [], 
+              AC_MSG_FAILURE("Could not find ldap_count_messages()"))
+AC_CHECK_FUNC([ldap_first_reference], [], 
+              AC_MSG_FAILURE("Could not find ldap_first_reference()"))
+AC_CHECK_FUNC([ldap_next_reference], [], 
+              AC_MSG_FAILURE("Could not find ldap_next_reference()"))
+AC_CHECK_FUNC([ldap_count_references], [], 
+              AC_MSG_FAILURE("Could not find ldap_count_references()"))
+AC_CHECK_FUNC([ldap_first_attribute], [], 
+              AC_MSG_FAILURE("Could not find ldap_first_attribute()"))
+AC_CHECK_FUNC([ldap_next_attribute], [], 
+              AC_MSG_FAILURE("Could not find ldap_next_attribute()"))
 AC_CHECK_FUNC([ldap_msgtype], [], 
               AC_MSG_FAILURE("Could not find ldap_msgtype()"))
 AC_CHECK_FUNC([ldap_msgid], [], 
               AC_MSG_FAILURE("Could not find ldap_msgid()"))
+AC_CHECK_FUNC([ldap_get_dn], [], 
+              AC_MSG_FAILURE("Could not find ldap_get_dn()"))
+AC_CHECK_FUNC([ldap_explode_dn], [], 
+              AC_MSG_FAILURE("Could not find ldap_explode_dn()"))
+AC_CHECK_FUNC([ldap_explode_rdn], [], 
+              AC_MSG_FAILURE("Could not find ldap_explode_rdn()"))
+AC_CHECK_FUNC([ldap_dn2ufn], [], 
+              AC_MSG_FAILURE("Could not find ldap_dn2ufn()"))
 AC_CHECK_FUNC([ldap_get_values], [], 
               AC_MSG_FAILURE("Could not find ldap_get_values()"))
-
-AC_CHECK_FUNCS([ldap_kerberos_bind_s])
+AC_CHECK_FUNC([ldap_modify_s], [], 
+              AC_MSG_FAILURE("Could not find ldap_modify_s()"))
+AC_CHECK_FUNC([ldap_add_s], [], 
+              AC_MSG_FAILURE("Could not find ldap_add_s()"))
+AC_CHECK_FUNC([ldap_delete_s], [], 
+              AC_MSG_FAILURE("Could not find ldap_delete_s()"))
+AC_CHECK_FUNC([ldap_abandon], [], 
+              AC_MSG_FAILURE("Could not find ldap_abandon()"))
+AC_CHECK_FUNC([ldap_get_option], [], 
+              AC_MSG_FAILURE("Could not find ldap_get_option()"))
+AC_CHECK_FUNC([ldap_set_option], [], 
+              AC_MSG_FAILURE("Could not find ldap_set_option()"))
 
 schemedir='${prefix}'"/scheme"
 libdir='${prefix}'"/lib"
@@ -79,6 +131,5 @@ libsysdir=${libdir}"/`scsh -lm ${srcdir}/scheme/configure.scm -o configure -c '(
 AC_SUBST(libdir)
 AC_SUBST(libsysdir)
 AC_SUBST(schemedir)
-AC_SUBST(LIBS)
 AC_SUBST(CC)
 AC_OUTPUT([Makefile c/Makefile scheme/Makefile])