diff --git a/acconfig.h b/acconfig.h
index 6610b93daf..d99806a6ad 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: acconfig.h,v 1.33 2001/01/18 22:21:22 bwelling Exp $ */
+/* $Id: acconfig.h,v 1.34 2001/07/04 00:34:40 bwelling Exp $ */
 
 /***
  *** This file is not to be included by any public header files, because
@@ -81,6 +81,9 @@
 /* define if flockfile() is available */
 #undef HAVE_FLOCKFILE
 
+/* define if getc_unlocked() is available */
+#undef HAVE_GETCUNLOCKED
+
 /* define if rlim_t is defined via sys/types.h or sys/resource.h */
 #undef HAVE_RLIM_T
 
diff --git a/config.h.in b/config.h.in
index c4aa47da13..6eac211b1b 100644
--- a/config.h.in
+++ b/config.h.in
@@ -16,7 +16,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.h.in,v 1.42 2001/02/24 23:05:07 bwelling Exp $ */
+/* $Id: config.h.in,v 1.43 2001/07/04 00:34:41 bwelling Exp $ */
 
 /***
  *** This file is not to be included by any public header files, because
@@ -92,6 +92,9 @@
 /* define if flockfile() is available */
 #undef HAVE_FLOCKFILE
 
+/* define if getc_unlocked() is available */
+#undef HAVE_GETCUNLOCKED
+
 /* define if rlim_t is defined via sys/types.h or sys/resource.h */
 #undef HAVE_RLIM_T
 
@@ -132,6 +135,9 @@ int sigwait(const unsigned int *set, int *sig);
 /* define if pthread_attr_getstacksize() is available */
 #undef HAVE_PTHREAD_ATTR_GETSTACKSIZE
 
+/* Define if you have the <dlfcn.h> header file.  */
+#undef HAVE_DLFCN_H
+
 /* Define if you have the <fcntl.h> header file.  */
 #undef HAVE_FCNTL_H
 
diff --git a/configure.in b/configure.in
index 6227bea033..7091ab25e8 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.265 $)
+AC_REVISION($Revision: 1.266 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -650,9 +650,11 @@ AC_SUBST(ISC_THREAD_DIR)
 
 #
 # flockfile is usually provided by pthreads, but we may want to use it
-# even if compiled with --disable-threads.
+# even if compiled with --disable-threads.  getc_unlocked might also not
+# be defined.
 #
 AC_CHECK_FUNC(flockfile, AC_DEFINE(HAVE_FLOCKFILE),)
+AC_CHECK_FUNC(getc_unlocked, AC_DEFINE(HAVE_GETCUNLOCKED),)
 
 # 
 # Indicate what the final decision was regarding threads.
diff --git a/lib/isc/lex.c b/lib/isc/lex.c
index 4c240ac69f..c6a8aed82d 100644
--- a/lib/isc/lex.c
+++ b/lib/isc/lex.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lex.c,v 1.63 2001/06/04 19:33:22 tale Exp $ */
+/* $Id: lex.c,v 1.64 2001/07/04 00:34:44 bwelling Exp $ */
 
 #include <config.h>
 
@@ -427,7 +427,7 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
 			if (source->is_file) {
 				stream = source->input;
 
-#ifdef HAVE_FLOCKFILE
+#if defined(HAVE_FLOCKFILE) && defined(HAVE_GETCUNLOCKED)
 				c = getc_unlocked(stream);
 #else
 				c = getc(stream);