*** pgsql/configure	2006/12/02 08:36:39	1.523
--- pgsql/configure	2009/09/04 01:16:26	1.523.2.26
***************
*** 1,6 ****
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.59 for PostgreSQL 8.2.0.
  #
  # Report bugs to <pgsql-bugs@postgresql.org>.
  #
--- 1,6 ----
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.59 for PostgreSQL 8.2.14.
  #
  # Report bugs to <pgsql-bugs@postgresql.org>.
  #
*************** SHELL=${CONFIG_SHELL-/bin/sh}
*** 271,278 ****
  # Identity of this package.
  PACKAGE_NAME='PostgreSQL'
  PACKAGE_TARNAME='postgresql'
! PACKAGE_VERSION='8.2.0'
! PACKAGE_STRING='PostgreSQL 8.2.0'
  PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
  
  ac_unique_file="src/backend/access/common/heaptuple.c"
--- 271,278 ----
  # Identity of this package.
  PACKAGE_NAME='PostgreSQL'
  PACKAGE_TARNAME='postgresql'
! PACKAGE_VERSION='8.2.14'
! PACKAGE_STRING='PostgreSQL 8.2.14'
  PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
  
  ac_unique_file="src/backend/access/common/heaptuple.c"
*************** if test "$ac_init_help" = "long"; then
*** 791,797 ****
    # Omit some internal or obsolete options to make the list less imposing.
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<_ACEOF
! \`configure' configures PostgreSQL 8.2.0 to adapt to many kinds of systems.
  
  Usage: $0 [OPTION]... [VAR=VALUE]...
  
--- 791,797 ----
    # Omit some internal or obsolete options to make the list less imposing.
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<_ACEOF
! \`configure' configures PostgreSQL 8.2.14 to adapt to many kinds of systems.
  
  Usage: $0 [OPTION]... [VAR=VALUE]...
  
*************** fi
*** 852,858 ****
  
  if test -n "$ac_init_help"; then
    case $ac_init_help in
!      short | recursive ) echo "Configuration of PostgreSQL 8.2.0:";;
     esac
    cat <<\_ACEOF
  
--- 852,858 ----
  
  if test -n "$ac_init_help"; then
    case $ac_init_help in
!      short | recursive ) echo "Configuration of PostgreSQL 8.2.14:";;
     esac
    cat <<\_ACEOF
  
*************** fi
*** 1008,1014 ****
  test -n "$ac_init_help" && exit 0
  if $ac_init_version; then
    cat <<\_ACEOF
! PostgreSQL configure 8.2.0
  generated by GNU Autoconf 2.59
  
  Copyright (C) 2003 Free Software Foundation, Inc.
--- 1008,1014 ----
  test -n "$ac_init_help" && exit 0
  if $ac_init_version; then
    cat <<\_ACEOF
! PostgreSQL configure 8.2.14
  generated by GNU Autoconf 2.59
  
  Copyright (C) 2003 Free Software Foundation, Inc.
*************** cat >&5 <<_ACEOF
*** 1024,1030 ****
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
! It was created by PostgreSQL $as_me 8.2.0, which was
  generated by GNU Autoconf 2.59.  Invocation command line was
  
    $ $0 $@
--- 1024,1030 ----
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
! It was created by PostgreSQL $as_me 8.2.14, which was
  generated by GNU Autoconf 2.59.  Invocation command line was
  
    $ $0 $@
*************** PostgreSQL has apparently not been porte
*** 1532,1538 ****
  To try a manual configuration, look into the src/template directory
  for a similar platform and use the '--with-template=' option.
  
! Please also contact <pgsql-ports@postgresql.org> to see about
  rectifying this.  Include the above 'checking host system type...'
  line.
  *******************************************************************
--- 1532,1538 ----
  To try a manual configuration, look into the src/template directory
  for a similar platform and use the '--with-template=' option.
  
! Please also contact <pgsql-bugs@postgresql.org> to see about
  rectifying this.  Include the above 'checking host system type...'
  line.
  *******************************************************************
*************** PostgreSQL has apparently not been porte
*** 1543,1549 ****
  To try a manual configuration, look into the src/template directory
  for a similar platform and use the '--with-template=' option.
  
! Please also contact <pgsql-ports@postgresql.org> to see about
  rectifying this.  Include the above 'checking host system type...'
  line.
  *******************************************************************
--- 1543,1549 ----
  To try a manual configuration, look into the src/template directory
  for a similar platform and use the '--with-template=' option.
  
! Please also contact <pgsql-bugs@postgresql.org> to see about
  rectifying this.  Include the above 'checking host system type...'
  line.
  *******************************************************************
*************** echo "${ECHO_T}no" >&6
*** 3086,3091 ****
--- 3086,3145 ----
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
+   # Disable optimizations that assume no overflow; needed for gcc 4.3+
+   echo "$as_me:$LINENO: checking if $CC supports -fwrapv" >&5
+ echo $ECHO_N "checking if $CC supports -fwrapv... $ECHO_C" >&6
+ pgac_save_CFLAGS=$CFLAGS
+ CFLAGS="$pgac_save_CFLAGS -fwrapv"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+ int
+ main ()
+ {
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+ 	 { ac_try='test -z "$ac_c_werror_flag"
+ 			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ CFLAGS="$pgac_save_CFLAGS"
+                     echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
  elif test x"${CC}" = x"xlc"; then
    # AIX xlc has to have strict aliasing turned off too
    echo "$as_me:$LINENO: checking if $CC supports -qnoansialias" >&5
*************** echo $ECHO_N "checking for flags to link
*** 4902,4911 ****
  pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
  pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
  perl_embed_ldflags=`echo X"$pgac_tmp1" | sed "s/^X//;s%$pgac_tmp2%%"`
! echo "$as_me:$LINENO: result: $perl_embed_ldflags" >&5
  echo "${ECHO_T}$perl_embed_ldflags" >&6
  fi
  
  if test "$with_python" = yes; then
    # Extract the first word of "python", so it can be a program name with args.
  set dummy python; ac_word=$2
--- 4956,4978 ----
  pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
  pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
  perl_embed_ldflags=`echo X"$pgac_tmp1" | sed "s/^X//;s%$pgac_tmp2%%"`
! if test -z "$perl_embed_ldflags" ; then
! 	echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
! 	{ { echo "$as_me:$LINENO: error: could not determine flags for linking embedded Perl.
! This probably means that ExtUtils::Embed or ExtUtils::MakeMaker is not
! installed." >&5
! echo "$as_me: error: could not determine flags for linking embedded Perl.
! This probably means that ExtUtils::Embed or ExtUtils::MakeMaker is not
! installed." >&2;}
!    { (exit 1); exit 1; }; }
! else
! 	echo "$as_me:$LINENO: result: $perl_embed_ldflags" >&5
  echo "${ECHO_T}$perl_embed_ldflags" >&6
  fi
  
+ fi
+ 
  if test "$with_python" = yes; then
    # Extract the first word of "python", so it can be a program name with args.
  set dummy python; ac_word=$2
*************** fi
*** 5026,5034 ****
  
  # Supply a numeric version string for use by 3rd party add-ons
  # awk -F is a regex on some platforms, and not on others, so make "." a tab
! PG_VERSION_NUM="`echo "$PACKAGE_VERSION" | sed 's/A-Za-z.*$//' |
  tr '.' '	' |
