diff --git a/src/acconfig.h b/src/acconfig.h
index eaebaad07d8f694d41c7b57dc44d42fdf15802f3..ba48b07815beb33ad4c735ad76ad0a4d7a694b5a 100644
--- a/src/acconfig.h
+++ b/src/acconfig.h
@@ -1,5 +1,5 @@
 /*
- * $Id: acconfig.h,v 1.33 1998/10/11 22:33:11 hubbe Exp $
+ * $Id: acconfig.h,v 1.34 1998/11/18 20:16:09 marcus Exp $
  */
 #ifndef MACHINE_H
 #define MACHINE_H
@@ -58,6 +58,9 @@
 /* Solaris has rusage as an ioctl on procfs */
 #undef GETRUSAGE_THROUGH_PROCFS
 
+/* Define if you have fork */
+#undef HAVE_FORK
+
 /* Define if you have isspace */
 #undef HAVE_ISSPACE
 
diff --git a/src/configure.in b/src/configure.in
index 43ed8203e4766c8dc376249005291564412989eb..85537a7fac8e86a5367ec5e6446aa7f538c5d3a5 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,4 @@
-AC_REVISION("$Id: configure.in,v 1.252 1998/11/17 05:13:19 hubbe Exp $")
+AC_REVISION("$Id: configure.in,v 1.253 1998/11/18 20:16:11 marcus Exp $")
 AC_INIT(interpret.c)
 AC_CONFIG_HEADER(machine.h)
 
@@ -1199,7 +1199,6 @@ AC_CHECK_FUNCS( \
  strdup \
  kill \
  alarm \
- fork \
  fork1 \
  flock \
  lockf \
@@ -1587,6 +1586,21 @@ if test [$]pike_cv_func_$1 = yes; then
 AC_DEFINE(translit(HAVE_$1,[a-z],[A-Z]))
 fi])
 
+########################################################################
+MY_CHECK_FUNCTION(fork,
+[
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+int main()
+{
+  exit(fork()==-1);
+}
+]);
 ########################################################################
 MY_CHECK_FUNCTION(fpsetmask,
 [