*** pgsql/configure	2008/03/10 21:50:16	1.587
--- pgsql/configure	2008/03/30 04:08:14	1.588
*************** if test -n "$ac_init_help"; then
*** 1349,1355 ****
  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-nls[=LANGUAGES]  enable Native Language Support
    --disable-shared        do not build shared libraries
    --disable-rpath         do not embed shared library search path in executables
--- 1349,1355 ----
  Optional Features:
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
!   --disable-integer-datetimes  disable 64-bit integer date/time support
    --enable-nls[=LANGUAGES]  enable Native Language Support
    --disable-shared        do not build shared libraries
    --disable-rpath         do not embed shared library search path in executables
*************** fi
*** 2176,2182 ****
  
  
  #
! # 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; }
--- 2176,2182 ----
  
  
  #
! # 64-bit integer date/time storage: enabled by default.
  #
  { 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; }
*************** echo "$as_me: error: no argument expecte
*** 2205,2211 ****
    esac
  
  else
!   enable_integer_datetimes=no
  
  fi
  
--- 2205,2215 ----
    esac
  
  else
!   enable_integer_datetimes=yes
! 
! cat >>confdefs.h <<\_ACEOF
! #define USE_INTEGER_DATETIMES 1
! _ACEOF
  
  fi
  
*************** fi
*** 23293,23298 ****
--- 23297,23322 ----
  
  
  
+ # If the user did not disable integer datetimes, check that
+ # there is a working 64-bit integral type to use.
+ if test x"$USE_INTEGER_DATETIMES" = x"yes" &&
+    test x"$HAVE_LONG_INT_64" = x"no" &&
+    test x"$HAVE_LONG_LONG_INT_64" = x"no" &&
+    test x"$HAVE_INT64" = x"no" ; then
+   { { echo "$as_me:$LINENO: error:
+ Integer-based datetime support requires a 64-bit integer type,
+ but no such type could be found. The --disable-integer-datetimes
+ configure option can be used to disable integer-based storage
+ of datetime values." >&5
+ echo "$as_me: error:
+ Integer-based datetime support requires a 64-bit integer type,
+ but no such type could be found. The --disable-integer-datetimes
+ configure option can be used to disable integer-based storage
+ of datetime values." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ 
  if test "$PORTNAME" != "win32"
  then
  { echo "$as_me:$LINENO: checking for POSIX signal interface" >&5