diff --git a/configure b/configure
index cbd52429a4..5195e19711 100755
--- a/configure
+++ b/configure
@@ -849,6 +849,7 @@ if test -n "$ac_init_help"; then
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-integer-datetimes  enable 64-bit integer date/time support
   --enable-recode         enable character set recode support
   --enable-multibyte      enable multibyte character support
   --enable-nls[=LANGUAGES]  enable Native Language Support
@@ -1577,6 +1578,43 @@ fi;
 
 
 #
+# 64-bit integer date/time storage (--enable-integer-datetimes)
+#
+echo "$as_me:$LINENO: checking whether to build with 64-bit integer date/time support" >&5
+echo $ECHO_N "checking whether to build with 64-bit integer date/time support... $ECHO_C" >&6
+
+
+# Check whether --enable-integer-datetimes or --disable-integer-datetimes was given.
+if test "${enable_integer_datetimes+set}" = set; then
+  enableval="$enable_integer_datetimes"
+
+  case $enableval in
+    yes)
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_INTEGER_DATETIMES 1
+_ACEOF
+
+      ;;
+    no)
+      :
+      ;;
+    *)
+      { { echo "$as_me:$LINENO: error: no argument expected for --enable-integer-datetimes option" >&5
+echo "$as_me: error: no argument expected for --enable-integer-datetimes option" >&2;}
+   { (exit 1); exit 1; }; }
+      ;;
+  esac
+
+else
+  enable_integer_datetimes=no
+
+fi;
+
+echo "$as_me:$LINENO: result: $enable_integer_datetimes" >&5
+echo "${ECHO_T}$enable_integer_datetimes" >&6
+
+
 # Character set recode (--enable-recode)
 #
 echo "$as_me:$LINENO: checking whether to build with recode support" >&5
diff --git a/configure.in b/configure.in
index 3491bbc855..b592e4c5b3 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $Header: /cvsroot/pgsql/configure.in,v 1.179 2002/04/21 00:22:52 ishii Exp $
+dnl $Header: /cvsroot/pgsql/configure.in,v 1.180 2002/04/21 19:54:50 thomas Exp $
 
 dnl Developers, please strive to achieve this order:
 dnl
@@ -141,6 +141,15 @@ PGAC_ARG_REQ(with, libs,      [  --with-libs=DIRS        alternative spelling of
 
 
 #
+# 64-bit integer date/time storage (--enable-integer-datetimes)
+#
+AC_MSG_CHECKING([whether to build with 64-bit integer date/time support])
+PGAC_ARG_BOOL(enable, integer-datetimes, no, [  --enable-integer-datetimes  enable 64-bit integer date/time support],
+              [AC_DEFINE([USE_INTEGER_DATETIMES], 1,
+                         [Set to 1 if you want integer date/time support (--enable-integer-datetimes)])])
+AC_MSG_RESULT([$enable_integer_datetimes])
+
+
 # Character set recode (--enable-recode)
 #
 AC_MSG_CHECKING([whether to build with recode support])