diff -ur --unidirectional-new-file jikes.orig/src/configure.in work/jikes/src/configure.in
--- jikes.orig/src/configure.in	Wed Aug 25 05:11:06 1999
+++ work/jikes/src/configure.in	Wed Sep 15 10:33:20 1999
@@ -160,15 +160,12 @@
         LDFLAGS="$LDFLAGS $LDDEBUGFLAGS"
         ;;
     FreeBSD)
-	CCREQUIREDFLAGS="$CCREQUIREDFLAGS -DUNIX -DIEEE_DIV_0 -DGNU_LIBC5 -DNO_WCHAR_H"
+	CCREQUIREDFLAGS="$CCREQUIREDFLAGS -DUNIX -DIEEE_DIV_0 -DGNU_LIBC5"
 
         if test $CC_NAME = "$CXX"; then
             CCREQUIREDFLAGS="-funsigned-char $CCREQUIREDFLAGS"
         fi
 
-	# FreeBSD doesn't have the wchar.h functions yet
-	CCREQUIREDFLAGS="$CCREQUIREDFLAGS -DGNU_LIBC5 -DNO_WCHAR_H"
-
 	# Check byte-order
         case "`uname -m`" in
             alpha)
@@ -285,18 +282,23 @@
 
 
 #--------------------------------------------------------------------
-# 	Check for libc brokenness (linux libc5, maybe others?) - CSA
+# 	Check for missing/broken wchar.h
 #--------------------------------------------------------------------
-AC_CACHE_CHECK(for a broken wchar.h, jikes_cv_broken_wchar,
+AC_CHECK_HEADERS(wchar.h)
+if test $ac_cv_header_wchar_h = no; then
+	CCREQUIREDFLAGS="$CCREQUIREDFLAGS -include missing-wchar.h"
+else
+	AC_CACHE_CHECK(for a broken wchar.h, jikes_cv_broken_wchar,
 	AC_TRY_COMPILE([#include <wchar.h>],[wint_t foo;],
 	jikes_cv_broken_wchar=no, jikes_cv_broken_wchar=yes))
-if test $jikes_cv_broken_wchar = yes; then
-	AC_TRY_COMPILE([
-#include "libc5-fix.h"
-#include <wchar.h>
-],[wint_t foo;],
-	CCREQUIREDFLAGS="$CCREQUIREDFLAGS -include libc5-fix.h",
-	AC_MSG_ERROR([Can't fix broken wchar.h]))
+	if test $jikes_cv_broken_wchar = yes; then
+		AC_TRY_COMPILE([
+		#include "libc5-fix.h"
+		#include <wchar.h>
+		],[wint_t foo;],
+		CCREQUIREDFLAGS="$CCREQUIREDFLAGS -include libc5-fix.h",
+		AC_MSG_ERROR([Can't fix broken wchar.h]))
+	fi
 fi
 
 # Subst variables into Makefile.in to produce the Makefile
