diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index 2704b39ee01c685dfc851efca89ac2f2eb3aa307..3521280f4997c63b649904c07495ead2036568e3 100644
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.9 1997/04/13 17:09:45 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.10 1997/04/22 17:47:14 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -137,9 +137,7 @@ ltoa(int32 l, char *a)
 int
 ftoa(double value, char *ascii, int width, int prec1, char format)
 {
-#if defined(__FreeBSD__) || \
-    defined(bsdi) || \
-    defined(bsdi_2_1)
+#ifndef HAVE_FCVT
 	char	out[256];
 	char	fmt[256];
 	int	ret;
diff --git a/src/configure b/src/configure
index db2ba2792f714f8ebd6edd2d46582ed241c98fb9..e61be8345c5b6e38710e0dcddf4f159ceb3b7fb2 100755
--- a/src/configure
+++ b/src/configure
@@ -3361,7 +3361,7 @@ else
 fi
 done
 
-for ac_func in sigprocmask waitpid setsid random
+for ac_func in sigprocmask waitpid setsid random fcvt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 echo "configure:3368: checking for $ac_func" >&5
diff --git a/src/configure.in b/src/configure.in
index 36851f5a671fc650fa72a9fbb5dfe690f1bfa3dd..d6e6a848df5c43ea1ce426618527ff3e67626e71 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -397,7 +397,7 @@ AC_FUNC_MEMCMP
 AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(isinf tzset getrusage vfork memmove sigsetjmp kill sysconf)
-AC_CHECK_FUNCS(sigprocmask waitpid setsid random)
+AC_CHECK_FUNCS(sigprocmask waitpid setsid random fcvt)
 AC_CHECK_FUNC(inet_aton, AC_DEFINE(HAVE_INET_ATON), INET_ATON='inet_aton.o')
 AC_CHECK_FUNC(strerror, AC_DEFINE(HAVE_STRERROR), STRERROR='strerror.o')
 AC_CHECK_FUNC(strdup, AC_DEFINE(HAVE_STRDUP), STRDUP='../../utils/strdup.o')
diff --git a/src/include/config.h.in b/src/include/config.h.in
index a16312d3f0e35b07d3e6e85ff4dd839609792c5b..481b646199725fcf863dcb8ffe0524d92e9e4b52 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -59,6 +59,9 @@
 /* Set to 1 if you have inet_aton() */
 #undef HAVE_INET_ATON
 
+/* Set to 1 if you have fcvt() */
+#undef HAVE_FCVT
+
 /* Set to 1 if you have strerror() */
 #undef HAVE_STRERROR