diff --git a/src/configure.in b/src/configure.in
index 82b532170a0a6ccbf6335075d9587f5dca68a969..1f382c70e974e8a4811d534009fcdc83a989d0e5 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,4 @@
-AC_REVISION("$Id: configure.in,v 1.376 2000/05/25 02:18:35 hubbe Exp $")
+AC_REVISION("$Id: configure.in,v 1.377 2000/06/16 17:37:34 grubba Exp $")
 AC_INIT(interpret.c)
 AC_CONFIG_HEADER(machine.h)
 
@@ -170,6 +170,9 @@ case "$UNAME" in
   Linux\ 2.*)
     AC_DEFINE(USE_Wl)
     ;;
+  UnixWare\ 7.*)
+    AC_DEFINE(USE_YP_)
+    ;;
   *)
     AC_DEFINE(USE_LD_LIBRARY_PATH)
     ;;
@@ -3228,6 +3231,9 @@ AC_CACHE_VAL(pike_cv_sys_nonblock,
   if test "$pike_cv_sys_os" = "AmigaOS" ; then
     pike_cv_sys_nonblock=USE_FCNTL_O_NONBLOCK
   else
+    # Make sure we can run configure in a separate directory.
+    OCPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="-I$srcdir $CPPFLAGS"
     AC_TRY_RUN([
 #define TESTING
 #define USE_FCNTL_FNDELAY
@@ -3259,6 +3265,8 @@ unset pike_cv_sys_nonblock),
 unset pike_cv_sys_nonblock),
 unset pike_cv_sys_nonblock),
 unset pike_cv_sys_nonblock)
+    # Restore CPPFLAGS
+    CPPFLAGS="$OCPPFLAGS"
   fi
 ])