! $AWK '{printf \"%d%02d%02d\", $1, $2, (NF >= 3) ? $3 : 0}'`"
  
  cat >>confdefs.h <<_ACEOF
  #define PG_VERSION_NUM $PG_VERSION_NUM
--- 5093,5101 ----
  
  # Supply a numeric version string for use by 3rd party add-ons
  # awk -F is a regex on some platforms, and not on others, so make "." a tab
! PG_VERSION_NUM="`echo "$PACKAGE_VERSION" | sed 's/[A-Za-z].*$//' |
  tr '.' '	' |
! $AWK '{printf "%d%02d%02d", $1, $2, (NF >= 3) ? $3 : 0}'`"
  
  cat >>confdefs.h <<_ACEOF
  #define PG_VERSION_NUM $PG_VERSION_NUM
*************** fi
*** 13133,13138 ****
--- 13200,13263 ----
  
  fi
  
+ 
+ # Win32 requires headers to be loaded for __stdcall, so can't use
+ # AC_CHECK_FUNCS here.
+   echo "$as_me:$LINENO: checking for krb5_free_unparsed_name" >&5
+ echo $ECHO_N "checking for krb5_free_unparsed_name... $ECHO_C" >&6
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <krb5.h>
+ int
+ main ()
+ {
+ krb5_free_unparsed_name(NULL,NULL);
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+ 	 { ac_try='test -z "$ac_c_werror_flag"
+ 			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_KRB5_FREE_UNPARSED_NAME 1
+ _ACEOF
+ 
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
  fi
  
  
*************** esac
*** 14771,14778 ****
  
  fi
  
! # similarly, use system's getopt_long() only if system provides struct option.
! if test x"$ac_cv_type_struct_option" = xyes ; then
  
  for ac_func in getopt_long
  do
--- 14896,14922 ----
  
  fi
  
! # Similarly, use system's getopt_long() only if system provides struct option.
! # Solaris' getopt() doesn't do what we want for long options, so always use
! # our versions on that platform.
! if test "$PORTNAME" = "solaris"; then
!   case $LIBOBJS in
!     "getopt.$ac_objext"   | \
!   *" getopt.$ac_objext"   | \
!     "getopt.$ac_objext "* | \
!   *" getopt.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS getopt.$ac_objext" ;;
! esac
! 
!   case $LIBOBJS in
!     "getopt_long.$ac_objext"   | \
!   *" getopt_long.$ac_objext"   | \
!     "getopt_long.$ac_objext "* | \
!   *" getopt_long.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS getopt_long.$ac_objext" ;;
! esac
! 
! elif test x"$ac_cv_type_struct_option" = xyes ; then
  
  for ac_func in getopt_long
  do
*************** esac
*** 14905,14918 ****
  
  # Win32 support
  if test "$PORTNAME" = "win32"; then
! case $LIBOBJS in
!     "gettimeofday.$ac_objext"   | \
!   *" gettimeofday.$ac_objext"   | \
!     "gettimeofday.$ac_objext "* | \
!   *" gettimeofday.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS gettimeofday.$ac_objext" ;;
  esac
  
  case $LIBOBJS in
      "kill.$ac_objext"   | \
    *" kill.$ac_objext"   | \
--- 15049,15166 ----
  
  # Win32 support
  if test "$PORTNAME" = "win32"; then
! 
! for ac_func in gettimeofday
! do
! as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   cat >conftest.$ac_ext <<_ACEOF
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
!    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
! #define $ac_func innocuous_$ac_func
! 
! /* System header to define __stub macros and hopefully few prototypes,
!     which can conflict with char $ac_func (); below.
!     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
!     <limits.h> exists even on freestanding compilers.  */
! 
! #ifdef __STDC__
! # include <limits.h>
! #else
! # include <assert.h>
! #endif
! 
! #undef $ac_func
! 
! /* Override any gcc2 internal prototype to avoid an error.  */
! #ifdef __cplusplus
! extern "C"
! {
! #endif
! /* We use char because int might match the return type of a gcc2
!    builtin and then its argument prototype would still apply.  */
! char $ac_func ();
! /* The GNU C library defines this for functions which it implements
!     to always fail with ENOSYS.  Some functions are actually named
!     something starting with __ and the normal name is an alias.  */
! #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
! choke me
! #else
! char (*f) () = $ac_func;
! #endif
! #ifdef __cplusplus
! }
! #endif
! 
! int
! main ()
! {
! return f != $ac_func;
!   ;
!   return 0;
! }
! _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
!   (eval $ac_link) 2>conftest.er1
!   ac_status=$?
!   grep -v '^ *+' conftest.er1 >conftest.err
!   rm -f conftest.er1
!   cat conftest.err >&5
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"
! 			 || test ! -s conftest.err'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; } &&
! 	 { ac_try='test -s conftest$ac_exeext'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; }; then
!   eval "$as_ac_var=yes"
! else
!   echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
! eval "$as_ac_var=no"
! fi
! rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
! fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
! if test `eval echo '${'$as_ac_var'}'` = yes; then
!   cat >>confdefs.h <<_ACEOF
! #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
! _ACEOF
! 
! else
!   case $LIBOBJS in
!     "$ac_func.$ac_objext"   | \
!   *" $ac_func.$ac_objext"   | \
!     "$ac_func.$ac_objext "* | \
!   *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
+ fi
+ done
+ 
+ 
  case $LIBOBJS in
      "kill.$ac_objext"   | \
    *" kill.$ac_objext"   | \
*************** if test "${ac_cv_lib_ldap_ldap_bind+set}
*** 17185,17191 ****
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
! LIBS="-lldap  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 17433,17439 ----
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
! LIBS="-lldap $EXTRA_LDAP_LIBS $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
*************** echo "$as_me: error: library 'ldap' is r
*** 17256,17262 ****
     { (exit 1); exit 1; }; }
  fi
  
!     LDAP_LIBS_BE="-lldap"
      if test "$enable_thread_safety" = yes; then
        # on some platforms ldap_r fails to link without PTHREAD_LIBS
  
--- 17504,17510 ----
     { (exit 1); exit 1; }; }
  fi
  
!     LDAP_LIBS_BE="-lldap $EXTRA_LDAP_LIBS"
      if test "$enable_thread_safety" = yes; then
        # on some platforms ldap_r fails to link without PTHREAD_LIBS
  
*************** if test "${ac_cv_lib_ldap_r_ldap_simple_
*** 17266,17272 ****
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
! LIBS="-lldap_r $PTHREAD_LIBS $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 17514,17520 ----
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
! LIBS="-lldap_r $PTHREAD_CFLAGS $PTHREAD_LIBS $EXTRA_LDAP_LIBS $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
*************** echo "$as_me: error: library 'ldap_r' is
*** 17337,17345 ****
     { (exit 1); exit 1; }; }
  fi
  
!       LDAP_LIBS_FE="-lldap_r"
      else
!       LDAP_LIBS_FE="-lldap"
      fi
    else
  
--- 17585,17593 ----
     { (exit 1); exit 1; }; }
  fi
  
!       LDAP_LIBS_FE="-lldap_r $EXTRA_LDAP_LIBS"
      else
!       LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"
      fi
    else
  
*************** _ACEOF
*** 21837,21849 ****
  
  if test "$enable_nls" = yes ; then
  
!   echo "$as_me:$LINENO: checking for library containing gettext" >&5
! echo $ECHO_N "checking for library containing gettext... $ECHO_C" >&6
! if test "${ac_cv_search_gettext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
! ac_cv_search_gettext=no
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 22085,22097 ----
  
  if test "$enable_nls" = yes ; then
  
!   echo "$as_me:$LINENO: checking for library containing bind_textdomain_codeset" >&5
! echo $ECHO_N "checking for library containing bind_textdomain_codeset... $ECHO_C" >&6
! if test "${ac_cv_search_bind_textdomain_codeset+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
! ac_cv_search_bind_textdomain_codeset=no
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
*************** extern "C"
*** 21857,21867 ****
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
! char gettext ();
  int
  main ()
  {
! gettext ();
    ;
    return 0;
  }
--- 22105,22115 ----
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
! char bind_textdomain_codeset ();
  int
  main ()
  {
! bind_textdomain_codeset ();
    ;
    return 0;
  }
*************** if { (eval echo "$as_me:$LINENO: \"$ac_l
*** 21888,21894 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_gettext="none required"
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
--- 22136,22142 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_bind_textdomain_codeset="none required"
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
*************** sed 's/^/| /' conftest.$ac_ext >&5
*** 21896,21902 ****
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
! if test "$ac_cv_search_gettext" = no; then
    for ac_lib in intl; do
      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
      cat >conftest.$ac_ext <<_ACEOF
--- 22144,22150 ----
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
! if test "$ac_cv_search_bind_textdomain_codeset" = no; then
    for ac_lib in intl; do
      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
      cat >conftest.$ac_ext <<_ACEOF
*************** extern "C"
*** 21912,21922 ****
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
! char gettext ();
  int
  main ()
  {
! gettext ();
    ;
    return 0;
  }
--- 22160,22170 ----
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
! char bind_textdomain_codeset ();
  int
  main ()
  {
! bind_textdomain_codeset ();
    ;
    return 0;
  }
*************** if { (eval echo "$as_me:$LINENO: \"$ac_l
*** 21943,21949 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_gettext="-l$ac_lib"
  break
  else
    echo "$as_me: failed program was:" >&5
--- 22191,22197 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_bind_textdomain_codeset="-l$ac_lib"
  break
  else
    echo "$as_me: failed program was:" >&5
*************** rm -f conftest.err conftest.$ac_objext \
*** 21956,21965 ****
  fi
  LIBS=$ac_func_search_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_search_gettext" >&5
! echo "${ECHO_T}$ac_cv_search_gettext" >&6
! if test "$ac_cv_search_gettext" != no; then
!   test "$ac_cv_search_gettext" = "none required" || LIBS="$ac_cv_search_gettext $LIBS"
  
  else
    { { echo "$as_me:$LINENO: error: a gettext implementation is required for NLS" >&5
--- 22204,22213 ----
  fi
  LIBS=$ac_func_search_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_search_bind_textdomain_codeset" >&5
! echo "${ECHO_T}$ac_cv_search_bind_textdomain_codeset" >&6
! if test "$ac_cv_search_bind_textdomain_codeset" != no; then
!   test "$ac_cv_search_bind_textdomain_codeset" = "none required" || LIBS="$ac_cv_search_bind_textdomain_codeset $LIBS"
  
  else
    { { echo "$as_me:$LINENO: error: a gettext implementation is required for NLS" >&5
*************** else
*** 22617,22623 ****
        for pgac_postfix in \
          sgml/stylesheets/nwalsh-modular \
          sgml/stylesheets/docbook \
! 		sgml/docbook-dsssl \
          sgml/docbook/dsssl/modular \
          sgml/docbook/stylesheet/dsssl/modular \
          sgml/docbook/dsssl-stylesheets
--- 22865,22872 ----
        for pgac_postfix in \
          sgml/stylesheets/nwalsh-modular \
          sgml/stylesheets/docbook \
!         sgml/stylesheets/dsssl/docbook \
!         sgml/docbook-dsssl \
          sgml/docbook/dsssl/modular \
          sgml/docbook/stylesheet/dsssl/modular \
          sgml/docbook/dsssl-stylesheets
*************** sed 's/^/| /' conftest.$ac_ext >&5
*** 22850,22856 ****
  echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6
    { { echo "$as_me:$LINENO: error: thread test program failed
! This platform is not thread-safe.  Check the file 'config.log'for the
  exact reason.
  
  You can use the configure option --enable-thread-safety-force to force
--- 23099,23105 ----
  echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6
    { { echo "$as_me:$LINENO: error: thread test program failed
! This platform is not thread-safe.  Check the file 'config.log' for the
  exact reason.
  
  You can use the configure option --enable-thread-safety-force to force
*************** threads to be enabled.  But you must the
*** 22858,22864 ****
  src/test/thread and add locking function calls to your applications to
  guarantee thread safety." >&5
  echo "$as_me: error: thread test program failed
! This platform is not thread-safe.  Check the file 'config.log'for the
  exact reason.
  
  You can use the configure option --enable-thread-safety-force to force
--- 23107,23113 ----
  src/test/thread and add locking function calls to your applications to
  guarantee thread safety." >&5
  echo "$as_me: error: thread test program failed
! This platform is not thread-safe.  Check the file 'config.log' for the
  exact reason.
  
  You can use the configure option --enable-thread-safety-force to force
*************** _ASBOX
*** 23278,23284 ****
  } >&5
  cat >&5 <<_CSEOF
  
! This file was extended by PostgreSQL $as_me 8.2.0, which was
  generated by GNU Autoconf 2.59.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
--- 23527,23533 ----
  } >&5
  cat >&5 <<_CSEOF
  
! This file was extended by PostgreSQL $as_me 8.2.14, which was
  generated by GNU Autoconf 2.59.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
*************** _ACEOF
*** 23344,23350 ****
  
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
! PostgreSQL config.status 8.2.0
  configured by $0, generated by GNU Autoconf 2.59,
    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  
--- 23593,23599 ----
  
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
! PostgreSQL config.status 8.2.14
  configured by $0, generated by GNU Autoconf 2.59,
    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"