From 81a8518b4f87be709c7dd60483a294b2bc76ee7f Mon Sep 17 00:00:00 2001
From: susmitha devanga <devanga.susmitha@fujitsu.com>
Date: Tue, 16 Dec 2025 23:18:44 +0530
Subject: [PATCH v1] crc32 sve2

---
 config/c-compiler.m4              |   415 +-
 configure                         | 14831 ++++++++++++++--------------
 configure.ac                      |  1815 ++--
 meson.build                       |  4342 ++++----
 src/include/pg_config.h.in        |   117 +-
 src/include/port/pg_crc32c.h      |     8 +-
 src/port/pg_crc32c_armv8.c        |   188 +
 src/port/pg_crc32c_armv8_choose.c |    48 +-
 8 files changed, 11071 insertions(+), 10693 deletions(-)

diff --git a/config/c-compiler.m4 b/config/c-compiler.m4
index 1509dbfa2ab..adf4dec2679 100644
--- a/config/c-compiler.m4
+++ b/config/c-compiler.m4
@@ -14,11 +14,11 @@ AC_DEFUN([PGAC_PRINTF_ARCHETYPE],
 [pgac_cv_printf_archetype=gnu_printf
 PGAC_TEST_PRINTF_ARCHETYPE
 if [[ "$ac_archetype_ok" = no ]]; then
-  pgac_cv_printf_archetype=__syslog__
-  PGAC_TEST_PRINTF_ARCHETYPE
-  if [[ "$ac_archetype_ok" = no ]]; then
-    pgac_cv_printf_archetype=printf
-  fi
+	pgac_cv_printf_archetype=__syslog__
+	PGAC_TEST_PRINTF_ARCHETYPE
+	if [[ "$ac_archetype_ok" = no ]]; then
+		pgac_cv_printf_archetype=printf
+	fi
 fi])
 AC_DEFINE_UNQUOTED([PG_C_PRINTF_ATTRIBUTE], [$pgac_cv_printf_archetype],
 [Define to best C printf format archetype, usually gnu_printf if available.])
@@ -32,8 +32,8 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
 [extern void pgac_write(int ignore, const char *fmt,...)
 __attribute__((format($pgac_cv_printf_archetype, 2, 3)));],
 [pgac_write(0, "error %s: %m", "foo");])],
-                  [ac_archetype_ok=yes],
-                  [ac_archetype_ok=no])
+									[ac_archetype_ok=yes],
+									[ac_archetype_ok=no])
 ac_c_werror_flag=$ac_save_c_werror_flag
 ])# PGAC_TEST_PRINTF_ARCHETYPE
 
@@ -48,11 +48,11 @@ AC_DEFUN([PGAC_CXX_PRINTF_ARCHETYPE],
 [pgac_cv_cxx_printf_archetype=gnu_printf
 PGAC_TEST_CXX_PRINTF_ARCHETYPE
 if [[ "$ac_archetype_ok" = no ]]; then
-  pgac_cv_cxx_printf_archetype=__syslog__
-  PGAC_TEST_CXX_PRINTF_ARCHETYPE
-  if [[ "$ac_archetype_ok" = no ]]; then
-    pgac_cv_cxx_printf_archetype=printf
-  fi
+	pgac_cv_cxx_printf_archetype=__syslog__
+	PGAC_TEST_CXX_PRINTF_ARCHETYPE
+	if [[ "$ac_archetype_ok" = no ]]; then
+		pgac_cv_cxx_printf_archetype=printf
+	fi
 fi])
 AC_DEFINE_UNQUOTED([PG_CXX_PRINTF_ATTRIBUTE], [$pgac_cv_cxx_printf_archetype],
 [Define to best C++ printf format archetype, usually gnu_printf if available.])
@@ -67,8 +67,8 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
 [extern void pgac_write(int ignore, const char *fmt,...)
 __attribute__((format($pgac_cv_cxx_printf_archetype, 2, 3)));],
 [pgac_write(0, "error %s: %m", "foo");])],
-                  [ac_archetype_ok=yes],
-                  [ac_archetype_ok=no])
+									[ac_archetype_ok=yes],
+									[ac_archetype_ok=no])
 AC_LANG_POP([])
 ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 ])# PGAC_TEST_CXX_PRINTF_ARCHETYPE
@@ -107,17 +107,17 @@ c = a * b;
 d = (c + b) / b;
 /* must use the results, else compiler may optimize arithmetic away */
 if (d != a+1)
-  return 1;
+	return 1;
 ])],
 [pgac_cv__128bit_int=yes],
 [pgac_cv__128bit_int=no])])
 if test x"$pgac_cv__128bit_int" = xyes ; then
-  # Use of non-default alignment with __int128 tickles bugs in some compilers.
-  # If not cross-compiling, we can test for bugs and disable use of __int128
-  # with buggy compilers.  If cross-compiling, hope for the best.
-  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83925
-  AC_CACHE_CHECK([for __int128 alignment bug], [pgac_cv__128bit_int_bug],
-  [AC_RUN_IFELSE([AC_LANG_PROGRAM([
+	# Use of non-default alignment with __int128 tickles bugs in some compilers.
+	# If not cross-compiling, we can test for bugs and disable use of __int128
+	# with buggy compilers.  If cross-compiling, hope for the best.
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83925
+	AC_CACHE_CHECK([for __int128 alignment bug], [pgac_cv__128bit_int_bug],
+	[AC_RUN_IFELSE([AC_LANG_PROGRAM([
 /* This must match the corresponding code in c.h: */
 #if defined(__GNUC__)
 #define pg_attribute_aligned(a) __attribute__((aligned(a)))
@@ -137,15 +137,15 @@ int128a q;
 pass_by_val(main, (int128a) i64);
 q = (int128a) i64;
 if (q != holder)
-  return 1;
+	return 1;
 ])],
-  [pgac_cv__128bit_int_bug=ok],
-  [pgac_cv__128bit_int_bug=broken],
-  [pgac_cv__128bit_int_bug="assuming ok"])])
-  if test x"$pgac_cv__128bit_int_bug" != xbroken ; then
-    AC_DEFINE(PG_INT128_TYPE, __int128, [Define to the name of a signed 128-bit integer type.])
-    AC_CHECK_ALIGNOF(PG_INT128_TYPE)
-  fi
+	[pgac_cv__128bit_int_bug=ok],
+	[pgac_cv__128bit_int_bug=broken],
+	[pgac_cv__128bit_int_bug="assuming ok"])])
+	if test x"$pgac_cv__128bit_int_bug" != xbroken ; then
+		AC_DEFINE(PG_INT128_TYPE, __int128, [Define to the name of a signed 128-bit integer type.])
+		AC_CHECK_ALIGNOF(PG_INT128_TYPE)
+	fi
 fi])# PGAC_TYPE_128BIT_INT
 
 
@@ -161,7 +161,7 @@ AC_DEFUN([PGAC_C_STATEMENT_EXPRESSIONS],
 [pgac_cv_statement_expressions=no])])
 if test x"$pgac_cv_statement_expressions" = xyes ; then
 AC_DEFINE(HAVE_STATEMENT_EXPRESSIONS, 1,
-          [Define to 1 if your compiler supports statement expressions.])
+					[Define to 1 if your compiler supports statement expressions.])
 fi])# PGAC_C_STATEMENT_EXPRESSIONS
 
 
@@ -175,20 +175,20 @@ AC_DEFUN([PGAC_C_TYPEOF],
 [AC_CACHE_CHECK(for typeof, pgac_cv_c_typeof,
 [pgac_cv_c_typeof=no
 for pgac_kw in typeof __typeof__; do
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
 [int x = 0;
 $pgac_kw(x) y;
 y = x;
 return y;])],
 [pgac_cv_c_typeof=$pgac_kw])
-  test "$pgac_cv_c_typeof" != no && break
+	test "$pgac_cv_c_typeof" != no && break
 done])
 if test "$pgac_cv_c_typeof" != no; then
-  AC_DEFINE(HAVE_TYPEOF, 1,
-            [Define to 1 if your compiler understands `typeof' or something similar.])
-  if test "$pgac_cv_c_typeof" != typeof; then
-    AC_DEFINE_UNQUOTED(typeof, $pgac_cv_c_typeof, [Define to how the compiler spells `typeof'.])
-  fi
+	AC_DEFINE(HAVE_TYPEOF, 1,
+						[Define to 1 if your compiler understands `typeof' or something similar.])
+	if test "$pgac_cv_c_typeof" != typeof; then
+		AC_DEFINE_UNQUOTED(typeof, $pgac_cv_c_typeof, [Define to how the compiler spells `typeof'.])
+	fi
 fi])# PGAC_C_TYPEOF
 
 
@@ -208,7 +208,7 @@ AC_DEFUN([PGAC_C_TYPES_COMPATIBLE],
 [pgac_cv__types_compatible=no])])
 if test x"$pgac_cv__types_compatible" = xyes ; then
 AC_DEFINE(HAVE__BUILTIN_TYPES_COMPATIBLE_P, 1,
-          [Define to 1 if your compiler understands __builtin_types_compatible_p.])
+					[Define to 1 if your compiler understands __builtin_types_compatible_p.])
 fi])# PGAC_C_TYPES_COMPATIBLE
 
 
@@ -222,15 +222,15 @@ AC_DEFUN([PGAC_C_BUILTIN_CONSTANT_P],
 [AC_CACHE_CHECK(for __builtin_constant_p, pgac_cv__builtin_constant_p,
 [AC_COMPILE_IFELSE([AC_LANG_SOURCE(
 [[static int x;
-  static int y[__builtin_constant_p(x) ? x : 1];
-  static int z[__builtin_constant_p("string literal") ? 1 : x];
+	static int y[__builtin_constant_p(x) ? x : 1];
+	static int z[__builtin_constant_p("string literal") ? 1 : x];
 ]]
 )],
 [pgac_cv__builtin_constant_p=yes],
 [pgac_cv__builtin_constant_p=no])])
 if test x"$pgac_cv__builtin_constant_p" = xyes ; then
 AC_DEFINE(HAVE__BUILTIN_CONSTANT_P, 1,
-          [Define to 1 if your compiler understands __builtin_constant_p.])
+					[Define to 1 if your compiler understands __builtin_constant_p.])
 fi])# PGAC_C_BUILTIN_CONSTANT_P
 
 
@@ -259,7 +259,7 @@ int oflo;
 [pgac_cv__builtin_op_overflow=no])])
 if test x"$pgac_cv__builtin_op_overflow" = xyes ; then
 AC_DEFINE(HAVE__BUILTIN_OP_OVERFLOW, 1,
-          [Define to 1 if your compiler understands __builtin_$op_overflow.])
+					[Define to 1 if your compiler understands __builtin_$op_overflow.])
 fi])# PGAC_C_BUILTIN_OP_OVERFLOW
 
 
@@ -280,7 +280,7 @@ AC_DEFUN([PGAC_C_BUILTIN_UNREACHABLE],
 [pgac_cv__builtin_unreachable=no])])
 if test x"$pgac_cv__builtin_unreachable" = xyes ; then
 AC_DEFINE(HAVE__BUILTIN_UNREACHABLE, 1,
-          [Define to 1 if your compiler understands __builtin_unreachable.])
+					[Define to 1 if your compiler understands __builtin_unreachable.])
 fi])# PGAC_C_BUILTIN_UNREACHABLE
 
 
@@ -296,15 +296,15 @@ AC_DEFUN([PGAC_C_COMPUTED_GOTO],
 [AC_CACHE_CHECK(for computed goto support, pgac_cv_computed_goto,
 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
 [[void *labeladdrs[] = {&&my_label};
-  goto *labeladdrs[0];
-  my_label:
-  return 1;
+	goto *labeladdrs[0];
+	my_label:
+	return 1;
 ]])],
 [pgac_cv_computed_goto=yes],
 [pgac_cv_computed_goto=no])])
 if test x"$pgac_cv_computed_goto" = xyes ; then
 AC_DEFINE(HAVE_COMPUTED_GOTO, 1,
-          [Define to 1 if your compiler handles computed gotos.])
+					[Define to 1 if your compiler handles computed gotos.])
 fi])# PGAC_C_COMPUTED_GOTO
 
 
@@ -325,13 +325,13 @@ AC_DEFUN([PGAC_CHECK_BUILTIN_FUNC],
 int
 call$1($2)
 {
-    return $1(x);
+		return $1(x);
 }], [])],
 [pgac_cv$1=yes],
 [pgac_cv$1=no])])
 if test x"${pgac_cv$1}" = xyes ; then
 AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE$1]), 1,
-                   [Define to 1 if your compiler understands $1.])
+									 [Define to 1 if your compiler understands $1.])
 fi])# PGAC_CHECK_BUILTIN_FUNC
 
 
@@ -347,13 +347,13 @@ AC_DEFUN([PGAC_CHECK_BUILTIN_FUNC_PTR],
 void *
 call$1(void)
 {
-    return $1($2);
+		return $1($2);
 }], [])],
 [pgac_cv$1=yes],
 [pgac_cv$1=no])])
 if test x"${pgac_cv$1}" = xyes ; then
 AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE$1]), 1,
-                   [Define to 1 if your compiler understands $1.])
+									 [Define to 1 if your compiler understands $1.])
 fi])# PGAC_CHECK_BUILTIN_FUNC_PTR
 
 
@@ -373,13 +373,13 @@ CFLAGS="${$2} $3"
 ac_save_c_werror_flag=$ac_c_werror_flag
 ac_c_werror_flag=yes
 _AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
-                   [Ac_cachevar=yes],
-                   [Ac_cachevar=no])
+									 [Ac_cachevar=yes],
+									 [Ac_cachevar=no])
 ac_c_werror_flag=$ac_save_c_werror_flag
 CFLAGS="$pgac_save_CFLAGS"
 CC="$pgac_save_CC"])
 if test x"$Ac_cachevar" = x"yes"; then
-  $2="${$2} $3"
+	$2="${$2} $3"
 fi
 undefine([Ac_cachevar])dnl
 ])# PGAC_PROG_VARCC_VARFLAGS_OPT
@@ -423,14 +423,14 @@ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
 ac_cxx_werror_flag=yes
 AC_LANG_PUSH(C++)
 _AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
-                   [Ac_cachevar=yes],
-                   [Ac_cachevar=no])
+									 [Ac_cachevar=yes],
+									 [Ac_cachevar=no])
 AC_LANG_POP([])
 ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 CXXFLAGS="$pgac_save_CXXFLAGS"
 CXX="$pgac_save_CXX"])
 if test x"$Ac_cachevar" = x"yes"; then
-  $2="${$2} $3"
+	$2="${$2} $3"
 fi
 undefine([Ac_cachevar])dnl
 ])# PGAC_PROG_VARCXX_VARFLAGS_OPT
@@ -460,12 +460,12 @@ AC_CACHE_CHECK([whether $CC supports $2, for $1], [Ac_cachevar],
 [pgac_save_LDFLAGS=$LDFLAGS
 LDFLAGS="$pgac_save_LDFLAGS $2"
 AC_RUN_IFELSE([AC_LANG_PROGRAM([extern void $3 (); void (*fptr) () = $3;],[])],
-              [Ac_cachevar=yes],
-              [Ac_cachevar=no],
-              [Ac_cachevar="assuming no"])
+							[Ac_cachevar=yes],
+							[Ac_cachevar=no],
+							[Ac_cachevar="assuming no"])
 LDFLAGS="$pgac_save_LDFLAGS"])
 if test x"$Ac_cachevar" = x"yes"; then
-  $1="${$1} $2"
+	$1="${$1} $2"
 fi
 undefine([Ac_cachevar])dnl
 ])# PGAC_PROG_CC_LD_VARFLAGS_OPT
@@ -490,13 +490,13 @@ AC_DEFUN([PGAC_PROG_CC_LDFLAGS_OPT],
 AC_DEFUN([PGAC_HAVE_GCC__SYNC_CHAR_TAS],
 [AC_CACHE_CHECK(for builtin __sync char locking functions, pgac_cv_gcc_sync_char_tas,
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([],
-  [char lock = 0;
-   __sync_lock_test_and_set(&lock, 1);
-   __sync_lock_release(&lock);])],
-  [pgac_cv_gcc_sync_char_tas="yes"],
-  [pgac_cv_gcc_sync_char_tas="no"])])
+	[char lock = 0;
+	 __sync_lock_test_and_set(&lock, 1);
+	 __sync_lock_release(&lock);])],
+	[pgac_cv_gcc_sync_char_tas="yes"],
+	[pgac_cv_gcc_sync_char_tas="no"])])
 if test x"$pgac_cv_gcc_sync_char_tas" = x"yes"; then
-  AC_DEFINE(HAVE_GCC__SYNC_CHAR_TAS, 1, [Define to 1 if you have __sync_lock_test_and_set(char *) and friends.])
+	AC_DEFINE(HAVE_GCC__SYNC_CHAR_TAS, 1, [Define to 1 if you have __sync_lock_test_and_set(char *) and friends.])
 fi])# PGAC_HAVE_GCC__SYNC_CHAR_TAS
 
 # PGAC_HAVE_GCC__SYNC_INT32_TAS
@@ -506,13 +506,13 @@ fi])# PGAC_HAVE_GCC__SYNC_CHAR_TAS
 AC_DEFUN([PGAC_HAVE_GCC__SYNC_INT32_TAS],
 [AC_CACHE_CHECK(for builtin __sync int32 locking functions, pgac_cv_gcc_sync_int32_tas,
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([],
-  [int lock = 0;
-   __sync_lock_test_and_set(&lock, 1);
-   __sync_lock_release(&lock);])],
-  [pgac_cv_gcc_sync_int32_tas="yes"],
-  [pgac_cv_gcc_sync_int32_tas="no"])])
+	[int lock = 0;
+	 __sync_lock_test_and_set(&lock, 1);
+	 __sync_lock_release(&lock);])],
+	[pgac_cv_gcc_sync_int32_tas="yes"],
+	[pgac_cv_gcc_sync_int32_tas="no"])])
 if test x"$pgac_cv_gcc_sync_int32_tas" = x"yes"; then
-  AC_DEFINE(HAVE_GCC__SYNC_INT32_TAS, 1, [Define to 1 if you have __sync_lock_test_and_set(int *) and friends.])
+	AC_DEFINE(HAVE_GCC__SYNC_INT32_TAS, 1, [Define to 1 if you have __sync_lock_test_and_set(int *) and friends.])
 fi])# PGAC_HAVE_GCC__SYNC_INT32_TAS
 
 # PGAC_HAVE_GCC__SYNC_INT32_CAS
@@ -522,12 +522,12 @@ fi])# PGAC_HAVE_GCC__SYNC_INT32_TAS
 AC_DEFUN([PGAC_HAVE_GCC__SYNC_INT32_CAS],
 [AC_CACHE_CHECK(for builtin __sync int32 atomic operations, pgac_cv_gcc_sync_int32_cas,
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([],
-  [int val = 0;
-   __sync_val_compare_and_swap(&val, 0, 37);])],
-  [pgac_cv_gcc_sync_int32_cas="yes"],
-  [pgac_cv_gcc_sync_int32_cas="no"])])
+	[int val = 0;
+	 __sync_val_compare_and_swap(&val, 0, 37);])],
+	[pgac_cv_gcc_sync_int32_cas="yes"],
+	[pgac_cv_gcc_sync_int32_cas="no"])])
 if test x"$pgac_cv_gcc_sync_int32_cas" = x"yes"; then
-  AC_DEFINE(HAVE_GCC__SYNC_INT32_CAS, 1, [Define to 1 if you have __sync_val_compare_and_swap(int *, int, int).])
+	AC_DEFINE(HAVE_GCC__SYNC_INT32_CAS, 1, [Define to 1 if you have __sync_val_compare_and_swap(int *, int, int).])
 fi])# PGAC_HAVE_GCC__SYNC_INT32_CAS
 
 # PGAC_HAVE_GCC__SYNC_INT64_CAS
@@ -537,12 +537,12 @@ fi])# PGAC_HAVE_GCC__SYNC_INT32_CAS
 AC_DEFUN([PGAC_HAVE_GCC__SYNC_INT64_CAS],
 [AC_CACHE_CHECK(for builtin __sync int64 atomic operations, pgac_cv_gcc_sync_int64_cas,
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <stdint.h>],
-  [int64_t lock = 0;
-   __sync_val_compare_and_swap(&lock, 0, (int64_t) 37);])],
-  [pgac_cv_gcc_sync_int64_cas="yes"],
-  [pgac_cv_gcc_sync_int64_cas="no"])])
+	[int64_t lock = 0;
+	 __sync_val_compare_and_swap(&lock, 0, (int64_t) 37);])],
+	[pgac_cv_gcc_sync_int64_cas="yes"],
+	[pgac_cv_gcc_sync_int64_cas="no"])])
 if test x"$pgac_cv_gcc_sync_int64_cas" = x"yes"; then
-  AC_DEFINE(HAVE_GCC__SYNC_INT64_CAS, 1, [Define to 1 if you have __sync_val_compare_and_swap(int64_t *, int64_t, int64_t).])
+	AC_DEFINE(HAVE_GCC__SYNC_INT64_CAS, 1, [Define to 1 if you have __sync_val_compare_and_swap(int64_t *, int64_t, int64_t).])
 fi])# PGAC_HAVE_GCC__SYNC_INT64_CAS
 
 # PGAC_HAVE_GCC__ATOMIC_INT32_CAS
@@ -552,13 +552,13 @@ fi])# PGAC_HAVE_GCC__SYNC_INT64_CAS
 AC_DEFUN([PGAC_HAVE_GCC__ATOMIC_INT32_CAS],
 [AC_CACHE_CHECK(for builtin __atomic int32 atomic operations, pgac_cv_gcc_atomic_int32_cas,
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([],
-  [int val = 0;
-   int expect = 0;
-   __atomic_compare_exchange_n(&val, &expect, 37, 0, __ATOMIC_SEQ_CST, __ATOMIC_RELAXED);])],
-  [pgac_cv_gcc_atomic_int32_cas="yes"],
-  [pgac_cv_gcc_atomic_int32_cas="no"])])
+	[int val = 0;
+	 int expect = 0;
+	 __atomic_compare_exchange_n(&val, &expect, 37, 0, __ATOMIC_SEQ_CST, __ATOMIC_RELAXED);])],
+	[pgac_cv_gcc_atomic_int32_cas="yes"],
+	[pgac_cv_gcc_atomic_int32_cas="no"])])
 if test x"$pgac_cv_gcc_atomic_int32_cas" = x"yes"; then
-  AC_DEFINE(HAVE_GCC__ATOMIC_INT32_CAS, 1, [Define to 1 if you have __atomic_compare_exchange_n(int *, int *, int).])
+	AC_DEFINE(HAVE_GCC__ATOMIC_INT32_CAS, 1, [Define to 1 if you have __atomic_compare_exchange_n(int *, int *, int).])
 fi])# PGAC_HAVE_GCC__ATOMIC_INT32_CAS
 
 # PGAC_HAVE_GCC__ATOMIC_INT64_CAS
@@ -568,13 +568,13 @@ fi])# PGAC_HAVE_GCC__ATOMIC_INT32_CAS
 AC_DEFUN([PGAC_HAVE_GCC__ATOMIC_INT64_CAS],
 [AC_CACHE_CHECK(for builtin __atomic int64 atomic operations, pgac_cv_gcc_atomic_int64_cas,
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <stdint.h>],
-  [int64_t val = 0;
-   int64_t expect = 0;
-   __atomic_compare_exchange_n(&val, &expect, 37, 0, __ATOMIC_SEQ_CST, __ATOMIC_RELAXED);])],
-  [pgac_cv_gcc_atomic_int64_cas="yes"],
-  [pgac_cv_gcc_atomic_int64_cas="no"])])
+	[int64_t val = 0;
+	 int64_t expect = 0;
+	 __atomic_compare_exchange_n(&val, &expect, 37, 0, __ATOMIC_SEQ_CST, __ATOMIC_RELAXED);])],
+	[pgac_cv_gcc_atomic_int64_cas="yes"],
+	[pgac_cv_gcc_atomic_int64_cas="no"])])
 if test x"$pgac_cv_gcc_atomic_int64_cas" = x"yes"; then
-  AC_DEFINE(HAVE_GCC__ATOMIC_INT64_CAS, 1, [Define to 1 if you have __atomic_compare_exchange_n(int64 *, int64 *, int64).])
+	AC_DEFINE(HAVE_GCC__ATOMIC_INT64_CAS, 1, [Define to 1 if you have __atomic_compare_exchange_n(int64 *, int64 *, int64).])
 fi])# PGAC_HAVE_GCC__ATOMIC_INT64_CAS
 
 # PGAC_SSE42_CRC32_INTRINSICS
@@ -593,22 +593,22 @@ AC_DEFUN([PGAC_SSE42_CRC32_INTRINSICS],
 [define([Ac_cachevar], [AS_TR_SH([pgac_cv_sse42_crc32_intrinsics])])dnl
 AC_CACHE_CHECK([for _mm_crc32_u8 and _mm_crc32_u32], [Ac_cachevar],
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <nmmintrin.h>
-    unsigned int crc;
-    #if defined(__has_attribute) && __has_attribute (target)
-    __attribute__((target("sse4.2")))
-    #endif
-    static int crc32_sse42_test(void)
-    {
-      crc = _mm_crc32_u8(crc, 0);
-      crc = _mm_crc32_u32(crc, 0);
-      /* return computed value, to prevent the above being optimized away */
-      return crc == 0;
-    }],
-  [return crc32_sse42_test();])],
-  [Ac_cachevar=yes],
-  [Ac_cachevar=no])])
+		unsigned int crc;
+		#if defined(__has_attribute) && __has_attribute (target)
+		__attribute__((target("sse4.2")))
+		#endif
+		static int crc32_sse42_test(void)
+		{
+			crc = _mm_crc32_u8(crc, 0);
+			crc = _mm_crc32_u32(crc, 0);
+			/* return computed value, to prevent the above being optimized away */
+			return crc == 0;
+		}],
+	[return crc32_sse42_test();])],
+	[Ac_cachevar=yes],
+	[Ac_cachevar=no])])
 if test x"$Ac_cachevar" = x"yes"; then
-  pgac_sse42_crc32_intrinsics=yes
+	pgac_sse42_crc32_intrinsics=yes
 fi
 undefine([Ac_cachevar])dnl
 ])# PGAC_SSE42_CRC32_INTRINSICS
@@ -624,30 +624,30 @@ AC_DEFUN([PGAC_AVX512_PCLMUL_INTRINSICS],
 [define([Ac_cachevar], [AS_TR_SH([pgac_cv_avx512_pclmul_intrinsics])])dnl
 AC_CACHE_CHECK([for _mm512_clmulepi64_epi128], [Ac_cachevar],
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <immintrin.h>
-    __m512i x;
-    __m512i y;
-
-    #if defined(__has_attribute) && __has_attribute (target)
-    __attribute__((target("vpclmulqdq,avx512vl")))
-    #endif
-    static int avx512_pclmul_test(void)
-    {
-      __m128i z;
-
-      x = _mm512_xor_si512(_mm512_zextsi128_si512(_mm_cvtsi32_si128(0)), x);
-      y = _mm512_clmulepi64_epi128(x, y, 0);
-      z = _mm_ternarylogic_epi64(
-                _mm512_castsi512_si128(y),
-                _mm512_extracti32x4_epi32(y, 1),
-                _mm512_extracti32x4_epi32(y, 2),
-                0x96);
-      return _mm_crc32_u64(0, _mm_extract_epi64(z, 0));
-    }],
-  [return avx512_pclmul_test();])],
-  [Ac_cachevar=yes],
-  [Ac_cachevar=no])])
+		__m512i x;
+		__m512i y;
+
+		#if defined(__has_attribute) && __has_attribute (target)
+		__attribute__((target("vpclmulqdq,avx512vl")))
+		#endif
+		static int avx512_pclmul_test(void)
+		{
+			__m128i z;
+
+			x = _mm512_xor_si512(_mm512_zextsi128_si512(_mm_cvtsi32_si128(0)), x);
+			y = _mm512_clmulepi64_epi128(x, y, 0);
+			z = _mm_ternarylogic_epi64(
+								_mm512_castsi512_si128(y),
+								_mm512_extracti32x4_epi32(y, 1),
+								_mm512_extracti32x4_epi32(y, 2),
+								0x96);
+			return _mm_crc32_u64(0, _mm_extract_epi64(z, 0));
+		}],
+	[return avx512_pclmul_test();])],
+	[Ac_cachevar=yes],
+	[Ac_cachevar=no])])
 if test x"$Ac_cachevar" = x"yes"; then
-  pgac_avx512_pclmul_intrinsics=yes
+	pgac_avx512_pclmul_intrinsics=yes
 fi
 undefine([Ac_cachevar])dnl
 ])# PGAC_AVX512_PCLMUL_INTRINSICS
@@ -669,18 +669,18 @@ AC_CACHE_CHECK([for __crc32cb, __crc32ch, __crc32cw, and __crc32cd with CFLAGS=$
 CFLAGS="$pgac_save_CFLAGS $1"
 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <arm_acle.h>
 unsigned int crc;],
-  [crc = __crc32cb(crc, 0);
-   crc = __crc32ch(crc, 0);
-   crc = __crc32cw(crc, 0);
-   crc = __crc32cd(crc, 0);
-   /* return computed value, to prevent the above being optimized away */
-   return crc == 0;])],
-  [Ac_cachevar=yes],
-  [Ac_cachevar=no])
+	[crc = __crc32cb(crc, 0);
+	 crc = __crc32ch(crc, 0);
+	 crc = __crc32cw(crc, 0);
+	 crc = __crc32cd(crc, 0);
+	 /* return computed value, to prevent the above being optimized away */
+	 return crc == 0;])],
+	[Ac_cachevar=yes],
+	[Ac_cachevar=no])
 CFLAGS="$pgac_save_CFLAGS"])
 if test x"$Ac_cachevar" = x"yes"; then
-  CFLAGS_CRC="$1"
-  pgac_armv8_crc32c_intrinsics=yes
+	CFLAGS_CRC="$1"
+	pgac_armv8_crc32c_intrinsics=yes
 fi
 undefine([Ac_cachevar])dnl
 ])# PGAC_ARMV8_CRC32C_INTRINSICS
@@ -700,19 +700,19 @@ undefine([Ac_cachevar])dnl
 AC_DEFUN([PGAC_LOONGARCH_CRC32C_INTRINSICS],
 [define([Ac_cachevar], [AS_TR_SH([pgac_cv_loongarch_crc32c_intrinsics])])dnl
 AC_CACHE_CHECK(
-  [for __builtin_loongarch_crcc_w_b_w, __builtin_loongarch_crcc_w_h_w, __builtin_loongarch_crcc_w_w_w and __builtin_loongarch_crcc_w_d_w],
-  [Ac_cachevar],
+	[for __builtin_loongarch_crcc_w_b_w, __builtin_loongarch_crcc_w_h_w, __builtin_loongarch_crcc_w_w_w and __builtin_loongarch_crcc_w_d_w],
+	[Ac_cachevar],
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([unsigned int crc;],
-  [crc = __builtin_loongarch_crcc_w_b_w(0, crc);
-   crc = __builtin_loongarch_crcc_w_h_w(0, crc);
-   crc = __builtin_loongarch_crcc_w_w_w(0, crc);
-   crc = __builtin_loongarch_crcc_w_d_w(0, crc);
-   /* return computed value, to prevent the above being optimized away */
-   return crc == 0;])],
-  [Ac_cachevar=yes],
-  [Ac_cachevar=no])])
+	[crc = __builtin_loongarch_crcc_w_b_w(0, crc);
+	 crc = __builtin_loongarch_crcc_w_h_w(0, crc);
+	 crc = __builtin_loongarch_crcc_w_w_w(0, crc);
+	 crc = __builtin_loongarch_crcc_w_d_w(0, crc);
+	 /* return computed value, to prevent the above being optimized away */
+	 return crc == 0;])],
+	[Ac_cachevar=yes],
+	[Ac_cachevar=no])])
 if test x"$Ac_cachevar" = x"yes"; then
-  pgac_loongarch_crc32c_intrinsics=yes
+	pgac_loongarch_crc32c_intrinsics=yes
 fi
 undefine([Ac_cachevar])dnl
 ])# PGAC_LOONGARCH_CRC32C_INTRINSICS
@@ -727,18 +727,18 @@ AC_DEFUN([PGAC_XSAVE_INTRINSICS],
 [define([Ac_cachevar], [AS_TR_SH([pgac_cv_xsave_intrinsics])])dnl
 AC_CACHE_CHECK([for _xgetbv], [Ac_cachevar],
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <immintrin.h>
-    #if defined(__has_attribute) && __has_attribute (target)
-    __attribute__((target("xsave")))
-    #endif
-    static int xsave_test(void)
-    {
-      return _xgetbv(0) & 0xe0;
-    }],
-  [return xsave_test();])],
-  [Ac_cachevar=yes],
-  [Ac_cachevar=no])])
+		#if defined(__has_attribute) && __has_attribute (target)
+		__attribute__((target("xsave")))
+		#endif
+		static int xsave_test(void)
+		{
+			return _xgetbv(0) & 0xe0;
+		}],
+	[return xsave_test();])],
+	[Ac_cachevar=yes],
+	[Ac_cachevar=no])])
 if test x"$Ac_cachevar" = x"yes"; then
-  pgac_xsave_intrinsics=yes
+	pgac_xsave_intrinsics=yes
 fi
 undefine([Ac_cachevar])dnl
 ])# PGAC_XSAVE_INTRINSICS
@@ -754,27 +754,27 @@ AC_DEFUN([PGAC_AVX512_POPCNT_INTRINSICS],
 [define([Ac_cachevar], [AS_TR_SH([pgac_cv_avx512_popcnt_intrinsics])])dnl
 AC_CACHE_CHECK([for _mm512_popcnt_epi64], [Ac_cachevar],
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <immintrin.h>
-    #include <stdint.h>
-    char buf[sizeof(__m512i)];
-
-    #if defined(__has_attribute) && __has_attribute (target)
-    __attribute__((target("avx512vpopcntdq,avx512bw")))
-    #endif
-    static int popcount_test(void)
-    {
-      int64_t popcnt = 0;
-      __m512i accum = _mm512_setzero_si512();
-      __m512i val = _mm512_maskz_loadu_epi8((__mmask64) 0xf0f0f0f0f0f0f0f0, (const __m512i *) buf);
-      __m512i cnt = _mm512_popcnt_epi64(val);
-      accum = _mm512_add_epi64(accum, cnt);
-      popcnt = _mm512_reduce_add_epi64(accum);
-      return (int) popcnt;
-    }]],
-  [return popcount_test();])],
-  [Ac_cachevar=yes],
-  [Ac_cachevar=no])])
+		#include <stdint.h>
+		char buf[sizeof(__m512i)];
+
+		#if defined(__has_attribute) && __has_attribute (target)
+		__attribute__((target("avx512vpopcntdq,avx512bw")))
+		#endif
+		static int popcount_test(void)
+		{
+			int64_t popcnt = 0;
+			__m512i accum = _mm512_setzero_si512();
+			__m512i val = _mm512_maskz_loadu_epi8((__mmask64) 0xf0f0f0f0f0f0f0f0, (const __m512i *) buf);
+			__m512i cnt = _mm512_popcnt_epi64(val);
+			accum = _mm512_add_epi64(accum, cnt);
+			popcnt = _mm512_reduce_add_epi64(accum);
+			return (int) popcnt;
+		}]],
+	[return popcount_test();])],
+	[Ac_cachevar=yes],
+	[Ac_cachevar=no])])
 if test x"$Ac_cachevar" = x"yes"; then
-  pgac_avx512_popcnt_intrinsics=yes
+	pgac_avx512_popcnt_intrinsics=yes
 fi
 undefine([Ac_cachevar])dnl
 ])# PGAC_AVX512_POPCNT_INTRINSICS
@@ -822,11 +822,48 @@ AC_CACHE_CHECK([for svcnt_x], [Ac_cachevar],
 		vec8 = svand_n_u8_x(pred, svld1_u8(pred, (const uint8_t *) p), 0x55);
 		return (int) (popcnt + svaddv_u8(pred, svcnt_u8_x(pred, vec8)));
 	}]],
-  [return popcount_test();])],
-  [Ac_cachevar=yes],
-  [Ac_cachevar=no])])
+	[return popcount_test();])],
+	[Ac_cachevar=yes],
+	[Ac_cachevar=no])])
 if test x"$Ac_cachevar" = x"yes"; then
-  pgac_sve_popcnt_intrinsics=yes
+	pgac_sve_popcnt_intrinsics=yes
 fi
 undefine([Ac_cachevar])dnl
 ])# PGAC_SVE_POPCNT_INTRINSICS
+
+# PGAC_SVE2_CRC32_INTRINSICS
+# --------------------------
+# Check if the compiler supports the SVE2 CRC32 intrinsics like:
+# svcrc32b_u32, svcrc32h_u32, svcrc32w_u32, svcrc32x_u32, etc.
+#
+# If supported, sets pgac_sve2_crc32_intrinsics.
+AC_DEFUN([PGAC_SVE2_CRC32_INTRINSICS],
+[define([Ac_cachevar], [AS_TR_SH([pgac_cv_sve2_crc32_intrinsics])])dnl
+AC_CACHE_CHECK([for SVE2 CRC32 intrinsics], [Ac_cachevar],
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <arm_sve.h>
+#include <stdint.h>
+
+#if defined(__has_attribute) && __has_attribute (target)
+__attribute__((target("arch=armv9-a+sve2-aes")))
+#endif
+static uint32_t test_crc32_sve2(void)
+{
+		svbool_t pg = svptrue_b64();
+	const uint64_t data[2] = { 0x1234567890abcdef, 0xfedcba0987654321 };
+	svuint64_t x1 = svld1_u64(pg, data);
+	svuint64_t x2 = svld1_u64(pg, data + 1);
+
+	// test key CRC folding ops
+	svuint64_t m1 = svpmullb_pair_u64(x1, x2);
+	svuint64_t m2 = svpmullt_pair_u64(x1, x2);
+	svuint64_t res = sveor3_u64(m1, m2, x2);
+	return (int)svaddv_u64(pg, res) & 1;
+}]],
+[return (int)test_crc32_sve2();])],
+[Ac_cachevar=yes],
+[Ac_cachevar=no])])
+if test x"$Ac_cachevar" = x"yes"; then
+	pgac_sve2_crc32_intrinsics=yes
+fi
+undefine([Ac_cachevar])dnl
+])# PGAC_SVE2_CRC32_INTRINSICS
diff --git a/configure b/configure
index 14ad0a5006f..669250805cf 100755
--- a/configure
+++ b/configure
@@ -19,18 +19,18 @@
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
+	emulate sh
+	NULLCMD=:
+	# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+	# is contrary to our usage.  Disable this feature.
+	alias -g '${1+"$@"}'='"$@"'
+	setopt NO_GLOB_SUBST
+else
+	case `(set -o) 2>/dev/null` in #(
+	*posix*) :
+		set -o posix ;; #(
+	*) :
+		 ;;
 esac
 fi
 
@@ -45,41 +45,41 @@ as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
 # Prefer a ksh shell builtin over an external printf program on Solaris,
 # but without wasting forks for bash or zsh.
 if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
+		&& (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+	as_echo='print -r --'
+	as_echo_n='print -rn --'
 elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
+	as_echo='printf %s\n'
+	as_echo_n='printf %s'
+else
+	if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+		as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+		as_echo_n='/usr/ucb/echo -n'
+	else
+		as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+		as_echo_n_body='eval
+			arg=$1;
+			case $arg in #(
+			*"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
+			esac;
+			expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+		'
+		export as_echo_n_body
+		as_echo_n='sh -c $as_echo_n_body as_echo'
+	fi
+	export as_echo_body
+	as_echo='sh -c $as_echo_body as_echo'
 fi
 
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
+	PATH_SEPARATOR=:
+	(PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+		(PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+			PATH_SEPARATOR=';'
+	}
 fi
 
 
@@ -93,26 +93,26 @@ IFS=" ""	$as_nl"
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	*[\\/]* ) as_myself=$0 ;;
+	*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+	done
 IFS=$as_save_IFS
 
-     ;;
+		 ;;
 esac
 # We did not find ourselves, most probably we were run as `sh COMMAND'
 # in which case we are not to be found in the path.
 if test "x$as_myself" = x; then
-  as_myself=$0
+	as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
+	$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+	exit 1
 fi
 
 # Unset variables that we do not need and which cause bugs (e.g. in
@@ -121,7 +121,7 @@ fi
 # trigger a bug in pdksh 5.2.14.
 for as_var in BASH_ENV ENV MAIL MAILPATH
 do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+	&& ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -137,10 +137,10 @@ export LANGUAGE
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Use a proper internal environment variable to ensure we don't fall
-  # into an infinite loop, continuously re-executing ourselves.
-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-    _as_can_reexec=no; export _as_can_reexec;
-    # We cannot yet assume a decent shell, so we have to provide a
+	# into an infinite loop, continuously re-executing ourselves.
+	if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+		_as_can_reexec=no; export _as_can_reexec;
+		# We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
 # works around shells that cannot unset nonexistent variables.
 # Preserve -v and -x to the replacement shell.
@@ -148,37 +148,37 @@ BASH_ENV=/dev/null
 ENV=/dev/null
 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
+	*v*x* | *x*v* ) as_opts=-vx ;;
+	*v* ) as_opts=-v ;;
+	*x* ) as_opts=-x ;;
+	* ) as_opts= ;;
 esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
 $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
 as_fn_exit 255
-  fi
-  # We don't want this to propagate to other subprocesses.
-          { _as_can_reexec=; unset _as_can_reexec;}
+	fi
+	# We don't want this to propagate to other subprocesses.
+					{ _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
+	as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+	emulate sh
+	NULLCMD=:
+	# Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+	# is contrary to our usage.  Disable this feature.
+	alias -g '\${1+\"\$@\"}'='\"\$@\"'
+	setopt NO_GLOB_SUBST
+else
+	case \`(set -o) 2>/dev/null\` in #(
+	*posix*) :
+		set -o posix ;; #(
+	*) :
+		 ;;
 esac
 fi
 "
-  as_required="as_fn_return () { (exit \$1); }
+	as_required="as_fn_return () { (exit \$1); }
 as_fn_success () { as_fn_return 0; }
 as_fn_failure () { as_fn_return 1; }
 as_fn_ret_success () { return 0; }
@@ -192,56 +192,56 @@ as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
 if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 
 else
-  exitcode=1; echo positional parameters were not saved.
+	exitcode=1; echo positional parameters were not saved.
 fi
 test x\$exitcode = x0 || exit 1
 test -x / || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+	as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+	as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+	eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+	test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
 test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
+	if (eval "$as_required") 2>/dev/null; then :
+	as_have_required=yes
 else
-  as_have_required=no
+	as_have_required=no
 fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+	if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
 else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+	as_found=:
+	case $as_dir in #(
 	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
+		 for as_base in sh bash ksh sh5; do
+			 # Try only shells that exist, to save several forks.
+			 as_shell=$as_dir/$as_base
+			 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+				{ $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+	CONFIG_SHELL=$as_shell as_have_required=yes
+			 if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+	break 2
+fi
+fi
+		 done;;
+			 esac
+	as_found=false
 done
 $as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
+				{ $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+	CONFIG_SHELL=$SHELL as_have_required=yes
 fi; }
 IFS=$as_save_IFS
 
 
-      if test "x$CONFIG_SHELL" != x; then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
+			if test "x$CONFIG_SHELL" != x; then :
+	export CONFIG_SHELL
+						 # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
 # works around shells that cannot unset nonexistent variables.
 # Preserve -v and -x to the replacement shell.
@@ -249,10 +249,10 @@ BASH_ENV=/dev/null
 ENV=/dev/null
 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
+	*v*x* | *x*v* ) as_opts=-vx ;;
+	*v* ) as_opts=-v ;;
+	*x* ) as_opts=-x ;;
+	* ) as_opts= ;;
 esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
@@ -261,20 +261,20 @@ $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and
+		if test x$as_have_required = xno; then :
+	$as_echo "$0: This script requires a shell more modern than all"
+	$as_echo "$0: the shells that I found on your system."
+	if test x${ZSH_VERSION+set} = xset ; then
+		$as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+		$as_echo "$0: be upgraded to zsh 4.3.4 or later."
+	else
+		$as_echo "$0: Please tell bug-autoconf@gnu.org and
 $0: pgsql-bugs@lists.postgresql.org about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
-  fi
-  exit 1
+	fi
+	exit 1
 fi
 fi
 fi
@@ -292,7 +292,7 @@ unset CLICOLOR_FORCE GREP_OPTIONS
 # Portably unset VAR.
 as_fn_unset ()
 {
-  { eval $1=; unset $1;}
+	{ eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
 
@@ -301,7 +301,7 @@ as_unset=as_fn_unset
 # Set $? to STATUS, without forking.
 as_fn_set_status ()
 {
-  return $1
+	return $1
 } # as_fn_set_status
 
 # as_fn_exit STATUS
@@ -309,9 +309,9 @@ as_fn_set_status ()
 # Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
 as_fn_exit ()
 {
-  set +e
-  as_fn_set_status $1
-  exit $1
+	set +e
+	as_fn_set_status $1
+	exit $1
 } # as_fn_exit
 
 # as_fn_mkdir_p
@@ -320,44 +320,44 @@ as_fn_exit ()
 as_fn_mkdir_p ()
 {
 
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
+	case $as_dir in #(
+	-*) as_dir=./$as_dir;;
+	esac
+	test -d "$as_dir" || eval $as_mkdir_p || {
+		as_dirs=
+		while :; do
+			case $as_dir in #(
+			*\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+			*) as_qdir=$as_dir;;
+			esac
+			as_dirs="'$as_qdir' $as_dirs"
+			as_dir=`$as_dirname -- "$as_dir" ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+		sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+			s//\1/
+			q
+		}
+		/^X\(\/\/\)[^/].*/{
+			s//\1/
+			q
+		}
+		/^X\(\/\/\)$/{
+			s//\1/
+			q
+		}
+		/^X\(\/\).*/{
+			s//\1/
+			q
+		}
+		s/.*/./; q'`
+			test -d "$as_dir" && break
+		done
+		test -z "$as_dirs" || eval "mkdir $as_dirs"
+	} || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -367,7 +367,7 @@ $as_echo X"$as_dir" |
 # Test if FILE is an executable regular file.
 as_fn_executable_p ()
 {
-  test -f "$1" && test -x "$1"
+	test -f "$1" && test -x "$1"
 } # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
@@ -376,15 +376,15 @@ as_fn_executable_p ()
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
 if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
+	eval 'as_fn_append ()
+	{
+		eval $1+=\$2
+	}'
+else
+	as_fn_append ()
+	{
+		eval $1=\$$1\$2
+	}
 fi # as_fn_append
 
 # as_fn_arith ARG...
@@ -393,15 +393,15 @@ fi # as_fn_append
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
 if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
+	eval 'as_fn_arith ()
+	{
+		as_val=$(( $* ))
+	}'
+else
+	as_fn_arith ()
+	{
+		as_val=`expr "$@" || test $? -eq 1`
+	}
 fi # as_fn_arith
 
 
@@ -412,32 +412,32 @@ fi # as_fn_arith
 # script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
+	as_status=$1; test $as_status -eq 0 && as_status=1
+	if test "$4"; then
+		as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+		$as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+	fi
+	$as_echo "$as_me: error: $2" >&2
+	as_fn_exit $as_status
 } # as_fn_error
 
 if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
+	 test "X`expr 00001 : '.*\(...\)'`" = X001; then
+	as_expr=expr
 else
-  as_expr=false
+	as_expr=false
 fi
 
 if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
+	as_basename=basename
 else
-  as_basename=false
+	as_basename=false
 fi
 
 if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
+	as_dirname=dirname
 else
-  as_dirname=false
+	as_dirname=false
 fi
 
 as_me=`$as_basename -- "$0" ||
@@ -445,19 +445,19 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
+		sed '/^.*\/\([^/][^/]*\)\/*$/{
+			s//\1/
+			q
+		}
+		/^X\/\(\/\/\)$/{
+			s//\1/
+			q
+		}
+		/^X\/\(\/\).*/{
+			s//\1/
+			q
+		}
+		s/.*/./; q'`
 
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
@@ -467,86 +467,86 @@ as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
+	as_lineno_1=$LINENO as_lineno_1a=$LINENO
+	as_lineno_2=$LINENO as_lineno_2a=$LINENO
+	eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+	test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+	# Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+	sed -n '
+		p
+		/[$]LINENO/=
+	' <$as_myself |
+		sed '
+			s/[$]LINENO.*/&-/
+			t lineno
+			b
+			:lineno
+			N
+			:loop
+			s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+			t loop
+			s/-\n.*//
+		' >$as_me.lineno &&
+	chmod +x "$as_me.lineno" ||
+		{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+	# If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+	# already done that, so ensure we don't try to do so again and fall
+	# in an infinite loop.  This has already happened in practice.
+	_as_can_reexec=no; export _as_can_reexec
+	# Don't try to exec as it changes $[0], causing all sort of problems
+	# (the dirname of $[0] is not the place where we might find the
+	# original and so on.  Autoconf is especially sensitive to this).
+	. "./$as_me.lineno"
+	# Exit status is that of the last command.
+	exit
 }
 
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
+	case `echo 'xy\c'` in
+	*c*) ECHO_T='	';;	# ECHO_T is single tab character.
+	xy)  ECHO_C='\c';;
+	*)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+			 ECHO_T='	';;
+	esac;;
 *)
-  ECHO_N='-n';;
+	ECHO_N='-n';;
 esac
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
+	rm -f conf$$.dir/conf$$.file
 else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
+	rm -f conf$$.dir
+	mkdir conf$$.dir 2>/dev/null
 fi
 if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
+	if ln -s conf$$.file conf$$ 2>/dev/null; then
+		as_ln_s='ln -s'
+		# ... but there are two gotchas:
+		# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+		# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+		# In both cases, we have to default to `cp -pR'.
+		ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+			as_ln_s='cp -pR'
+	elif ln conf$$.file conf$$ 2>/dev/null; then
+		as_ln_s=ln
+	else
+		as_ln_s='cp -pR'
+	fi
+else
+	as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
+	as_mkdir_p='mkdir -p "$as_dir"'
 else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
+	test -d ./-p && rmdir ./-p
+	as_mkdir_p=false
 fi
 
 as_test_x='test -x'
@@ -888,7 +888,7 @@ with_ssl
 with_openssl
 enable_largefile
 '
-      ac_precious_vars='build_alias
+			ac_precious_vars='build_alias
 host_alias
 target_alias
 PG_TEST_EXTRA
@@ -981,373 +981,373 @@ ac_prev=
 ac_dashdash=
 for ac_option
 do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
+	# If the previous option needs an argument, assign it.
+	if test -n "$ac_prev"; then
+		eval $ac_prev=\$ac_option
+		ac_prev=
+		continue
+	fi
+
+	case $ac_option in
+	*=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+	*=)   ac_optarg= ;;
+	*)    ac_optarg=yes ;;
+	esac
+
+	# Accept the important Cygnus configure options, so we can diagnose typos.
+
+	case $ac_dashdash$ac_option in
+	--)
+		ac_dashdash=yes ;;
+
+	-bindir | --bindir | --bindi | --bind | --bin | --bi)
+		ac_prev=bindir ;;
+	-bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+		bindir=$ac_optarg ;;
+
+	-build | --build | --buil | --bui | --bu)
+		ac_prev=build_alias ;;
+	-build=* | --build=* | --buil=* | --bui=* | --bu=*)
+		build_alias=$ac_optarg ;;
+
+	-cache-file | --cache-file | --cache-fil | --cache-fi \
+	| --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+		ac_prev=cache_file ;;
+	-cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+	| --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+		cache_file=$ac_optarg ;;
+
+	--config-cache | -C)
+		cache_file=config.cache ;;
+
+	-datadir | --datadir | --datadi | --datad)
+		ac_prev=datadir ;;
+	-datadir=* | --datadir=* | --datadi=* | --datad=*)
+		datadir=$ac_optarg ;;
+
+	-datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+	| --dataroo | --dataro | --datar)
+		ac_prev=datarootdir ;;
+	-datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+	| --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+		datarootdir=$ac_optarg ;;
+
+	-disable-* | --disable-*)
+		ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+		# Reject names that are not valid shell variable names.
+		expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+			as_fn_error $? "invalid feature name: $ac_useropt"
+		ac_useropt_orig=$ac_useropt
+		ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+		case $ac_user_opts in
+			*"
 "enable_$ac_useropt"
 "*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+			*) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
 	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
+		esac
+		eval enable_$ac_useropt=no ;;
+
+	-docdir | --docdir | --docdi | --doc | --do)
+		ac_prev=docdir ;;
+	-docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+		docdir=$ac_optarg ;;
+
+	-dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+		ac_prev=dvidir ;;
+	-dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+		dvidir=$ac_optarg ;;
+
+	-enable-* | --enable-*)
+		ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+		# Reject names that are not valid shell variable names.
+		expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+			as_fn_error $? "invalid feature name: $ac_useropt"
+		ac_useropt_orig=$ac_useropt
+		ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+		case $ac_user_opts in
+			*"
 "enable_$ac_useropt"
 "*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+			*) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
 	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
+		esac
+		eval enable_$ac_useropt=\$ac_optarg ;;
+
+	-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+	| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+	| --exec | --exe | --ex)
+		ac_prev=exec_prefix ;;
+	-exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+	| --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+	| --exec=* | --exe=* | --ex=*)
+		exec_prefix=$ac_optarg ;;
+
+	-gas | --gas | --ga | --g)
+		# Obsolete; use --with-gas.
+		with_gas=yes ;;
+
+	-help | --help | --hel | --he | -h)
+		ac_init_help=long ;;
+	-help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+		ac_init_help=recursive ;;
+	-help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+		ac_init_help=short ;;
+
+	-host | --host | --hos | --ho)
+		ac_prev=host_alias ;;
+	-host=* | --host=* | --hos=* | --ho=*)
+		host_alias=$ac_optarg ;;
+
+	-htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+		ac_prev=htmldir ;;
+	-htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+	| --ht=*)
+		htmldir=$ac_optarg ;;
+
+	-includedir | --includedir | --includedi | --included | --include \
+	| --includ | --inclu | --incl | --inc)
+		ac_prev=includedir ;;
+	-includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+	| --includ=* | --inclu=* | --incl=* | --inc=*)
+		includedir=$ac_optarg ;;
+
+	-infodir | --infodir | --infodi | --infod | --info | --inf)
+		ac_prev=infodir ;;
+	-infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+		infodir=$ac_optarg ;;
+
+	-libdir | --libdir | --libdi | --libd)
+		ac_prev=libdir ;;
+	-libdir=* | --libdir=* | --libdi=* | --libd=*)
+		libdir=$ac_optarg ;;
+
+	-libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+	| --libexe | --libex | --libe)
+		ac_prev=libexecdir ;;
+	-libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+	| --libexe=* | --libex=* | --libe=*)
+		libexecdir=$ac_optarg ;;
+
+	-localedir | --localedir | --localedi | --localed | --locale)
+		ac_prev=localedir ;;
+	-localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+		localedir=$ac_optarg ;;
+
+	-localstatedir | --localstatedir | --localstatedi | --localstated \
+	| --localstate | --localstat | --localsta | --localst | --locals)
+		ac_prev=localstatedir ;;
+	-localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+	| --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+		localstatedir=$ac_optarg ;;
+
+	-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+		ac_prev=mandir ;;
+	-mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+		mandir=$ac_optarg ;;
+
+	-nfp | --nfp | --nf)
+		# Obsolete; use --without-fp.
+		with_fp=no ;;
+
+	-no-create | --no-create | --no-creat | --no-crea | --no-cre \
+	| --no-cr | --no-c | -n)
+		no_create=yes ;;
+
+	-no-recursion | --no-recursion | --no-recursio | --no-recursi \
+	| --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+		no_recursion=yes ;;
+
+	-oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+	| --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+	| --oldin | --oldi | --old | --ol | --o)
+		ac_prev=oldincludedir ;;
+	-oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+	| --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+	| --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+		oldincludedir=$ac_optarg ;;
+
+	-prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+		ac_prev=prefix ;;
+	-prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+		prefix=$ac_optarg ;;
+
+	-program-prefix | --program-prefix | --program-prefi | --program-pref \
+	| --program-pre | --program-pr | --program-p)
+		ac_prev=program_prefix ;;
+	-program-prefix=* | --program-prefix=* | --program-prefi=* \
+	| --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+		program_prefix=$ac_optarg ;;
+
+	-program-suffix | --program-suffix | --program-suffi | --program-suff \
+	| --program-suf | --program-su | --program-s)
+		ac_prev=program_suffix ;;
+	-program-suffix=* | --program-suffix=* | --program-suffi=* \
+	| --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+		program_suffix=$ac_optarg ;;
+
+	-program-transform-name | --program-transform-name \
+	| --program-transform-nam | --program-transform-na \
+	| --program-transform-n | --program-transform- \
+	| --program-transform | --program-transfor \
+	| --program-transfo | --program-transf \
+	| --program-trans | --program-tran \
+	| --progr-tra | --program-tr | --program-t)
+		ac_prev=program_transform_name ;;
+	-program-transform-name=* | --program-transform-name=* \
+	| --program-transform-nam=* | --program-transform-na=* \
+	| --program-transform-n=* | --program-transform-=* \
+	| --program-transform=* | --program-transfor=* \
+	| --program-transfo=* | --program-transf=* \
+	| --program-trans=* | --program-tran=* \
+	| --progr-tra=* | --program-tr=* | --program-t=*)
+		program_transform_name=$ac_optarg ;;
+
+	-pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+		ac_prev=pdfdir ;;
+	-pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+		pdfdir=$ac_optarg ;;
+
+	-psdir | --psdir | --psdi | --psd | --ps)
+		ac_prev=psdir ;;
+	-psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+		psdir=$ac_optarg ;;
+
+	-q | -quiet | --quiet | --quie | --qui | --qu | --q \
+	| -silent | --silent | --silen | --sile | --sil)
+		silent=yes ;;
+
+	-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+		ac_prev=sbindir ;;
+	-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+	| --sbi=* | --sb=*)
+		sbindir=$ac_optarg ;;
+
+	-sharedstatedir | --sharedstatedir | --sharedstatedi \
+	| --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+	| --sharedst | --shareds | --shared | --share | --shar \
+	| --sha | --sh)
+		ac_prev=sharedstatedir ;;
+	-sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+	| --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+	| --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+	| --sha=* | --sh=*)
+		sharedstatedir=$ac_optarg ;;
+
+	-site | --site | --sit)
+		ac_prev=site ;;
+	-site=* | --site=* | --sit=*)
+		site=$ac_optarg ;;
+
+	-srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+		ac_prev=srcdir ;;
+	-srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+		srcdir=$ac_optarg ;;
+
+	-sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+	| --syscon | --sysco | --sysc | --sys | --sy)
+		ac_prev=sysconfdir ;;
+	-sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+	| --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+		sysconfdir=$ac_optarg ;;
+
+	-target | --target | --targe | --targ | --tar | --ta | --t)
+		ac_prev=target_alias ;;
+	-target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+		target_alias=$ac_optarg ;;
+
+	-v | -verbose | --verbose | --verbos | --verbo | --verb)
+		verbose=yes ;;
+
+	-version | --version | --versio | --versi | --vers | -V)
+		ac_init_version=: ;;
+
+	-with-* | --with-*)
+		ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+		# Reject names that are not valid shell variable names.
+		expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+			as_fn_error $? "invalid package name: $ac_useropt"
+		ac_useropt_orig=$ac_useropt
+		ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+		case $ac_user_opts in
+			*"
 "with_$ac_useropt"
 "*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+			*) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
 	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
+		esac
+		eval with_$ac_useropt=\$ac_optarg ;;
+
+	-without-* | --without-*)
+		ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+		# Reject names that are not valid shell variable names.
+		expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+			as_fn_error $? "invalid package name: $ac_useropt"
+		ac_useropt_orig=$ac_useropt
+		ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+		case $ac_user_opts in
+			*"
 "with_$ac_useropt"
 "*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+			*) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
 	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+		esac
+		eval with_$ac_useropt=no ;;
+
+	--x)
+		# Obsolete; use --with-x.
+		with_x=yes ;;
+
+	-x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+	| --x-incl | --x-inc | --x-in | --x-i)
+		ac_prev=x_includes ;;
+	-x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+	| --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+		x_includes=$ac_optarg ;;
+
+	-x-libraries | --x-libraries | --x-librarie | --x-librari \
+	| --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+		ac_prev=x_libraries ;;
+	-x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+	| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+		x_libraries=$ac_optarg ;;
+
+	-*) as_fn_error $? "unrecognized option: \`$ac_option'
 Try \`$0 --help' for more information"
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
-    ;;
-
-  esac
+		;;
+
+	*=*)
+		ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+		# Reject names that are not valid shell variable names.
+		case $ac_envvar in #(
+			'' | [0-9]* | *[!_$as_cr_alnum]* )
+			as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+		esac
+		eval $ac_envvar=\$ac_optarg
+		export $ac_envvar ;;
+
+	*)
+		# FIXME: should be removed in autoconf 3.0.
+		$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+		expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+			$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+		: "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+		;;
+
+	esac
 done
 
 if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
+	ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+	as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
+	case $enable_option_checking in
+		no) ;;
+		fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+		*)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+	esac
 fi
 
 # Check all directory arguments for consistency.
@@ -1356,19 +1356,19 @@ for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+	eval ac_val=\$$ac_var
+	# Remove trailing slashes.
+	case $ac_val in
+		*/ )
+			ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+			eval $ac_var=\$ac_val;;
+	esac
+	# Be sure to have absolute directory names.
+	case $ac_val in
+		[\\/$]* | ?:[\\/]* )  continue;;
+		NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+	esac
+	as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1380,11 +1380,11 @@ target=$target_alias
 
 # FIXME: To remove some day.
 if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
+	if test "x$build_alias" = x; then
+		cross_compiling=maybe
+	elif test "x$build_alias" != "x$host_alias"; then
+		cross_compiling=yes
+	fi
 fi
 
 ac_tool_prefix=
@@ -1396,48 +1396,48 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
+	as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
+	as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
+	ac_srcdir_defaulted=yes
+	# Try the directory containing this script, then the parent directory.
+	ac_confdir=`$as_dirname -- "$as_myself" ||
 $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
+		sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+			s//\1/
+			q
+		}
+		/^X\(\/\/\)[^/].*/{
+			s//\1/
+			q
+		}
+		/^X\(\/\/\)$/{
+			s//\1/
+			q
+		}
+		/^X\(\/\).*/{
+			s//\1/
+			q
+		}
+		s/.*/./; q'`
+	srcdir=$ac_confdir
+	if test ! -r "$srcdir/$ac_unique_file"; then
+		srcdir=..
+	fi
+else
+	ac_srcdir_defaulted=no
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+	test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+	as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
@@ -1445,7 +1445,7 @@ ac_abs_confdir=`(
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
+	srcdir=.
 fi
 # Remove unnecessary trailing slashes from srcdir.
 # Double slashes in file names in object file debugging info
@@ -1454,19 +1454,19 @@ case $srcdir in
 */) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
 esac
 for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+	eval ac_env_${ac_var}_set=\${${ac_var}+set}
+	eval ac_env_${ac_var}_value=\$${ac_var}
+	eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+	eval ac_cv_env_${ac_var}_value=\$${ac_var}
 done
 
 #
 # Report the --help message.
 #
 if test "$ac_init_help" = "long"; then
-  # 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
+	# 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 19devel to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1477,21 +1477,21 @@ VAR=VALUE.  See below for descriptions of some of the useful variables.
 Defaults for the options are specified in brackets.
 
 Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+	-h, --help              display this help and exit
+			--help=short        display options specific to this package
+			--help=recursive    display the short help of all the included packages
+	-V, --version           display version information and exit
+	-q, --quiet, --silent   do not print \`checking ...' messages
+			--cache-file=FILE   cache test results in FILE [disabled]
+	-C, --config-cache      alias for \`--cache-file=config.cache'
+	-n, --no-create         do not create output files
+			--srcdir=DIR        find the sources in DIR [configure dir or \`..']
 
 Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
+	--prefix=PREFIX         install architecture-independent files in PREFIX
+													[$ac_default_prefix]
+	--exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+													[PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1501,160 +1501,160 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/postgresql]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
+	--bindir=DIR            user executables [EPREFIX/bin]
+	--sbindir=DIR           system admin executables [EPREFIX/sbin]
+	--libexecdir=DIR        program executables [EPREFIX/libexec]
+	--sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+	--sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+	--localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+	--libdir=DIR            object code libraries [EPREFIX/lib]
+	--includedir=DIR        C header files [PREFIX/include]
+	--oldincludedir=DIR     C header files for non-gcc [/usr/include]
+	--datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+	--datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+	--infodir=DIR           info documentation [DATAROOTDIR/info]
+	--localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+	--mandir=DIR            man documentation [DATAROOTDIR/man]
+	--docdir=DIR            documentation root [DATAROOTDIR/doc/postgresql]
+	--htmldir=DIR           html documentation [DOCDIR]
+	--dvidir=DIR            dvi documentation [DOCDIR]
+	--pdfdir=DIR            pdf documentation [DOCDIR]
+	--psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+	cat <<\_ACEOF
 
 System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+	--build=BUILD     configure for building on BUILD [guessed]
+	--host=HOST       cross-compile to build programs to run on HOST [BUILD]
 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of PostgreSQL 19devel:";;
-   esac
-  cat <<\_ACEOF
+	case $ac_init_help in
+		 short | recursive ) echo "Configuration of PostgreSQL 19devel:";;
+	 esac
+	cat <<\_ACEOF
 
 Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-integer-datetimes
-                          obsolete option, no longer supported
-  --enable-nls[=LANGUAGES]
-                          enable Native Language Support
-  --disable-rpath         do not embed shared library search path in
-                          executables
-  --enable-debug          build with debugging symbols (-g)
-  --enable-profiling      build with profiling enabled
-  --enable-coverage       build with coverage testing instrumentation
-  --enable-dtrace         build with DTrace support
-  --enable-tap-tests      enable TAP tests (requires Perl and IPC::Run)
-  --enable-injection-points
-                          enable injection points (for testing)
-  --enable-depend         turn on automatic dependency tracking
-  --enable-cassert        enable assertion checks (for debugging)
-  --disable-largefile     omit support for large files
+	--disable-option-checking  ignore unrecognized --enable/--with options
+	--disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+	--enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+	--disable-integer-datetimes
+													obsolete option, no longer supported
+	--enable-nls[=LANGUAGES]
+													enable Native Language Support
+	--disable-rpath         do not embed shared library search path in
+													executables
+	--enable-debug          build with debugging symbols (-g)
+	--enable-profiling      build with profiling enabled
+	--enable-coverage       build with coverage testing instrumentation
+	--enable-dtrace         build with DTrace support
+	--enable-tap-tests      enable TAP tests (requires Perl and IPC::Run)
+	--enable-injection-points
+													enable injection points (for testing)
+	--enable-depend         turn on automatic dependency tracking
+	--enable-cassert        enable assertion checks (for debugging)
+	--disable-largefile     omit support for large files
 
 Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-extra-version=STRING
-                          append STRING to version
-  --with-template=NAME    override operating system template
-  --with-includes=DIRS    look for additional header files in DIRS
-  --with-libraries=DIRS   look for additional libraries in DIRS
-  --with-libs=DIRS        alternative spelling of --with-libraries
-  --with-pgport=PORTNUM   set default port number [5432]
-  --with-blocksize=BLOCKSIZE
-                          set table block size in kB [8]
-  --with-segsize=SEGSIZE  set table segment size in GB [1]
-  --with-segsize-blocks=SEGSIZE_BLOCKS
-                          set table segment size in blocks [0]
-  --with-wal-blocksize=BLOCKSIZE
-                          set WAL block size in kB [8]
-  --with-llvm             build with LLVM based JIT support
-  --without-icu           build without ICU support
-  --with-tcl              build Tcl modules (PL/Tcl)
-  --with-tclconfig=DIR    tclConfig.sh is in DIR
-  --with-perl             build Perl modules (PL/Perl)
-  --with-python           build Python modules (PL/Python)
-  --with-gssapi           build with GSSAPI support
-  --with-krb-srvnam=NAME  default service principal name in Kerberos (GSSAPI)
-                          [postgres]
-  --with-pam              build with PAM support
-  --with-bsd-auth         build with BSD Authentication support
-  --with-ldap             build with LDAP support
-  --with-bonjour          build with Bonjour support
-  --with-selinux          build with SELinux support
-  --with-systemd          build with systemd support
-  --without-readline      do not use GNU Readline nor BSD Libedit for editing
-  --with-libedit-preferred
-                          prefer BSD Libedit over GNU Readline
-  --with-liburing         build with io_uring support, for asynchronous I/O
-  --with-uuid=LIB         build contrib/uuid-ossp using LIB (bsd,e2fs,ossp)
-  --with-ossp-uuid        obsolete spelling of --with-uuid=ossp
-  --with-libcurl          build with libcurl support
-  --with-libnuma          build with libnuma support
-  --with-libxml           build with XML support
-  --with-libxslt          use XSLT support when building contrib/xml2
-  --with-system-tzdata=DIR
-                          use system time zone data in DIR
-  --without-zlib          do not use Zlib
-  --with-lz4              build with LZ4 support
-  --with-zstd             build with ZSTD support
-  --with-ssl=LIB          use LIB for SSL/TLS support (openssl)
-  --with-openssl          obsolete spelling of --with-ssl=openssl
+	--with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+	--without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+	--with-extra-version=STRING
+													append STRING to version
+	--with-template=NAME    override operating system template
+	--with-includes=DIRS    look for additional header files in DIRS
+	--with-libraries=DIRS   look for additional libraries in DIRS
+	--with-libs=DIRS        alternative spelling of --with-libraries
+	--with-pgport=PORTNUM   set default port number [5432]
+	--with-blocksize=BLOCKSIZE
+													set table block size in kB [8]
+	--with-segsize=SEGSIZE  set table segment size in GB [1]
+	--with-segsize-blocks=SEGSIZE_BLOCKS
+													set table segment size in blocks [0]
+	--with-wal-blocksize=BLOCKSIZE
+													set WAL block size in kB [8]
+	--with-llvm             build with LLVM based JIT support
+	--without-icu           build without ICU support
+	--with-tcl              build Tcl modules (PL/Tcl)
+	--with-tclconfig=DIR    tclConfig.sh is in DIR
+	--with-perl             build Perl modules (PL/Perl)
+	--with-python           build Python modules (PL/Python)
+	--with-gssapi           build with GSSAPI support
+	--with-krb-srvnam=NAME  default service principal name in Kerberos (GSSAPI)
+													[postgres]
+	--with-pam              build with PAM support
+	--with-bsd-auth         build with BSD Authentication support
+	--with-ldap             build with LDAP support
+	--with-bonjour          build with Bonjour support
+	--with-selinux          build with SELinux support
+	--with-systemd          build with systemd support
+	--without-readline      do not use GNU Readline nor BSD Libedit for editing
+	--with-libedit-preferred
+													prefer BSD Libedit over GNU Readline
+	--with-liburing         build with io_uring support, for asynchronous I/O
+	--with-uuid=LIB         build contrib/uuid-ossp using LIB (bsd,e2fs,ossp)
+	--with-ossp-uuid        obsolete spelling of --with-uuid=ossp
+	--with-libcurl          build with libcurl support
+	--with-libnuma          build with libnuma support
+	--with-libxml           build with XML support
+	--with-libxslt          use XSLT support when building contrib/xml2
+	--with-system-tzdata=DIR
+													use system time zone data in DIR
+	--without-zlib          do not use Zlib
+	--with-lz4              build with LZ4 support
+	--with-zstd             build with ZSTD support
+	--with-ssl=LIB          use LIB for SSL/TLS support (openssl)
+	--with-openssl          obsolete spelling of --with-ssl=openssl
 
 Some influential environment variables:
-  PG_TEST_EXTRA
-              enable selected extra tests (overridden at runtime by
-              PG_TEST_EXTRA environment variable)
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-  LLVM_CONFIG path to llvm-config command
-  CLANG       path to clang compiler to generate bitcode
-  CPP         C preprocessor
-  PKG_CONFIG  path to pkg-config utility
-  PKG_CONFIG_PATH
-              directories to add to pkg-config's search path
-  PKG_CONFIG_LIBDIR
-              path overriding pkg-config's built-in search path
-  ICU_CFLAGS  C compiler flags for ICU, overriding pkg-config
-  ICU_LIBS    linker flags for ICU, overriding pkg-config
-  LIBURING_CFLAGS
-              C compiler flags for LIBURING, overriding pkg-config
-  LIBURING_LIBS
-              linker flags for LIBURING, overriding pkg-config
-  LIBCURL_CFLAGS
-              C compiler flags for LIBCURL, overriding pkg-config
-  LIBCURL_LIBS
-              linker flags for LIBCURL, overriding pkg-config
-  LIBNUMA_CFLAGS
-              C compiler flags for LIBNUMA, overriding pkg-config
-  LIBNUMA_LIBS
-              linker flags for LIBNUMA, overriding pkg-config
-  XML2_CONFIG path to xml2-config utility
-  XML2_CFLAGS C compiler flags for XML2, overriding pkg-config
-  XML2_LIBS   linker flags for XML2, overriding pkg-config
-  LZ4_CFLAGS  C compiler flags for LZ4, overriding pkg-config
-  LZ4_LIBS    linker flags for LZ4, overriding pkg-config
-  ZSTD_CFLAGS C compiler flags for ZSTD, overriding pkg-config
-  ZSTD_LIBS   linker flags for ZSTD, overriding pkg-config
-  LDFLAGS_EX  extra linker flags for linking executables only
-  LDFLAGS_SL  extra linker flags for linking shared libraries only
-  PERL        Perl program
-  PYTHON      Python program
-  MSGFMT      msgfmt program for NLS
-  TCLSH       Tcl interpreter program (tclsh)
+	PG_TEST_EXTRA
+							enable selected extra tests (overridden at runtime by
+							PG_TEST_EXTRA environment variable)
+	CC          C compiler command
+	CFLAGS      C compiler flags
+	LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+							nonstandard directory <lib dir>
+	LIBS        libraries to pass to the linker, e.g. -l<library>
+	CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+							you have headers in a nonstandard directory <include dir>
+	CXX         C++ compiler command
+	CXXFLAGS    C++ compiler flags
+	LLVM_CONFIG path to llvm-config command
+	CLANG       path to clang compiler to generate bitcode
+	CPP         C preprocessor
+	PKG_CONFIG  path to pkg-config utility
+	PKG_CONFIG_PATH
+							directories to add to pkg-config's search path
+	PKG_CONFIG_LIBDIR
+							path overriding pkg-config's built-in search path
+	ICU_CFLAGS  C compiler flags for ICU, overriding pkg-config
+	ICU_LIBS    linker flags for ICU, overriding pkg-config
+	LIBURING_CFLAGS
+							C compiler flags for LIBURING, overriding pkg-config
+	LIBURING_LIBS
+							linker flags for LIBURING, overriding pkg-config
+	LIBCURL_CFLAGS
+							C compiler flags for LIBCURL, overriding pkg-config
+	LIBCURL_LIBS
+							linker flags for LIBCURL, overriding pkg-config
+	LIBNUMA_CFLAGS
+							C compiler flags for LIBNUMA, overriding pkg-config
+	LIBNUMA_LIBS
+							linker flags for LIBNUMA, overriding pkg-config
+	XML2_CONFIG path to xml2-config utility
+	XML2_CFLAGS C compiler flags for XML2, overriding pkg-config
+	XML2_LIBS   linker flags for XML2, overriding pkg-config
+	LZ4_CFLAGS  C compiler flags for LZ4, overriding pkg-config
+	LZ4_LIBS    linker flags for LZ4, overriding pkg-config
+	ZSTD_CFLAGS C compiler flags for ZSTD, overriding pkg-config
+	ZSTD_LIBS   linker flags for ZSTD, overriding pkg-config
+	LDFLAGS_EX  extra linker flags for linking executables only
+	LDFLAGS_SL  extra linker flags for linking shared libraries only
+	PERL        Perl program
+	PYTHON      Python program
+	MSGFMT      msgfmt program for NLS
+	TCLSH       Tcl interpreter program (tclsh)
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1666,23 +1666,23 @@ ac_status=$?
 fi
 
 if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
+	# If there are subdirs, report their specific --help.
+	for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+		test -d "$ac_dir" ||
+			{ cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+			continue
+		ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
+	ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+	# A ".." for each directory in $ac_dir_suffix.
+	ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+	case $ac_top_builddir_sub in
+	"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+	*)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+	esac ;;
 esac
 ac_abs_top_builddir=$ac_pwd
 ac_abs_builddir=$ac_pwd$ac_dir_suffix
@@ -1690,39 +1690,39 @@ ac_abs_builddir=$ac_pwd$ac_dir_suffix
 ac_top_builddir=$ac_top_build_prefix
 
 case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+	.)  # We are building in place.
+		ac_srcdir=.
+		ac_top_srcdir=$ac_top_builddir_sub
+		ac_abs_top_srcdir=$ac_pwd ;;
+	[\\/]* | ?:[\\/]* )  # Absolute name.
+		ac_srcdir=$srcdir$ac_dir_suffix;
+		ac_top_srcdir=$srcdir
+		ac_abs_top_srcdir=$srcdir ;;
+	*) # Relative name.
+		ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+		ac_top_srcdir=$ac_top_build_prefix$srcdir
+		ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
 esac
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
+		cd "$ac_dir" || { ac_status=$?; continue; }
+		# Check for guested configure.
+		if test -f "$ac_srcdir/configure.gnu"; then
+			echo &&
+			$SHELL "$ac_srcdir/configure.gnu" --help=recursive
+		elif test -f "$ac_srcdir/configure"; then
+			echo &&
+			$SHELL "$ac_srcdir/configure" --help=recursive
+		else
+			$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+		fi || ac_status=$?
+		cd "$ac_pwd" || { ac_status=$?; break; }
+	done
 fi
 
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
-  cat <<\_ACEOF
+	cat <<\_ACEOF
 PostgreSQL configure 19devel
 generated by GNU Autoconf 2.69
 
@@ -1732,7 +1732,7 @@ gives unlimited permission to copy, distribute and modify it.
 
 Copyright (c) 1996-2025, PostgreSQL Global Development Group
 _ACEOF
-  exit
+	exit
 fi
 
 ## ------------------------ ##
@@ -1744,36 +1744,36 @@ fi
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
 ac_fn_c_try_compile ()
 {
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
+	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+	rm -f conftest.$ac_objext
+	if { { ac_try="$ac_compile"
 case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+	*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+	*) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
+	(eval "$ac_compile") 2>conftest.err
+	ac_status=$?
+	if test -s conftest.err; then
+		grep -v '^ *+' conftest.err >conftest.er1
+		cat conftest.er1 >&5
+		mv -f conftest.er1 conftest.err
+	fi
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
+			 } && test -s conftest.$ac_objext; then :
+	ac_retval=0
 else
-  $as_echo "$as_me: failed program was:" >&5
+	$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
+	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+	as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
 
@@ -1782,36 +1782,36 @@ fi
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
 ac_fn_cxx_try_compile ()
 {
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
+	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+	rm -f conftest.$ac_objext
+	if { { ac_try="$ac_compile"
 case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+	*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+	*) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
+	(eval "$ac_compile") 2>conftest.err
+	ac_status=$?
+	if test -s conftest.err; then
+		grep -v '^ *+' conftest.err >conftest.er1
+		cat conftest.er1 >&5
+		mv -f conftest.er1 conftest.err
+	fi
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
+			 } && test -s conftest.$ac_objext; then :
+	ac_retval=0
 else
-  $as_echo "$as_me: failed program was:" >&5
+	$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
+	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+	as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_compile
 
@@ -1820,44 +1820,44 @@ fi
 # Try to link conftest.$ac_ext, and return whether this succeeded.
 ac_fn_c_try_link ()
 {
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
+	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+	rm -f conftest.$ac_objext conftest$ac_exeext
+	if { { ac_try="$ac_link"
 case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+	*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+	*) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
+	(eval "$ac_link") 2>conftest.err
+	ac_status=$?
+	if test -s conftest.err; then
+		grep -v '^ *+' conftest.err >conftest.er1
+		cat conftest.er1 >&5
+		mv -f conftest.er1 conftest.err
+	fi
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
+			 } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
-       }; then :
-  ac_retval=0
+			 }; then :
+	ac_retval=0
 else
-  $as_echo "$as_me: failed program was:" >&5
+	$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
 fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
+	# Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+	# created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+	# interfere with the next link command; also delete a directory that is
+	# left behind by Apple's compiler.  We do this before executing the actions.
+	rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+	as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
 
@@ -1866,35 +1866,35 @@ fi
 # Try to preprocess conftest.$ac_ext, and return whether this succeeded.
 ac_fn_c_try_cpp ()
 {
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
+	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+	if { { ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+	*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+	*) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
+	(eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+	ac_status=$?
+	if test -s conftest.err; then
+		grep -v '^ *+' conftest.err >conftest.er1
+		cat conftest.er1 >&5
+		mv -f conftest.er1 conftest.err
+	fi
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
+			 }; then :
+	ac_retval=0
 else
-  $as_echo "$as_me: failed program was:" >&5
+	$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-    ac_retval=1
+		ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
+	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+	as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
 
@@ -1905,18 +1905,18 @@ fi
 # accordingly.
 ac_fn_c_check_header_mongrel ()
 {
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+	if eval \${$3+:} false; then :
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
 if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+				 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 else
-  # Is the header compilable?
+	# Is the header compilable?
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
 $as_echo_n "checking $2 usability... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1925,9 +1925,9 @@ $4
 #include <$2>
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
+	ac_header_compiler=yes
 else
-  ac_header_compiler=no
+	ac_header_compiler=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
@@ -1941,9 +1941,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #include <$2>
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
+	ac_header_preproc=yes
 else
-  ac_header_preproc=no
+	ac_header_preproc=no
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
@@ -1951,41 +1951,41 @@ $as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+	yes:no: )
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
 $as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+		;;
+	no:yes:* )
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
 $as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
 $as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
 $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
 ( $as_echo "## ---------------------------------------------- ##
 ## Report this to pgsql-bugs@lists.postgresql.org ##
 ## ---------------------------------------------- ##"
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
+		 ) | sed "s/^/$as_me: WARNING:     /" >&2
+		;;
 esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
 if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  eval "$3=\$ac_header_compiler"
+	eval "$3=\$ac_header_compiler"
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+				 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
 
@@ -1995,39 +1995,39 @@ fi
 # that executables *can* be run.
 ac_fn_c_try_run ()
 {
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
+	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+	if { { ac_try="$ac_link"
 case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+	*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+	*) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+	(eval "$ac_link") 2>&5
+	ac_status=$?
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+	{ { case "(($ac_try" in
+	*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+	*) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
+	(eval "$ac_try") 2>&5
+	ac_status=$?
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; }; }; then :
+	ac_retval=0
+else
+	$as_echo "$as_me: program exited with status $ac_status" >&5
+			 $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_retval=$ac_status
+			 ac_retval=$ac_status
 fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
+	rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+	as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
 
@@ -2037,28 +2037,28 @@ fi
 # INCLUDES, setting the cache variable VAR accordingly.
 ac_fn_c_check_header_compile ()
 {
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
 if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
+	eval "$3=yes"
 else
-  eval "$3=no"
+	eval "$3=no"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+				 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
 
@@ -2067,22 +2067,22 @@ $as_echo "$ac_res" >&6; }
 # Tests whether FUNC exists, setting the cache variable VAR accordingly
 ac_fn_c_check_func ()
 {
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
 if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+	 For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 #define $2 innocuous_$2
 
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
+		which can conflict with char $2 (); below.
+		Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+		<limits.h> exists even on freestanding compilers.  */
 
 #ifdef __STDC__
 # include <limits.h>
@@ -2093,15 +2093,15 @@ else
 #undef $2
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
 char $2 ();
 /* 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.  */
+		to always fail with ENOSYS.  Some functions are actually named
+		something starting with __ and the normal name is an alias.  */
 #if defined __stub_$2 || defined __stub___$2
 choke me
 #endif
@@ -2110,22 +2110,22 @@ int
 main ()
 {
 return $2 ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
+	eval "$3=yes"
 else
-  eval "$3=no"
+	eval "$3=no"
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+				 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 
@@ -2135,13 +2135,13 @@ $as_echo "$ac_res" >&6; }
 # INCLUDES, setting cache variable VAR accordingly.
 ac_fn_c_check_member ()
 {
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
 $as_echo_n "checking for $2.$3... " >&6; }
 if eval \${$4+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
@@ -2150,14 +2150,14 @@ main ()
 static $2 ac_aggr;
 if (ac_aggr.$3)
 return 0;
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$4=yes"
+	eval "$4=yes"
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
@@ -2166,23 +2166,23 @@ main ()
 static $2 ac_aggr;
 if (sizeof ac_aggr.$3)
 return 0;
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$4=yes"
+	eval "$4=yes"
 else
-  eval "$4=no"
+	eval "$4=no"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$4
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+				 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_member
 
@@ -2192,14 +2192,14 @@ $as_echo "$ac_res" >&6; }
 # variable VAR accordingly.
 ac_fn_c_check_type ()
 {
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
 if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  eval "$3=no"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	eval "$3=no"
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
@@ -2207,36 +2207,36 @@ main ()
 {
 if (sizeof ($2))
 	 return 0;
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
 main ()
 {
 if (sizeof (($2)))
-	    return 0;
-  ;
-  return 0;
+			return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
 else
-  eval "$3=yes"
+	eval "$3=yes"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+				 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
 
@@ -2247,9 +2247,9 @@ $as_echo "$ac_res" >&6; }
 # computed
 ac_fn_c_compute_int ()
 {
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if test "$cross_compiling" = yes; then
-    # Depending upon the size, compute the lo and hi bounds.
+	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+	if test "$cross_compiling" = yes; then
+		# Depending upon the size, compute the lo and hi bounds.
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
@@ -2260,14 +2260,14 @@ static int test_array [1 - 2 * !(($2) >= 0)];
 test_array [0] = 0;
 return test_array [0];
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	ac_lo=0 ac_mid=0
+	while :; do
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
@@ -2277,24 +2277,24 @@ static int test_array [1 - 2 * !(($2) <= $ac_mid)];
 test_array [0] = 0;
 return test_array [0];
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=$ac_mid; break
+	ac_hi=$ac_mid; break
 else
-  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+	as_fn_arith $ac_mid + 1 && ac_lo=$as_val
 			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
+				ac_lo= ac_hi=
+				break
 			fi
 			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
+	done
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
@@ -2304,14 +2304,14 @@ static int test_array [1 - 2 * !(($2) < 0)];
 test_array [0] = 0;
 return test_array [0];
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	ac_hi=-1 ac_mid=-1
+	while :; do
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
@@ -2321,32 +2321,32 @@ static int test_array [1 - 2 * !(($2) >= $ac_mid)];
 test_array [0] = 0;
 return test_array [0];
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_lo=$ac_mid; break
+	ac_lo=$ac_mid; break
 else
-  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+	as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
 			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
+				ac_lo= ac_hi=
+				break
 			fi
 			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
+	done
 else
-  ac_lo= ac_hi=
+	ac_lo= ac_hi=
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
-  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
@@ -2356,14 +2356,14 @@ static int test_array [1 - 2 * !(($2) <= $ac_mid)];
 test_array [0] = 0;
 return test_array [0];
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=$ac_mid
+	ac_hi=$ac_mid
 else
-  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+	as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
@@ -2371,8 +2371,8 @@ case $ac_lo in #((
 ?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
 '') ac_retval=1 ;;
 esac
-  else
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	else
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 static long int longval () { return $2; }
@@ -2383,43 +2383,43 @@ int
 main ()
 {
 
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (($2) < 0)
-    {
-      long int i = longval ();
-      if (i != ($2))
+	FILE *f = fopen ("conftest.val", "w");
+	if (! f)
+		return 1;
+	if (($2) < 0)
+		{
+			long int i = longval ();
+			if (i != ($2))
 	return 1;
-      fprintf (f, "%ld", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ($2))
+			fprintf (f, "%ld", i);
+		}
+	else
+		{
+			unsigned long int i = ulongval ();
+			if (i != ($2))
 	return 1;
-      fprintf (f, "%lu", i);
-    }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
+			fprintf (f, "%lu", i);
+		}
+	/* Do not output a trailing newline, as this causes \r\n confusion
+		 on some platforms.  */
+	return ferror (f) || fclose (f) != 0;
+
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+	echo >>conftest.val; read $3 <conftest.val; ac_retval=0
 else
-  ac_retval=1
+	ac_retval=1
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+	conftest.$ac_objext conftest.beam conftest.$ac_ext
 rm -f conftest.val
 
-  fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
+	fi
+	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+	as_fn_set_status $ac_retval
 
 } # ac_fn_c_compute_int
 
@@ -2429,18 +2429,18 @@ rm -f conftest.val
 # accordingly.
 ac_fn_c_check_decl ()
 {
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  # Initialize each $ac_[]_AC_LANG_ABBREV[]_decl_warn_flag once.
-      as_decl_name=`echo $2|sed 's/ *(.*//'`
-  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+	# Initialize each $ac_[]_AC_LANG_ABBREV[]_decl_warn_flag once.
+			as_decl_name=`echo $2|sed 's/ *(.*//'`
+	as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
 $as_echo_n "checking whether $as_decl_name is declared... " >&6; }
 if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_save_werror_flag=$ac_c_werror_flag
-  ac_c_werror_flag="$ac_c_decl_warn_flag$ac_c_werror_flag"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	ac_save_werror_flag=$ac_c_werror_flag
+	ac_c_werror_flag="$ac_c_decl_warn_flag$ac_c_werror_flag"
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
@@ -2448,28 +2448,28 @@ main ()
 {
 #ifndef $as_decl_name
 #ifdef __cplusplus
-  (void) $as_decl_use;
+	(void) $as_decl_use;
 #else
-  (void) $as_decl_name;
+	(void) $as_decl_name;
 #endif
 #endif
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
+	eval "$3=yes"
 else
-  eval "$3=no"
+	eval "$3=no"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_c_werror_flag=$ac_save_werror_flag
+	ac_c_werror_flag=$ac_save_werror_flag
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+				 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_decl
 cat >config.log <<_ACEOF
@@ -2479,7 +2479,7 @@ running configure, to aid debugging if configure makes a mistake.
 It was created by PostgreSQL $as_me 19devel, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
-  $ $0 $@
+	$ $0 $@
 
 _ACEOF
 exec 5>>config.log
@@ -2511,10 +2511,10 @@ _ASUNAME
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		$as_echo "PATH: $as_dir"
+	done
 IFS=$as_save_IFS
 
 } >&5
@@ -2540,39 +2540,39 @@ ac_configure_args1=
 ac_must_keep_next=false
 for ac_pass in 1 2
 do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
+	for ac_arg
+	do
+		case $ac_arg in
+		-no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+		-q | -quiet | --quiet | --quie | --qui | --qu | --q \
+		| -silent | --silent | --silen | --sile | --sil)
+			continue ;;
+		*\'*)
+			ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+		esac
+		case $ac_pass in
+		1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+		2)
+			as_fn_append ac_configure_args1 " '$ac_arg'"
+			if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
-      else
+			else
 	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
+		*=* | --config-cache | -C | -disable-* | --disable-* \
+		| -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+		| -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+		| -with-* | --with-* | -without-* | --without-* | --x)
+			case "$ac_configure_args0 " in
+				"$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+			esac
+			;;
+		-* ) ac_must_keep_next=true ;;
 	esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
+			fi
+			as_fn_append ac_configure_args " '$ac_arg'"
+			;;
+		esac
+	done
 done
 { ac_configure_args0=; unset ac_configure_args0;}
 { ac_configure_args1=; unset ac_configure_args1;}
@@ -2583,94 +2583,94 @@ done
 # WARNING: Use '\'' to represent an apostrophe within the trap.
 # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
+	# Save into config.log some information that might help in debugging.
+	{
+		echo
 
-    $as_echo "## ---------------- ##
+		$as_echo "## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
+		echo
+		# The following way of writing the cache mishandles newlines in values,
 (
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+	for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+		eval ac_val=\$$ac_var
+		case $ac_val in #(
+		*${as_nl}*)
+			case $ac_var in #(
+			*_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
+			esac
+			case $ac_var in #(
+			_ | IFS | as_nl) ;; #(
+			BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+			*) { eval $ac_var=; unset $ac_var;} ;;
+			esac ;;
+		esac
+	done
+	(set) 2>&1 |
+		case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+		*${as_nl}ac_space=\ *)
+			sed -n \
 	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
+		s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+			;; #(
+		*)
+			sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+			;;
+		esac |
+		sort
 )
-    echo
+		echo
 
-    $as_echo "## ----------------- ##
+		$as_echo "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+		echo
+		for ac_var in $ac_subst_vars
+		do
+			eval ac_val=\$$ac_var
+			case $ac_val in
+			*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+			esac
+			$as_echo "$ac_var='\''$ac_val'\''"
+		done | sort
+		echo
+
+		if test -n "$ac_subst_files"; then
+			$as_echo "## ------------------- ##
 ## File substitutions. ##
 ## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
+			echo
+			for ac_var in $ac_subst_files
+			do
 	eval ac_val=\$$ac_var
 	case $ac_val in
 	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
 	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
+			done | sort
+			echo
+		fi
 
-    if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+		if test -s confdefs.h; then
+			$as_echo "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
+			echo
+			cat confdefs.h
+			echo
+		fi
+		test "$ac_signal" != 0 &&
+			$as_echo "$as_me: caught signal $ac_signal"
+		$as_echo "$as_me: exit $exit_status"
+	} >&5
+	rm -f core *.core core.conftest.* &&
+		rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+		exit $exit_status
 ' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+	trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
 ac_signal=0
 
@@ -2711,107 +2711,107 @@ _ACEOF
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+	# We do not want a PATH search for config.site.
+	case $CONFIG_SITE in #((
+		-*)  ac_site_file1=./$CONFIG_SITE;;
+		*/*) ac_site_file1=$CONFIG_SITE;;
+		*)   ac_site_file1=./$CONFIG_SITE;;
+	esac
 elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
+	ac_site_file1=$prefix/share/config.site
+	ac_site_file2=$prefix/etc/config.site
 else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
+	ac_site_file1=$ac_default_prefix/share/config.site
+	ac_site_file2=$ac_default_prefix/etc/config.site
 fi
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+	test "x$ac_site_file" = xNONE && continue
+	if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+		sed 's/^/| /' "$ac_site_file" >&5
+		. "$ac_site_file" \
+			|| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See \`config.log' for more details" "$LINENO" 5; }
-  fi
+	fi
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+	# Some versions of bash will fail to source /dev/null (special files
+	# actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+	if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
+		case $cache_file in
+			[\\/]* | ?:[\\/]* ) . "$cache_file";;
+			*)                      . "./$cache_file";;
+		esac
+	fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
 $as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
+	>$cache_file
 fi
 
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
 for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+	eval ac_old_set=\$ac_cv_env_${ac_var}_set
+	eval ac_new_set=\$ac_env_${ac_var}_set
+	eval ac_old_val=\$ac_cv_env_${ac_var}_value
+	eval ac_new_val=\$ac_env_${ac_var}_value
+	case $ac_old_set,$ac_new_set in
+		set,)
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+			ac_cache_corrupted=: ;;
+		,set)
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
+			ac_cache_corrupted=: ;;
+		,);;
+		*)
+			if test "x$ac_old_val" != "x$ac_new_val"; then
 	# differences in whitespace do not lead to failure.
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
+		ac_cache_corrupted=:
 	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
+		eval $ac_var=\$ac_old_val
 	fi
 	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
 $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
 	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
 $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
+			fi;;
+	esac
+	# Pass precious variables to config.status.
+	if test "$ac_new_set" = set; then
+		case $ac_new_val in
+		*\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+		*) ac_arg=$ac_var=$ac_new_val ;;
+		esac
+		case " $ac_configure_args " in
+			*" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+			*) as_fn_append ac_configure_args " '$ac_arg'" ;;
+		esac
+	fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+	as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2830,22 +2830,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_aux_dir=
 for ac_dir in config "$srcdir"/config; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
+	if test -f "$ac_dir/install-sh"; then
+		ac_aux_dir=$ac_dir
+		ac_install_sh="$ac_aux_dir/install-sh -c"
+		break
+	elif test -f "$ac_dir/install.sh"; then
+		ac_aux_dir=$ac_dir
+		ac_install_sh="$ac_aux_dir/install.sh -c"
+		break
+	elif test -f "$ac_dir/shtool"; then
+		ac_aux_dir=$ac_dir
+		ac_install_sh="$ac_aux_dir/shtool install -c"
+		break
+	fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
+	as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2889,21 +2889,21 @@ _ACEOF
 
 # Check whether --with-extra-version was given.
 if test "${with_extra_version+set}" = set; then :
-  withval=$with_extra_version;
-  case $withval in
-    yes)
-      as_fn_error $? "argument required for --with-extra-version option" "$LINENO" 5
-      ;;
-    no)
-      as_fn_error $? "argument required for --with-extra-version option" "$LINENO" 5
-      ;;
-    *)
-      PG_VERSION="$PACKAGE_VERSION$withval"
-      ;;
-  esac
+	withval=$with_extra_version;
+	case $withval in
+		yes)
+			as_fn_error $? "argument required for --with-extra-version option" "$LINENO" 5
+			;;
+		no)
+			as_fn_error $? "argument required for --with-extra-version option" "$LINENO" 5
+			;;
+		*)
+			PG_VERSION="$PACKAGE_VERSION$withval"
+			;;
+	esac
 
 else
-  PG_VERSION="$PACKAGE_VERSION"
+	PG_VERSION="$PACKAGE_VERSION"
 fi
 
 
@@ -2915,20 +2915,20 @@ _ACEOF
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+	as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
 if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_build_alias=$build_alias
+	ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+	ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+	as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+	as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
@@ -2954,13 +2954,13 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
 if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
+	if test "x$host_alias" = x; then
+	ac_cv_host=$ac_cv_build
 else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+	ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+		as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -2994,47 +2994,47 @@ $as_echo_n "checking which template to use... " >&6; }
 
 # Check whether --with-template was given.
 if test "${with_template+set}" = set; then :
-  withval=$with_template;
-  case $withval in
-    yes)
-      as_fn_error $? "argument required for --with-template option" "$LINENO" 5
-      ;;
-    no)
-      as_fn_error $? "argument required for --with-template option" "$LINENO" 5
-      ;;
-    *)
-
-  case $withval in
-    list)   echo; ls "$srcdir/src/template"; exit;;
-    *)      if test -f "$srcdir/src/template/$with_template" ; then
-              template=$withval
-            else
-              as_fn_error $? "'$withval' is not a valid template name. Use 'list' for a list." "$LINENO" 5
-            fi;;
-  esac
-
-      ;;
-  esac
+	withval=$with_template;
+	case $withval in
+		yes)
+			as_fn_error $? "argument required for --with-template option" "$LINENO" 5
+			;;
+		no)
+			as_fn_error $? "argument required for --with-template option" "$LINENO" 5
+			;;
+		*)
+
+	case $withval in
+		list)   echo; ls "$srcdir/src/template"; exit;;
+		*)      if test -f "$srcdir/src/template/$with_template" ; then
+							template=$withval
+						else
+							as_fn_error $? "'$withval' is not a valid template name. Use 'list' for a list." "$LINENO" 5
+						fi;;
+	esac
+
+			;;
+	esac
 
 else
 
 # --with-template not given
 
 case $host_os in
-  cygwin*|msys*) template=cygwin ;;
-  darwin*) template=darwin ;;
+	cygwin*|msys*) template=cygwin ;;
+	darwin*) template=darwin ;;
 dragonfly*) template=netbsd ;;
  freebsd*) template=freebsd ;;
  linux*|gnu*|k*bsd*-gnu)
-           template=linux ;;
-   mingw*) template=win32 ;;
-  netbsd*) template=netbsd ;;
+					 template=linux ;;
+	 mingw*) template=win32 ;;
+	netbsd*) template=netbsd ;;
  openbsd*) template=openbsd ;;
  solaris*) template=solaris ;;
 esac
 
-  if test x"$template" = x"" ; then
-    as_fn_error $? "
+	if test x"$template" = x"" ; then
+		as_fn_error $? "
 *******************************************************************
 PostgreSQL has apparently not been ported to your platform yet.
 To try a manual configuration, look into the src/template directory
@@ -3045,7 +3045,7 @@ rectifying this.  Include the above 'checking host system type...'
 line.
 *******************************************************************
 " "$LINENO" 5
-  fi
+	fi
 
 
 fi
@@ -3075,18 +3075,18 @@ DLSUFFIX=".so"
 
 # Check whether --with-includes was given.
 if test "${with_includes+set}" = set; then :
-  withval=$with_includes;
-  case $withval in
-    yes)
-      as_fn_error $? "argument required for --with-includes option" "$LINENO" 5
-      ;;
-    no)
-      as_fn_error $? "argument required for --with-includes option" "$LINENO" 5
-      ;;
-    *)
-
-      ;;
-  esac
+	withval=$with_includes;
+	case $withval in
+		yes)
+			as_fn_error $? "argument required for --with-includes option" "$LINENO" 5
+			;;
+		no)
+			as_fn_error $? "argument required for --with-includes option" "$LINENO" 5
+			;;
+		*)
+
+			;;
+	esac
 
 fi
 
@@ -3101,18 +3101,18 @@ fi
 
 # Check whether --with-libraries was given.
 if test "${with_libraries+set}" = set; then :
-  withval=$with_libraries;
-  case $withval in
-    yes)
-      as_fn_error $? "argument required for --with-libraries option" "$LINENO" 5
-      ;;
-    no)
-      as_fn_error $? "argument required for --with-libraries option" "$LINENO" 5
-      ;;
-    *)
-      LIBRARY_DIRS=$withval
-      ;;
-  esac
+	withval=$with_libraries;
+	case $withval in
+		yes)
+			as_fn_error $? "argument required for --with-libraries option" "$LINENO" 5
+			;;
+		no)
+			as_fn_error $? "argument required for --with-libraries option" "$LINENO" 5
+			;;
+		*)
+			LIBRARY_DIRS=$withval
+			;;
+	esac
 
 fi
 
@@ -3123,18 +3123,18 @@ fi
 
 # Check whether --with-libs was given.
 if test "${with_libs+set}" = set; then :
-  withval=$with_libs;
-  case $withval in
-    yes)
-      as_fn_error $? "argument required for --with-libs option" "$LINENO" 5
-      ;;
-    no)
-      as_fn_error $? "argument required for --with-libs option" "$LINENO" 5
-      ;;
-    *)
-      LIBRARY_DIRS=$withval
-      ;;
-  esac
+	withval=$with_libs;
+	case $withval in
+		yes)
+			as_fn_error $? "argument required for --with-libs option" "$LINENO" 5
+			;;
+		no)
+			as_fn_error $? "argument required for --with-libs option" "$LINENO" 5
+			;;
+		*)
+			LIBRARY_DIRS=$withval
+			;;
+	esac
 
 fi
 
@@ -3150,21 +3150,21 @@ fi
 
 # Check whether --enable-integer-datetimes was given.
 if test "${enable_integer_datetimes+set}" = set; then :
-  enableval=$enable_integer_datetimes;
-  case $enableval in
-    yes)
-      :
-      ;;
-    no)
-      as_fn_error $? "--disable-integer-datetimes is no longer supported" "$LINENO" 5
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --enable-integer-datetimes option" "$LINENO" 5
-      ;;
-  esac
+	enableval=$enable_integer_datetimes;
+	case $enableval in
+		yes)
+			:
+			;;
+		no)
+			as_fn_error $? "--disable-integer-datetimes is no longer supported" "$LINENO" 5
+			;;
+		*)
+			as_fn_error $? "no argument expected for --enable-integer-datetimes option" "$LINENO" 5
+			;;
+	esac
 
 else
-  enable_integer_datetimes=yes
+	enable_integer_datetimes=yes
 
 fi
 
@@ -3180,22 +3180,22 @@ $as_echo_n "checking whether NLS is wanted... " >&6; }
 
 # Check whether --enable-nls was given.
 if test "${enable_nls+set}" = set; then :
-  enableval=$enable_nls;
-  case $enableval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      enable_nls=yes
+	enableval=$enable_nls;
+	case $enableval in
+		yes)
+			:
+			;;
+		no)
+			:
+			;;
+		*)
+			enable_nls=yes
 WANTED_LANGUAGES=$enableval
-      ;;
-  esac
+			;;
+	esac
 
 else
-  enable_nls=no
+	enable_nls=no
 fi
 
 
@@ -3221,21 +3221,21 @@ $as_echo_n "checking for default port number... " >&6; }
 
 # Check whether --with-pgport was given.
 if test "${with_pgport+set}" = set; then :
-  withval=$with_pgport;
-  case $withval in
-    yes)
-      as_fn_error $? "argument required for --with-pgport option" "$LINENO" 5
-      ;;
-    no)
-      as_fn_error $? "argument required for --with-pgport option" "$LINENO" 5
-      ;;
-    *)
-      default_port=$withval
-      ;;
-  esac
+	withval=$with_pgport;
+	case $withval in
+		yes)
+			as_fn_error $? "argument required for --with-pgport option" "$LINENO" 5
+			;;
+		no)
+			as_fn_error $? "argument required for --with-pgport option" "$LINENO" 5
+			;;
+		*)
+			default_port=$withval
+			;;
+	esac
 
 else
-  default_port=5432
+	default_port=5432
 fi
 
 
@@ -3256,13 +3256,13 @@ _ACEOF
 
 # It's worth validating port; you can get very confusing errors otherwise
 if test x"$default_port" = x""; then
-  as_fn_error $? "invalid --with-pgport specification: empty string" "$LINENO" 5
+	as_fn_error $? "invalid --with-pgport specification: empty string" "$LINENO" 5
 elif test ! x`echo "$default_port" | sed -e 's/[0-9]*//'` = x""; then
-  as_fn_error $? "invalid --with-pgport specification: must be a number" "$LINENO" 5
+	as_fn_error $? "invalid --with-pgport specification: must be a number" "$LINENO" 5
 elif test ! x`echo "$default_port" | sed -e 's/^0.//'` = x"$default_port"; then
-  as_fn_error $? "invalid --with-pgport specification: must not have leading 0" "$LINENO" 5
+	as_fn_error $? "invalid --with-pgport specification: must not have leading 0" "$LINENO" 5
 elif test "$default_port" -lt "1" -o "$default_port" -gt "65535"; then
-  as_fn_error $? "invalid --with-pgport specification: must be between 1 and 65535" "$LINENO" 5
+	as_fn_error $? "invalid --with-pgport specification: must be between 1 and 65535" "$LINENO" 5
 fi
 
 #
@@ -3272,21 +3272,21 @@ fi
 
 # Check whether --enable-rpath was given.
 if test "${enable_rpath+set}" = set; then :
-  enableval=$enable_rpath;
-  case $enableval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --enable-rpath option" "$LINENO" 5
-      ;;
-  esac
+	enableval=$enable_rpath;
+	case $enableval in
+		yes)
+			:
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --enable-rpath option" "$LINENO" 5
+			;;
+	esac
 
 else
-  enable_rpath=yes
+	enable_rpath=yes
 
 fi
 
@@ -3300,21 +3300,21 @@ fi
 
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then :
-  enableval=$enable_debug;
-  case $enableval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --enable-debug option" "$LINENO" 5
-      ;;
-  esac
+	enableval=$enable_debug;
+	case $enableval in
+		yes)
+			:
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --enable-debug option" "$LINENO" 5
+			;;
+	esac
 
 else
-  enable_debug=no
+	enable_debug=no
 
 fi
 
@@ -3328,21 +3328,21 @@ fi
 
 # Check whether --enable-profiling was given.
 if test "${enable_profiling+set}" = set; then :
-  enableval=$enable_profiling;
-  case $enableval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --enable-profiling option" "$LINENO" 5
-      ;;
-  esac
+	enableval=$enable_profiling;
+	case $enableval in
+		yes)
+			:
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --enable-profiling option" "$LINENO" 5
+			;;
+	esac
 
 else
-  enable_profiling=no
+	enable_profiling=no
 
 fi
 
@@ -3355,191 +3355,191 @@ fi
 
 # Check whether --enable-coverage was given.
 if test "${enable_coverage+set}" = set; then :
-  enableval=$enable_coverage;
-  case $enableval in
-    yes)
-      if test -z "$GCOV"; then
-  for ac_prog in gcov
+	enableval=$enable_coverage;
+	case $enableval in
+		yes)
+			if test -z "$GCOV"; then
+	for ac_prog in gcov
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_GCOV+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GCOV in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GCOV="$GCOV" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $GCOV in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_GCOV="$GCOV" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GCOV="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_GCOV="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 GCOV=$ac_cv_path_GCOV
 if test -n "$GCOV"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOV" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOV" >&5
 $as_echo "$GCOV" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$GCOV" && break
+	test -n "$GCOV" && break
 done
 
 else
-  # Report the value of GCOV in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCOV" >&5
+	# Report the value of GCOV in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCOV" >&5
 $as_echo_n "checking for GCOV... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOV" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOV" >&5
 $as_echo "$GCOV" >&6; }
 fi
 
 if test -z "$GCOV"; then
-  as_fn_error $? "gcov not found" "$LINENO" 5
+	as_fn_error $? "gcov not found" "$LINENO" 5
 fi
 if test -z "$LCOV"; then
-  for ac_prog in lcov
+	for ac_prog in lcov
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_LCOV+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $LCOV in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_LCOV="$LCOV" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $LCOV in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_LCOV="$LCOV" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_LCOV="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_LCOV="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 LCOV=$ac_cv_path_LCOV
 if test -n "$LCOV"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5
 $as_echo "$LCOV" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$LCOV" && break
+	test -n "$LCOV" && break
 done
 
 else
-  # Report the value of LCOV in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LCOV" >&5
+	# Report the value of LCOV in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LCOV" >&5
 $as_echo_n "checking for LCOV... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5
 $as_echo "$LCOV" >&6; }
 fi
 
 if test -z "$LCOV"; then
-  as_fn_error $? "lcov not found" "$LINENO" 5
+	as_fn_error $? "lcov not found" "$LINENO" 5
 fi
 if test -z "$GENHTML"; then
-  for ac_prog in genhtml
+	for ac_prog in genhtml
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_GENHTML+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GENHTML in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GENHTML="$GENHTML" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $GENHTML in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_GENHTML="$GENHTML" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GENHTML="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_GENHTML="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 GENHTML=$ac_cv_path_GENHTML
 if test -n "$GENHTML"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5
 $as_echo "$GENHTML" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$GENHTML" && break
+	test -n "$GENHTML" && break
 done
 
 else
-  # Report the value of GENHTML in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GENHTML" >&5
+	# Report the value of GENHTML in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GENHTML" >&5
 $as_echo_n "checking for GENHTML... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5
 $as_echo "$GENHTML" >&6; }
 fi
 
 if test -z "$GENHTML"; then
-  as_fn_error $? "genhtml not found" "$LINENO" 5
-fi
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --enable-coverage option" "$LINENO" 5
-      ;;
-  esac
+	as_fn_error $? "genhtml not found" "$LINENO" 5
+fi
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --enable-coverage option" "$LINENO" 5
+			;;
+	esac
 
 else
-  enable_coverage=no
+	enable_coverage=no
 
 fi
 
@@ -3553,78 +3553,78 @@ fi
 
 # Check whether --enable-dtrace was given.
 if test "${enable_dtrace+set}" = set; then :
-  enableval=$enable_dtrace;
-  case $enableval in
-    yes)
-      if test -z "$DTRACE"; then
-  for ac_prog in dtrace
+	enableval=$enable_dtrace;
+	case $enableval in
+		yes)
+			if test -z "$DTRACE"; then
+	for ac_prog in dtrace
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_DTRACE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $DTRACE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_DTRACE="$DTRACE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $DTRACE in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_DTRACE="$DTRACE" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_DTRACE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_DTRACE="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 DTRACE=$ac_cv_path_DTRACE
 if test -n "$DTRACE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DTRACE" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DTRACE" >&5
 $as_echo "$DTRACE" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$DTRACE" && break
+	test -n "$DTRACE" && break
 done
 
 else
-  # Report the value of DTRACE in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DTRACE" >&5
+	# Report the value of DTRACE in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DTRACE" >&5
 $as_echo_n "checking for DTRACE... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DTRACE" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DTRACE" >&5
 $as_echo "$DTRACE" >&6; }
 fi
 
 if test -z "$DTRACE"; then
-  as_fn_error $? "dtrace not found" "$LINENO" 5
+	as_fn_error $? "dtrace not found" "$LINENO" 5
 fi
 
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --enable-dtrace option" "$LINENO" 5
-      ;;
-  esac
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --enable-dtrace option" "$LINENO" 5
+			;;
+	esac
 
 else
-  enable_dtrace=no
+	enable_dtrace=no
 
 fi
 
@@ -3638,21 +3638,21 @@ fi
 
 # Check whether --enable-tap-tests was given.
 if test "${enable_tap_tests+set}" = set; then :
-  enableval=$enable_tap_tests;
-  case $enableval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --enable-tap-tests option" "$LINENO" 5
-      ;;
-  esac
+	enableval=$enable_tap_tests;
+	case $enableval in
+		yes)
+			:
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --enable-tap-tests option" "$LINENO" 5
+			;;
+	esac
 
 else
-  enable_tap_tests=no
+	enable_tap_tests=no
 
 fi
 
@@ -3667,23 +3667,23 @@ fi
 
 # Check whether --enable-injection-points was given.
 if test "${enable_injection_points+set}" = set; then :
-  enableval=$enable_injection_points;
-  case $enableval in
-    yes)
+	enableval=$enable_injection_points;
+	case $enableval in
+		yes)
 
 $as_echo "#define USE_INJECTION_POINTS 1" >>confdefs.h
 
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --enable-injection-points option" "$LINENO" 5
-      ;;
-  esac
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --enable-injection-points option" "$LINENO" 5
+			;;
+	esac
 
 else
-  enable_injection_points=no
+	enable_injection_points=no
 
 fi
 
@@ -3700,32 +3700,32 @@ $as_echo_n "checking for block size... " >&6; }
 
 # Check whether --with-blocksize was given.
 if test "${with_blocksize+set}" = set; then :
-  withval=$with_blocksize;
-  case $withval in
-    yes)
-      as_fn_error $? "argument required for --with-blocksize option" "$LINENO" 5
-      ;;
-    no)
-      as_fn_error $? "argument required for --with-blocksize option" "$LINENO" 5
-      ;;
-    *)
-      blocksize=$withval
-      ;;
-  esac
+	withval=$with_blocksize;
+	case $withval in
+		yes)
+			as_fn_error $? "argument required for --with-blocksize option" "$LINENO" 5
+			;;
+		no)
+			as_fn_error $? "argument required for --with-blocksize option" "$LINENO" 5
+			;;
+		*)
+			blocksize=$withval
+			;;
+	esac
 
 else
-  blocksize=8
+	blocksize=8
 fi
 
 
 case ${blocksize} in
-  1) BLCKSZ=1024;;
-  2) BLCKSZ=2048;;
-  4) BLCKSZ=4096;;
-  8) BLCKSZ=8192;;
+	1) BLCKSZ=1024;;
+	2) BLCKSZ=2048;;
+	4) BLCKSZ=4096;;
+	8) BLCKSZ=8192;;
  16) BLCKSZ=16384;;
  32) BLCKSZ=32768;;
-  *) as_fn_error $? "Invalid block size. Allowed values are 1,2,4,8,16,32." "$LINENO" 5
+	*) as_fn_error $? "Invalid block size. Allowed values are 1,2,4,8,16,32." "$LINENO" 5
 esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${blocksize}kB" >&5
 $as_echo "${blocksize}kB" >&6; }
@@ -3744,21 +3744,21 @@ _ACEOF
 
 # Check whether --with-segsize was given.
 if test "${with_segsize+set}" = set; then :
-  withval=$with_segsize;
-  case $withval in
-    yes)
-      as_fn_error $? "argument required for --with-segsize option" "$LINENO" 5
-      ;;
-    no)
-      as_fn_error $? "argument required for --with-segsize option" "$LINENO" 5
-      ;;
-    *)
-      segsize=$withval
-      ;;
-  esac
+	withval=$with_segsize;
+	case $withval in
+		yes)
+			as_fn_error $? "argument required for --with-segsize option" "$LINENO" 5
+			;;
+		no)
+			as_fn_error $? "argument required for --with-segsize option" "$LINENO" 5
+			;;
+		*)
+			segsize=$withval
+			;;
+	esac
 
 else
-  segsize=1
+	segsize=1
 fi
 
 
@@ -3767,21 +3767,21 @@ fi
 
 # Check whether --with-segsize-blocks was given.
 if test "${with_segsize_blocks+set}" = set; then :
-  withval=$with_segsize_blocks;
-  case $withval in
-    yes)
-      as_fn_error $? "argument required for --with-segsize-blocks option" "$LINENO" 5
-      ;;
-    no)
-      as_fn_error $? "argument required for --with-segsize-blocks option" "$LINENO" 5
-      ;;
-    *)
-      segsize_blocks=$withval
-      ;;
-  esac
+	withval=$with_segsize_blocks;
+	case $withval in
+		yes)
+			as_fn_error $? "argument required for --with-segsize-blocks option" "$LINENO" 5
+			;;
+		no)
+			as_fn_error $? "argument required for --with-segsize-blocks option" "$LINENO" 5
+			;;
+		*)
+			segsize_blocks=$withval
+			;;
+	esac
 
 else
-  segsize_blocks=0
+	segsize_blocks=0
 fi
 
 
@@ -3790,22 +3790,22 @@ fi
 # otherwise. segsize-blocks is only really useful for developers wanting to
 # test segment related code. Warn if both are used.
 if test $segsize_blocks -ne 0 -a $segsize -ne 1; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: both --with-segsize and --with-segsize-blocks specified, --with-segsize-blocks wins" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: both --with-segsize and --with-segsize-blocks specified, --with-segsize-blocks wins" >&5
 $as_echo "$as_me: WARNING: both --with-segsize and --with-segsize-blocks specified, --with-segsize-blocks wins" >&2;}
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for segment size" >&5
 $as_echo_n "checking for segment size... " >&6; }
 if test $segsize_blocks -eq 0; then
-  # this expression is set up to avoid unnecessary integer overflow
-  # blocksize is already guaranteed to be a factor of 1024
-  RELSEG_SIZE=`expr '(' 1024 / ${blocksize} ')' '*' ${segsize} '*' 1024`
-  test $? -eq 0 || exit 1
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${segsize}GB" >&5
+	# this expression is set up to avoid unnecessary integer overflow
+	# blocksize is already guaranteed to be a factor of 1024
+	RELSEG_SIZE=`expr '(' 1024 / ${blocksize} ')' '*' ${segsize} '*' 1024`
+	test $? -eq 0 || exit 1
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${segsize}GB" >&5
 $as_echo "${segsize}GB" >&6; }
 else
-  RELSEG_SIZE=$segsize_blocks
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${RELSEG_SIZE} blocks" >&5
+	RELSEG_SIZE=$segsize_blocks
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${RELSEG_SIZE} blocks" >&5
 $as_echo "${RELSEG_SIZE} blocks" >&6; }
 fi
 
@@ -3825,33 +3825,33 @@ $as_echo_n "checking for WAL block size... " >&6; }
 
 # Check whether --with-wal-blocksize was given.
 if test "${with_wal_blocksize+set}" = set; then :
-  withval=$with_wal_blocksize;
-  case $withval in
-    yes)
-      as_fn_error $? "argument required for --with-wal-blocksize option" "$LINENO" 5
-      ;;
-    no)
-      as_fn_error $? "argument required for --with-wal-blocksize option" "$LINENO" 5
-      ;;
-    *)
-      wal_blocksize=$withval
-      ;;
-  esac
+	withval=$with_wal_blocksize;
+	case $withval in
+		yes)
+			as_fn_error $? "argument required for --with-wal-blocksize option" "$LINENO" 5
+			;;
+		no)
+			as_fn_error $? "argument required for --with-wal-blocksize option" "$LINENO" 5
+			;;
+		*)
+			wal_blocksize=$withval
+			;;
+	esac
 
 else
-  wal_blocksize=8
+	wal_blocksize=8
 fi
 
 
 case ${wal_blocksize} in
-  1) XLOG_BLCKSZ=1024;;
-  2) XLOG_BLCKSZ=2048;;
-  4) XLOG_BLCKSZ=4096;;
-  8) XLOG_BLCKSZ=8192;;
+	1) XLOG_BLCKSZ=1024;;
+	2) XLOG_BLCKSZ=2048;;
+	4) XLOG_BLCKSZ=4096;;
+	8) XLOG_BLCKSZ=8192;;
  16) XLOG_BLCKSZ=16384;;
  32) XLOG_BLCKSZ=32768;;
  64) XLOG_BLCKSZ=65536;;
-  *) as_fn_error $? "Invalid WAL block size. Allowed values are 1,2,4,8,16,32,64." "$LINENO" 5
+	*) as_fn_error $? "Invalid WAL block size. Allowed values are 1,2,4,8,16,32,64." "$LINENO" 5
 esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${wal_blocksize}kB" >&5
 $as_echo "${wal_blocksize}kB" >&6; }
@@ -3877,103 +3877,103 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in $pgac_cc_list
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+	for ac_prog in $pgac_cc_list
+	do
+		# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
+	if test -n "$CC"; then
+	ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-    test -n "$CC" && break
-  done
+		test -n "$CC" && break
+	done
 fi
 if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in $pgac_cc_list
+	ac_ct_CC=$CC
+	for ac_prog in $pgac_cc_list
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+	if test -n "$ac_ct_CC"; then
+	ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_prog_ac_ct_CC="$ac_prog"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$ac_ct_CC" && break
+	test -n "$ac_ct_CC" && break
 done
 
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
+	if test "x$ac_ct_CC" = x; then
+		CC=""
+	else
+		case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    CC=$ac_ct_CC
-  fi
+		CC=$ac_ct_CC
+	fi
 fi
 
 
@@ -3987,24 +3987,24 @@ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
+	{ { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+	*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+	*) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
+	(eval "$ac_compiler $ac_option >&5") 2>conftest.err
+	ac_status=$?
+	if test -s conftest.err; then
+		sed '10a\
 ... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
+				 10q' conftest.err >conftest.er1
+		cat conftest.er1 >&5
+	fi
+	rm -f conftest.er1 conftest.err
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; }
 done
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4014,8 +4014,8 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
@@ -4033,43 +4033,43 @@ ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
 ac_rmfiles=
 for ac_file in $ac_files
 do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
+	case $ac_file in
+		*.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+		* ) ac_rmfiles="$ac_rmfiles $ac_file";;
+	esac
 done
 rm -f $ac_rmfiles
 
 if { { ac_try="$ac_link_default"
 case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+	*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+	*) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+	(eval "$ac_link_default") 2>&5
+	ac_status=$?
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; }; then :
+	# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
 # so that the user can short-circuit this test for compilers unknown to
 # Autoconf.
 for ac_file in $ac_files ''
 do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	test -f "$ac_file" || continue
+	case $ac_file in
+		*.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
-    [ab].out )
+		[ab].out )
 	# We found the default executable, but exeext='' is most
 	# certainly right.
 	break;;
-    *.* )
+		*.* )
 	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+		 ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
 	# We set ac_cv_exeext here because the later test for it is not
 	# safe: cross compilers may not add the suffix if given an `-o'
@@ -4077,17 +4077,17 @@ do
 	# Even if this section looks crufty: it has the advantage of
 	# actually working.
 	break;;
-    * )
+		* )
 	break;;
-  esac
+	esac
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
 else
-  ac_file=''
+	ac_file=''
 fi
 if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -4097,7 +4097,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See \`config.log' for more details" "$LINENO" 5; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
@@ -4112,30 +4112,30 @@ ac_clean_files=$ac_clean_files_save
 $as_echo_n "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+	*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+	*) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+	(eval "$ac_link") 2>&5
+	ac_status=$?
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; }; then :
+	# If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
 # `rm'.
 for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
+	test -f "$ac_file" || continue
+	case $ac_file in
+		*.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+		*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+		break;;
+		* ) break;;
+	esac
 done
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details" "$LINENO" 5; }
@@ -4156,8 +4156,8 @@ main ()
 FILE *f = fopen ("conftest.out", "w");
  return ferror (f) || fclose (f) != 0;
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 ac_clean_files="$ac_clean_files conftest.out"
@@ -4166,40 +4166,40 @@ ac_clean_files="$ac_clean_files conftest.out"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
 $as_echo_n "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
+	{ { ac_try="$ac_link"
 case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+	*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+	*) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+	(eval "$ac_link") 2>&5
+	ac_status=$?
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; }
+	if { ac_try='./conftest$ac_cv_exeext'
+	{ { case "(($ac_try" in
+	*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+	*) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
+	(eval "$ac_try") 2>&5
+	ac_status=$?
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; }; }; then
+		cross_compiling=no
+	else
+		if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
-    else
+		else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details" "$LINENO" 5; }
-    fi
-  fi
+		fi
+	fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
 $as_echo "$cross_compiling" >&6; }
@@ -4209,41 +4209,41 @@ ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
 if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 rm -f conftest.o conftest.obj
 if { { ac_try="$ac_compile"
 case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+	*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+	*) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
+	(eval "$ac_compile") 2>&5
+	ac_status=$?
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; }; then :
+	for ac_file in conftest.o conftest.obj conftest.*; do
+	test -f "$ac_file" || continue;
+	case $ac_file in
+		*.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+		*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+			 break;;
+	esac
 done
 else
-  $as_echo "$as_me: failed program was:" >&5
+	$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -4260,26 +4260,26 @@ ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 #ifndef __GNUC__
-       choke me
+			 choke me
 #endif
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
+	ac_compiler_gnu=yes
 else
-  ac_compiler_gnu=no
+	ac_compiler_gnu=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
@@ -4288,51 +4288,51 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
 $as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
-  GCC=yes
+	GCC=yes
 else
-  GCC=
+	GCC=
 fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
 if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	ac_save_c_werror_flag=$ac_c_werror_flag
+	 ac_c_werror_flag=yes
+	 ac_cv_prog_cc_g=no
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
+	ac_cv_prog_cc_g=yes
 else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	CFLAGS=""
+			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
 else
-  ac_c_werror_flag=$ac_save_c_werror_flag
+	ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4341,43 +4341,43 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
+	ac_cv_prog_cc_g=yes
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
+	 ac_c_werror_flag=$ac_save_c_werror_flag
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
 $as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
+	CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
+	if test "$GCC" = yes; then
+		CFLAGS="-g -O2"
+	else
+		CFLAGS="-g"
+	fi
+else
+	if test "$GCC" = yes; then
+		CFLAGS="-O2"
+	else
+		CFLAGS=
+	fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_cv_prog_cc_c89=no
+	ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4388,32 +4388,32 @@ struct stat;
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
 static char *e (p, i)
-     char **p;
-     int i;
+		 char **p;
+		 int i;
 {
-  return p[i];
+	return p[i];
 }
 static char *f (char * (*g) (char **, int), char **p, ...)
 {
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
+	char *s;
+	va_list v;
+	va_start (v,p);
+	s = g (p, va_arg (v,int));
+	va_end (v);
+	return s;
 }
 
 /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
+	 function prototypes and stuff, but not '\xHH' hex character constants.
+	 These don't provoke an error unfortunately, instead are silently treated
+	 as 'x'.  The following induces an error, until -std is added to get
+	 proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+	 array size at least.  It's necessary to write '\x00'==0 to get something
+	 that's true only with -std.  */
 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
 /* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
+	 inside strings and character constants.  */
 #define FOO(x) 'x'
 int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
 
@@ -4427,19 +4427,19 @@ int
 main ()
 {
 return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
+	CC="$ac_save_CC $ac_arg"
+	if ac_fn_c_try_compile "$LINENO"; then :
+	ac_cv_prog_cc_c89=$ac_arg
 fi
 rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
+	test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
@@ -4447,15 +4447,15 @@ CC=$ac_save_CC
 fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+	x)
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 $as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+	xno)
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 $as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+	*)
+		CC="$CC $ac_cv_prog_cc_c89"
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 if test "x$ac_cv_prog_cc_c89" != xno; then :
@@ -4475,39 +4475,39 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 $as_echo_n "checking for $CC option to accept ISO C11... " >&6; }
 
 if ${pgac_cv_prog_cc_c11+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_cv_prog_cc_c11=no
+	pgac_cv_prog_cc_c11=no
 pgac_save_CC=$CC
 for pgac_arg in '' '-std=gnu11' '-std=c11'; do
-  CC="$pgac_save_CC $pgac_arg"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	CC="$pgac_save_CC $pgac_arg"
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
 # error "Compiler does not advertise C11 conformance"
 #endif
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_cc_c11=$pgac_arg
+	pgac_cv_prog_cc_c11=$pgac_arg
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  test x"$pgac_cv_prog_cc_c11" != x"no" && break
+	test x"$pgac_cv_prog_cc_c11" != x"no" && break
 done
 CC=$pgac_save_CC
 fi
 
 
 if test x"$pgac_cv_prog_cc_c11" = x"no"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 $as_echo "unsupported" >&6; }
-  as_fn_error $? "C compiler \"$CC\" does not support C11" "$LINENO" 5
+	as_fn_error $? "C compiler \"$CC\" does not support C11" "$LINENO" 5
 elif test x"$pgac_cv_prog_cc_c11" = x""; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 $as_echo "none needed" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_cc_c11" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_cc_c11" >&5
 $as_echo "$pgac_cv_prog_cc_c11" >&6; }
-  CC="$CC $pgac_cv_prog_cc_c11"
+	CC="$CC $pgac_cv_prog_cc_c11"
 fi
 
 
@@ -4517,159 +4517,159 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in $pgac_cxx_list
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+	if test -n "$CCC"; then
+		CXX=$CCC
+	else
+		if test -n "$ac_tool_prefix"; then
+	for ac_prog in $pgac_cxx_list
+	do
+		# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+	if test -n "$CXX"; then
+	ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
 fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
 $as_echo "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-    test -n "$CXX" && break
-  done
+		test -n "$CXX" && break
+	done
 fi
 if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in $pgac_cxx_list
+	ac_ct_CXX=$CXX
+	for ac_prog in $pgac_cxx_list
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+	if test -n "$ac_ct_CXX"; then
+	ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_prog_ac_ct_CXX="$ac_prog"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
 $as_echo "$ac_ct_CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$ac_ct_CXX" && break
+	test -n "$ac_ct_CXX" && break
 done
 
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
+	if test "x$ac_ct_CXX" = x; then
+		CXX="g++"
+	else
+		case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    CXX=$ac_ct_CXX
-  fi
+		CXX=$ac_ct_CXX
+	fi
 fi
 
-  fi
+	fi
 fi
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
+	{ { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+	*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+	*) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
+	(eval "$ac_compiler $ac_option >&5") 2>conftest.err
+	ac_status=$?
+	if test -s conftest.err; then
+		sed '10a\
 ... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
+				 10q' conftest.err >conftest.er1
+		cat conftest.er1 >&5
+	fi
+	rm -f conftest.er1 conftest.err
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; }
 done
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
 if ${ac_cv_cxx_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 #ifndef __GNUC__
-       choke me
+			 choke me
 #endif
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
+	ac_compiler_gnu=yes
 else
-  ac_compiler_gnu=no
+	ac_compiler_gnu=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
@@ -4678,51 +4678,51 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
 $as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
-  GXX=yes
+	GXX=yes
 else
-  GXX=
+	GXX=
 fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
 if ${ac_cv_prog_cxx_g+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+	 ac_cxx_werror_flag=yes
+	 ac_cv_prog_cxx_g=no
+	 CXXFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
+	ac_cv_prog_cxx_g=yes
 else
-  CXXFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	CXXFLAGS=""
+			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
 
 else
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4731,36 +4731,36 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
+	ac_cv_prog_cxx_g=yes
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
 $as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
+	CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
+	if test "$GXX" = yes; then
+		CXXFLAGS="-g -O2"
+	else
+		CXXFLAGS="-g"
+	fi
+else
+	if test "$GXX" = yes; then
+		CXXFLAGS="-O2"
+	else
+		CXXFLAGS=
+	fi
 fi
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -4781,14 +4781,14 @@ main ()
 #ifndef __INTEL_COMPILER
 choke me
 #endif
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ICC=yes
+	ICC=yes
 else
-  ICC=no
+	ICC=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -4802,23 +4802,23 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 # Check whether --with-llvm was given.
 if test "${with_llvm+set}" = set; then :
-  withval=$with_llvm;
-  case $withval in
-    yes)
+	withval=$with_llvm;
+	case $withval in
+		yes)
 
 $as_echo "#define USE_LLVM 1" >>confdefs.h
 
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-llvm option" "$LINENO" 5
-      ;;
-  esac
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-llvm option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_llvm=no
+	with_llvm=no
 
 fi
 
@@ -4826,44 +4826,44 @@ fi
 
 for ac_prog in gawk mawk nawk awk
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+	if test -n "$AWK"; then
+	ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_prog_AWK="$ac_prog"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
 $as_echo "$AWK" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$AWK" && break
+	test -n "$AWK" && break
 done
 
 if test "$with_llvm" = yes; then :
@@ -4872,192 +4872,192 @@ if test "$with_llvm" = yes; then :
 
 
 
-  if test -z "$LLVM_CONFIG"; then
-  for ac_prog in llvm-config
+	if test -z "$LLVM_CONFIG"; then
+	for ac_prog in llvm-config
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_LLVM_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $LLVM_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_LLVM_CONFIG="$LLVM_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $LLVM_CONFIG in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_LLVM_CONFIG="$LLVM_CONFIG" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_LLVM_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_LLVM_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 LLVM_CONFIG=$ac_cv_path_LLVM_CONFIG
 if test -n "$LLVM_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LLVM_CONFIG" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LLVM_CONFIG" >&5
 $as_echo "$LLVM_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$LLVM_CONFIG" && break
+	test -n "$LLVM_CONFIG" && break
 done
 
 else
-  # Report the value of LLVM_CONFIG in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LLVM_CONFIG" >&5
+	# Report the value of LLVM_CONFIG in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LLVM_CONFIG" >&5
 $as_echo_n "checking for LLVM_CONFIG... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LLVM_CONFIG" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LLVM_CONFIG" >&5
 $as_echo "$LLVM_CONFIG" >&6; }
 fi
 
 
-  # no point continuing if llvm wasn't found
-  if test -z "$LLVM_CONFIG"; then
-    as_fn_error $? "llvm-config not found, but required when compiling --with-llvm, specify with LLVM_CONFIG=" "$LINENO" 5
-  fi
-  # check if detected $LLVM_CONFIG is executable
-  pgac_llvm_version="$($LLVM_CONFIG --version 2> /dev/null || echo no)"
-  if test "x$pgac_llvm_version" = "xno"; then
-    as_fn_error $? "$LLVM_CONFIG does not work" "$LINENO" 5
-  fi
-  # and whether the version is supported
-  if echo $pgac_llvm_version | $AWK -F '.' '{ if ($1 >= 14) exit 1; else exit 0;}';then
-    as_fn_error $? "$LLVM_CONFIG version is $pgac_llvm_version but at least 14 is required" "$LINENO" 5
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: using llvm $pgac_llvm_version" >&5
+	# no point continuing if llvm wasn't found
+	if test -z "$LLVM_CONFIG"; then
+		as_fn_error $? "llvm-config not found, but required when compiling --with-llvm, specify with LLVM_CONFIG=" "$LINENO" 5
+	fi
+	# check if detected $LLVM_CONFIG is executable
+	pgac_llvm_version="$($LLVM_CONFIG --version 2> /dev/null || echo no)"
+	if test "x$pgac_llvm_version" = "xno"; then
+		as_fn_error $? "$LLVM_CONFIG does not work" "$LINENO" 5
+	fi
+	# and whether the version is supported
+	if echo $pgac_llvm_version | $AWK -F '.' '{ if ($1 >= 14) exit 1; else exit 0;}';then
+		as_fn_error $? "$LLVM_CONFIG version is $pgac_llvm_version but at least 14 is required" "$LINENO" 5
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: using llvm $pgac_llvm_version" >&5
 $as_echo "$as_me: using llvm $pgac_llvm_version" >&6;}
 
-  # need clang to create some bitcode files
+	# need clang to create some bitcode files
 
-  if test -z "$CLANG"; then
-  for ac_prog in clang
+	if test -z "$CLANG"; then
+	for ac_prog in clang
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_CLANG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CLANG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CLANG="$CLANG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $CLANG in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_CLANG="$CLANG" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CLANG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_CLANG="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 CLANG=$ac_cv_path_CLANG
 if test -n "$CLANG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLANG" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLANG" >&5
 $as_echo "$CLANG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$CLANG" && break
+	test -n "$CLANG" && break
 done
 
 else
-  # Report the value of CLANG in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLANG" >&5
+	# Report the value of CLANG in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLANG" >&5
 $as_echo_n "checking for CLANG... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLANG" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLANG" >&5
 $as_echo "$CLANG" >&6; }
 fi
 
-  if test -z "$CLANG"; then
-    as_fn_error $? "clang not found, but required when compiling --with-llvm, specify with CLANG=" "$LINENO" 5
-  fi
-  # make sure clang is executable
-  if test "x$($CLANG --version 2> /dev/null || echo no)" = "xno"; then
-    as_fn_error $? "$CLANG does not work" "$LINENO" 5
-  fi
-  # Could check clang version, but it doesn't seem that
-  # important. Systems with a new enough LLVM version are usually
-  # going to have a decent clang version too. It's also not entirely
-  # clear what the minimum version is.
-
-  # Collect compiler flags necessary to build the LLVM dependent
-  # shared library.
-  for pgac_option in `$LLVM_CONFIG --cppflags`; do
-    case $pgac_option in
-      -I*|-D*) LLVM_CPPFLAGS="$pgac_option $LLVM_CPPFLAGS";;
-    esac
-  done
-
-  for pgac_option in `$LLVM_CONFIG --ldflags`; do
-    case $pgac_option in
-      -L*) LLVM_LIBS="$LLVM_LIBS $pgac_option";;
-    esac
-  done
+	if test -z "$CLANG"; then
+		as_fn_error $? "clang not found, but required when compiling --with-llvm, specify with CLANG=" "$LINENO" 5
+	fi
+	# make sure clang is executable
+	if test "x$($CLANG --version 2> /dev/null || echo no)" = "xno"; then
+		as_fn_error $? "$CLANG does not work" "$LINENO" 5
+	fi
+	# Could check clang version, but it doesn't seem that
+	# important. Systems with a new enough LLVM version are usually
+	# going to have a decent clang version too. It's also not entirely
+	# clear what the minimum version is.
+
+	# Collect compiler flags necessary to build the LLVM dependent
+	# shared library.
+	for pgac_option in `$LLVM_CONFIG --cppflags`; do
+		case $pgac_option in
+			-I*|-D*) LLVM_CPPFLAGS="$pgac_option $LLVM_CPPFLAGS";;
+		esac
+	done
 
-  # ABI influencing options, standard influencing options
-  for pgac_option in `$LLVM_CONFIG --cxxflags`; do
-    case $pgac_option in
-      -fno-rtti*) LLVM_CXXFLAGS="$LLVM_CXXFLAGS $pgac_option";;
-      -std=*) LLVM_CXXFLAGS="$LLVM_CXXFLAGS $pgac_option";;
-    esac
-  done
+	for pgac_option in `$LLVM_CONFIG --ldflags`; do
+		case $pgac_option in
+			-L*) LLVM_LIBS="$LLVM_LIBS $pgac_option";;
+		esac
+	done
 
-  # Look for components we're interested in, collect necessary
-  # libs. As some components are optional, we can't just list all of
-  # them as it'd raise an error.
-  pgac_components='';
-  for pgac_component in `$LLVM_CONFIG --components`; do
-    case $pgac_component in
-      engine) pgac_components="$pgac_components $pgac_component";;
-      debuginfodwarf) pgac_components="$pgac_components $pgac_component";;
-      orcjit) pgac_components="$pgac_components $pgac_component";;
-      passes) pgac_components="$pgac_components $pgac_component";;
-      native) pgac_components="$pgac_components $pgac_component";;
-      perfjitevents) pgac_components="$pgac_components $pgac_component";;
-    esac
-  done;
+	# ABI influencing options, standard influencing options
+	for pgac_option in `$LLVM_CONFIG --cxxflags`; do
+		case $pgac_option in
+			-fno-rtti*) LLVM_CXXFLAGS="$LLVM_CXXFLAGS $pgac_option";;
+			-std=*) LLVM_CXXFLAGS="$LLVM_CXXFLAGS $pgac_option";;
+		esac
+	done
 
-  # And then get the libraries that need to be linked in for the
-  # selected components.  They're large libraries, we only want to
-  # link them into the LLVM using shared library.
-  for pgac_option in `$LLVM_CONFIG --libs --system-libs $pgac_components`; do
-    case $pgac_option in
-      -l*) LLVM_LIBS="$LLVM_LIBS $pgac_option";;
-    esac
-  done
+	# Look for components we're interested in, collect necessary
+	# libs. As some components are optional, we can't just list all of
+	# them as it'd raise an error.
+	pgac_components='';
+	for pgac_component in `$LLVM_CONFIG --components`; do
+		case $pgac_component in
+			engine) pgac_components="$pgac_components $pgac_component";;
+			debuginfodwarf) pgac_components="$pgac_components $pgac_component";;
+			orcjit) pgac_components="$pgac_components $pgac_component";;
+			passes) pgac_components="$pgac_components $pgac_component";;
+			native) pgac_components="$pgac_components $pgac_component";;
+			perfjitevents) pgac_components="$pgac_components $pgac_component";;
+		esac
+	done;
+
+	# And then get the libraries that need to be linked in for the
+	# selected components.  They're large libraries, we only want to
+	# link them into the LLVM using shared library.
+	for pgac_option in `$LLVM_CONFIG --libs --system-libs $pgac_components`; do
+		case $pgac_option in
+			-l*) LLVM_LIBS="$LLVM_LIBS $pgac_option";;
+		esac
+	done
 
-  LLVM_BINPATH=`$LLVM_CONFIG --bindir`
+	LLVM_BINPATH=`$LLVM_CONFIG --bindir`
 
 
 
@@ -5086,33 +5086,33 @@ unset CXXFLAGS
 # else:  If the compiler is something else, then we use -O, unless debugging.
 
 if test "$ac_env_CFLAGS_set" = set; then
-  CFLAGS=$ac_env_CFLAGS_value
+	CFLAGS=$ac_env_CFLAGS_value
 elif test "${CFLAGS+set}" = set; then
-  : # (keep what template set)
+	: # (keep what template set)
 elif test "$enable_coverage" = yes; then
-  : # no optimization by default
+	: # no optimization by default
 elif test "$GCC" = yes; then
-  CFLAGS="-O2"
+	CFLAGS="-O2"
 else
-  # if the user selected debug mode, don't use -O
-  if test "$enable_debug" != yes; then
-    CFLAGS="-O"
-  fi
+	# if the user selected debug mode, don't use -O
+	if test "$enable_debug" != yes; then
+		CFLAGS="-O"
+	fi
 fi
 
 if test "$ac_env_CXXFLAGS_set" = set; then
-  CXXFLAGS=$ac_env_CXXFLAGS_value
+	CXXFLAGS=$ac_env_CXXFLAGS_value
 elif test "${CXXFLAGS+set}" = set; then
-  : # (keep what template set)
+	: # (keep what template set)
 elif test "$enable_coverage" = yes; then
-  : # no optimization by default
+	: # no optimization by default
 elif test "$GCC" = yes; then
-  CXXFLAGS="-O2"
+	CXXFLAGS="-O2"
 else
-  # if the user selected debug mode, don't use -O
-  if test "$enable_debug" != yes; then
-    CXXFLAGS="-O"
-  fi
+	# if the user selected debug mode, don't use -O
+	if test "$enable_debug" != yes; then
+		CXXFLAGS="-O"
+	fi
 fi
 
 # When generating bitcode (for inlining) we always want to use -O2
@@ -5122,14 +5122,14 @@ fi
 # attributes everywhere), which is bad for testing.  Still allow the
 # environment to override if done explicitly.
 if test "$ac_env_BITCODE_CFLAGS_set" = set; then
-  BITCODE_CFLAGS=$ac_env_BITCODE_CFLAGS_value
+	BITCODE_CFLAGS=$ac_env_BITCODE_CFLAGS_value
 else
-  BITCODE_CFLAGS="-O2 $BITCODE_CFLAGS"
+	BITCODE_CFLAGS="-O2 $BITCODE_CFLAGS"
 fi
 if test "$ac_env_BITCODE_CXXFLAGS_set" = set; then
-  BITCODE_CXXFLAGS=$ac_env_BITCODE_CXXFLAGS_value
+	BITCODE_CXXFLAGS=$ac_env_BITCODE_CXXFLAGS_value
 else
-  BITCODE_CXXFLAGS="-O2 $BITCODE_CXXFLAGS"
+	BITCODE_CXXFLAGS="-O2 $BITCODE_CXXFLAGS"
 fi
 
 # C[XX]FLAGS we determined above will be added back at the end
@@ -5144,10 +5144,10 @@ BITCODE_CXXFLAGS=""
 
 # set CFLAGS_UNROLL_LOOPS and CFLAGS_VECTORIZE from the environment, if present
 if test "$ac_env_CFLAGS_UNROLL_LOOPS_set" = set; then
-  CFLAGS_UNROLL_LOOPS=$ac_env_CFLAGS_UNROLL_LOOPS_value
+	CFLAGS_UNROLL_LOOPS=$ac_env_CFLAGS_UNROLL_LOOPS_value
 fi
 if test "$ac_env_CFLAGS_VECTORIZE_set" = set; then
-  CFLAGS_VECTORIZE=$ac_env_CFLAGS_VECTORIZE_value
+	CFLAGS_VECTORIZE=$ac_env_CFLAGS_VECTORIZE_value
 fi
 
 # Some versions of GCC support some additional useful warning flags.
@@ -5156,17 +5156,17 @@ fi
 # but has its own.  Also check other compiler-specific flags here.
 
 if test "$GCC" = yes -a "$ICC" = no; then
-  CFLAGS="-Wall -Wmissing-prototypes -Wpointer-arith"
-  CXXFLAGS="-Wall -Wpointer-arith"
-  # These work in some but not all gcc versions
-  save_CFLAGS=$CFLAGS
+	CFLAGS="-Wall -Wmissing-prototypes -Wpointer-arith"
+	CXXFLAGS="-Wall -Wpointer-arith"
+	# These work in some but not all gcc versions
+	save_CFLAGS=$CFLAGS
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Wdeclaration-after-statement, for CFLAGS" >&5
 $as_echo_n "checking whether ${CC} supports -Wdeclaration-after-statement, for CFLAGS... " >&6; }
 if ${pgac_cv_prog_CC_cflags__Wdeclaration_after_statement+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CC}
 CFLAGS="${CFLAGS} -Wdeclaration-after-statement"
@@ -5179,14 +5179,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__Wdeclaration_after_statement=yes
+	pgac_cv_prog_CC_cflags__Wdeclaration_after_statement=yes
 else
-  pgac_cv_prog_CC_cflags__Wdeclaration_after_statement=no
+	pgac_cv_prog_CC_cflags__Wdeclaration_after_statement=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -5196,25 +5196,25 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__Wdeclaration_after_statement" >&5
 $as_echo "$pgac_cv_prog_CC_cflags__Wdeclaration_after_statement" >&6; }
 if test x"$pgac_cv_prog_CC_cflags__Wdeclaration_after_statement" = x"yes"; then
-  CFLAGS="${CFLAGS} -Wdeclaration-after-statement"
+	CFLAGS="${CFLAGS} -Wdeclaration-after-statement"
 fi
 
 
-  # -Wdeclaration-after-statement isn't applicable for C++.  Specific C files
-  # disable it, so AC_SUBST the negative form.
-  PERMIT_DECLARATION_AFTER_STATEMENT=
-  if test x"$save_CFLAGS" != x"$CFLAGS"; then
-    PERMIT_DECLARATION_AFTER_STATEMENT=-Wno-declaration-after-statement
-  fi
+	# -Wdeclaration-after-statement isn't applicable for C++.  Specific C files
+	# disable it, so AC_SUBST the negative form.
+	PERMIT_DECLARATION_AFTER_STATEMENT=
+	if test x"$save_CFLAGS" != x"$CFLAGS"; then
+		PERMIT_DECLARATION_AFTER_STATEMENT=-Wno-declaration-after-statement
+	fi
 
-  # Really don't want VLAs to be used in our dialect of C
+	# Really don't want VLAs to be used in our dialect of C
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Werror=vla, for CFLAGS" >&5
 $as_echo_n "checking whether ${CC} supports -Werror=vla, for CFLAGS... " >&6; }
 if ${pgac_cv_prog_CC_cflags__Werror_vla+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CC}
 CFLAGS="${CFLAGS} -Werror=vla"
@@ -5227,14 +5227,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__Werror_vla=yes
+	pgac_cv_prog_CC_cflags__Werror_vla=yes
 else
-  pgac_cv_prog_CC_cflags__Werror_vla=no
+	pgac_cv_prog_CC_cflags__Werror_vla=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -5244,18 +5244,18 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__Werror_vla" >&5
 $as_echo "$pgac_cv_prog_CC_cflags__Werror_vla" >&6; }
 if test x"$pgac_cv_prog_CC_cflags__Werror_vla" = x"yes"; then
-  CFLAGS="${CFLAGS} -Werror=vla"
+	CFLAGS="${CFLAGS} -Werror=vla"
 fi
 
 
-  # On macOS, complain about usage of symbols newer than the deployment target
+	# On macOS, complain about usage of symbols newer than the deployment target
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Werror=unguarded-availability-new, for CFLAGS" >&5
 $as_echo_n "checking whether ${CC} supports -Werror=unguarded-availability-new, for CFLAGS... " >&6; }
 if ${pgac_cv_prog_CC_cflags__Werror_unguarded_availability_new+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CC}
 CFLAGS="${CFLAGS} -Werror=unguarded-availability-new"
@@ -5268,14 +5268,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__Werror_unguarded_availability_new=yes
+	pgac_cv_prog_CC_cflags__Werror_unguarded_availability_new=yes
 else
-  pgac_cv_prog_CC_cflags__Werror_unguarded_availability_new=no
+	pgac_cv_prog_CC_cflags__Werror_unguarded_availability_new=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -5285,16 +5285,16 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__Werror_unguarded_availability_new" >&5
 $as_echo "$pgac_cv_prog_CC_cflags__Werror_unguarded_availability_new" >&6; }
 if test x"$pgac_cv_prog_CC_cflags__Werror_unguarded_availability_new" = x"yes"; then
-  CFLAGS="${CFLAGS} -Werror=unguarded-availability-new"
+	CFLAGS="${CFLAGS} -Werror=unguarded-availability-new"
 fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -Werror=unguarded-availability-new, for CXXFLAGS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -Werror=unguarded-availability-new, for CXXFLAGS" >&5
 $as_echo_n "checking whether ${CXX} supports -Werror=unguarded-availability-new, for CXXFLAGS... " >&6; }
 if ${pgac_cv_prog_CXX_cxxflags__Werror_unguarded_availability_new+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CXXFLAGS=$CXXFLAGS
+	pgac_save_CXXFLAGS=$CXXFLAGS
 pgac_save_CXX=$CXX
 CXX=${CXX}
 CXXFLAGS="${CXXFLAGS} -Werror=unguarded-availability-new"
@@ -5313,14 +5313,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  pgac_cv_prog_CXX_cxxflags__Werror_unguarded_availability_new=yes
+	pgac_cv_prog_CXX_cxxflags__Werror_unguarded_availability_new=yes
 else
-  pgac_cv_prog_CXX_cxxflags__Werror_unguarded_availability_new=no
+	pgac_cv_prog_CXX_cxxflags__Werror_unguarded_availability_new=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
@@ -5336,18 +5336,18 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CXX_cxxflags__Werror_unguarded_availability_new" >&5
 $as_echo "$pgac_cv_prog_CXX_cxxflags__Werror_unguarded_availability_new" >&6; }
 if test x"$pgac_cv_prog_CXX_cxxflags__Werror_unguarded_availability_new" = x"yes"; then
-  CXXFLAGS="${CXXFLAGS} -Werror=unguarded-availability-new"
+	CXXFLAGS="${CXXFLAGS} -Werror=unguarded-availability-new"
 fi
 
 
-  # -Wvla is not applicable for C++
+	# -Wvla is not applicable for C++
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Wendif-labels, for CFLAGS" >&5
 $as_echo_n "checking whether ${CC} supports -Wendif-labels, for CFLAGS... " >&6; }
 if ${pgac_cv_prog_CC_cflags__Wendif_labels+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CC}
 CFLAGS="${CFLAGS} -Wendif-labels"
@@ -5360,14 +5360,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__Wendif_labels=yes
+	pgac_cv_prog_CC_cflags__Wendif_labels=yes
 else
-  pgac_cv_prog_CC_cflags__Wendif_labels=no
+	pgac_cv_prog_CC_cflags__Wendif_labels=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -5377,16 +5377,16 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__Wendif_labels" >&5
 $as_echo "$pgac_cv_prog_CC_cflags__Wendif_labels" >&6; }
 if test x"$pgac_cv_prog_CC_cflags__Wendif_labels" = x"yes"; then
-  CFLAGS="${CFLAGS} -Wendif-labels"
+	CFLAGS="${CFLAGS} -Wendif-labels"
 fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -Wendif-labels, for CXXFLAGS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -Wendif-labels, for CXXFLAGS" >&5
 $as_echo_n "checking whether ${CXX} supports -Wendif-labels, for CXXFLAGS... " >&6; }
 if ${pgac_cv_prog_CXX_cxxflags__Wendif_labels+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CXXFLAGS=$CXXFLAGS
+	pgac_save_CXXFLAGS=$CXXFLAGS
 pgac_save_CXX=$CXX
 CXX=${CXX}
 CXXFLAGS="${CXXFLAGS} -Wendif-labels"
@@ -5405,14 +5405,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  pgac_cv_prog_CXX_cxxflags__Wendif_labels=yes
+	pgac_cv_prog_CXX_cxxflags__Wendif_labels=yes
 else
-  pgac_cv_prog_CXX_cxxflags__Wendif_labels=no
+	pgac_cv_prog_CXX_cxxflags__Wendif_labels=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
@@ -5428,7 +5428,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CXX_cxxflags__Wendif_labels" >&5
 $as_echo "$pgac_cv_prog_CXX_cxxflags__Wendif_labels" >&6; }
 if test x"$pgac_cv_prog_CXX_cxxflags__Wendif_labels" = x"yes"; then
-  CXXFLAGS="${CXXFLAGS} -Wendif-labels"
+	CXXFLAGS="${CXXFLAGS} -Wendif-labels"
 fi
 
 
@@ -5436,9 +5436,9 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Wmissing-format-attribute, for CFLAGS" >&5
 $as_echo_n "checking whether ${CC} supports -Wmissing-format-attribute, for CFLAGS... " >&6; }
 if ${pgac_cv_prog_CC_cflags__Wmissing_format_attribute+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CC}
 CFLAGS="${CFLAGS} -Wmissing-format-attribute"
@@ -5451,14 +5451,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__Wmissing_format_attribute=yes
+	pgac_cv_prog_CC_cflags__Wmissing_format_attribute=yes
 else
-  pgac_cv_prog_CC_cflags__Wmissing_format_attribute=no
+	pgac_cv_prog_CC_cflags__Wmissing_format_attribute=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -5468,16 +5468,16 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__Wmissing_format_attribute" >&5
 $as_echo "$pgac_cv_prog_CC_cflags__Wmissing_format_attribute" >&6; }
 if test x"$pgac_cv_prog_CC_cflags__Wmissing_format_attribute" = x"yes"; then
-  CFLAGS="${CFLAGS} -Wmissing-format-attribute"
+	CFLAGS="${CFLAGS} -Wmissing-format-attribute"
 fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -Wmissing-format-attribute, for CXXFLAGS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -Wmissing-format-attribute, for CXXFLAGS" >&5
 $as_echo_n "checking whether ${CXX} supports -Wmissing-format-attribute, for CXXFLAGS... " >&6; }
 if ${pgac_cv_prog_CXX_cxxflags__Wmissing_format_attribute+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CXXFLAGS=$CXXFLAGS
+	pgac_save_CXXFLAGS=$CXXFLAGS
 pgac_save_CXX=$CXX
 CXX=${CXX}
 CXXFLAGS="${CXXFLAGS} -Wmissing-format-attribute"
@@ -5496,14 +5496,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  pgac_cv_prog_CXX_cxxflags__Wmissing_format_attribute=yes
+	pgac_cv_prog_CXX_cxxflags__Wmissing_format_attribute=yes
 else
-  pgac_cv_prog_CXX_cxxflags__Wmissing_format_attribute=no
+	pgac_cv_prog_CXX_cxxflags__Wmissing_format_attribute=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
@@ -5519,7 +5519,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CXX_cxxflags__Wmissing_format_attribute" >&5
 $as_echo "$pgac_cv_prog_CXX_cxxflags__Wmissing_format_attribute" >&6; }
 if test x"$pgac_cv_prog_CXX_cxxflags__Wmissing_format_attribute" = x"yes"; then
-  CXXFLAGS="${CXXFLAGS} -Wmissing-format-attribute"
+	CXXFLAGS="${CXXFLAGS} -Wmissing-format-attribute"
 fi
 
 
@@ -5527,9 +5527,9 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Wimplicit-fallthrough=3, for CFLAGS" >&5
 $as_echo_n "checking whether ${CC} supports -Wimplicit-fallthrough=3, for CFLAGS... " >&6; }
 if ${pgac_cv_prog_CC_cflags__Wimplicit_fallthrough_3+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CC}
 CFLAGS="${CFLAGS} -Wimplicit-fallthrough=3"
@@ -5542,14 +5542,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__Wimplicit_fallthrough_3=yes
+	pgac_cv_prog_CC_cflags__Wimplicit_fallthrough_3=yes
 else
-  pgac_cv_prog_CC_cflags__Wimplicit_fallthrough_3=no
+	pgac_cv_prog_CC_cflags__Wimplicit_fallthrough_3=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -5559,16 +5559,16 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__Wimplicit_fallthrough_3" >&5
 $as_echo "$pgac_cv_prog_CC_cflags__Wimplicit_fallthrough_3" >&6; }
 if test x"$pgac_cv_prog_CC_cflags__Wimplicit_fallthrough_3" = x"yes"; then
-  CFLAGS="${CFLAGS} -Wimplicit-fallthrough=3"
+	CFLAGS="${CFLAGS} -Wimplicit-fallthrough=3"
 fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -Wimplicit-fallthrough=3, for CXXFLAGS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -Wimplicit-fallthrough=3, for CXXFLAGS" >&5
 $as_echo_n "checking whether ${CXX} supports -Wimplicit-fallthrough=3, for CXXFLAGS... " >&6; }
 if ${pgac_cv_prog_CXX_cxxflags__Wimplicit_fallthrough_3+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CXXFLAGS=$CXXFLAGS
+	pgac_save_CXXFLAGS=$CXXFLAGS
 pgac_save_CXX=$CXX
 CXX=${CXX}
 CXXFLAGS="${CXXFLAGS} -Wimplicit-fallthrough=3"
@@ -5587,14 +5587,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  pgac_cv_prog_CXX_cxxflags__Wimplicit_fallthrough_3=yes
+	pgac_cv_prog_CXX_cxxflags__Wimplicit_fallthrough_3=yes
 else
-  pgac_cv_prog_CXX_cxxflags__Wimplicit_fallthrough_3=no
+	pgac_cv_prog_CXX_cxxflags__Wimplicit_fallthrough_3=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
@@ -5610,7 +5610,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CXX_cxxflags__Wimplicit_fallthrough_3" >&5
 $as_echo "$pgac_cv_prog_CXX_cxxflags__Wimplicit_fallthrough_3" >&6; }
 if test x"$pgac_cv_prog_CXX_cxxflags__Wimplicit_fallthrough_3" = x"yes"; then
-  CXXFLAGS="${CXXFLAGS} -Wimplicit-fallthrough=3"
+	CXXFLAGS="${CXXFLAGS} -Wimplicit-fallthrough=3"
 fi
 
 
@@ -5618,9 +5618,9 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Wcast-function-type, for CFLAGS" >&5
 $as_echo_n "checking whether ${CC} supports -Wcast-function-type, for CFLAGS... " >&6; }
 if ${pgac_cv_prog_CC_cflags__Wcast_function_type+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CC}
 CFLAGS="${CFLAGS} -Wcast-function-type"
@@ -5633,14 +5633,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__Wcast_function_type=yes
+	pgac_cv_prog_CC_cflags__Wcast_function_type=yes
 else
-  pgac_cv_prog_CC_cflags__Wcast_function_type=no
+	pgac_cv_prog_CC_cflags__Wcast_function_type=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -5650,16 +5650,16 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__Wcast_function_type" >&5
 $as_echo "$pgac_cv_prog_CC_cflags__Wcast_function_type" >&6; }
 if test x"$pgac_cv_prog_CC_cflags__Wcast_function_type" = x"yes"; then
-  CFLAGS="${CFLAGS} -Wcast-function-type"
+	CFLAGS="${CFLAGS} -Wcast-function-type"
 fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -Wcast-function-type, for CXXFLAGS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -Wcast-function-type, for CXXFLAGS" >&5
 $as_echo_n "checking whether ${CXX} supports -Wcast-function-type, for CXXFLAGS... " >&6; }
 if ${pgac_cv_prog_CXX_cxxflags__Wcast_function_type+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CXXFLAGS=$CXXFLAGS
+	pgac_save_CXXFLAGS=$CXXFLAGS
 pgac_save_CXX=$CXX
 CXX=${CXX}
 CXXFLAGS="${CXXFLAGS} -Wcast-function-type"
@@ -5678,14 +5678,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  pgac_cv_prog_CXX_cxxflags__Wcast_function_type=yes
+	pgac_cv_prog_CXX_cxxflags__Wcast_function_type=yes
 else
-  pgac_cv_prog_CXX_cxxflags__Wcast_function_type=no
+	pgac_cv_prog_CXX_cxxflags__Wcast_function_type=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
@@ -5701,7 +5701,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CXX_cxxflags__Wcast_function_type" >&5
 $as_echo "$pgac_cv_prog_CXX_cxxflags__Wcast_function_type" >&6; }
 if test x"$pgac_cv_prog_CXX_cxxflags__Wcast_function_type" = x"yes"; then
-  CXXFLAGS="${CXXFLAGS} -Wcast-function-type"
+	CXXFLAGS="${CXXFLAGS} -Wcast-function-type"
 fi
 
 
@@ -5709,9 +5709,9 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Wshadow=compatible-local, for CFLAGS" >&5
 $as_echo_n "checking whether ${CC} supports -Wshadow=compatible-local, for CFLAGS... " >&6; }
 if ${pgac_cv_prog_CC_cflags__Wshadow_compatible_local+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CC}
 CFLAGS="${CFLAGS} -Wshadow=compatible-local"
@@ -5724,14 +5724,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__Wshadow_compatible_local=yes
+	pgac_cv_prog_CC_cflags__Wshadow_compatible_local=yes
 else
-  pgac_cv_prog_CC_cflags__Wshadow_compatible_local=no
+	pgac_cv_prog_CC_cflags__Wshadow_compatible_local=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -5741,16 +5741,16 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__Wshadow_compatible_local" >&5
 $as_echo "$pgac_cv_prog_CC_cflags__Wshadow_compatible_local" >&6; }
 if test x"$pgac_cv_prog_CC_cflags__Wshadow_compatible_local" = x"yes"; then
-  CFLAGS="${CFLAGS} -Wshadow=compatible-local"
+	CFLAGS="${CFLAGS} -Wshadow=compatible-local"
 fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -Wshadow=compatible-local, for CXXFLAGS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -Wshadow=compatible-local, for CXXFLAGS" >&5
 $as_echo_n "checking whether ${CXX} supports -Wshadow=compatible-local, for CXXFLAGS... " >&6; }
 if ${pgac_cv_prog_CXX_cxxflags__Wshadow_compatible_local+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CXXFLAGS=$CXXFLAGS
+	pgac_save_CXXFLAGS=$CXXFLAGS
 pgac_save_CXX=$CXX
 CXX=${CXX}
 CXXFLAGS="${CXXFLAGS} -Wshadow=compatible-local"
@@ -5769,14 +5769,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  pgac_cv_prog_CXX_cxxflags__Wshadow_compatible_local=yes
+	pgac_cv_prog_CXX_cxxflags__Wshadow_compatible_local=yes
 else
-  pgac_cv_prog_CXX_cxxflags__Wshadow_compatible_local=no
+	pgac_cv_prog_CXX_cxxflags__Wshadow_compatible_local=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
@@ -5792,18 +5792,18 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CXX_cxxflags__Wshadow_compatible_local" >&5
 $as_echo "$pgac_cv_prog_CXX_cxxflags__Wshadow_compatible_local" >&6; }
 if test x"$pgac_cv_prog_CXX_cxxflags__Wshadow_compatible_local" = x"yes"; then
-  CXXFLAGS="${CXXFLAGS} -Wshadow=compatible-local"
+	CXXFLAGS="${CXXFLAGS} -Wshadow=compatible-local"
 fi
 
 
-  # This was included in -Wall/-Wformat in older GCC versions
+	# This was included in -Wall/-Wformat in older GCC versions
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Wformat-security, for CFLAGS" >&5
 $as_echo_n "checking whether ${CC} supports -Wformat-security, for CFLAGS... " >&6; }
 if ${pgac_cv_prog_CC_cflags__Wformat_security+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CC}
 CFLAGS="${CFLAGS} -Wformat-security"
@@ -5816,14 +5816,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__Wformat_security=yes
+	pgac_cv_prog_CC_cflags__Wformat_security=yes
 else
-  pgac_cv_prog_CC_cflags__Wformat_security=no
+	pgac_cv_prog_CC_cflags__Wformat_security=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -5833,16 +5833,16 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__Wformat_security" >&5
 $as_echo "$pgac_cv_prog_CC_cflags__Wformat_security" >&6; }
 if test x"$pgac_cv_prog_CC_cflags__Wformat_security" = x"yes"; then
-  CFLAGS="${CFLAGS} -Wformat-security"
+	CFLAGS="${CFLAGS} -Wformat-security"
 fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -Wformat-security, for CXXFLAGS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -Wformat-security, for CXXFLAGS" >&5
 $as_echo_n "checking whether ${CXX} supports -Wformat-security, for CXXFLAGS... " >&6; }
 if ${pgac_cv_prog_CXX_cxxflags__Wformat_security+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CXXFLAGS=$CXXFLAGS
+	pgac_save_CXXFLAGS=$CXXFLAGS
 pgac_save_CXX=$CXX
 CXX=${CXX}
 CXXFLAGS="${CXXFLAGS} -Wformat-security"
@@ -5861,14 +5861,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  pgac_cv_prog_CXX_cxxflags__Wformat_security=yes
+	pgac_cv_prog_CXX_cxxflags__Wformat_security=yes
 else
-  pgac_cv_prog_CXX_cxxflags__Wformat_security=no
+	pgac_cv_prog_CXX_cxxflags__Wformat_security=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
@@ -5884,20 +5884,20 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CXX_cxxflags__Wformat_security" >&5
 $as_echo "$pgac_cv_prog_CXX_cxxflags__Wformat_security" >&6; }
 if test x"$pgac_cv_prog_CXX_cxxflags__Wformat_security" = x"yes"; then
-  CXXFLAGS="${CXXFLAGS} -Wformat-security"
+	CXXFLAGS="${CXXFLAGS} -Wformat-security"
 fi
 
 
-  # gcc 14+, clang for a while
-  # (Supported in C++ by clang but not gcc.  For consistency, omit in C++.)
-  save_CFLAGS=$CFLAGS
+	# gcc 14+, clang for a while
+	# (Supported in C++ by clang but not gcc.  For consistency, omit in C++.)
+	save_CFLAGS=$CFLAGS
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Wmissing-variable-declarations, for CFLAGS" >&5
 $as_echo_n "checking whether ${CC} supports -Wmissing-variable-declarations, for CFLAGS... " >&6; }
 if ${pgac_cv_prog_CC_cflags__Wmissing_variable_declarations+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CC}
 CFLAGS="${CFLAGS} -Wmissing-variable-declarations"
@@ -5910,14 +5910,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__Wmissing_variable_declarations=yes
+	pgac_cv_prog_CC_cflags__Wmissing_variable_declarations=yes
 else
-  pgac_cv_prog_CC_cflags__Wmissing_variable_declarations=no
+	pgac_cv_prog_CC_cflags__Wmissing_variable_declarations=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -5927,23 +5927,23 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__Wmissing_variable_declarations" >&5
 $as_echo "$pgac_cv_prog_CC_cflags__Wmissing_variable_declarations" >&6; }
 if test x"$pgac_cv_prog_CC_cflags__Wmissing_variable_declarations" = x"yes"; then
-  CFLAGS="${CFLAGS} -Wmissing-variable-declarations"
+	CFLAGS="${CFLAGS} -Wmissing-variable-declarations"
 fi
 
 
-  PERMIT_MISSING_VARIABLE_DECLARATIONS=
-  if test x"$save_CFLAGS" != x"$CFLAGS"; then
-    PERMIT_MISSING_VARIABLE_DECLARATIONS=-Wno-missing-variable-declarations
-  fi
+	PERMIT_MISSING_VARIABLE_DECLARATIONS=
+	if test x"$save_CFLAGS" != x"$CFLAGS"; then
+		PERMIT_MISSING_VARIABLE_DECLARATIONS=-Wno-missing-variable-declarations
+	fi
 
-  # Disable strict-aliasing rules; needed for gcc 3.3+
+	# Disable strict-aliasing rules; needed for gcc 3.3+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -fno-strict-aliasing, for CFLAGS" >&5
 $as_echo_n "checking whether ${CC} supports -fno-strict-aliasing, for CFLAGS... " >&6; }
 if ${pgac_cv_prog_CC_cflags__fno_strict_aliasing+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CC}
 CFLAGS="${CFLAGS} -fno-strict-aliasing"
@@ -5956,14 +5956,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__fno_strict_aliasing=yes
+	pgac_cv_prog_CC_cflags__fno_strict_aliasing=yes
 else
-  pgac_cv_prog_CC_cflags__fno_strict_aliasing=no
+	pgac_cv_prog_CC_cflags__fno_strict_aliasing=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -5973,16 +5973,16 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__fno_strict_aliasing" >&5
 $as_echo "$pgac_cv_prog_CC_cflags__fno_strict_aliasing" >&6; }
 if test x"$pgac_cv_prog_CC_cflags__fno_strict_aliasing" = x"yes"; then
-  CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	CFLAGS="${CFLAGS} -fno-strict-aliasing"
 fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -fno-strict-aliasing, for CXXFLAGS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -fno-strict-aliasing, for CXXFLAGS" >&5
 $as_echo_n "checking whether ${CXX} supports -fno-strict-aliasing, for CXXFLAGS... " >&6; }
 if ${pgac_cv_prog_CXX_cxxflags__fno_strict_aliasing+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CXXFLAGS=$CXXFLAGS
+	pgac_save_CXXFLAGS=$CXXFLAGS
 pgac_save_CXX=$CXX
 CXX=${CXX}
 CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
@@ -6001,14 +6001,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  pgac_cv_prog_CXX_cxxflags__fno_strict_aliasing=yes
+	pgac_cv_prog_CXX_cxxflags__fno_strict_aliasing=yes
 else
-  pgac_cv_prog_CXX_cxxflags__fno_strict_aliasing=no
+	pgac_cv_prog_CXX_cxxflags__fno_strict_aliasing=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
@@ -6024,18 +6024,18 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CXX_cxxflags__fno_strict_aliasing" >&5
 $as_echo "$pgac_cv_prog_CXX_cxxflags__fno_strict_aliasing" >&6; }
 if test x"$pgac_cv_prog_CXX_cxxflags__fno_strict_aliasing" = x"yes"; then
-  CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
 fi
 
 
-  # Disable optimizations that assume no overflow; needed for gcc 4.3+
+	# Disable optimizations that assume no overflow; needed for gcc 4.3+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -fwrapv, for CFLAGS" >&5
 $as_echo_n "checking whether ${CC} supports -fwrapv, for CFLAGS... " >&6; }
 if ${pgac_cv_prog_CC_cflags__fwrapv+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CC}
 CFLAGS="${CFLAGS} -fwrapv"
@@ -6048,14 +6048,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__fwrapv=yes
+	pgac_cv_prog_CC_cflags__fwrapv=yes
 else
-  pgac_cv_prog_CC_cflags__fwrapv=no
+	pgac_cv_prog_CC_cflags__fwrapv=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -6065,16 +6065,16 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__fwrapv" >&5
 $as_echo "$pgac_cv_prog_CC_cflags__fwrapv" >&6; }
 if test x"$pgac_cv_prog_CC_cflags__fwrapv" = x"yes"; then
-  CFLAGS="${CFLAGS} -fwrapv"
+	CFLAGS="${CFLAGS} -fwrapv"
 fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -fwrapv, for CXXFLAGS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -fwrapv, for CXXFLAGS" >&5
 $as_echo_n "checking whether ${CXX} supports -fwrapv, for CXXFLAGS... " >&6; }
 if ${pgac_cv_prog_CXX_cxxflags__fwrapv+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CXXFLAGS=$CXXFLAGS
+	pgac_save_CXXFLAGS=$CXXFLAGS
 pgac_save_CXX=$CXX
 CXX=${CXX}
 CXXFLAGS="${CXXFLAGS} -fwrapv"
@@ -6093,14 +6093,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  pgac_cv_prog_CXX_cxxflags__fwrapv=yes
+	pgac_cv_prog_CXX_cxxflags__fwrapv=yes
 else
-  pgac_cv_prog_CXX_cxxflags__fwrapv=no
+	pgac_cv_prog_CXX_cxxflags__fwrapv=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
@@ -6116,18 +6116,18 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CXX_cxxflags__fwrapv" >&5
 $as_echo "$pgac_cv_prog_CXX_cxxflags__fwrapv" >&6; }
 if test x"$pgac_cv_prog_CXX_cxxflags__fwrapv" = x"yes"; then
-  CXXFLAGS="${CXXFLAGS} -fwrapv"
+	CXXFLAGS="${CXXFLAGS} -fwrapv"
 fi
 
 
-  # Disable FP optimizations that cause various errors on gcc 4.5+ or maybe 4.6+
+	# Disable FP optimizations that cause various errors on gcc 4.5+ or maybe 4.6+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -fexcess-precision=standard, for CFLAGS" >&5
 $as_echo_n "checking whether ${CC} supports -fexcess-precision=standard, for CFLAGS... " >&6; }
 if ${pgac_cv_prog_CC_cflags__fexcess_precision_standard+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CC}
 CFLAGS="${CFLAGS} -fexcess-precision=standard"
@@ -6140,14 +6140,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__fexcess_precision_standard=yes
+	pgac_cv_prog_CC_cflags__fexcess_precision_standard=yes
 else
-  pgac_cv_prog_CC_cflags__fexcess_precision_standard=no
+	pgac_cv_prog_CC_cflags__fexcess_precision_standard=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -6157,16 +6157,16 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__fexcess_precision_standard" >&5
 $as_echo "$pgac_cv_prog_CC_cflags__fexcess_precision_standard" >&6; }
 if test x"$pgac_cv_prog_CC_cflags__fexcess_precision_standard" = x"yes"; then
-  CFLAGS="${CFLAGS} -fexcess-precision=standard"
+	CFLAGS="${CFLAGS} -fexcess-precision=standard"
 fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -fexcess-precision=standard, for CXXFLAGS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -fexcess-precision=standard, for CXXFLAGS" >&5
 $as_echo_n "checking whether ${CXX} supports -fexcess-precision=standard, for CXXFLAGS... " >&6; }
 if ${pgac_cv_prog_CXX_cxxflags__fexcess_precision_standard+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CXXFLAGS=$CXXFLAGS
+	pgac_save_CXXFLAGS=$CXXFLAGS
 pgac_save_CXX=$CXX
 CXX=${CXX}
 CXXFLAGS="${CXXFLAGS} -fexcess-precision=standard"
@@ -6185,14 +6185,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  pgac_cv_prog_CXX_cxxflags__fexcess_precision_standard=yes
+	pgac_cv_prog_CXX_cxxflags__fexcess_precision_standard=yes
 else
-  pgac_cv_prog_CXX_cxxflags__fexcess_precision_standard=no
+	pgac_cv_prog_CXX_cxxflags__fexcess_precision_standard=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
@@ -6208,17 +6208,17 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CXX_cxxflags__fexcess_precision_standard" >&5
 $as_echo "$pgac_cv_prog_CXX_cxxflags__fexcess_precision_standard" >&6; }
 if test x"$pgac_cv_prog_CXX_cxxflags__fexcess_precision_standard" = x"yes"; then
-  CXXFLAGS="${CXXFLAGS} -fexcess-precision=standard"
+	CXXFLAGS="${CXXFLAGS} -fexcess-precision=standard"
 fi
 
 
-  # Optimization flags for specific files that benefit from loop unrolling
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -funroll-loops, for CFLAGS_UNROLL_LOOPS" >&5
+	# Optimization flags for specific files that benefit from loop unrolling
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -funroll-loops, for CFLAGS_UNROLL_LOOPS" >&5
 $as_echo_n "checking whether ${CC} supports -funroll-loops, for CFLAGS_UNROLL_LOOPS... " >&6; }
 if ${pgac_cv_prog_CC_cflags__funroll_loops+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CC}
 CFLAGS="${CFLAGS_UNROLL_LOOPS} -funroll-loops"
@@ -6231,14 +6231,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__funroll_loops=yes
+	pgac_cv_prog_CC_cflags__funroll_loops=yes
 else
-  pgac_cv_prog_CC_cflags__funroll_loops=no
+	pgac_cv_prog_CC_cflags__funroll_loops=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -6248,17 +6248,17 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__funroll_loops" >&5
 $as_echo "$pgac_cv_prog_CC_cflags__funroll_loops" >&6; }
 if test x"$pgac_cv_prog_CC_cflags__funroll_loops" = x"yes"; then
-  CFLAGS_UNROLL_LOOPS="${CFLAGS_UNROLL_LOOPS} -funroll-loops"
+	CFLAGS_UNROLL_LOOPS="${CFLAGS_UNROLL_LOOPS} -funroll-loops"
 fi
 
 
-  # Optimization flags for specific files that benefit from vectorization
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -ftree-vectorize, for CFLAGS_VECTORIZE" >&5
+	# Optimization flags for specific files that benefit from vectorization
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -ftree-vectorize, for CFLAGS_VECTORIZE" >&5
 $as_echo_n "checking whether ${CC} supports -ftree-vectorize, for CFLAGS_VECTORIZE... " >&6; }
 if ${pgac_cv_prog_CC_cflags__ftree_vectorize+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CC}
 CFLAGS="${CFLAGS_VECTORIZE} -ftree-vectorize"
@@ -6271,14 +6271,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__ftree_vectorize=yes
+	pgac_cv_prog_CC_cflags__ftree_vectorize=yes
 else
-  pgac_cv_prog_CC_cflags__ftree_vectorize=no
+	pgac_cv_prog_CC_cflags__ftree_vectorize=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -6288,25 +6288,25 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__ftree_vectorize" >&5
 $as_echo "$pgac_cv_prog_CC_cflags__ftree_vectorize" >&6; }
 if test x"$pgac_cv_prog_CC_cflags__ftree_vectorize" = x"yes"; then
-  CFLAGS_VECTORIZE="${CFLAGS_VECTORIZE} -ftree-vectorize"
+	CFLAGS_VECTORIZE="${CFLAGS_VECTORIZE} -ftree-vectorize"
 fi
 
 
-  #
-  # The following tests want to suppress various unhelpful warnings by adding
-  # -Wno-foo switches.  But gcc won't complain about unrecognized -Wno-foo
-  # switches, so we have to test for the positive form and if that works,
-  # add the negative form.  Note that tests of this form typically need to
-  # be duplicated in the BITCODE_CFLAGS setup stanza below.
-  #
-  # Suppress clang's unhelpful unused-command-line-argument warnings.
-  NOT_THE_CFLAGS=""
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Wunused-command-line-argument, for NOT_THE_CFLAGS" >&5
+	#
+	# The following tests want to suppress various unhelpful warnings by adding
+	# -Wno-foo switches.  But gcc won't complain about unrecognized -Wno-foo
+	# switches, so we have to test for the positive form and if that works,
+	# add the negative form.  Note that tests of this form typically need to
+	# be duplicated in the BITCODE_CFLAGS setup stanza below.
+	#
+	# Suppress clang's unhelpful unused-command-line-argument warnings.
+	NOT_THE_CFLAGS=""
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Wunused-command-line-argument, for NOT_THE_CFLAGS" >&5
 $as_echo_n "checking whether ${CC} supports -Wunused-command-line-argument, for NOT_THE_CFLAGS... " >&6; }
 if ${pgac_cv_prog_CC_cflags__Wunused_command_line_argument+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CC}
 CFLAGS="${NOT_THE_CFLAGS} -Wunused-command-line-argument"
@@ -6319,14 +6319,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__Wunused_command_line_argument=yes
+	pgac_cv_prog_CC_cflags__Wunused_command_line_argument=yes
 else
-  pgac_cv_prog_CC_cflags__Wunused_command_line_argument=no
+	pgac_cv_prog_CC_cflags__Wunused_command_line_argument=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -6336,22 +6336,22 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__Wunused_command_line_argument" >&5
 $as_echo "$pgac_cv_prog_CC_cflags__Wunused_command_line_argument" >&6; }
 if test x"$pgac_cv_prog_CC_cflags__Wunused_command_line_argument" = x"yes"; then
-  NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wunused-command-line-argument"
+	NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wunused-command-line-argument"
 fi
 
 
-  if test -n "$NOT_THE_CFLAGS"; then
-    CFLAGS="$CFLAGS -Wno-unused-command-line-argument"
-  fi
-  # Remove clang 12+'s compound-token-split-by-macro, as this causes a lot
-  # of warnings when building plperl because of usages in the Perl headers.
-  NOT_THE_CFLAGS=""
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Wcompound-token-split-by-macro, for NOT_THE_CFLAGS" >&5
+	if test -n "$NOT_THE_CFLAGS"; then
+		CFLAGS="$CFLAGS -Wno-unused-command-line-argument"
+	fi
+	# Remove clang 12+'s compound-token-split-by-macro, as this causes a lot
+	# of warnings when building plperl because of usages in the Perl headers.
+	NOT_THE_CFLAGS=""
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Wcompound-token-split-by-macro, for NOT_THE_CFLAGS" >&5
 $as_echo_n "checking whether ${CC} supports -Wcompound-token-split-by-macro, for NOT_THE_CFLAGS... " >&6; }
 if ${pgac_cv_prog_CC_cflags__Wcompound_token_split_by_macro+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CC}
 CFLAGS="${NOT_THE_CFLAGS} -Wcompound-token-split-by-macro"
@@ -6364,14 +6364,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__Wcompound_token_split_by_macro=yes
+	pgac_cv_prog_CC_cflags__Wcompound_token_split_by_macro=yes
 else
-  pgac_cv_prog_CC_cflags__Wcompound_token_split_by_macro=no
+	pgac_cv_prog_CC_cflags__Wcompound_token_split_by_macro=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -6381,21 +6381,21 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__Wcompound_token_split_by_macro" >&5
 $as_echo "$pgac_cv_prog_CC_cflags__Wcompound_token_split_by_macro" >&6; }
 if test x"$pgac_cv_prog_CC_cflags__Wcompound_token_split_by_macro" = x"yes"; then
-  NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wcompound-token-split-by-macro"
+	NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wcompound-token-split-by-macro"
 fi
 
 
-  if test -n "$NOT_THE_CFLAGS"; then
-    CFLAGS="$CFLAGS -Wno-compound-token-split-by-macro"
-  fi
-  # Similarly disable useless truncation warnings from gcc 8+
-  NOT_THE_CFLAGS=""
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Wformat-truncation, for NOT_THE_CFLAGS" >&5
+	if test -n "$NOT_THE_CFLAGS"; then
+		CFLAGS="$CFLAGS -Wno-compound-token-split-by-macro"
+	fi
+	# Similarly disable useless truncation warnings from gcc 8+
+	NOT_THE_CFLAGS=""
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Wformat-truncation, for NOT_THE_CFLAGS" >&5
 $as_echo_n "checking whether ${CC} supports -Wformat-truncation, for NOT_THE_CFLAGS... " >&6; }
 if ${pgac_cv_prog_CC_cflags__Wformat_truncation+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CC}
 CFLAGS="${NOT_THE_CFLAGS} -Wformat-truncation"
@@ -6408,14 +6408,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__Wformat_truncation=yes
+	pgac_cv_prog_CC_cflags__Wformat_truncation=yes
 else
-  pgac_cv_prog_CC_cflags__Wformat_truncation=no
+	pgac_cv_prog_CC_cflags__Wformat_truncation=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -6425,20 +6425,20 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__Wformat_truncation" >&5
 $as_echo "$pgac_cv_prog_CC_cflags__Wformat_truncation" >&6; }
 if test x"$pgac_cv_prog_CC_cflags__Wformat_truncation" = x"yes"; then
-  NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wformat-truncation"
+	NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wformat-truncation"
 fi
 
 
-  if test -n "$NOT_THE_CFLAGS"; then
-    CFLAGS="$CFLAGS -Wno-format-truncation"
-  fi
-  NOT_THE_CFLAGS=""
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Wstringop-truncation, for NOT_THE_CFLAGS" >&5
+	if test -n "$NOT_THE_CFLAGS"; then
+		CFLAGS="$CFLAGS -Wno-format-truncation"
+	fi
+	NOT_THE_CFLAGS=""
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Wstringop-truncation, for NOT_THE_CFLAGS" >&5
 $as_echo_n "checking whether ${CC} supports -Wstringop-truncation, for NOT_THE_CFLAGS... " >&6; }
 if ${pgac_cv_prog_CC_cflags__Wstringop_truncation+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CC}
 CFLAGS="${NOT_THE_CFLAGS} -Wstringop-truncation"
@@ -6451,14 +6451,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__Wstringop_truncation=yes
+	pgac_cv_prog_CC_cflags__Wstringop_truncation=yes
 else
-  pgac_cv_prog_CC_cflags__Wstringop_truncation=no
+	pgac_cv_prog_CC_cflags__Wstringop_truncation=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -6468,21 +6468,21 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__Wstringop_truncation" >&5
 $as_echo "$pgac_cv_prog_CC_cflags__Wstringop_truncation" >&6; }
 if test x"$pgac_cv_prog_CC_cflags__Wstringop_truncation" = x"yes"; then
-  NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wstringop-truncation"
+	NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wstringop-truncation"
 fi
 
 
-  if test -n "$NOT_THE_CFLAGS"; then
-    CFLAGS="$CFLAGS -Wno-stringop-truncation"
-  fi
-  # Suppress clang 16's strict warnings about function casts
-  NOT_THE_CFLAGS=""
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Wcast-function-type-strict, for NOT_THE_CFLAGS" >&5
+	if test -n "$NOT_THE_CFLAGS"; then
+		CFLAGS="$CFLAGS -Wno-stringop-truncation"
+	fi
+	# Suppress clang 16's strict warnings about function casts
+	NOT_THE_CFLAGS=""
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Wcast-function-type-strict, for NOT_THE_CFLAGS" >&5
 $as_echo_n "checking whether ${CC} supports -Wcast-function-type-strict, for NOT_THE_CFLAGS... " >&6; }
 if ${pgac_cv_prog_CC_cflags__Wcast_function_type_strict+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CC}
 CFLAGS="${NOT_THE_CFLAGS} -Wcast-function-type-strict"
@@ -6495,14 +6495,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__Wcast_function_type_strict=yes
+	pgac_cv_prog_CC_cflags__Wcast_function_type_strict=yes
 else
-  pgac_cv_prog_CC_cflags__Wcast_function_type_strict=no
+	pgac_cv_prog_CC_cflags__Wcast_function_type_strict=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -6512,23 +6512,23 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__Wcast_function_type_strict" >&5
 $as_echo "$pgac_cv_prog_CC_cflags__Wcast_function_type_strict" >&6; }
 if test x"$pgac_cv_prog_CC_cflags__Wcast_function_type_strict" = x"yes"; then
-  NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wcast-function-type-strict"
+	NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wcast-function-type-strict"
 fi
 
 
-  if test -n "$NOT_THE_CFLAGS"; then
-    CFLAGS="$CFLAGS -Wno-cast-function-type-strict"
-  fi
+	if test -n "$NOT_THE_CFLAGS"; then
+		CFLAGS="$CFLAGS -Wno-cast-function-type-strict"
+	fi
 elif test "$ICC" = yes; then
-  # Intel's compiler has a bug/misoptimization in checking for
-  # division by NAN (NaN == 0), -mp1 fixes it, so add it to the CFLAGS.
+	# Intel's compiler has a bug/misoptimization in checking for
+	# division by NAN (NaN == 0), -mp1 fixes it, so add it to the CFLAGS.
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -mp1, for CFLAGS" >&5
 $as_echo_n "checking whether ${CC} supports -mp1, for CFLAGS... " >&6; }
 if ${pgac_cv_prog_CC_cflags__mp1+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CC}
 CFLAGS="${CFLAGS} -mp1"
@@ -6541,14 +6541,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__mp1=yes
+	pgac_cv_prog_CC_cflags__mp1=yes
 else
-  pgac_cv_prog_CC_cflags__mp1=no
+	pgac_cv_prog_CC_cflags__mp1=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -6558,16 +6558,16 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__mp1" >&5
 $as_echo "$pgac_cv_prog_CC_cflags__mp1" >&6; }
 if test x"$pgac_cv_prog_CC_cflags__mp1" = x"yes"; then
-  CFLAGS="${CFLAGS} -mp1"
+	CFLAGS="${CFLAGS} -mp1"
 fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -mp1, for CXXFLAGS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -mp1, for CXXFLAGS" >&5
 $as_echo_n "checking whether ${CXX} supports -mp1, for CXXFLAGS... " >&6; }
 if ${pgac_cv_prog_CXX_cxxflags__mp1+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CXXFLAGS=$CXXFLAGS
+	pgac_save_CXXFLAGS=$CXXFLAGS
 pgac_save_CXX=$CXX
 CXX=${CXX}
 CXXFLAGS="${CXXFLAGS} -mp1"
@@ -6586,14 +6586,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  pgac_cv_prog_CXX_cxxflags__mp1=yes
+	pgac_cv_prog_CXX_cxxflags__mp1=yes
 else
-  pgac_cv_prog_CXX_cxxflags__mp1=no
+	pgac_cv_prog_CXX_cxxflags__mp1=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
@@ -6609,18 +6609,18 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CXX_cxxflags__mp1" >&5
 $as_echo "$pgac_cv_prog_CXX_cxxflags__mp1" >&6; }
 if test x"$pgac_cv_prog_CXX_cxxflags__mp1" = x"yes"; then
-  CXXFLAGS="${CXXFLAGS} -mp1"
+	CXXFLAGS="${CXXFLAGS} -mp1"
 fi
 
 
-  # Make sure strict aliasing is off (though this is said to be the default)
+	# Make sure strict aliasing is off (though this is said to be the default)
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -fno-strict-aliasing, for CFLAGS" >&5
 $as_echo_n "checking whether ${CC} supports -fno-strict-aliasing, for CFLAGS... " >&6; }
 if ${pgac_cv_prog_CC_cflags__fno_strict_aliasing+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CC}
 CFLAGS="${CFLAGS} -fno-strict-aliasing"
@@ -6633,14 +6633,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__fno_strict_aliasing=yes
+	pgac_cv_prog_CC_cflags__fno_strict_aliasing=yes
 else
-  pgac_cv_prog_CC_cflags__fno_strict_aliasing=no
+	pgac_cv_prog_CC_cflags__fno_strict_aliasing=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -6650,16 +6650,16 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__fno_strict_aliasing" >&5
 $as_echo "$pgac_cv_prog_CC_cflags__fno_strict_aliasing" >&6; }
 if test x"$pgac_cv_prog_CC_cflags__fno_strict_aliasing" = x"yes"; then
-  CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	CFLAGS="${CFLAGS} -fno-strict-aliasing"
 fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -fno-strict-aliasing, for CXXFLAGS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -fno-strict-aliasing, for CXXFLAGS" >&5
 $as_echo_n "checking whether ${CXX} supports -fno-strict-aliasing, for CXXFLAGS... " >&6; }
 if ${pgac_cv_prog_CXX_cxxflags__fno_strict_aliasing+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CXXFLAGS=$CXXFLAGS
+	pgac_save_CXXFLAGS=$CXXFLAGS
 pgac_save_CXX=$CXX
 CXX=${CXX}
 CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
@@ -6678,14 +6678,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  pgac_cv_prog_CXX_cxxflags__fno_strict_aliasing=yes
+	pgac_cv_prog_CXX_cxxflags__fno_strict_aliasing=yes
 else
-  pgac_cv_prog_CXX_cxxflags__fno_strict_aliasing=no
+	pgac_cv_prog_CXX_cxxflags__fno_strict_aliasing=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
@@ -6701,7 +6701,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CXX_cxxflags__fno_strict_aliasing" >&5
 $as_echo "$pgac_cv_prog_CXX_cxxflags__fno_strict_aliasing" >&6; }
 if test x"$pgac_cv_prog_CXX_cxxflags__fno_strict_aliasing" = x"yes"; then
-  CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
 fi
 
 
@@ -6718,12 +6718,12 @@ fi
 # compiler that supports one of the supported variants of -fvisibility=hidden
 # but uses a different syntax to mark a symbol as exported.
 if test "$GCC" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -fvisibility=hidden, for CFLAGS_SL_MODULE" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -fvisibility=hidden, for CFLAGS_SL_MODULE" >&5
 $as_echo_n "checking whether ${CC} supports -fvisibility=hidden, for CFLAGS_SL_MODULE... " >&6; }
 if ${pgac_cv_prog_CC_cflags__fvisibility_hidden+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CC}
 CFLAGS="${CFLAGS_SL_MODULE} -fvisibility=hidden"
@@ -6736,14 +6736,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__fvisibility_hidden=yes
+	pgac_cv_prog_CC_cflags__fvisibility_hidden=yes
 else
-  pgac_cv_prog_CC_cflags__fvisibility_hidden=no
+	pgac_cv_prog_CC_cflags__fvisibility_hidden=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -6753,17 +6753,17 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__fvisibility_hidden" >&5
 $as_echo "$pgac_cv_prog_CC_cflags__fvisibility_hidden" >&6; }
 if test x"$pgac_cv_prog_CC_cflags__fvisibility_hidden" = x"yes"; then
-  CFLAGS_SL_MODULE="${CFLAGS_SL_MODULE} -fvisibility=hidden"
+	CFLAGS_SL_MODULE="${CFLAGS_SL_MODULE} -fvisibility=hidden"
 fi
 
 
-  # For C++ we additionally want -fvisibility-inlines-hidden
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -fvisibility=hidden, for CXXFLAGS_SL_MODULE" >&5
+	# For C++ we additionally want -fvisibility-inlines-hidden
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -fvisibility=hidden, for CXXFLAGS_SL_MODULE" >&5
 $as_echo_n "checking whether ${CXX} supports -fvisibility=hidden, for CXXFLAGS_SL_MODULE... " >&6; }
 if ${pgac_cv_prog_CXX_cxxflags__fvisibility_hidden+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CXXFLAGS=$CXXFLAGS
+	pgac_save_CXXFLAGS=$CXXFLAGS
 pgac_save_CXX=$CXX
 CXX=${CXX}
 CXXFLAGS="${CXXFLAGS_SL_MODULE} -fvisibility=hidden"
@@ -6782,14 +6782,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  pgac_cv_prog_CXX_cxxflags__fvisibility_hidden=yes
+	pgac_cv_prog_CXX_cxxflags__fvisibility_hidden=yes
 else
-  pgac_cv_prog_CXX_cxxflags__fvisibility_hidden=no
+	pgac_cv_prog_CXX_cxxflags__fvisibility_hidden=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
@@ -6805,15 +6805,15 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CXX_cxxflags__fvisibility_hidden" >&5
 $as_echo "$pgac_cv_prog_CXX_cxxflags__fvisibility_hidden" >&6; }
 if test x"$pgac_cv_prog_CXX_cxxflags__fvisibility_hidden" = x"yes"; then
-  CXXFLAGS_SL_MODULE="${CXXFLAGS_SL_MODULE} -fvisibility=hidden"
+	CXXFLAGS_SL_MODULE="${CXXFLAGS_SL_MODULE} -fvisibility=hidden"
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -fvisibility-inlines-hidden, for CXXFLAGS_SL_MODULE" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -fvisibility-inlines-hidden, for CXXFLAGS_SL_MODULE" >&5
 $as_echo_n "checking whether ${CXX} supports -fvisibility-inlines-hidden, for CXXFLAGS_SL_MODULE... " >&6; }
 if ${pgac_cv_prog_CXX_cxxflags__fvisibility_inlines_hidden+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CXXFLAGS=$CXXFLAGS
+	pgac_save_CXXFLAGS=$CXXFLAGS
 pgac_save_CXX=$CXX
 CXX=${CXX}
 CXXFLAGS="${CXXFLAGS_SL_MODULE} -fvisibility-inlines-hidden"
@@ -6832,14 +6832,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  pgac_cv_prog_CXX_cxxflags__fvisibility_inlines_hidden=yes
+	pgac_cv_prog_CXX_cxxflags__fvisibility_inlines_hidden=yes
 else
-  pgac_cv_prog_CXX_cxxflags__fvisibility_inlines_hidden=no
+	pgac_cv_prog_CXX_cxxflags__fvisibility_inlines_hidden=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
@@ -6855,10 +6855,10 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CXX_cxxflags__fvisibility_inlines_hidden" >&5
 $as_echo "$pgac_cv_prog_CXX_cxxflags__fvisibility_inlines_hidden" >&6; }
 if test x"$pgac_cv_prog_CXX_cxxflags__fvisibility_inlines_hidden" = x"yes"; then
-  CXXFLAGS_SL_MODULE="${CXXFLAGS_SL_MODULE} -fvisibility-inlines-hidden"
+	CXXFLAGS_SL_MODULE="${CXXFLAGS_SL_MODULE} -fvisibility-inlines-hidden"
 fi
 
-  have_visibility_attribute=$pgac_cv_prog_CC_cflags__fvisibility_hidden
+	have_visibility_attribute=$pgac_cv_prog_CC_cflags__fvisibility_hidden
 fi
 
 if test "$have_visibility_attribute" = "yes"; then
@@ -6879,14 +6879,14 @@ fi
 # warning in the main build is enough.
 # 3. But we must duplicate -Wno-warning flags, else we'll see those anyway.
 if test "$with_llvm" = yes ; then
-  CLANGXX="$CLANG -xc++"
+	CLANGXX="$CLANG -xc++"
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -fno-strict-aliasing, for BITCODE_CFLAGS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -fno-strict-aliasing, for BITCODE_CFLAGS" >&5
 $as_echo_n "checking whether ${CLANG} supports -fno-strict-aliasing, for BITCODE_CFLAGS... " >&6; }
 if ${pgac_cv_prog_CLANG_cflags__fno_strict_aliasing+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CLANG}
 CFLAGS="${BITCODE_CFLAGS} -fno-strict-aliasing"
@@ -6899,14 +6899,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CLANG_cflags__fno_strict_aliasing=yes
+	pgac_cv_prog_CLANG_cflags__fno_strict_aliasing=yes
 else
-  pgac_cv_prog_CLANG_cflags__fno_strict_aliasing=no
+	pgac_cv_prog_CLANG_cflags__fno_strict_aliasing=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -6916,15 +6916,15 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CLANG_cflags__fno_strict_aliasing" >&5
 $as_echo "$pgac_cv_prog_CLANG_cflags__fno_strict_aliasing" >&6; }
 if test x"$pgac_cv_prog_CLANG_cflags__fno_strict_aliasing" = x"yes"; then
-  BITCODE_CFLAGS="${BITCODE_CFLAGS} -fno-strict-aliasing"
+	BITCODE_CFLAGS="${BITCODE_CFLAGS} -fno-strict-aliasing"
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANGXX} supports -fno-strict-aliasing, for BITCODE_CXXFLAGS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANGXX} supports -fno-strict-aliasing, for BITCODE_CXXFLAGS" >&5
 $as_echo_n "checking whether ${CLANGXX} supports -fno-strict-aliasing, for BITCODE_CXXFLAGS... " >&6; }
 if ${pgac_cv_prog_CLANGXX_cxxflags__fno_strict_aliasing+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CXXFLAGS=$CXXFLAGS
+	pgac_save_CXXFLAGS=$CXXFLAGS
 pgac_save_CXX=$CXX
 CXX=${CLANGXX}
 CXXFLAGS="${BITCODE_CXXFLAGS} -fno-strict-aliasing"
@@ -6943,14 +6943,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  pgac_cv_prog_CLANGXX_cxxflags__fno_strict_aliasing=yes
+	pgac_cv_prog_CLANGXX_cxxflags__fno_strict_aliasing=yes
 else
-  pgac_cv_prog_CLANGXX_cxxflags__fno_strict_aliasing=no
+	pgac_cv_prog_CLANGXX_cxxflags__fno_strict_aliasing=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
@@ -6966,15 +6966,15 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CLANGXX_cxxflags__fno_strict_aliasing" >&5
 $as_echo "$pgac_cv_prog_CLANGXX_cxxflags__fno_strict_aliasing" >&6; }
 if test x"$pgac_cv_prog_CLANGXX_cxxflags__fno_strict_aliasing" = x"yes"; then
-  BITCODE_CXXFLAGS="${BITCODE_CXXFLAGS} -fno-strict-aliasing"
+	BITCODE_CXXFLAGS="${BITCODE_CXXFLAGS} -fno-strict-aliasing"
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -fwrapv, for BITCODE_CFLAGS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -fwrapv, for BITCODE_CFLAGS" >&5
 $as_echo_n "checking whether ${CLANG} supports -fwrapv, for BITCODE_CFLAGS... " >&6; }
 if ${pgac_cv_prog_CLANG_cflags__fwrapv+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CLANG}
 CFLAGS="${BITCODE_CFLAGS} -fwrapv"
@@ -6987,14 +6987,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CLANG_cflags__fwrapv=yes
+	pgac_cv_prog_CLANG_cflags__fwrapv=yes
 else
-  pgac_cv_prog_CLANG_cflags__fwrapv=no
+	pgac_cv_prog_CLANG_cflags__fwrapv=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -7004,15 +7004,15 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CLANG_cflags__fwrapv" >&5
 $as_echo "$pgac_cv_prog_CLANG_cflags__fwrapv" >&6; }
 if test x"$pgac_cv_prog_CLANG_cflags__fwrapv" = x"yes"; then
-  BITCODE_CFLAGS="${BITCODE_CFLAGS} -fwrapv"
+	BITCODE_CFLAGS="${BITCODE_CFLAGS} -fwrapv"
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANGXX} supports -fwrapv, for BITCODE_CXXFLAGS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANGXX} supports -fwrapv, for BITCODE_CXXFLAGS" >&5
 $as_echo_n "checking whether ${CLANGXX} supports -fwrapv, for BITCODE_CXXFLAGS... " >&6; }
 if ${pgac_cv_prog_CLANGXX_cxxflags__fwrapv+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CXXFLAGS=$CXXFLAGS
+	pgac_save_CXXFLAGS=$CXXFLAGS
 pgac_save_CXX=$CXX
 CXX=${CLANGXX}
 CXXFLAGS="${BITCODE_CXXFLAGS} -fwrapv"
@@ -7031,14 +7031,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  pgac_cv_prog_CLANGXX_cxxflags__fwrapv=yes
+	pgac_cv_prog_CLANGXX_cxxflags__fwrapv=yes
 else
-  pgac_cv_prog_CLANGXX_cxxflags__fwrapv=no
+	pgac_cv_prog_CLANGXX_cxxflags__fwrapv=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
@@ -7054,15 +7054,15 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CLANGXX_cxxflags__fwrapv" >&5
 $as_echo "$pgac_cv_prog_CLANGXX_cxxflags__fwrapv" >&6; }
 if test x"$pgac_cv_prog_CLANGXX_cxxflags__fwrapv" = x"yes"; then
-  BITCODE_CXXFLAGS="${BITCODE_CXXFLAGS} -fwrapv"
+	BITCODE_CXXFLAGS="${BITCODE_CXXFLAGS} -fwrapv"
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -fexcess-precision=standard, for BITCODE_CFLAGS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -fexcess-precision=standard, for BITCODE_CFLAGS" >&5
 $as_echo_n "checking whether ${CLANG} supports -fexcess-precision=standard, for BITCODE_CFLAGS... " >&6; }
 if ${pgac_cv_prog_CLANG_cflags__fexcess_precision_standard+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CLANG}
 CFLAGS="${BITCODE_CFLAGS} -fexcess-precision=standard"
@@ -7075,14 +7075,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CLANG_cflags__fexcess_precision_standard=yes
+	pgac_cv_prog_CLANG_cflags__fexcess_precision_standard=yes
 else
-  pgac_cv_prog_CLANG_cflags__fexcess_precision_standard=no
+	pgac_cv_prog_CLANG_cflags__fexcess_precision_standard=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -7092,15 +7092,15 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CLANG_cflags__fexcess_precision_standard" >&5
 $as_echo "$pgac_cv_prog_CLANG_cflags__fexcess_precision_standard" >&6; }
 if test x"$pgac_cv_prog_CLANG_cflags__fexcess_precision_standard" = x"yes"; then
-  BITCODE_CFLAGS="${BITCODE_CFLAGS} -fexcess-precision=standard"
+	BITCODE_CFLAGS="${BITCODE_CFLAGS} -fexcess-precision=standard"
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANGXX} supports -fexcess-precision=standard, for BITCODE_CXXFLAGS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANGXX} supports -fexcess-precision=standard, for BITCODE_CXXFLAGS" >&5
 $as_echo_n "checking whether ${CLANGXX} supports -fexcess-precision=standard, for BITCODE_CXXFLAGS... " >&6; }
 if ${pgac_cv_prog_CLANGXX_cxxflags__fexcess_precision_standard+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CXXFLAGS=$CXXFLAGS
+	pgac_save_CXXFLAGS=$CXXFLAGS
 pgac_save_CXX=$CXX
 CXX=${CLANGXX}
 CXXFLAGS="${BITCODE_CXXFLAGS} -fexcess-precision=standard"
@@ -7119,14 +7119,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  pgac_cv_prog_CLANGXX_cxxflags__fexcess_precision_standard=yes
+	pgac_cv_prog_CLANGXX_cxxflags__fexcess_precision_standard=yes
 else
-  pgac_cv_prog_CLANGXX_cxxflags__fexcess_precision_standard=no
+	pgac_cv_prog_CLANGXX_cxxflags__fexcess_precision_standard=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
@@ -7142,20 +7142,20 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CLANGXX_cxxflags__fexcess_precision_standard" >&5
 $as_echo "$pgac_cv_prog_CLANGXX_cxxflags__fexcess_precision_standard" >&6; }
 if test x"$pgac_cv_prog_CLANGXX_cxxflags__fexcess_precision_standard" = x"yes"; then
-  BITCODE_CXXFLAGS="${BITCODE_CXXFLAGS} -fexcess-precision=standard"
+	BITCODE_CXXFLAGS="${BITCODE_CXXFLAGS} -fexcess-precision=standard"
 fi
 
 
-  # Ideally bitcode should perhaps match $CC's use, or not, of outline atomic
-  # functions, but for now we err on the side of suppressing them in bitcode,
-  # because we can't assume they're available at runtime.  This affects aarch64
-  # builds using the basic armv8-a ISA without LSE support.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -mno-outline-atomics, for BITCODE_CFLAGS" >&5
+	# Ideally bitcode should perhaps match $CC's use, or not, of outline atomic
+	# functions, but for now we err on the side of suppressing them in bitcode,
+	# because we can't assume they're available at runtime.  This affects aarch64
+	# builds using the basic armv8-a ISA without LSE support.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -mno-outline-atomics, for BITCODE_CFLAGS" >&5
 $as_echo_n "checking whether ${CLANG} supports -mno-outline-atomics, for BITCODE_CFLAGS... " >&6; }
 if ${pgac_cv_prog_CLANG_cxxflags__mno_outline_atomics+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CXXFLAGS=$CXXFLAGS
+	pgac_save_CXXFLAGS=$CXXFLAGS
 pgac_save_CXX=$CXX
 CXX=${CLANG}
 CXXFLAGS="${BITCODE_CFLAGS} -mno-outline-atomics"
@@ -7174,14 +7174,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  pgac_cv_prog_CLANG_cxxflags__mno_outline_atomics=yes
+	pgac_cv_prog_CLANG_cxxflags__mno_outline_atomics=yes
 else
-  pgac_cv_prog_CLANG_cxxflags__mno_outline_atomics=no
+	pgac_cv_prog_CLANG_cxxflags__mno_outline_atomics=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
@@ -7197,15 +7197,15 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CLANG_cxxflags__mno_outline_atomics" >&5
 $as_echo "$pgac_cv_prog_CLANG_cxxflags__mno_outline_atomics" >&6; }
 if test x"$pgac_cv_prog_CLANG_cxxflags__mno_outline_atomics" = x"yes"; then
-  BITCODE_CFLAGS="${BITCODE_CFLAGS} -mno-outline-atomics"
+	BITCODE_CFLAGS="${BITCODE_CFLAGS} -mno-outline-atomics"
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -mno-outline-atomics, for BITCODE_CXXFLAGS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -mno-outline-atomics, for BITCODE_CXXFLAGS" >&5
 $as_echo_n "checking whether ${CLANG} supports -mno-outline-atomics, for BITCODE_CXXFLAGS... " >&6; }
 if ${pgac_cv_prog_CLANG_cxxflags__mno_outline_atomics+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CXXFLAGS=$CXXFLAGS
+	pgac_save_CXXFLAGS=$CXXFLAGS
 pgac_save_CXX=$CXX
 CXX=${CLANG}
 CXXFLAGS="${BITCODE_CXXFLAGS} -mno-outline-atomics"
@@ -7224,14 +7224,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  pgac_cv_prog_CLANG_cxxflags__mno_outline_atomics=yes
+	pgac_cv_prog_CLANG_cxxflags__mno_outline_atomics=yes
 else
-  pgac_cv_prog_CLANG_cxxflags__mno_outline_atomics=no
+	pgac_cv_prog_CLANG_cxxflags__mno_outline_atomics=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
@@ -7247,17 +7247,17 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CLANG_cxxflags__mno_outline_atomics" >&5
 $as_echo "$pgac_cv_prog_CLANG_cxxflags__mno_outline_atomics" >&6; }
 if test x"$pgac_cv_prog_CLANG_cxxflags__mno_outline_atomics" = x"yes"; then
-  BITCODE_CXXFLAGS="${BITCODE_CXXFLAGS} -mno-outline-atomics"
+	BITCODE_CXXFLAGS="${BITCODE_CXXFLAGS} -mno-outline-atomics"
 fi
 
 
-  NOT_THE_CFLAGS=""
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -Wunused-command-line-argument, for NOT_THE_CFLAGS" >&5
+	NOT_THE_CFLAGS=""
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -Wunused-command-line-argument, for NOT_THE_CFLAGS" >&5
 $as_echo_n "checking whether ${CLANG} supports -Wunused-command-line-argument, for NOT_THE_CFLAGS... " >&6; }
 if ${pgac_cv_prog_CLANG_cflags__Wunused_command_line_argument+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CLANG}
 CFLAGS="${NOT_THE_CFLAGS} -Wunused-command-line-argument"
@@ -7270,14 +7270,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CLANG_cflags__Wunused_command_line_argument=yes
+	pgac_cv_prog_CLANG_cflags__Wunused_command_line_argument=yes
 else
-  pgac_cv_prog_CLANG_cflags__Wunused_command_line_argument=no
+	pgac_cv_prog_CLANG_cflags__Wunused_command_line_argument=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -7287,19 +7287,19 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CLANG_cflags__Wunused_command_line_argument" >&5
 $as_echo "$pgac_cv_prog_CLANG_cflags__Wunused_command_line_argument" >&6; }
 if test x"$pgac_cv_prog_CLANG_cflags__Wunused_command_line_argument" = x"yes"; then
-  NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wunused-command-line-argument"
+	NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wunused-command-line-argument"
 fi
 
-  if test -n "$NOT_THE_CFLAGS"; then
-    BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-unused-command-line-argument"
-  fi
-  NOT_THE_CFLAGS=""
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -Wcompound-token-split-by-macro, for NOT_THE_CFLAGS" >&5
+	if test -n "$NOT_THE_CFLAGS"; then
+		BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-unused-command-line-argument"
+	fi
+	NOT_THE_CFLAGS=""
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -Wcompound-token-split-by-macro, for NOT_THE_CFLAGS" >&5
 $as_echo_n "checking whether ${CLANG} supports -Wcompound-token-split-by-macro, for NOT_THE_CFLAGS... " >&6; }
 if ${pgac_cv_prog_CLANG_cflags__Wcompound_token_split_by_macro+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CLANG}
 CFLAGS="${NOT_THE_CFLAGS} -Wcompound-token-split-by-macro"
@@ -7312,14 +7312,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CLANG_cflags__Wcompound_token_split_by_macro=yes
+	pgac_cv_prog_CLANG_cflags__Wcompound_token_split_by_macro=yes
 else
-  pgac_cv_prog_CLANG_cflags__Wcompound_token_split_by_macro=no
+	pgac_cv_prog_CLANG_cflags__Wcompound_token_split_by_macro=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -7329,19 +7329,19 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CLANG_cflags__Wcompound_token_split_by_macro" >&5
 $as_echo "$pgac_cv_prog_CLANG_cflags__Wcompound_token_split_by_macro" >&6; }
 if test x"$pgac_cv_prog_CLANG_cflags__Wcompound_token_split_by_macro" = x"yes"; then
-  NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wcompound-token-split-by-macro"
+	NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wcompound-token-split-by-macro"
 fi
 
-  if test -n "$NOT_THE_CFLAGS"; then
-    BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-compound-token-split-by-macro"
-  fi
-  NOT_THE_CFLAGS=""
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -Wformat-truncation, for NOT_THE_CFLAGS" >&5
+	if test -n "$NOT_THE_CFLAGS"; then
+		BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-compound-token-split-by-macro"
+	fi
+	NOT_THE_CFLAGS=""
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -Wformat-truncation, for NOT_THE_CFLAGS" >&5
 $as_echo_n "checking whether ${CLANG} supports -Wformat-truncation, for NOT_THE_CFLAGS... " >&6; }
 if ${pgac_cv_prog_CLANG_cflags__Wformat_truncation+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CLANG}
 CFLAGS="${NOT_THE_CFLAGS} -Wformat-truncation"
@@ -7354,14 +7354,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CLANG_cflags__Wformat_truncation=yes
+	pgac_cv_prog_CLANG_cflags__Wformat_truncation=yes
 else
-  pgac_cv_prog_CLANG_cflags__Wformat_truncation=no
+	pgac_cv_prog_CLANG_cflags__Wformat_truncation=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -7371,19 +7371,19 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CLANG_cflags__Wformat_truncation" >&5
 $as_echo "$pgac_cv_prog_CLANG_cflags__Wformat_truncation" >&6; }
 if test x"$pgac_cv_prog_CLANG_cflags__Wformat_truncation" = x"yes"; then
-  NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wformat-truncation"
+	NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wformat-truncation"
 fi
 
-  if test -n "$NOT_THE_CFLAGS"; then
-    BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-format-truncation"
-  fi
-  NOT_THE_CFLAGS=""
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -Wstringop-truncation, for NOT_THE_CFLAGS" >&5
+	if test -n "$NOT_THE_CFLAGS"; then
+		BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-format-truncation"
+	fi
+	NOT_THE_CFLAGS=""
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -Wstringop-truncation, for NOT_THE_CFLAGS" >&5
 $as_echo_n "checking whether ${CLANG} supports -Wstringop-truncation, for NOT_THE_CFLAGS... " >&6; }
 if ${pgac_cv_prog_CLANG_cflags__Wstringop_truncation+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 pgac_save_CC=$CC
 CC=${CLANG}
 CFLAGS="${NOT_THE_CFLAGS} -Wstringop-truncation"
@@ -7396,14 +7396,14 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CLANG_cflags__Wstringop_truncation=yes
+	pgac_cv_prog_CLANG_cflags__Wstringop_truncation=yes
 else
-  pgac_cv_prog_CLANG_cflags__Wstringop_truncation=no
+	pgac_cv_prog_CLANG_cflags__Wstringop_truncation=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
@@ -7413,55 +7413,55 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CLANG_cflags__Wstringop_truncation" >&5
 $as_echo "$pgac_cv_prog_CLANG_cflags__Wstringop_truncation" >&6; }
 if test x"$pgac_cv_prog_CLANG_cflags__Wstringop_truncation" = x"yes"; then
-  NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wstringop-truncation"
+	NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wstringop-truncation"
 fi
 
-  if test -n "$NOT_THE_CFLAGS"; then
-    BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-stringop-truncation"
-  fi
+	if test -n "$NOT_THE_CFLAGS"; then
+		BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-stringop-truncation"
+	fi
 fi
 
 # supply -g if --enable-debug
 if test "$enable_debug" = yes && test "$ac_cv_prog_cc_g" = yes; then
-  CFLAGS="$CFLAGS -g"
+	CFLAGS="$CFLAGS -g"
 fi
 
 if test "$enable_debug" = yes && test "$ac_cv_prog_cxx_g" = yes; then
-  CXXFLAGS="$CXXFLAGS -g"
+	CXXFLAGS="$CXXFLAGS -g"
 fi
 
 # enable code coverage if --enable-coverage
 if test "$enable_coverage" = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
-    CXXFLAGS="$CXXFLAGS -fprofile-arcs -ftest-coverage"
-  else
-    as_fn_error $? "--enable-coverage is supported only when using GCC" "$LINENO" 5
-  fi
+	if test "$GCC" = yes; then
+		CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
+		CXXFLAGS="$CXXFLAGS -fprofile-arcs -ftest-coverage"
+	else
+		as_fn_error $? "--enable-coverage is supported only when using GCC" "$LINENO" 5
+	fi
 fi
 
 # enable profiling if --enable-profiling
 if test "$enable_profiling" = yes && test "$ac_cv_prog_cc_g" = yes; then
-  if test "$GCC" = yes; then
+	if test "$GCC" = yes; then
 
 $as_echo "#define PROFILE_PID_DIR 1" >>confdefs.h
 
-    CFLAGS="$CFLAGS -pg $PLATFORM_PROFILE_FLAGS"
-    CXXFLAGS="$CXXFLAGS -pg $PLATFORM_PROFILE_FLAGS"
-  else
-    as_fn_error $? "--enable-profiling is supported only when using GCC" "$LINENO" 5
-  fi
+		CFLAGS="$CFLAGS -pg $PLATFORM_PROFILE_FLAGS"
+		CXXFLAGS="$CXXFLAGS -pg $PLATFORM_PROFILE_FLAGS"
+	else
+		as_fn_error $? "--enable-profiling is supported only when using GCC" "$LINENO" 5
+	fi
 fi
 
 # On Solaris, we need these #defines to get POSIX-conforming versions
 # of many interfaces (sigwait, getpwuid_r, shmdt, ...).
 if test "$PORTNAME" = "solaris"; then
-  CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS"
+	CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS"
 fi
 
 # We already have this in Makefile.win32, but configure needs it too
 if test "$PORTNAME" = "win32"; then
-  CPPFLAGS="$CPPFLAGS -I$srcdir/src/include/port/win32"
+	CPPFLAGS="$CPPFLAGS -I$srcdir/src/include/port/win32"
 fi
 
 # Now that we're done automatically adding stuff to C[XX]FLAGS, put back the
@@ -7489,20 +7489,20 @@ int
 main ()
 {
 return 0;
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-   as_fn_error $? "cannot proceed" "$LINENO" 5
+	 as_fn_error $? "cannot proceed" "$LINENO" 5
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 
 # Defend against gcc -ffast-math
 if test "$GCC" = yes; then
@@ -7515,14 +7515,14 @@ main ()
 #ifdef __FAST_MATH__
 choke me
 #endif
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
 else
-  as_fn_error $? "do not put -ffast-math in CFLAGS" "$LINENO" 5
+	as_fn_error $? "do not put -ffast-math in CFLAGS" "$LINENO" 5
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
@@ -7548,14 +7548,14 @@ main ()
 choke me
 #endif
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
 else
-  as_fn_error $? "Compiling PostgreSQL with clang, on 32bit x86, requires SSE2 support. Use -msse2 or use gcc." "$LINENO" 5
+	as_fn_error $? "Compiling PostgreSQL with clang, on 32bit x86, requires SSE2 support. Use -msse2 or use gcc." "$LINENO" 5
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
@@ -7569,52 +7569,52 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 $as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
+	CPP=
 fi
 if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
+	if ${ac_cv_prog_CPP+:} false; then :
+	$as_echo_n "(cached) " >&6
 else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
+			# Double quotes because CPP needs to be expanded
+		for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+		do
+			ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	# Use a header file that comes with gcc, so configuring glibc
+	# with a fresh cross-compiler works.
+	# Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+	# <limits.h> exists even on freestanding compilers.
+	# On the NeXT, cc -E runs the code through the compiler's parser,
+	# not just through cpp. "Syntax error" is here to catch this case.
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
-		     Syntax error
+				 Syntax error
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
 
 else
-  # Broken: fails on valid input.
+	# Broken: fails on valid input.
 continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	# OK, works on sane cases.  Now check whether nonexistent headers
+	# can be detected and how.
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
+	# Broken: success on invalid input.
 continue
 else
-  # Passes both tests.
+	# Passes both tests.
 ac_preproc_ok=:
 break
 fi
@@ -7624,56 +7624,56 @@ done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
-  break
+	break
 fi
 
-    done
-    ac_cv_prog_CPP=$CPP
+		done
+		ac_cv_prog_CPP=$CPP
 
 fi
-  CPP=$ac_cv_prog_CPP
+	CPP=$ac_cv_prog_CPP
 else
-  ac_cv_prog_CPP=$CPP
+	ac_cv_prog_CPP=$CPP
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
 $as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	# Use a header file that comes with gcc, so configuring glibc
+	# with a fresh cross-compiler works.
+	# Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+	# <limits.h> exists even on freestanding compilers.
+	# On the NeXT, cc -E runs the code through the compiler's parser,
+	# not just through cpp. "Syntax error" is here to catch this case.
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
-		     Syntax error
+				 Syntax error
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
 
 else
-  # Broken: fails on valid input.
+	# Broken: fails on valid input.
 continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	# OK, works on sane cases.  Now check whether nonexistent headers
+	# can be detected and how.
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
+	# Broken: success on invalid input.
 continue
 else
-  # Passes both tests.
+	# Passes both tests.
 ac_preproc_ok=:
 break
 fi
@@ -7685,7 +7685,7 @@ rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details" "$LINENO" 5; }
@@ -7718,101 +7718,101 @@ _ACEOF
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+	# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $PKG_CONFIG in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
+	ac_pt_PKG_CONFIG=$PKG_CONFIG
+	# Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $ac_pt_PKG_CONFIG in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
 $as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
+	if test "x$ac_pt_PKG_CONFIG" = x; then
+		PKG_CONFIG=""
+	else
+		case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
+		PKG_CONFIG=$ac_pt_PKG_CONFIG
+	fi
 else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+	PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 fi
 
 fi
@@ -7837,21 +7837,21 @@ fi
 
 # Check whether --enable-depend was given.
 if test "${enable_depend+set}" = set; then :
-  enableval=$enable_depend;
-  case $enableval in
-    yes)
-      autodepend=yes
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --enable-depend option" "$LINENO" 5
-      ;;
-  esac
+	enableval=$enable_depend;
+	case $enableval in
+		yes)
+			autodepend=yes
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --enable-depend option" "$LINENO" 5
+			;;
+	esac
 
 else
-  enable_depend=no
+	enable_depend=no
 
 fi
 
@@ -7866,23 +7866,23 @@ fi
 
 # Check whether --enable-cassert was given.
 if test "${enable_cassert+set}" = set; then :
-  enableval=$enable_cassert;
-  case $enableval in
-    yes)
+	enableval=$enable_cassert;
+	case $enableval in
+		yes)
 
 $as_echo "#define USE_ASSERT_CHECKING 1" >>confdefs.h
 
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --enable-cassert option" "$LINENO" 5
-      ;;
-  esac
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --enable-cassert option" "$LINENO" 5
+			;;
+	esac
 
 else
-  enable_cassert=no
+	enable_cassert=no
 
 fi
 
@@ -7896,12 +7896,12 @@ ac_save_IFS=$IFS
 IFS="${IFS}${PATH_SEPARATOR}"
 # SRCH_INC comes from the template file
 for dir in $with_includes $SRCH_INC; do
-  if test -d "$dir"; then
-    INCLUDES="$INCLUDES -I$dir"
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Include directory $dir does not exist." >&5
+	if test -d "$dir"; then
+		INCLUDES="$INCLUDES -I$dir"
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Include directory $dir does not exist." >&5
 $as_echo "$as_me: WARNING: *** Include directory $dir does not exist." >&2;}
-  fi
+	fi
 done
 IFS=$ac_save_IFS
 
@@ -7913,12 +7913,12 @@ ac_save_IFS=$IFS
 IFS="${IFS}${PATH_SEPARATOR}"
 # LIBRARY_DIRS comes from command line, SRCH_LIB from template file.
 for dir in $LIBRARY_DIRS $SRCH_LIB; do
-  if test -d "$dir"; then
-    LIBDIRS="$LIBDIRS -L$dir"
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Library directory $dir does not exist." >&5
+	if test -d "$dir"; then
+		LIBDIRS="$LIBDIRS -L$dir"
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Library directory $dir does not exist." >&5
 $as_echo "$as_me: WARNING: *** Library directory $dir does not exist." >&2;}
-  fi
+	fi
 done
 IFS=$ac_save_IFS
 
@@ -7932,23 +7932,23 @@ $as_echo_n "checking whether to build with ICU support... " >&6; }
 
 # Check whether --with-icu was given.
 if test "${with_icu+set}" = set; then :
-  withval=$with_icu;
-  case $withval in
-    yes)
+	withval=$with_icu;
+	case $withval in
+		yes)
 
 $as_echo "#define USE_ICU 1" >>confdefs.h
 
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-icu option" "$LINENO" 5
-      ;;
-  esac
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-icu option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_icu=yes
+	with_icu=yes
 
 $as_echo "#define USE_ICU 1" >>confdefs.h
 
@@ -7966,56 +7966,56 @@ pkg_failed=no
 $as_echo_n "checking for icu-uc icu-i18n... " >&6; }
 
 if test -n "$ICU_CFLAGS"; then
-    pkg_cv_ICU_CFLAGS="$ICU_CFLAGS"
+		pkg_cv_ICU_CFLAGS="$ICU_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc icu-i18n\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "icu-uc icu-i18n") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-uc icu-i18n" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+		if test -n "$PKG_CONFIG" && \
+		{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc icu-i18n\""; } >&5
+	($PKG_CONFIG --exists --print-errors "icu-uc icu-i18n") 2>&5
+	ac_status=$?
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; }; then
+	pkg_cv_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-uc icu-i18n" 2>/dev/null`
+					test "x$?" != "x0" && pkg_failed=yes
 else
-  pkg_failed=yes
+	pkg_failed=yes
 fi
  else
-    pkg_failed=untried
+		pkg_failed=untried
 fi
 if test -n "$ICU_LIBS"; then
-    pkg_cv_ICU_LIBS="$ICU_LIBS"
+		pkg_cv_ICU_LIBS="$ICU_LIBS"
  elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc icu-i18n\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "icu-uc icu-i18n") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_ICU_LIBS=`$PKG_CONFIG --libs "icu-uc icu-i18n" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+		if test -n "$PKG_CONFIG" && \
+		{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc icu-i18n\""; } >&5
+	($PKG_CONFIG --exists --print-errors "icu-uc icu-i18n") 2>&5
+	ac_status=$?
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; }; then
+	pkg_cv_ICU_LIBS=`$PKG_CONFIG --libs "icu-uc icu-i18n" 2>/dev/null`
+					test "x$?" != "x0" && pkg_failed=yes
 else
-  pkg_failed=yes
+	pkg_failed=yes
 fi
  else
-    pkg_failed=untried
+		pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
+				_pkg_short_errors_supported=yes
 else
-        _pkg_short_errors_supported=no
+				_pkg_short_errors_supported=no
 fi
-        if test $_pkg_short_errors_supported = yes; then
-	        ICU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "icu-uc icu-i18n" 2>&1`
-        else
-	        ICU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "icu-uc icu-i18n" 2>&1`
-        fi
+				if test $_pkg_short_errors_supported = yes; then
+					ICU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "icu-uc icu-i18n" 2>&1`
+				else
+					ICU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "icu-uc icu-i18n" 2>&1`
+				fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$ICU_PKG_ERRORS" >&5
 
@@ -8030,7 +8030,7 @@ Alternatively, you may set the environment variables ICU_CFLAGS
 and ICU_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -8047,7 +8047,7 @@ See \`config.log' for more details" "$LINENO" 5; }
 else
 	ICU_CFLAGS=$pkg_cv_ICU_CFLAGS
 	ICU_LIBS=$pkg_cv_ICU_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 fi
@@ -8063,21 +8063,21 @@ $as_echo_n "checking whether to build with Tcl... " >&6; }
 
 # Check whether --with-tcl was given.
 if test "${with_tcl+set}" = set; then :
-  withval=$with_tcl;
-  case $withval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-tcl option" "$LINENO" 5
-      ;;
-  esac
+	withval=$with_tcl;
+	case $withval in
+		yes)
+			:
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-tcl option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_tcl=no
+	with_tcl=no
 
 fi
 
@@ -8094,18 +8094,18 @@ $as_echo "$with_tcl" >&6; }
 
 # Check whether --with-tclconfig was given.
 if test "${with_tclconfig+set}" = set; then :
-  withval=$with_tclconfig;
-  case $withval in
-    yes)
-      as_fn_error $? "argument required for --with-tclconfig option" "$LINENO" 5
-      ;;
-    no)
-      as_fn_error $? "argument required for --with-tclconfig option" "$LINENO" 5
-      ;;
-    *)
-
-      ;;
-  esac
+	withval=$with_tclconfig;
+	case $withval in
+		yes)
+			as_fn_error $? "argument required for --with-tclconfig option" "$LINENO" 5
+			;;
+		no)
+			as_fn_error $? "argument required for --with-tclconfig option" "$LINENO" 5
+			;;
+		*)
+
+			;;
+	esac
 
 fi
 
@@ -8121,21 +8121,21 @@ $as_echo_n "checking whether to build Perl modules... " >&6; }
 
 # Check whether --with-perl was given.
 if test "${with_perl+set}" = set; then :
-  withval=$with_perl;
-  case $withval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-perl option" "$LINENO" 5
-      ;;
-  esac
+	withval=$with_perl;
+	case $withval in
+		yes)
+			:
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-perl option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_perl=no
+	with_perl=no
 
 fi
 
@@ -8154,21 +8154,21 @@ $as_echo_n "checking whether to build Python modules... " >&6; }
 
 # Check whether --with-python was given.
 if test "${with_python+set}" = set; then :
-  withval=$with_python;
-  case $withval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-python option" "$LINENO" 5
-      ;;
-  esac
+	withval=$with_python;
+	case $withval in
+		yes)
+			:
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-python option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_python=no
+	with_python=no
 
 fi
 
@@ -8187,26 +8187,26 @@ $as_echo_n "checking whether to build with GSSAPI support... " >&6; }
 
 # Check whether --with-gssapi was given.
 if test "${with_gssapi+set}" = set; then :
-  withval=$with_gssapi;
-  case $withval in
-    yes)
+	withval=$with_gssapi;
+	case $withval in
+		yes)
 
 
 $as_echo "#define ENABLE_GSS 1" >>confdefs.h
 
-  krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
+	krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
 
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-gssapi option" "$LINENO" 5
-      ;;
-  esac
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-gssapi option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_gssapi=no
+	with_gssapi=no
 
 fi
 
@@ -8227,21 +8227,21 @@ $as_echo "$with_gssapi" >&6; }
 
 # Check whether --with-krb-srvnam was given.
 if test "${with_krb_srvnam+set}" = set; then :
-  withval=$with_krb_srvnam;
-  case $withval in
-    yes)
-      as_fn_error $? "argument required for --with-krb-srvnam option" "$LINENO" 5
-      ;;
-    no)
-      as_fn_error $? "argument required for --with-krb-srvnam option" "$LINENO" 5
-      ;;
-    *)
-
-      ;;
-  esac
+	withval=$with_krb_srvnam;
+	case $withval in
+		yes)
+			as_fn_error $? "argument required for --with-krb-srvnam option" "$LINENO" 5
+			;;
+		no)
+			as_fn_error $? "argument required for --with-krb-srvnam option" "$LINENO" 5
+			;;
+		*)
+
+			;;
+	esac
 
 else
-  with_krb_srvnam="postgres"
+	with_krb_srvnam="postgres"
 fi
 
 
@@ -8263,23 +8263,23 @@ $as_echo_n "checking whether to build with PAM support... " >&6; }
 
 # Check whether --with-pam was given.
 if test "${with_pam+set}" = set; then :
-  withval=$with_pam;
-  case $withval in
-    yes)
+	withval=$with_pam;
+	case $withval in
+		yes)
 
 $as_echo "#define USE_PAM 1" >>confdefs.h
 
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-pam option" "$LINENO" 5
-      ;;
-  esac
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-pam option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_pam=no
+	with_pam=no
 
 fi
 
@@ -8298,23 +8298,23 @@ $as_echo_n "checking whether to build with BSD Authentication support... " >&6;
 
 # Check whether --with-bsd-auth was given.
 if test "${with_bsd_auth+set}" = set; then :
-  withval=$with_bsd_auth;
-  case $withval in
-    yes)
+	withval=$with_bsd_auth;
+	case $withval in
+		yes)
 
 $as_echo "#define USE_BSD_AUTH 1" >>confdefs.h
 
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-bsd-auth option" "$LINENO" 5
-      ;;
-  esac
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-bsd-auth option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_bsd_auth=no
+	with_bsd_auth=no
 
 fi
 
@@ -8333,23 +8333,23 @@ $as_echo_n "checking whether to build with LDAP support... " >&6; }
 
 # Check whether --with-ldap was given.
 if test "${with_ldap+set}" = set; then :
-  withval=$with_ldap;
-  case $withval in
-    yes)
+	withval=$with_ldap;
+	case $withval in
+		yes)
 
 $as_echo "#define USE_LDAP 1" >>confdefs.h
 
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-ldap option" "$LINENO" 5
-      ;;
-  esac
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-ldap option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_ldap=no
+	with_ldap=no
 
 fi
 
@@ -8369,23 +8369,23 @@ $as_echo_n "checking whether to build with Bonjour support... " >&6; }
 
 # Check whether --with-bonjour was given.
 if test "${with_bonjour+set}" = set; then :
-  withval=$with_bonjour;
-  case $withval in
-    yes)
+	withval=$with_bonjour;
+	case $withval in
+		yes)
 
 $as_echo "#define USE_BONJOUR 1" >>confdefs.h
 
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-bonjour option" "$LINENO" 5
-      ;;
-  esac
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-bonjour option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_bonjour=no
+	with_bonjour=no
 
 fi
 
@@ -8404,21 +8404,21 @@ $as_echo_n "checking whether to build with SELinux support... " >&6; }
 
 # Check whether --with-selinux was given.
 if test "${with_selinux+set}" = set; then :
-  withval=$with_selinux;
-  case $withval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-selinux option" "$LINENO" 5
-      ;;
-  esac
+	withval=$with_selinux;
+	case $withval in
+		yes)
+			:
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-selinux option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_selinux=no
+	with_selinux=no
 
 fi
 
@@ -8437,23 +8437,23 @@ $as_echo_n "checking whether to build with systemd support... " >&6; }
 
 # Check whether --with-systemd was given.
 if test "${with_systemd+set}" = set; then :
-  withval=$with_systemd;
-  case $withval in
-    yes)
+	withval=$with_systemd;
+	case $withval in
+		yes)
 
 $as_echo "#define USE_SYSTEMD 1" >>confdefs.h
 
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-systemd option" "$LINENO" 5
-      ;;
-  esac
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-systemd option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_systemd=no
+	with_systemd=no
 
 fi
 
@@ -8470,21 +8470,21 @@ $as_echo "$with_systemd" >&6; }
 
 # Check whether --with-readline was given.
 if test "${with_readline+set}" = set; then :
-  withval=$with_readline;
-  case $withval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-readline option" "$LINENO" 5
-      ;;
-  esac
+	withval=$with_readline;
+	case $withval in
+		yes)
+			:
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-readline option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_readline=yes
+	with_readline=yes
 
 fi
 
@@ -8493,11 +8493,11 @@ fi
 # This is particularly a problem with non-US code pages.
 # Therefore disable its use until we understand the cause. 2004-07-20
 if test "$PORTNAME" = "win32"; then
-  if test "$with_readline" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Readline does not work on MinGW --- disabling" >&5
+	if test "$with_readline" = yes; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Readline does not work on MinGW --- disabling" >&5
 $as_echo "$as_me: WARNING: *** Readline does not work on MinGW --- disabling" >&2;}
-    with_readline=no
-  fi
+		with_readline=no
+	fi
 fi
 
 
@@ -8510,21 +8510,21 @@ fi
 
 # Check whether --with-libedit-preferred was given.
 if test "${with_libedit_preferred+set}" = set; then :
-  withval=$with_libedit_preferred;
-  case $withval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-libedit-preferred option" "$LINENO" 5
-      ;;
-  esac
+	withval=$with_libedit_preferred;
+	case $withval in
+		yes)
+			:
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-libedit-preferred option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_libedit_preferred=no
+	with_libedit_preferred=no
 
 fi
 
@@ -8540,23 +8540,23 @@ $as_echo_n "checking whether to build with liburing support... " >&6; }
 
 # Check whether --with-liburing was given.
 if test "${with_liburing+set}" = set; then :
-  withval=$with_liburing;
-  case $withval in
-    yes)
+	withval=$with_liburing;
+	case $withval in
+		yes)
 
 $as_echo "#define USE_LIBURING 1" >>confdefs.h
 
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-liburing option" "$LINENO" 5
-      ;;
-  esac
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-liburing option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_liburing=no
+	with_liburing=no
 
 fi
 
@@ -8572,56 +8572,56 @@ pkg_failed=no
 $as_echo_n "checking for liburing... " >&6; }
 
 if test -n "$LIBURING_CFLAGS"; then
-    pkg_cv_LIBURING_CFLAGS="$LIBURING_CFLAGS"
+		pkg_cv_LIBURING_CFLAGS="$LIBURING_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liburing\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "liburing") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBURING_CFLAGS=`$PKG_CONFIG --cflags "liburing" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+		if test -n "$PKG_CONFIG" && \
+		{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liburing\""; } >&5
+	($PKG_CONFIG --exists --print-errors "liburing") 2>&5
+	ac_status=$?
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; }; then
+	pkg_cv_LIBURING_CFLAGS=`$PKG_CONFIG --cflags "liburing" 2>/dev/null`
+					test "x$?" != "x0" && pkg_failed=yes
 else
-  pkg_failed=yes
+	pkg_failed=yes
 fi
  else
-    pkg_failed=untried
+		pkg_failed=untried
 fi
 if test -n "$LIBURING_LIBS"; then
-    pkg_cv_LIBURING_LIBS="$LIBURING_LIBS"
+		pkg_cv_LIBURING_LIBS="$LIBURING_LIBS"
  elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liburing\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "liburing") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBURING_LIBS=`$PKG_CONFIG --libs "liburing" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+		if test -n "$PKG_CONFIG" && \
+		{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liburing\""; } >&5
+	($PKG_CONFIG --exists --print-errors "liburing") 2>&5
+	ac_status=$?
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; }; then
+	pkg_cv_LIBURING_LIBS=`$PKG_CONFIG --libs "liburing" 2>/dev/null`
+					test "x$?" != "x0" && pkg_failed=yes
 else
-  pkg_failed=yes
+	pkg_failed=yes
 fi
  else
-    pkg_failed=untried
+		pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
+				_pkg_short_errors_supported=yes
 else
-        _pkg_short_errors_supported=no
+				_pkg_short_errors_supported=no
 fi
-        if test $_pkg_short_errors_supported = yes; then
-	        LIBURING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "liburing" 2>&1`
-        else
-	        LIBURING_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "liburing" 2>&1`
-        fi
+				if test $_pkg_short_errors_supported = yes; then
+					LIBURING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "liburing" 2>&1`
+				else
+					LIBURING_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "liburing" 2>&1`
+				fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBURING_PKG_ERRORS" >&5
 
@@ -8636,7 +8636,7 @@ Alternatively, you may set the environment variables LIBURING_CFLAGS
 and LIBURING_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -8653,7 +8653,7 @@ See \`config.log' for more details" "$LINENO" 5; }
 else
 	LIBURING_CFLAGS=$pkg_cv_LIBURING_CFLAGS
 	LIBURING_LIBS=$pkg_cv_LIBURING_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 fi
@@ -8672,69 +8672,69 @@ fi
 
 # Check whether --with-uuid was given.
 if test "${with_uuid+set}" = set; then :
-  withval=$with_uuid;
-  case $withval in
-    yes)
-      as_fn_error $? "argument required for --with-uuid option" "$LINENO" 5
-      ;;
-    no)
-      as_fn_error $? "argument required for --with-uuid option" "$LINENO" 5
-      ;;
-    *)
-
-      ;;
-  esac
+	withval=$with_uuid;
+	case $withval in
+		yes)
+			as_fn_error $? "argument required for --with-uuid option" "$LINENO" 5
+			;;
+		no)
+			as_fn_error $? "argument required for --with-uuid option" "$LINENO" 5
+			;;
+		*)
+
+			;;
+	esac
 
 fi
 
 
 if test x"$with_uuid" = x"" ; then
-  with_uuid=no
+	with_uuid=no
 fi
 
 
 
 # Check whether --with-ossp-uuid was given.
 if test "${with_ossp_uuid+set}" = set; then :
-  withval=$with_ossp_uuid;
-  case $withval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-ossp-uuid option" "$LINENO" 5
-      ;;
-  esac
+	withval=$with_ossp_uuid;
+	case $withval in
+		yes)
+			:
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-ossp-uuid option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_ossp_uuid=no
+	with_ossp_uuid=no
 
 fi
 
 
 if test "$with_ossp_uuid" = yes ; then
-  with_uuid=ossp
+	with_uuid=ossp
 fi
 
 if test "$with_uuid" != no ; then
-  if test "$with_uuid" = bsd ; then
+	if test "$with_uuid" = bsd ; then
 
 $as_echo "#define HAVE_UUID_BSD 1" >>confdefs.h
 
-  elif test "$with_uuid" = e2fs ; then
+	elif test "$with_uuid" = e2fs ; then
 
 $as_echo "#define HAVE_UUID_E2FS 1" >>confdefs.h
 
-  elif test "$with_uuid" = ossp ; then
+	elif test "$with_uuid" = ossp ; then
 
 $as_echo "#define HAVE_UUID_OSSP 1" >>confdefs.h
 
-  else
-    as_fn_error $? "--with-uuid must specify one of bsd, e2fs, or ossp" "$LINENO" 5
-  fi
+	else
+		as_fn_error $? "--with-uuid must specify one of bsd, e2fs, or ossp" "$LINENO" 5
+	fi
 fi
 
 
@@ -8749,23 +8749,23 @@ $as_echo_n "checking whether to build with libcurl support... " >&6; }
 
 # Check whether --with-libcurl was given.
 if test "${with_libcurl+set}" = set; then :
-  withval=$with_libcurl;
-  case $withval in
-    yes)
+	withval=$with_libcurl;
+	case $withval in
+		yes)
 
 $as_echo "#define USE_LIBCURL 1" >>confdefs.h
 
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-libcurl option" "$LINENO" 5
-      ;;
-  esac
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-libcurl option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_libcurl=no
+	with_libcurl=no
 
 fi
 
@@ -8775,64 +8775,64 @@ $as_echo "$with_libcurl" >&6; }
 
 
 if test "$with_libcurl" = yes ; then
-  # Check for libcurl 7.61.0 or higher (corresponding to RHEL8 and the ability
-  # to explicitly set TLS 1.3 ciphersuites).
+	# Check for libcurl 7.61.0 or higher (corresponding to RHEL8 and the ability
+	# to explicitly set TLS 1.3 ciphersuites).
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl >= 7.61.0" >&5
 $as_echo_n "checking for libcurl >= 7.61.0... " >&6; }
 
 if test -n "$LIBCURL_CFLAGS"; then
-    pkg_cv_LIBCURL_CFLAGS="$LIBCURL_CFLAGS"
+		pkg_cv_LIBCURL_CFLAGS="$LIBCURL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.61.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libcurl >= 7.61.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBCURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= 7.61.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+		if test -n "$PKG_CONFIG" && \
+		{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.61.0\""; } >&5
+	($PKG_CONFIG --exists --print-errors "libcurl >= 7.61.0") 2>&5
+	ac_status=$?
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; }; then
+	pkg_cv_LIBCURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= 7.61.0" 2>/dev/null`
+					test "x$?" != "x0" && pkg_failed=yes
 else
-  pkg_failed=yes
+	pkg_failed=yes
 fi
  else
-    pkg_failed=untried
+		pkg_failed=untried
 fi
 if test -n "$LIBCURL_LIBS"; then
-    pkg_cv_LIBCURL_LIBS="$LIBCURL_LIBS"
+		pkg_cv_LIBCURL_LIBS="$LIBCURL_LIBS"
  elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.61.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libcurl >= 7.61.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBCURL_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.61.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+		if test -n "$PKG_CONFIG" && \
+		{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.61.0\""; } >&5
+	($PKG_CONFIG --exists --print-errors "libcurl >= 7.61.0") 2>&5
+	ac_status=$?
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; }; then
+	pkg_cv_LIBCURL_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.61.0" 2>/dev/null`
+					test "x$?" != "x0" && pkg_failed=yes
 else
-  pkg_failed=yes
+	pkg_failed=yes
 fi
  else
-    pkg_failed=untried
+		pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
+				_pkg_short_errors_supported=yes
 else
-        _pkg_short_errors_supported=no
+				_pkg_short_errors_supported=no
 fi
-        if test $_pkg_short_errors_supported = yes; then
-	        LIBCURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl >= 7.61.0" 2>&1`
-        else
-	        LIBCURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl >= 7.61.0" 2>&1`
-        fi
+				if test $_pkg_short_errors_supported = yes; then
+					LIBCURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl >= 7.61.0" 2>&1`
+				else
+					LIBCURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl >= 7.61.0" 2>&1`
+				fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBCURL_PKG_ERRORS" >&5
 
@@ -8847,7 +8847,7 @@ Alternatively, you may set the environment variables LIBCURL_CFLAGS
 and LIBCURL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -8864,37 +8864,37 @@ See \`config.log' for more details" "$LINENO" 5; }
 else
 	LIBCURL_CFLAGS=$pkg_cv_LIBCURL_CFLAGS
 	LIBCURL_LIBS=$pkg_cv_LIBCURL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 fi
 
-  # Curl's flags are kept separate from the standard CPPFLAGS/LDFLAGS. We use
-  # them only for libpq-oauth.
-  LIBCURL_CPPFLAGS=
-  LIBCURL_LDFLAGS=
+	# Curl's flags are kept separate from the standard CPPFLAGS/LDFLAGS. We use
+	# them only for libpq-oauth.
+	LIBCURL_CPPFLAGS=
+	LIBCURL_LDFLAGS=
 
-  # We only care about -I, -D, and -L switches. Note that -lcurl will be added
-  # to LIBCURL_LDLIBS by PGAC_CHECK_LIBCURL, below.
-  for pgac_option in $LIBCURL_CFLAGS; do
-    case $pgac_option in
-      -I*|-D*) LIBCURL_CPPFLAGS="$LIBCURL_CPPFLAGS $pgac_option";;
-    esac
-  done
-  for pgac_option in $LIBCURL_LIBS; do
-    case $pgac_option in
-      -L*) LIBCURL_LDFLAGS="$LIBCURL_LDFLAGS $pgac_option";;
-    esac
-  done
+	# We only care about -I, -D, and -L switches. Note that -lcurl will be added
+	# to LIBCURL_LDLIBS by PGAC_CHECK_LIBCURL, below.
+	for pgac_option in $LIBCURL_CFLAGS; do
+		case $pgac_option in
+			-I*|-D*) LIBCURL_CPPFLAGS="$LIBCURL_CPPFLAGS $pgac_option";;
+		esac
+	done
+	for pgac_option in $LIBCURL_LIBS; do
+		case $pgac_option in
+			-L*) LIBCURL_LDFLAGS="$LIBCURL_LDFLAGS $pgac_option";;
+		esac
+	done
 
 
 
 
-  # OAuth requires python for testing
-  if test "$with_python" != yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** OAuth support tests require --with-python to run" >&5
+	# OAuth requires python for testing
+	if test "$with_python" != yes; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** OAuth support tests require --with-python to run" >&5
 $as_echo "$as_me: WARNING: *** OAuth support tests require --with-python to run" >&2;}
-  fi
+	fi
 fi
 
 
@@ -8908,23 +8908,23 @@ $as_echo_n "checking whether to build with libnuma support... " >&6; }
 
 # Check whether --with-libnuma was given.
 if test "${with_libnuma+set}" = set; then :
-  withval=$with_libnuma;
-  case $withval in
-    yes)
+	withval=$with_libnuma;
+	case $withval in
+		yes)
 
 $as_echo "#define USE_LIBNUMA 1" >>confdefs.h
 
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-libnuma option" "$LINENO" 5
-      ;;
-  esac
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-libnuma option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_libnuma=no
+	with_libnuma=no
 
 fi
 
@@ -8934,19 +8934,19 @@ $as_echo "$with_libnuma" >&6; }
 
 
 if test "$with_libnuma" = yes ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for numa_available in -lnuma" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for numa_available in -lnuma" >&5
 $as_echo_n "checking for numa_available in -lnuma... " >&6; }
 if ${ac_cv_lib_numa_numa_available+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
+	ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnuma  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -8955,30 +8955,30 @@ int
 main ()
 {
 return numa_available ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_numa_numa_available=yes
+	ac_cv_lib_numa_numa_available=yes
 else
-  ac_cv_lib_numa_numa_available=no
+	ac_cv_lib_numa_numa_available=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_numa_numa_available" >&5
 $as_echo "$ac_cv_lib_numa_numa_available" >&6; }
 if test "x$ac_cv_lib_numa_numa_available" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBNUMA 1
 _ACEOF
 
-  LIBS="-lnuma $LIBS"
+	LIBS="-lnuma $LIBS"
 
 else
-  as_fn_error $? "library 'libnuma' is required for NUMA support" "$LINENO" 5
+	as_fn_error $? "library 'libnuma' is required for NUMA support" "$LINENO" 5
 fi
 
 
@@ -8987,56 +8987,56 @@ pkg_failed=no
 $as_echo_n "checking for numa... " >&6; }
 
 if test -n "$LIBNUMA_CFLAGS"; then
-    pkg_cv_LIBNUMA_CFLAGS="$LIBNUMA_CFLAGS"
+		pkg_cv_LIBNUMA_CFLAGS="$LIBNUMA_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"numa\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "numa") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBNUMA_CFLAGS=`$PKG_CONFIG --cflags "numa" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+		if test -n "$PKG_CONFIG" && \
+		{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"numa\""; } >&5
+	($PKG_CONFIG --exists --print-errors "numa") 2>&5
+	ac_status=$?
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; }; then
+	pkg_cv_LIBNUMA_CFLAGS=`$PKG_CONFIG --cflags "numa" 2>/dev/null`
+					test "x$?" != "x0" && pkg_failed=yes
 else
-  pkg_failed=yes
+	pkg_failed=yes
 fi
  else
-    pkg_failed=untried
+		pkg_failed=untried
 fi
 if test -n "$LIBNUMA_LIBS"; then
-    pkg_cv_LIBNUMA_LIBS="$LIBNUMA_LIBS"
+		pkg_cv_LIBNUMA_LIBS="$LIBNUMA_LIBS"
  elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"numa\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "numa") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBNUMA_LIBS=`$PKG_CONFIG --libs "numa" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+		if test -n "$PKG_CONFIG" && \
+		{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"numa\""; } >&5
+	($PKG_CONFIG --exists --print-errors "numa") 2>&5
+	ac_status=$?
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; }; then
+	pkg_cv_LIBNUMA_LIBS=`$PKG_CONFIG --libs "numa" 2>/dev/null`
+					test "x$?" != "x0" && pkg_failed=yes
 else
-  pkg_failed=yes
+	pkg_failed=yes
 fi
  else
-    pkg_failed=untried
+		pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
+				_pkg_short_errors_supported=yes
 else
-        _pkg_short_errors_supported=no
+				_pkg_short_errors_supported=no
 fi
-        if test $_pkg_short_errors_supported = yes; then
-	        LIBNUMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "numa" 2>&1`
-        else
-	        LIBNUMA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "numa" 2>&1`
-        fi
+				if test $_pkg_short_errors_supported = yes; then
+					LIBNUMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "numa" 2>&1`
+				else
+					LIBNUMA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "numa" 2>&1`
+				fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBNUMA_PKG_ERRORS" >&5
 
@@ -9051,7 +9051,7 @@ Alternatively, you may set the environment variables LIBNUMA_CFLAGS
 and LIBNUMA_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -9068,7 +9068,7 @@ See \`config.log' for more details" "$LINENO" 5; }
 else
 	LIBNUMA_CFLAGS=$pkg_cv_LIBNUMA_CFLAGS
 	LIBNUMA_LIBS=$pkg_cv_LIBNUMA_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 fi
@@ -9084,23 +9084,23 @@ $as_echo_n "checking whether to build with XML support... " >&6; }
 
 # Check whether --with-libxml was given.
 if test "${with_libxml+set}" = set; then :
-  withval=$with_libxml;
-  case $withval in
-    yes)
+	withval=$with_libxml;
+	case $withval in
+		yes)
 
 $as_echo "#define USE_LIBXML 1" >>confdefs.h
 
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-libxml option" "$LINENO" 5
-      ;;
-  esac
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-libxml option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_libxml=no
+	with_libxml=no
 
 fi
 
@@ -9110,153 +9110,153 @@ $as_echo "$with_libxml" >&6; }
 
 
 if test "$with_libxml" = yes ; then
-  # Check pkg-config, then xml2-config.  But for backwards compatibility,
-  # setting XML2_CONFIG overrides pkg-config.
-    have_libxml2_pkg_config=no
-  if test -z "$XML2_CONFIG" -a -n "$PKG_CONFIG"; then
+	# Check pkg-config, then xml2-config.  But for backwards compatibility,
+	# setting XML2_CONFIG overrides pkg-config.
+		have_libxml2_pkg_config=no
+	if test -z "$XML2_CONFIG" -a -n "$PKG_CONFIG"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.6.23" >&5
 $as_echo_n "checking for libxml-2.0 >= 2.6.23... " >&6; }
 
 if test -n "$XML2_CFLAGS"; then
-    pkg_cv_XML2_CFLAGS="$XML2_CFLAGS"
+		pkg_cv_XML2_CFLAGS="$XML2_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.6.23\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.6.23") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_XML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.6.23" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+		if test -n "$PKG_CONFIG" && \
+		{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.6.23\""; } >&5
+	($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.6.23") 2>&5
+	ac_status=$?
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; }; then
+	pkg_cv_XML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.6.23" 2>/dev/null`
+					test "x$?" != "x0" && pkg_failed=yes
 else
-  pkg_failed=yes
+	pkg_failed=yes
 fi
  else
-    pkg_failed=untried
+		pkg_failed=untried
 fi
 if test -n "$XML2_LIBS"; then
-    pkg_cv_XML2_LIBS="$XML2_LIBS"
+		pkg_cv_XML2_LIBS="$XML2_LIBS"
  elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.6.23\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.6.23") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_XML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.6.23" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+		if test -n "$PKG_CONFIG" && \
+		{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.6.23\""; } >&5
+	($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.6.23") 2>&5
+	ac_status=$?
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; }; then
+	pkg_cv_XML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.6.23" 2>/dev/null`
+					test "x$?" != "x0" && pkg_failed=yes
 else
-  pkg_failed=yes
+	pkg_failed=yes
 fi
  else
-    pkg_failed=untried
+		pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
+				_pkg_short_errors_supported=yes
 else
-        _pkg_short_errors_supported=no
+				_pkg_short_errors_supported=no
 fi
-        if test $_pkg_short_errors_supported = yes; then
-	        XML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0 >= 2.6.23" 2>&1`
-        else
-	        XML2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0 >= 2.6.23" 2>&1`
-        fi
+				if test $_pkg_short_errors_supported = yes; then
+					XML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0 >= 2.6.23" 2>&1`
+				else
+					XML2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0 >= 2.6.23" 2>&1`
+				fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XML2_PKG_ERRORS" >&5
 
 	# do nothing
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	# do nothing
 else
 	XML2_CFLAGS=$pkg_cv_XML2_CFLAGS
 	XML2_LIBS=$pkg_cv_XML2_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	have_libxml2_pkg_config=yes
 fi
-  fi
-  if test "$have_libxml2_pkg_config" = no ; then
-    if test -z "$XML2_CONFIG"; then
-  for ac_prog in xml2-config
+	fi
+	if test "$have_libxml2_pkg_config" = no ; then
+		if test -z "$XML2_CONFIG"; then
+	for ac_prog in xml2-config
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_XML2_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $XML2_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_XML2_CONFIG="$XML2_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $XML2_CONFIG in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_XML2_CONFIG="$XML2_CONFIG" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_XML2_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_XML2_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 XML2_CONFIG=$ac_cv_path_XML2_CONFIG
 if test -n "$XML2_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XML2_CONFIG" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XML2_CONFIG" >&5
 $as_echo "$XML2_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$XML2_CONFIG" && break
+	test -n "$XML2_CONFIG" && break
 done
 
 else
-  # Report the value of XML2_CONFIG in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML2_CONFIG" >&5
+	# Report the value of XML2_CONFIG in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML2_CONFIG" >&5
 $as_echo_n "checking for XML2_CONFIG... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XML2_CONFIG" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XML2_CONFIG" >&5
 $as_echo "$XML2_CONFIG" >&6; }
 fi
 
-    if test -n "$XML2_CONFIG"; then
-      XML2_CFLAGS=`$XML2_CONFIG --cflags`
-      XML2_LIBS=`$XML2_CONFIG --libs`
-    fi
-  fi
-  # Note the user could also set XML2_CFLAGS/XML2_LIBS directly
-  for pgac_option in $XML2_CFLAGS; do
-    case $pgac_option in
-      -I*|-D*) INCLUDES="$INCLUDES $pgac_option";;
-    esac
-  done
-  for pgac_option in $XML2_LIBS; do
-    case $pgac_option in
-      -L*) LIBDIRS="$LIBDIRS $pgac_option";;
-    esac
-  done
+		if test -n "$XML2_CONFIG"; then
+			XML2_CFLAGS=`$XML2_CONFIG --cflags`
+			XML2_LIBS=`$XML2_CONFIG --libs`
+		fi
+	fi
+	# Note the user could also set XML2_CFLAGS/XML2_LIBS directly
+	for pgac_option in $XML2_CFLAGS; do
+		case $pgac_option in
+			-I*|-D*) INCLUDES="$INCLUDES $pgac_option";;
+		esac
+	done
+	for pgac_option in $XML2_LIBS; do
+		case $pgac_option in
+			-L*) LIBDIRS="$LIBDIRS $pgac_option";;
+		esac
+	done
 fi
 
 
@@ -9268,23 +9268,23 @@ fi
 
 # Check whether --with-libxslt was given.
 if test "${with_libxslt+set}" = set; then :
-  withval=$with_libxslt;
-  case $withval in
-    yes)
+	withval=$with_libxslt;
+	case $withval in
+		yes)
 
 $as_echo "#define USE_LIBXSLT 1" >>confdefs.h
 
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-libxslt option" "$LINENO" 5
-      ;;
-  esac
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-libxslt option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_libxslt=no
+	with_libxslt=no
 
 fi
 
@@ -9301,18 +9301,18 @@ fi
 
 # Check whether --with-system-tzdata was given.
 if test "${with_system_tzdata+set}" = set; then :
-  withval=$with_system_tzdata;
-  case $withval in
-    yes)
-      as_fn_error $? "argument required for --with-system-tzdata option" "$LINENO" 5
-      ;;
-    no)
-      as_fn_error $? "argument required for --with-system-tzdata option" "$LINENO" 5
-      ;;
-    *)
-
-      ;;
-  esac
+	withval=$with_system_tzdata;
+	case $withval in
+		yes)
+			as_fn_error $? "argument required for --with-system-tzdata option" "$LINENO" 5
+			;;
+		no)
+			as_fn_error $? "argument required for --with-system-tzdata option" "$LINENO" 5
+			;;
+		*)
+
+			;;
+	esac
 
 fi
 
@@ -9327,21 +9327,21 @@ fi
 
 # Check whether --with-zlib was given.
 if test "${with_zlib+set}" = set; then :
-  withval=$with_zlib;
-  case $withval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-zlib option" "$LINENO" 5
-      ;;
-  esac
+	withval=$with_zlib;
+	case $withval in
+		yes)
+			:
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-zlib option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_zlib=yes
+	with_zlib=yes
 
 fi
 
@@ -9358,23 +9358,23 @@ $as_echo_n "checking whether to build with LZ4 support... " >&6; }
 
 # Check whether --with-lz4 was given.
 if test "${with_lz4+set}" = set; then :
-  withval=$with_lz4;
-  case $withval in
-    yes)
+	withval=$with_lz4;
+	case $withval in
+		yes)
 
 $as_echo "#define USE_LZ4 1" >>confdefs.h
 
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-lz4 option" "$LINENO" 5
-      ;;
-  esac
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-lz4 option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_lz4=no
+	with_lz4=no
 
 fi
 
@@ -9390,56 +9390,56 @@ pkg_failed=no
 $as_echo_n "checking for liblz4... " >&6; }
 
 if test -n "$LZ4_CFLAGS"; then
-    pkg_cv_LZ4_CFLAGS="$LZ4_CFLAGS"
+		pkg_cv_LZ4_CFLAGS="$LZ4_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblz4\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "liblz4") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LZ4_CFLAGS=`$PKG_CONFIG --cflags "liblz4" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+		if test -n "$PKG_CONFIG" && \
+		{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblz4\""; } >&5
+	($PKG_CONFIG --exists --print-errors "liblz4") 2>&5
+	ac_status=$?
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; }; then
+	pkg_cv_LZ4_CFLAGS=`$PKG_CONFIG --cflags "liblz4" 2>/dev/null`
+					test "x$?" != "x0" && pkg_failed=yes
 else
-  pkg_failed=yes
+	pkg_failed=yes
 fi
  else
-    pkg_failed=untried
+		pkg_failed=untried
 fi
 if test -n "$LZ4_LIBS"; then
-    pkg_cv_LZ4_LIBS="$LZ4_LIBS"
+		pkg_cv_LZ4_LIBS="$LZ4_LIBS"
  elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblz4\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "liblz4") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LZ4_LIBS=`$PKG_CONFIG --libs "liblz4" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+		if test -n "$PKG_CONFIG" && \
+		{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblz4\""; } >&5
+	($PKG_CONFIG --exists --print-errors "liblz4") 2>&5
+	ac_status=$?
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; }; then
+	pkg_cv_LZ4_LIBS=`$PKG_CONFIG --libs "liblz4" 2>/dev/null`
+					test "x$?" != "x0" && pkg_failed=yes
 else
-  pkg_failed=yes
+	pkg_failed=yes
 fi
  else
-    pkg_failed=untried
+		pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
+				_pkg_short_errors_supported=yes
 else
-        _pkg_short_errors_supported=no
+				_pkg_short_errors_supported=no
 fi
-        if test $_pkg_short_errors_supported = yes; then
-	        LZ4_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "liblz4" 2>&1`
-        else
-	        LZ4_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "liblz4" 2>&1`
-        fi
+				if test $_pkg_short_errors_supported = yes; then
+					LZ4_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "liblz4" 2>&1`
+				else
+					LZ4_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "liblz4" 2>&1`
+				fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LZ4_PKG_ERRORS" >&5
 
@@ -9454,7 +9454,7 @@ Alternatively, you may set the environment variables LZ4_CFLAGS
 and LZ4_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -9471,22 +9471,22 @@ See \`config.log' for more details" "$LINENO" 5; }
 else
 	LZ4_CFLAGS=$pkg_cv_LZ4_CFLAGS
 	LZ4_LIBS=$pkg_cv_LZ4_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 fi
-  # We only care about -I, -D, and -L switches;
-  # note that -llz4 will be added by AC_CHECK_LIB below.
-  for pgac_option in $LZ4_CFLAGS; do
-    case $pgac_option in
-      -I*|-D*) INCLUDES="$INCLUDES $pgac_option";;
-    esac
-  done
-  for pgac_option in $LZ4_LIBS; do
-    case $pgac_option in
-      -L*) LIBDIRS="$LIBDIRS $pgac_option";;
-    esac
-  done
+	# We only care about -I, -D, and -L switches;
+	# note that -llz4 will be added by AC_CHECK_LIB below.
+	for pgac_option in $LZ4_CFLAGS; do
+		case $pgac_option in
+			-I*|-D*) INCLUDES="$INCLUDES $pgac_option";;
+		esac
+	done
+	for pgac_option in $LZ4_LIBS; do
+		case $pgac_option in
+			-L*) LIBDIRS="$LIBDIRS $pgac_option";;
+		esac
+	done
 fi
 
 #
@@ -9499,23 +9499,23 @@ $as_echo_n "checking whether to build with ZSTD support... " >&6; }
 
 # Check whether --with-zstd was given.
 if test "${with_zstd+set}" = set; then :
-  withval=$with_zstd;
-  case $withval in
-    yes)
+	withval=$with_zstd;
+	case $withval in
+		yes)
 
 $as_echo "#define USE_ZSTD 1" >>confdefs.h
 
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-zstd option" "$LINENO" 5
-      ;;
-  esac
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-zstd option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_zstd=no
+	with_zstd=no
 
 fi
 
@@ -9531,56 +9531,56 @@ pkg_failed=no
 $as_echo_n "checking for libzstd >= 1.4.0... " >&6; }
 
 if test -n "$ZSTD_CFLAGS"; then
-    pkg_cv_ZSTD_CFLAGS="$ZSTD_CFLAGS"
+		pkg_cv_ZSTD_CFLAGS="$ZSTD_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzstd >= 1.4.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libzstd >= 1.4.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_ZSTD_CFLAGS=`$PKG_CONFIG --cflags "libzstd >= 1.4.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+		if test -n "$PKG_CONFIG" && \
+		{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzstd >= 1.4.0\""; } >&5
+	($PKG_CONFIG --exists --print-errors "libzstd >= 1.4.0") 2>&5
+	ac_status=$?
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; }; then
+	pkg_cv_ZSTD_CFLAGS=`$PKG_CONFIG --cflags "libzstd >= 1.4.0" 2>/dev/null`
+					test "x$?" != "x0" && pkg_failed=yes
 else
-  pkg_failed=yes
+	pkg_failed=yes
 fi
  else
-    pkg_failed=untried
+		pkg_failed=untried
 fi
 if test -n "$ZSTD_LIBS"; then
-    pkg_cv_ZSTD_LIBS="$ZSTD_LIBS"
+		pkg_cv_ZSTD_LIBS="$ZSTD_LIBS"
  elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzstd >= 1.4.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libzstd >= 1.4.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_ZSTD_LIBS=`$PKG_CONFIG --libs "libzstd >= 1.4.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+		if test -n "$PKG_CONFIG" && \
+		{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzstd >= 1.4.0\""; } >&5
+	($PKG_CONFIG --exists --print-errors "libzstd >= 1.4.0") 2>&5
+	ac_status=$?
+	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+	test $ac_status = 0; }; then
+	pkg_cv_ZSTD_LIBS=`$PKG_CONFIG --libs "libzstd >= 1.4.0" 2>/dev/null`
+					test "x$?" != "x0" && pkg_failed=yes
 else
-  pkg_failed=yes
+	pkg_failed=yes
 fi
  else
-    pkg_failed=untried
+		pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
+				_pkg_short_errors_supported=yes
 else
-        _pkg_short_errors_supported=no
+				_pkg_short_errors_supported=no
 fi
-        if test $_pkg_short_errors_supported = yes; then
-	        ZSTD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libzstd >= 1.4.0" 2>&1`
-        else
-	        ZSTD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libzstd >= 1.4.0" 2>&1`
-        fi
+				if test $_pkg_short_errors_supported = yes; then
+					ZSTD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libzstd >= 1.4.0" 2>&1`
+				else
+					ZSTD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libzstd >= 1.4.0" 2>&1`
+				fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$ZSTD_PKG_ERRORS" >&5
 
@@ -9595,7 +9595,7 @@ Alternatively, you may set the environment variables ZSTD_CFLAGS
 and ZSTD_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -9612,22 +9612,22 @@ See \`config.log' for more details" "$LINENO" 5; }
 else
 	ZSTD_CFLAGS=$pkg_cv_ZSTD_CFLAGS
 	ZSTD_LIBS=$pkg_cv_ZSTD_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 fi
-  # We only care about -I, -D, and -L switches;
-  # note that -lzstd will be added by AC_CHECK_LIB below.
-  for pgac_option in $ZSTD_CFLAGS; do
-    case $pgac_option in
-      -I*|-D*) INCLUDES="$INCLUDES $pgac_option";;
-    esac
-  done
-  for pgac_option in $ZSTD_LIBS; do
-    case $pgac_option in
-      -L*) LIBDIRS="$LIBDIRS $pgac_option";;
-    esac
-  done
+	# We only care about -I, -D, and -L switches;
+	# note that -lzstd will be added by AC_CHECK_LIB below.
+	for pgac_option in $ZSTD_CFLAGS; do
+		case $pgac_option in
+			-I*|-D*) INCLUDES="$INCLUDES $pgac_option";;
+		esac
+	done
+	for pgac_option in $ZSTD_LIBS; do
+		case $pgac_option in
+			-L*) LIBDIRS="$LIBDIRS $pgac_option";;
+		esac
+	done
 fi
 #
 # Assignments
@@ -9640,309 +9640,309 @@ LDFLAGS="$LDFLAGS $LIBDIRS"
 
 
 
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+	if test -n "$ac_tool_prefix"; then
+	# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+	if test -n "$STRIP"; then
+	ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
 $as_echo "$STRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
+	ac_ct_STRIP=$STRIP
+	# Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+	if test -n "$ac_ct_STRIP"; then
+	ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_prog_ac_ct_STRIP="strip"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
 $as_echo "$ac_ct_STRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
+	if test "x$ac_ct_STRIP" = x; then
+		STRIP=":"
+	else
+		case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    STRIP=$ac_ct_STRIP
-  fi
+		STRIP=$ac_ct_STRIP
+	fi
 else
-  STRIP="$ac_cv_prog_STRIP"
+	STRIP="$ac_cv_prog_STRIP"
 fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is possible to strip libraries" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is possible to strip libraries" >&5
 $as_echo_n "checking whether it is possible to strip libraries... " >&6; }
-  if test x"$STRIP" != x"" && "$STRIP" -V 2>&1 | grep "GNU strip" >/dev/null; then
-    STRIP_STATIC_LIB="$STRIP --strip-unneeded"
-    STRIP_SHARED_LIB="$STRIP --strip-unneeded"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+	if test x"$STRIP" != x"" && "$STRIP" -V 2>&1 | grep "GNU strip" >/dev/null; then
+		STRIP_STATIC_LIB="$STRIP --strip-unneeded"
+		STRIP_SHARED_LIB="$STRIP --strip-unneeded"
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-  else
-    case $host_os in
-      darwin*)
-        STRIP="$STRIP -x"
-        STRIP_STATIC_LIB=$STRIP
-        STRIP_SHARED_LIB=$STRIP
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+	else
+		case $host_os in
+			darwin*)
+				STRIP="$STRIP -x"
+				STRIP_STATIC_LIB=$STRIP
+				STRIP_SHARED_LIB=$STRIP
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-        ;;
-      *)
-        STRIP_STATIC_LIB=:
-        STRIP_SHARED_LIB=:
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+				;;
+			*)
+				STRIP_STATIC_LIB=:
+				STRIP_SHARED_LIB=:
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-        ;;
-    esac
-  fi
+				;;
+		esac
+	fi
 
 
 
 if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+	# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
+	if test -n "$AR"; then
+	ac_cv_prog_AR="$AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_prog_AR="${ac_tool_prefix}ar"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
 fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
 $as_echo "$AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
+	ac_ct_AR=$AR
+	# Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+	if test -n "$ac_ct_AR"; then
+	ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_prog_ac_ct_AR="ar"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
 $as_echo "$ac_ct_AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_AR" = x; then
-    AR="ar"
-  else
-    case $cross_compiling:$ac_tool_warned in
+	if test "x$ac_ct_AR" = x; then
+		AR="ar"
+	else
+		case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    AR=$ac_ct_AR
-  fi
+		AR=$ac_ct_AR
+	fi
 else
-  AR="$ac_cv_prog_AR"
+	AR="$ac_cv_prog_AR"
 fi
 
 if test "$PORTNAME" = "win32"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
+	if test -n "$ac_tool_prefix"; then
+	# Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_WINDRES+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if test -n "$WINDRES"; then
-  ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
+	if test -n "$WINDRES"; then
+	ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
 fi
 fi
 WINDRES=$ac_cv_prog_WINDRES
 if test -n "$WINDRES"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
 $as_echo "$WINDRES" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_WINDRES"; then
-  ac_ct_WINDRES=$WINDRES
-  # Extract the first word of "windres", so it can be a program name with args.
+	ac_ct_WINDRES=$WINDRES
+	# Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_WINDRES+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_WINDRES"; then
-  ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
+	if test -n "$ac_ct_WINDRES"; then
+	ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_WINDRES="windres"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_prog_ac_ct_WINDRES="windres"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
 if test -n "$ac_ct_WINDRES"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5
 $as_echo "$ac_ct_WINDRES" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_WINDRES" = x; then
-    WINDRES="windres"
-  else
-    case $cross_compiling:$ac_tool_warned in
+	if test "x$ac_ct_WINDRES" = x; then
+		WINDRES="windres"
+	else
+		case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    WINDRES=$ac_ct_WINDRES
-  fi
+		WINDRES=$ac_ct_WINDRES
+	fi
 else
-  WINDRES="$ac_cv_prog_WINDRES"
+	WINDRES="$ac_cv_prog_WINDRES"
 fi
 
 fi
@@ -9965,69 +9965,69 @@ fi
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if ${ac_cv_path_install+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		# Account for people who put trailing slashes in PATH elements.
 case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
+	./ | .// | /[cC]/* | \
+	/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+	?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+	/usr/ucb/* ) ;;
+	*)
+		# OSF1 and SCO ODT 3.0 have their own names for install.
+		# Don't use installbsd from OSF since it installs stuff as root
+		# by default.
+		for ac_prog in ginstall scoinst install; do
+			for ac_exec_ext in '' $ac_executable_extensions; do
 	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
+		if test $ac_prog = install &&
+			grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+			# AIX install.  It has an incompatible calling convention.
+			:
+		elif test $ac_prog = install &&
+			grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+			# program-specific install script used by HP pwplus--don't use.
+			:
+		else
+			rm -rf conftest.one conftest.two conftest.dir
+			echo one > conftest.one
+			echo two > conftest.two
+			mkdir conftest.dir
+			if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+				test -s conftest.one && test -s conftest.two &&
+				test -s conftest.dir/conftest.one &&
+				test -s conftest.dir/conftest.two
+			then
+				ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+				break 3
+			fi
+		fi
 	fi
-      done
-    done
-    ;;
+			done
+		done
+		;;
 esac
 
-  done
+	done
 IFS=$as_save_IFS
 
 rm -rf conftest.one conftest.two conftest.dir
 
 fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
+	if test "${ac_cv_path_install+set}" = set; then
+		INSTALL=$ac_cv_path_install
+	else
+		# As a last resort, use the slow shell script.  Don't cache a
+		# value for INSTALL within a source directory, because that will
+		# break other packages using the cache if that directory is
+		# removed, or if the value is a relative name.
+		INSTALL=$ac_install_sh
+	fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
 $as_echo "$INSTALL" >&6; }
@@ -10044,62 +10044,62 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 # a relative path to it in each makefile where it substitutes it. This clashes
 # with our Makefile.global concept. This workaround helps.
 case $INSTALL in
-  *install-sh*) install_bin='';;
-  *) install_bin=$INSTALL;;
+	*install-sh*) install_bin='';;
+	*) install_bin=$INSTALL;;
 esac
 
 
 if test -z "$TAR"; then
-  for ac_prog in tar
+	for ac_prog in tar
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_TAR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $TAR in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_TAR="$TAR" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $TAR in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_TAR="$TAR" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_TAR="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_TAR="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 TAR=$ac_cv_path_TAR
 if test -n "$TAR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAR" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAR" >&5
 $as_echo "$TAR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$TAR" && break
+	test -n "$TAR" && break
 done
 
 else
-  # Report the value of TAR in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TAR" >&5
+	# Report the value of TAR in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TAR" >&5
 $as_echo_n "checking for TAR... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAR" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAR" >&5
 $as_echo "$TAR" >&6; }
 fi
 
@@ -10107,51 +10107,51 @@ fi
 $as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
 $as_echo "no, using $LN_S" >&6; }
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
-  $as_echo_n "(cached) " >&6
+	if ${ac_cv_path_mkdir+:} false; then :
+	$as_echo_n "(cached) " >&6
 else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in mkdir gmkdir; do
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
+		 as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+		 case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+			 'mkdir (GNU coreutils) '* | \
+			 'mkdir (coreutils) '* | \
+			 'mkdir (fileutils) '4.1*)
+				 ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+				 break 3;;
+		 esac
 	 done
-       done
-  done
+			 done
+	done
 IFS=$as_save_IFS
 
 fi
 
-  test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    MKDIR_P="$ac_install_sh -d"
-  fi
+	test -d ./--version && rmdir ./--version
+	if test "${ac_cv_path_mkdir+set}" = set; then
+		MKDIR_P="$ac_cv_path_mkdir -p"
+	else
+		# As a last resort, use the slow shell script.  Don't cache a
+		# value for MKDIR_P within a source directory, because that will
+		# break other packages using the cache if that directory is
+		# removed, or if the value is a relative name.
+		MKDIR_P="$ac_install_sh -d"
+	fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
@@ -10160,7 +10160,7 @@ $as_echo "$MKDIR_P" >&6; }
 # a relative path to it in each makefile where it substitutes it. This clashes
 # with our Makefile.global concept. This workaround helps.
 case $MKDIR_P in
-  *install-sh*) MKDIR_P='\${SHELL} \${top_srcdir}/config/install-sh -c -d';;
+	*install-sh*) MKDIR_P='\${SHELL} \${top_srcdir}/config/install-sh -c -d';;
 esac
 
 # Extract the first word of "nm", so it can be a program name with args.
@@ -10168,178 +10168,178 @@ set dummy nm; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_NM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $NM in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_NM="$NM" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $NM in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_NM="$NM" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 NM=$ac_cv_path_NM
 if test -n "$NM"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5
 $as_echo "$NM" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 
 if test -z "$BISON"; then
-  for ac_prog in bison
+	for ac_prog in bison
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_BISON+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $BISON in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_BISON="$BISON" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $BISON in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_BISON="$BISON" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_BISON="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_BISON="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 BISON=$ac_cv_path_BISON
 if test -n "$BISON"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5
 $as_echo "$BISON" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$BISON" && break
+	test -n "$BISON" && break
 done
 
 else
-  # Report the value of BISON in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BISON" >&5
+	# Report the value of BISON in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BISON" >&5
 $as_echo_n "checking for BISON... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5
 $as_echo "$BISON" >&6; }
 fi
 
 
 if test "$BISON"; then
-  pgac_bison_version=`$BISON --version 2>/dev/null | sed q`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: using $pgac_bison_version" >&5
+	pgac_bison_version=`$BISON --version 2>/dev/null | sed q`
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: using $pgac_bison_version" >&5
 $as_echo "$as_me: using $pgac_bison_version" >&6;}
-  if echo "$pgac_bison_version" | $AWK '{ if ($4 < 2.3) exit 0; else exit 1;}'
-  then
-    as_fn_error $? "
+	if echo "$pgac_bison_version" | $AWK '{ if ($4 < 2.3) exit 0; else exit 1;}'
+	then
+		as_fn_error $? "
 *** The installed version of Bison, $BISON, is too old to use with PostgreSQL.
 *** Bison version 2.3 or later is required, but this is $pgac_bison_version." "$LINENO" 5
-  fi
-  # Bison >=3.0 issues warnings about %name-prefix="base_yy", instead
-  # of the now preferred %name-prefix "base_yy", but the latter
-  # doesn't work with Bison 2.3 or less.  So for now we silence the
-  # deprecation warnings.
-  if echo "$pgac_bison_version" | $AWK '{ if ($4 >= 3) exit 0; else exit 1;}'
-  then
-    BISONFLAGS="$BISONFLAGS -Wno-deprecated"
-  fi
+	fi
+	# Bison >=3.0 issues warnings about %name-prefix="base_yy", instead
+	# of the now preferred %name-prefix "base_yy", but the latter
+	# doesn't work with Bison 2.3 or less.  So for now we silence the
+	# deprecation warnings.
+	if echo "$pgac_bison_version" | $AWK '{ if ($4 >= 3) exit 0; else exit 1;}'
+	then
+		BISONFLAGS="$BISONFLAGS -Wno-deprecated"
+	fi
 fi
 
 if test -z "$BISON"; then
-  as_fn_error $? "bison not found" "$LINENO" 5
+	as_fn_error $? "bison not found" "$LINENO" 5
 fi
 
 
 if test -z "$FLEX"; then
-  for ac_prog in flex
+	for ac_prog in flex
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_FLEX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $FLEX in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_FLEX="$FLEX" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $FLEX in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_FLEX="$FLEX" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_FLEX="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_FLEX="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 FLEX=$ac_cv_path_FLEX
 if test -n "$FLEX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5
 $as_echo "$FLEX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$FLEX" && break
+	test -n "$FLEX" && break
 done
 
 else
-  # Report the value of FLEX in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLEX" >&5
+	# Report the value of FLEX in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLEX" >&5
 $as_echo_n "checking for FLEX... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5
 $as_echo "$FLEX" >&6; }
 fi
 
 if test -z "$FLEX"; then
-  as_fn_error $? "flex not found" "$LINENO" 5
+	as_fn_error $? "flex not found" "$LINENO" 5
 fi
 
 pgac_flex_version=`$FLEX --version 2>/dev/null`
@@ -10351,81 +10351,81 @@ $as_echo "$as_me: using $pgac_flex_version" >&6;}
 
 
 if test -z "$PERL"; then
-  for ac_prog in perl
+	for ac_prog in perl
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_PERL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PERL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $PERL in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 PERL=$ac_cv_path_PERL
 if test -n "$PERL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
 $as_echo "$PERL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$PERL" && break
+	test -n "$PERL" && break
 done
 
 else
-  # Report the value of PERL in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PERL" >&5
+	# Report the value of PERL in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PERL" >&5
 $as_echo_n "checking for PERL... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
 $as_echo "$PERL" >&6; }
 fi
 
 
 if test "$PERL"; then
-  pgac_perl_version=`$PERL -v 2>/dev/null | sed -n 's/This is perl.*v[a-z ]*\([0-9]\.[0-9][0-9.]*\).*$/\1/p'`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: using perl $pgac_perl_version" >&5
+	pgac_perl_version=`$PERL -v 2>/dev/null | sed -n 's/This is perl.*v[a-z ]*\([0-9]\.[0-9][0-9.]*\).*$/\1/p'`
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: using perl $pgac_perl_version" >&5
 $as_echo "$as_me: using perl $pgac_perl_version" >&6;}
-  if echo "$pgac_perl_version" | sed 's/[.a-z_]/ /g' | \
-    $AWK '{ if ($1 == 5 && ($2 >= 14)) exit 1; else exit 0;}'
-  then
-    as_fn_error $? "
+	if echo "$pgac_perl_version" | sed 's/[.a-z_]/ /g' | \
+		$AWK '{ if ($1 == 5 && ($2 >= 14)) exit 1; else exit 0;}'
+	then
+		as_fn_error $? "
 *** The installed version of Perl, $PERL, is too old to use with PostgreSQL.
 *** Perl version 5.14 or later is required, but this is $pgac_perl_version." "$LINENO" 5
-  fi
+	fi
 fi
 
 if test -z "$PERL"; then
-  as_fn_error $? "Perl not found" "$LINENO" 5
+	as_fn_error $? "Perl not found" "$LINENO" 5
 fi
 
 if test "$with_perl" = yes; then
-  if test -z "$PERL"; then
-    as_fn_error $? "Perl not found" "$LINENO" 5
-  fi
+	if test -z "$PERL"; then
+		as_fn_error $? "Perl not found" "$LINENO" 5
+	fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Perl archlibexp" >&5
 $as_echo_n "checking for Perl archlibexp... " >&6; }
@@ -10445,21 +10445,21 @@ perl_useshrplib=`$PERL -MConfig -e 'print $Config{useshrplib}'`
 test "$PORTNAME" = "win32" && perl_useshrplib=`echo $perl_useshrplib | sed 's,\\\\,/,g'`
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $perl_useshrplib" >&5
 $as_echo "$perl_useshrplib" >&6; }
-  if test "$perl_useshrplib" != yes && test "$perl_useshrplib" != true; then
-    as_fn_error $? "cannot build PL/Perl because libperl is not a shared library
+	if test "$perl_useshrplib" != yes && test "$perl_useshrplib" != true; then
+		as_fn_error $? "cannot build PL/Perl because libperl is not a shared library
 You might have to rebuild your Perl installation.  Refer to the
 documentation for details.  Use --without-perl to disable building
 PL/Perl." "$LINENO" 5
-  fi
-  # On most platforms, archlibexp is also where the Perl include files live ...
-  perl_includespec="-I$perl_archlibexp/CORE"
-  # ... but on newer macOS versions, we must use -iwithsysroot to look
-  # under $PG_SYSROOT
-  if test \! -f "$perl_archlibexp/CORE/perl.h" ; then
-    if test -f "$PG_SYSROOT$perl_archlibexp/CORE/perl.h" ; then
-      perl_includespec="-iwithsysroot $perl_archlibexp/CORE"
-    fi
-  fi
+	fi
+	# On most platforms, archlibexp is also where the Perl include files live ...
+	perl_includespec="-I$perl_archlibexp/CORE"
+	# ... but on newer macOS versions, we must use -iwithsysroot to look
+	# under $PG_SYSROOT
+	if test \! -f "$perl_archlibexp/CORE/perl.h" ; then
+		if test -f "$PG_SYSROOT$perl_archlibexp/CORE/perl.h" ; then
+			perl_includespec="-iwithsysroot $perl_archlibexp/CORE"
+		fi
+	fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLAGS recommended by Perl" >&5
 $as_echo_n "checking for CFLAGS recommended by Perl... " >&6; }
@@ -10504,62 +10504,62 @@ fi
 fi
 
 if test "$with_python" = yes; then
-  if test -z "$PYTHON"; then
-  for ac_prog in python3 python
+	if test -z "$PYTHON"; then
+	for ac_prog in python3 python
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_PYTHON+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PYTHON in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $PYTHON in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 PYTHON=$ac_cv_path_PYTHON
 if test -n "$PYTHON"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
 $as_echo "$PYTHON" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$PYTHON" && break
+	test -n "$PYTHON" && break
 done
 
 else
-  # Report the value of PYTHON in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYTHON" >&5
+	# Report the value of PYTHON in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYTHON" >&5
 $as_echo_n "checking for PYTHON... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
 $as_echo "$PYTHON" >&6; }
 fi
 
 if test x"$PYTHON" = x""; then
-  as_fn_error $? "Python not found" "$LINENO" 5
+	as_fn_error $? "Python not found" "$LINENO" 5
 fi
 
 
@@ -10572,19 +10572,19 @@ python_minorversion=`echo "$python_fullversion" | sed 's/^[0-9]*\.\([0-9]*\).*/\
 python_version=`echo "$python_fullversion" | sed 's/^\([0-9]*\.[0-9]*\).*/\1/'`
 # Reject unsupported Python versions as soon as practical.
 if test "$python_majorversion" -lt 3; then
-  as_fn_error $? "Python version $python_version is too old (version 3 or later is required)" "$LINENO" 5
+	as_fn_error $? "Python version $python_version is too old (version 3 or later is required)" "$LINENO" 5
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python sysconfig module" >&5
 $as_echo_n "checking for Python sysconfig module... " >&6; }
 if "${PYTHON}" -c 'import sysconfig' 2>&5
 then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-    as_fn_error $? "sysconfig module not found" "$LINENO" 5
+		as_fn_error $? "sysconfig module not found" "$LINENO" 5
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python configuration directory" >&5
@@ -10597,7 +10597,7 @@ $as_echo "$python_configdir" >&6; }
 $as_echo_n "checking Python include directory... " >&6; }
 python_includespec=`${PYTHON} -c "import sysconfig; print('-I' + sysconfig.get_config_var('INCLUDEPY'))"`
 if test "$PORTNAME" = win32 ; then
-    python_includespec=`echo $python_includespec | sed 's,[\],/,g'`
+		python_includespec=`echo $python_includespec | sed 's,[\],/,g'`
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $python_includespec" >&5
 $as_echo "$python_includespec" >&6; }
@@ -10691,66 +10691,66 @@ $as_echo "${python_libspec} ${python_additional_libs}" >&6; }
 fi
 
 if test x"$cross_compiling" = x"yes" && test -z "$with_system_tzdata"; then
-  if test -z "$ZIC"; then
-  for ac_prog in zic
+	if test -z "$ZIC"; then
+	for ac_prog in zic
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_ZIC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ZIC in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ZIC="$ZIC" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $ZIC in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_ZIC="$ZIC" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ZIC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_ZIC="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 ZIC=$ac_cv_path_ZIC
 if test -n "$ZIC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIC" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIC" >&5
 $as_echo "$ZIC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$ZIC" && break
+	test -n "$ZIC" && break
 done
 
 else
-  # Report the value of ZIC in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZIC" >&5
+	# Report the value of ZIC in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZIC" >&5
 $as_echo_n "checking for ZIC... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIC" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIC" >&5
 $as_echo "$ZIC" >&6; }
 fi
 
-  if test -z "$ZIC"; then
-    as_fn_error $? "
+	if test -z "$ZIC"; then
+		as_fn_error $? "
 When cross-compiling, either use the option --with-system-tzdata to use
 existing time-zone data, or set the environment variable ZIC to a zic
 program to use during the build." "$LINENO" 5
-  fi
+	fi
 fi
 
 #
@@ -10768,128 +10768,128 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
 if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+						ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+		 for ac_i in 1 2 3 4 5 6 7; do
+			 ac_script="$ac_script$as_nl$ac_script"
+		 done
+		 echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+		 { ac_script=; unset ac_script;}
+		 if test -z "$SED"; then
+	ac_path_SED_found=false
+	# Loop through the user's path and test for each of PROGNAME-LIST
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_SED" || continue
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_prog in sed gsed; do
+		for ac_exec_ext in '' $ac_executable_extensions; do
+			ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+			as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
+	# Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
 *GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+	ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
 *)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+	ac_count=0
+	$as_echo_n 0123456789 >"conftest.in"
+	while :
+	do
+		cat "conftest.in" "conftest.in" >"conftest.tmp"
+		mv "conftest.tmp" "conftest.in"
+		cp "conftest.in" "conftest.nl"
+		$as_echo '' >> "conftest.nl"
+		"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+		diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+		as_fn_arith $ac_count + 1 && ac_count=$as_val
+		if test $ac_count -gt ${ac_path_SED_max-0}; then
+			# Best one so far, save it but keep looking for a better one
+			ac_cv_path_SED="$ac_path_SED"
+			ac_path_SED_max=$ac_count
+		fi
+		# 10*(2^10) chars as input seems more than enough
+		test $ac_count -gt 10 && break
+	done
+	rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
+			$ac_path_SED_found && break 3
+		done
+	done
+	done
 IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
+	if test -z "$ac_cv_path_SED"; then
+		as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+	fi
 else
-  ac_cv_path_SED=$SED
+	ac_cv_path_SED=$SED
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
 $as_echo "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
-  rm -f conftest.sed
+	rm -f conftest.sed
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	if test -z "$GREP"; then
+	ac_path_GREP_found=false
+	# Loop through the user's path and test for each of PROGNAME-LIST
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_prog in grep ggrep; do
+		for ac_exec_ext in '' $ac_executable_extensions; do
+			ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+			as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
+	# Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+	ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+	ac_count=0
+	$as_echo_n 0123456789 >"conftest.in"
+	while :
+	do
+		cat "conftest.in" "conftest.in" >"conftest.tmp"
+		mv "conftest.tmp" "conftest.in"
+		cp "conftest.in" "conftest.nl"
+		$as_echo 'GREP' >> "conftest.nl"
+		"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+		diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+		as_fn_arith $ac_count + 1 && ac_count=$as_val
+		if test $ac_count -gt ${ac_path_GREP_max-0}; then
+			# Best one so far, save it but keep looking for a better one
+			ac_cv_path_GREP="$ac_path_GREP"
+			ac_path_GREP_max=$ac_count
+		fi
+		# 10*(2^10) chars as input seems more than enough
+		test $ac_count -gt 10 && break
+	done
+	rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
+			$ac_path_GREP_found && break 3
+		done
+	done
+	done
 IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
+	if test -z "$ac_cv_path_GREP"; then
+		as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+	fi
 else
-  ac_cv_path_GREP=$GREP
+	ac_cv_path_GREP=$GREP
 fi
 
 fi
@@ -10901,64 +10901,64 @@ $as_echo "$ac_cv_path_GREP" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
 if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+	 then ac_cv_path_EGREP="$GREP -E"
+	 else
+		 if test -z "$EGREP"; then
+	ac_path_EGREP_found=false
+	# Loop through the user's path and test for each of PROGNAME-LIST
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_prog in egrep; do
+		for ac_exec_ext in '' $ac_executable_extensions; do
+			ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+			as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
+	# Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+	ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+	ac_count=0
+	$as_echo_n 0123456789 >"conftest.in"
+	while :
+	do
+		cat "conftest.in" "conftest.in" >"conftest.tmp"
+		mv "conftest.tmp" "conftest.in"
+		cp "conftest.in" "conftest.nl"
+		$as_echo 'EGREP' >> "conftest.nl"
+		"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+		diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+		as_fn_arith $ac_count + 1 && ac_count=$as_val
+		if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+			# Best one so far, save it but keep looking for a better one
+			ac_cv_path_EGREP="$ac_path_EGREP"
+			ac_path_EGREP_max=$ac_count
+		fi
+		# 10*(2^10) chars as input seems more than enough
+		test $ac_count -gt 10 && break
+	done
+	rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
+			$ac_path_EGREP_found && break 3
+		done
+	done
+	done
 IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
+	if test -z "$ac_cv_path_EGREP"; then
+		as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+	fi
 else
-  ac_cv_path_EGREP=$EGREP
+	ac_cv_path_EGREP=$EGREP
 fi
 
-   fi
+	 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
 $as_echo "$ac_cv_path_EGREP" >&6; }
@@ -10968,9 +10968,9 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
 if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -10981,57 +10981,57 @@ int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
+	ac_cv_header_stdc=yes
 else
-  ac_cv_header_stdc=no
+	ac_cv_header_stdc=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
+	$EGREP "memchr" >/dev/null 2>&1; then :
 
 else
-  ac_cv_header_stdc=no
+	ac_cv_header_stdc=no
 fi
 rm -f conftest*
 
 fi
 
 if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
+	$EGREP "free" >/dev/null 2>&1; then :
 
 else
-  ac_cv_header_stdc=no
+	ac_cv_header_stdc=no
 fi
 rm -f conftest*
 
 fi
 
 if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
+	# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+	if test "$cross_compiling" = yes; then :
+	:
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -11040,9 +11040,9 @@ else
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
 #else
 # define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
+			 (('a' <= (c) && (c) <= 'i') \
+				 || ('j' <= (c) && (c) <= 'r') \
+				 || ('s' <= (c) && (c) <= 'z'))
 # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
 #endif
 
@@ -11050,21 +11050,21 @@ else
 int
 main ()
 {
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
+	int i;
+	for (i = 0; i < 256; i++)
+		if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
+			return 2;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
 
 else
-  ac_cv_header_stdc=no
+	ac_cv_header_stdc=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+	conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
@@ -11079,13 +11079,13 @@ fi
 
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
+			inttypes.h stdint.h unistd.h
 do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
@@ -11095,7 +11095,7 @@ done
 
 
 if test "$PORTNAME" != "win32"; then :
-   # then
+	 # then
 
 
 
@@ -11116,22 +11116,22 @@ ax_pthread_ok=no
 # etcetera environment variables, and if threads linking works using
 # them:
 if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
-        ax_pthread_save_CC="$CC"
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        if test "x$PTHREAD_CC" != "x"; then :
-  CC="$PTHREAD_CC"
-fi
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS" >&5
+				ax_pthread_save_CC="$CC"
+				ax_pthread_save_CFLAGS="$CFLAGS"
+				ax_pthread_save_LIBS="$LIBS"
+				if test "x$PTHREAD_CC" != "x"; then :
+	CC="$PTHREAD_CC"
+fi
+				CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+				LIBS="$PTHREAD_LIBS $LIBS"
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS" >&5
 $as_echo_n "checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS... " >&6; }
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+				cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -11140,24 +11140,24 @@ int
 main ()
 {
 return pthread_join ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ax_pthread_ok=yes
+	ax_pthread_ok=yes
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
+		conftest$ac_exeext conftest.$ac_ext
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
 $as_echo "$ax_pthread_ok" >&6; }
-        if test "x$ax_pthread_ok" = "xno"; then
-                PTHREAD_LIBS=""
-                PTHREAD_CFLAGS=""
-        fi
-        CC="$ax_pthread_save_CC"
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
+				if test "x$ax_pthread_ok" = "xno"; then
+								PTHREAD_LIBS=""
+								PTHREAD_CFLAGS=""
+				fi
+				CC="$ax_pthread_save_CC"
+				CFLAGS="$ax_pthread_save_CFLAGS"
+				LIBS="$ax_pthread_save_LIBS"
 fi
 
 # We must check for the threads library under a number of different
@@ -11194,64 +11194,64 @@ ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --
 
 case $host_os in
 
-        freebsd*)
+				freebsd*)
 
-        # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-        # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+				# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+				# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
 
-        ax_pthread_flags="-kthread lthread $ax_pthread_flags"
-        ;;
+				ax_pthread_flags="-kthread lthread $ax_pthread_flags"
+				;;
 
-        hpux*)
+				hpux*)
 
-        # From the cc(1) man page: "[-mt] Sets various -D flags to enable
-        # multi-threading and also sets -lpthread."
+				# From the cc(1) man page: "[-mt] Sets various -D flags to enable
+				# multi-threading and also sets -lpthread."
 
-        ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
-        ;;
+				ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
+				;;
 
-        openedition*)
+				openedition*)
 
-        # IBM z/OS requires a feature-test macro to be defined in order to
-        # enable POSIX threads at all, so give the user a hint if this is
-        # not set. (We don't define these ourselves, as they can affect
-        # other portions of the system API in unpredictable ways.)
+				# IBM z/OS requires a feature-test macro to be defined in order to
+				# enable POSIX threads at all, so give the user a hint if this is
+				# not set. (We don't define these ourselves, as they can affect
+				# other portions of the system API in unpredictable ways.)
 
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+				cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #            if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
-             AX_PTHREAD_ZOS_MISSING
+						 AX_PTHREAD_ZOS_MISSING
 #            endif
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "AX_PTHREAD_ZOS_MISSING" >/dev/null 2>&1; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&5
+	$EGREP "AX_PTHREAD_ZOS_MISSING" >/dev/null 2>&1; then :
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&5
 $as_echo "$as_me: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&2;}
 fi
 rm -f conftest*
 
-        ;;
+				;;
 
-        solaris*)
+				solaris*)
 
-        # On Solaris (at least, for some versions), libc contains stubbed
-        # (non-functional) versions of the pthreads routines, so link-based
-        # tests will erroneously succeed. (N.B.: The stubs are missing
-        # pthread_cleanup_push, or rather a function called by this macro,
-        # so we could check for that, but who knows whether they'll stub
-        # that too in a future libc.)  So we'll check first for the
-        # standard Solaris way of linking pthreads (-mt -lpthread).
+				# On Solaris (at least, for some versions), libc contains stubbed
+				# (non-functional) versions of the pthreads routines, so link-based
+				# tests will erroneously succeed. (N.B.: The stubs are missing
+				# pthread_cleanup_push, or rather a function called by this macro,
+				# so we could check for that, but who knows whether they'll stub
+				# that too in a future libc.)  So we'll check first for the
+				# standard Solaris way of linking pthreads (-mt -lpthread).
 
-        ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags"
-        ;;
+				ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags"
+				;;
 esac
 
 # GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
 
 if test "x$GCC" = "xyes"; then :
-  ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"
+	ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"
 fi
 
 # The presence of a feature test macro requesting re-entrant function
@@ -11259,22 +11259,22 @@ fi
 # correctly enabled
 
 case $host_os in
-        darwin* | hpux* | linux* | osf* | solaris*)
-        ax_pthread_check_macro="_REENTRANT"
-        ;;
+				darwin* | hpux* | linux* | osf* | solaris*)
+				ax_pthread_check_macro="_REENTRANT"
+				;;
 
-        aix*)
-        ax_pthread_check_macro="_THREAD_SAFE"
-        ;;
+				aix*)
+				ax_pthread_check_macro="_THREAD_SAFE"
+				;;
 
-        *)
-        ax_pthread_check_macro="--"
-        ;;
+				*)
+				ax_pthread_check_macro="--"
+				;;
 esac
 if test "x$ax_pthread_check_macro" = "x--"; then :
-  ax_pthread_check_cond=0
+	ax_pthread_check_cond=0
 else
-  ax_pthread_check_cond="!defined($ax_pthread_check_macro)"
+	ax_pthread_check_cond="!defined($ax_pthread_check_macro)"
 fi
 
 # Are we compiling with Clang?
@@ -11282,26 +11282,26 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC is Clang" >&5
 $as_echo_n "checking whether $CC is Clang... " >&6; }
 if ${ax_cv_PTHREAD_CLANG+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ax_cv_PTHREAD_CLANG=no
-     # Note that Autoconf sets GCC=yes for Clang as well as GCC
-     if test "x$GCC" = "xyes"; then
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	ax_cv_PTHREAD_CLANG=no
+		 # Note that Autoconf sets GCC=yes for Clang as well as GCC
+		 if test "x$GCC" = "xyes"; then
+				cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Note: Clang 2.7 lacks __clang_[a-z]+__ */
 #            if defined(__clang__) && defined(__llvm__)
-             AX_PTHREAD_CC_IS_CLANG
+						 AX_PTHREAD_CC_IS_CLANG
 #            endif
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "AX_PTHREAD_CC_IS_CLANG" >/dev/null 2>&1; then :
-  ax_cv_PTHREAD_CLANG=yes
+	$EGREP "AX_PTHREAD_CC_IS_CLANG" >/dev/null 2>&1; then :
+	ax_cv_PTHREAD_CLANG=yes
 fi
 rm -f conftest*
 
-     fi
+		 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG" >&5
@@ -11315,403 +11315,403 @@ ax_pthread_clang_warning=no
 
 if test "x$ax_pthread_clang" = "xyes"; then
 
-        # Clang takes -pthread; it has never supported any other flag
-
-        # (Note 1: This will need to be revisited if a system that Clang
-        # supports has POSIX threads in a separate library.  This tends not
-        # to be the way of modern systems, but it's conceivable.)
-
-        # (Note 2: On some systems, notably Darwin, -pthread is not needed
-        # to get POSIX threads support; the API is always present and
-        # active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
-        # -pthread does define _REENTRANT, and while the Darwin headers
-        # ignore this macro, third-party headers might not.)
-
-        PTHREAD_CFLAGS="-pthread"
-        PTHREAD_LIBS=
-
-        ax_pthread_ok=yes
-
-        # However, older versions of Clang make a point of warning the user
-        # that, in an invocation where only linking and no compilation is
-        # taking place, the -pthread option has no effect ("argument unused
-        # during compilation").  They expect -pthread to be passed in only
-        # when source code is being compiled.
-        #
-        # Problem is, this is at odds with the way Automake and most other
-        # C build frameworks function, which is that the same flags used in
-        # compilation (CFLAGS) are also used in linking.  Many systems
-        # supported by AX_PTHREAD require exactly this for POSIX threads
-        # support, and in fact it is often not straightforward to specify a
-        # flag that is used only in the compilation phase and not in
-        # linking.  Such a scenario is extremely rare in practice.
-        #
-        # Even though use of the -pthread flag in linking would only print
-        # a warning, this can be a nuisance for well-run software projects
-        # that build with -Werror.  So if the active version of Clang has
-        # this misfeature, we search for an option to squash it.
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread" >&5
+				# Clang takes -pthread; it has never supported any other flag
+
+				# (Note 1: This will need to be revisited if a system that Clang
+				# supports has POSIX threads in a separate library.  This tends not
+				# to be the way of modern systems, but it's conceivable.)
+
+				# (Note 2: On some systems, notably Darwin, -pthread is not needed
+				# to get POSIX threads support; the API is always present and
+				# active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
+				# -pthread does define _REENTRANT, and while the Darwin headers
+				# ignore this macro, third-party headers might not.)
+
+				PTHREAD_CFLAGS="-pthread"
+				PTHREAD_LIBS=
+
+				ax_pthread_ok=yes
+
+				# However, older versions of Clang make a point of warning the user
+				# that, in an invocation where only linking and no compilation is
+				# taking place, the -pthread option has no effect ("argument unused
+				# during compilation").  They expect -pthread to be passed in only
+				# when source code is being compiled.
+				#
+				# Problem is, this is at odds with the way Automake and most other
+				# C build frameworks function, which is that the same flags used in
+				# compilation (CFLAGS) are also used in linking.  Many systems
+				# supported by AX_PTHREAD require exactly this for POSIX threads
+				# support, and in fact it is often not straightforward to specify a
+				# flag that is used only in the compilation phase and not in
+				# linking.  Such a scenario is extremely rare in practice.
+				#
+				# Even though use of the -pthread flag in linking would only print
+				# a warning, this can be a nuisance for well-run software projects
+				# that build with -Werror.  So if the active version of Clang has
+				# this misfeature, we search for an option to squash it.
+
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread" >&5
 $as_echo_n "checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread... " >&6; }
 if ${ax_cv_PTHREAD_CLANG_NO_WARN_FLAG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
-             # Create an alternate version of $ac_link that compiles and
-             # links in two steps (.c -> .o, .o -> exe) instead of one
-             # (.c -> exe), because the warning occurs only in the second
-             # step
-             ax_pthread_save_ac_link="$ac_link"
-             ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
-             ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
-             ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
-             ax_pthread_save_CFLAGS="$CFLAGS"
-             for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
-                if test "x$ax_pthread_try" = "xunknown"; then :
-  break
-fi
-                CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
-                ac_link="$ax_pthread_save_ac_link"
-                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	$as_echo_n "(cached) " >&6
+else
+	ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
+						 # Create an alternate version of $ac_link that compiles and
+						 # links in two steps (.c -> .o, .o -> exe) instead of one
+						 # (.c -> exe), because the warning occurs only in the second
+						 # step
+						 ax_pthread_save_ac_link="$ac_link"
+						 ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
+						 ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
+						 ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
+						 ax_pthread_save_CFLAGS="$CFLAGS"
+						 for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
+								if test "x$ax_pthread_try" = "xunknown"; then :
+	break
+fi
+								CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
+								ac_link="$ax_pthread_save_ac_link"
+								cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void){return 0;}
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_link="$ax_pthread_2step_ac_link"
-                     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	ac_link="$ax_pthread_2step_ac_link"
+										 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void){return 0;}
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  break
+	break
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-             done
-             ac_link="$ax_pthread_save_ac_link"
-             CFLAGS="$ax_pthread_save_CFLAGS"
-             if test "x$ax_pthread_try" = "x"; then :
-  ax_pthread_try=no
+		conftest$ac_exeext conftest.$ac_ext
+						 done
+						 ac_link="$ax_pthread_save_ac_link"
+						 CFLAGS="$ax_pthread_save_CFLAGS"
+						 if test "x$ax_pthread_try" = "x"; then :
+	ax_pthread_try=no
 fi
-             ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
+						 ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&5
 $as_echo "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&6; }
 
-        case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
-                no | unknown) ;;
-                *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
-        esac
+				case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
+								no | unknown) ;;
+								*) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
+				esac
 
 fi # $ax_pthread_clang = yes
 
 if test "x$ax_pthread_ok" = "xno"; then
 for ax_pthread_try_flag in $ax_pthread_flags; do
 
-        case $ax_pthread_try_flag in
-                none)
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5
+				case $ax_pthread_try_flag in
+								none)
+								{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5
 $as_echo_n "checking whether pthreads work without any flags... " >&6; }
-                ;;
+								;;
 
-                -mt,pthread)
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with -mt -lpthread" >&5
+								-mt,pthread)
+								{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with -mt -lpthread" >&5
 $as_echo_n "checking whether pthreads work with -mt -lpthread... " >&6; }
-                PTHREAD_CFLAGS="-mt"
-                PTHREAD_LIBS="-lpthread"
-                ;;
+								PTHREAD_CFLAGS="-mt"
+								PTHREAD_LIBS="-lpthread"
+								;;
 
-                -*)
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $ax_pthread_try_flag" >&5
+								-*)
+								{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $ax_pthread_try_flag" >&5
 $as_echo_n "checking whether pthreads work with $ax_pthread_try_flag... " >&6; }
-                PTHREAD_CFLAGS="$ax_pthread_try_flag"
-                ;;
+								PTHREAD_CFLAGS="$ax_pthread_try_flag"
+								;;
 
-                pthread-config)
-                # Extract the first word of "pthread-config", so it can be a program name with args.
+								pthread-config)
+								# Extract the first word of "pthread-config", so it can be a program name with args.
 set dummy pthread-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ax_pthread_config+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if test -n "$ax_pthread_config"; then
-  ac_cv_prog_ax_pthread_config="$ax_pthread_config" # Let the user override the test.
+	if test -n "$ax_pthread_config"; then
+	ac_cv_prog_ax_pthread_config="$ax_pthread_config" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ax_pthread_config="yes"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_prog_ax_pthread_config="yes"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_ax_pthread_config" && ac_cv_prog_ax_pthread_config="no"
+	test -z "$ac_cv_prog_ax_pthread_config" && ac_cv_prog_ax_pthread_config="no"
 fi
 fi
 ax_pthread_config=$ac_cv_prog_ax_pthread_config
 if test -n "$ax_pthread_config"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_config" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_config" >&5
 $as_echo "$ax_pthread_config" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-                if test "x$ax_pthread_config" = "xno"; then :
-  continue
+								if test "x$ax_pthread_config" = "xno"; then :
+	continue
 fi
-                PTHREAD_CFLAGS="`pthread-config --cflags`"
-                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-                ;;
+								PTHREAD_CFLAGS="`pthread-config --cflags`"
+								PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+								;;
 
-                *)
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$ax_pthread_try_flag" >&5
+								*)
+								{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$ax_pthread_try_flag" >&5
 $as_echo_n "checking for the pthreads library -l$ax_pthread_try_flag... " >&6; }
-                PTHREAD_LIBS="-l$ax_pthread_try_flag"
-                ;;
-        esac
-
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-
-        # Check for various functions.  We must include pthread.h,
-        # since some functions may be macros.  (On the Sequent, we
-        # need a special flag -Kthread to make this header compile.)
-        # We check for pthread_join because it is in -lpthread on IRIX
-        # while pthread_create is in libc.  We check for pthread_attr_init
-        # due to DEC craziness with -lpthreads.  We check for
-        # pthread_cleanup_push because it is one of the few pthread
-        # functions on Solaris that doesn't have a non-functional libc stub.
-        # We try pthread_create on general principles.
-
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+								PTHREAD_LIBS="-l$ax_pthread_try_flag"
+								;;
+				esac
+
+				ax_pthread_save_CFLAGS="$CFLAGS"
+				ax_pthread_save_LIBS="$LIBS"
+				CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+				LIBS="$PTHREAD_LIBS $LIBS"
+
+				# Check for various functions.  We must include pthread.h,
+				# since some functions may be macros.  (On the Sequent, we
+				# need a special flag -Kthread to make this header compile.)
+				# We check for pthread_join because it is in -lpthread on IRIX
+				# while pthread_create is in libc.  We check for pthread_attr_init
+				# due to DEC craziness with -lpthreads.  We check for
+				# pthread_cleanup_push because it is one of the few pthread
+				# functions on Solaris that doesn't have a non-functional libc stub.
+				# We try pthread_create on general principles.
+
+				cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 #                       if $ax_pthread_check_cond
 #                        error "$ax_pthread_check_macro must be defined"
 #                       endif
-                        static void routine(void *a) { a = 0; }
-                        static void *start_routine(void *a) { return a; }
+												static void routine(void *a) { a = 0; }
+												static void *start_routine(void *a) { return a; }
 int
 main ()
 {
 pthread_t th; pthread_attr_t attr;
-                        pthread_create(&th, 0, start_routine, 0);
-                        pthread_join(th, 0);
-                        pthread_attr_init(&attr);
-                        pthread_cleanup_push(routine, 0);
-                        pthread_cleanup_pop(0) /* ; */
-  ;
-  return 0;
+												pthread_create(&th, 0, start_routine, 0);
+												pthread_join(th, 0);
+												pthread_attr_init(&attr);
+												pthread_cleanup_push(routine, 0);
+												pthread_cleanup_pop(0) /* ; */
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ax_pthread_ok=yes
+	ax_pthread_ok=yes
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
+				CFLAGS="$ax_pthread_save_CFLAGS"
+				LIBS="$ax_pthread_save_LIBS"
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
 $as_echo "$ax_pthread_ok" >&6; }
-        if test "x$ax_pthread_ok" = "xyes"; then :
-  break
+				if test "x$ax_pthread_ok" = "xyes"; then :
+	break
 fi
 
-        PTHREAD_LIBS=""
-        PTHREAD_CFLAGS=""
+				PTHREAD_LIBS=""
+				PTHREAD_CFLAGS=""
 done
 fi
 
 # Various other checks:
 if test "x$ax_pthread_ok" = "xyes"; then
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
+				ax_pthread_save_CFLAGS="$CFLAGS"
+				ax_pthread_save_LIBS="$LIBS"
+				CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+				LIBS="$PTHREAD_LIBS $LIBS"
 
-        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5
+				# Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5
 $as_echo_n "checking for joinable pthread attribute... " >&6; }
 if ${ax_cv_PTHREAD_JOINABLE_ATTR+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ax_cv_PTHREAD_JOINABLE_ATTR=unknown
-             for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	ax_cv_PTHREAD_JOINABLE_ATTR=unknown
+						 for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+								 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
 main ()
 {
 int attr = $ax_pthread_attr; return attr /* ; */
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break
+	ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-             done
+		conftest$ac_exeext conftest.$ac_ext
+						 done
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_JOINABLE_ATTR" >&5
 $as_echo "$ax_cv_PTHREAD_JOINABLE_ATTR" >&6; }
-        if test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
-               test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
-               test "x$ax_pthread_joinable_attr_defined" != "xyes"; then :
+				if test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
+							 test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
+							 test "x$ax_pthread_joinable_attr_defined" != "xyes"; then :
 
 cat >>confdefs.h <<_ACEOF
 #define PTHREAD_CREATE_JOINABLE $ax_cv_PTHREAD_JOINABLE_ATTR
 _ACEOF
 
-               ax_pthread_joinable_attr_defined=yes
+							 ax_pthread_joinable_attr_defined=yes
 
 fi
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether more special flags are required for pthreads" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether more special flags are required for pthreads" >&5
 $as_echo_n "checking whether more special flags are required for pthreads... " >&6; }
 if ${ax_cv_PTHREAD_SPECIAL_FLAGS+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ax_cv_PTHREAD_SPECIAL_FLAGS=no
-             case $host_os in
-             solaris*)
-             ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
-             ;;
-             esac
+	ax_cv_PTHREAD_SPECIAL_FLAGS=no
+						 case $host_os in
+						 solaris*)
+						 ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
+						 ;;
+						 esac
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_SPECIAL_FLAGS" >&5
 $as_echo "$ax_cv_PTHREAD_SPECIAL_FLAGS" >&6; }
-        if test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
-               test "x$ax_pthread_special_flags_added" != "xyes"; then :
-  PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
-               ax_pthread_special_flags_added=yes
+				if test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
+							 test "x$ax_pthread_special_flags_added" != "xyes"; then :
+	PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
+							 ax_pthread_special_flags_added=yes
 fi
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5
 $as_echo_n "checking for PTHREAD_PRIO_INHERIT... " >&6; }
 if ${ax_cv_PTHREAD_PRIO_INHERIT+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
 main ()
 {
 int i = PTHREAD_PRIO_INHERIT;
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ax_cv_PTHREAD_PRIO_INHERIT=yes
+	ax_cv_PTHREAD_PRIO_INHERIT=yes
 else
-  ax_cv_PTHREAD_PRIO_INHERIT=no
+	ax_cv_PTHREAD_PRIO_INHERIT=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5
 $as_echo "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; }
-        if test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
-               test "x$ax_pthread_prio_inherit_defined" != "xyes"; then :
+				if test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
+							 test "x$ax_pthread_prio_inherit_defined" != "xyes"; then :
 
 $as_echo "#define HAVE_PTHREAD_PRIO_INHERIT 1" >>confdefs.h
 
-               ax_pthread_prio_inherit_defined=yes
+							 ax_pthread_prio_inherit_defined=yes
 
 fi
 
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
+				CFLAGS="$ax_pthread_save_CFLAGS"
+				LIBS="$ax_pthread_save_LIBS"
 
-        # More AIX lossage: compile with *_r variant
-        if test "x$GCC" != "xyes"; then
-            case $host_os in
-                aix*)
-                case "x/$CC" in #(
-  x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6) :
-    #handle absolute path differently from PATH based program lookup
-                     case "x$CC" in #(
-  x/*) :
-    if as_fn_executable_p ${CC}_r; then :
-  PTHREAD_CC="${CC}_r"
+				# More AIX lossage: compile with *_r variant
+				if test "x$GCC" != "xyes"; then
+						case $host_os in
+								aix*)
+								case "x/$CC" in #(
+	x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6) :
+		#handle absolute path differently from PATH based program lookup
+										 case "x$CC" in #(
+	x/*) :
+		if as_fn_executable_p ${CC}_r; then :
+	PTHREAD_CC="${CC}_r"
 fi ;; #(
-  *) :
-    for ac_prog in ${CC}_r
+	*) :
+		for ac_prog in ${CC}_r
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_PTHREAD_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if test -n "$PTHREAD_CC"; then
-  ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test.
+	if test -n "$PTHREAD_CC"; then
+	ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_PTHREAD_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_prog_PTHREAD_CC="$ac_prog"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
 fi
 fi
 PTHREAD_CC=$ac_cv_prog_PTHREAD_CC
 if test -n "$PTHREAD_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5
 $as_echo "$PTHREAD_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$PTHREAD_CC" && break
+	test -n "$PTHREAD_CC" && break
 done
 test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
  ;;
 esac ;; #(
-  *) :
-     ;;
+	*) :
+		 ;;
 esac
-                ;;
-            esac
-        fi
+								;;
+						esac
+				fi
 fi
 
 test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
@@ -11725,9 +11725,9 @@ if test "x$ax_pthread_ok" = "xyes"; then
 
 $as_echo "#define HAVE_PTHREAD 1" >>confdefs.h
 
-        :
+				:
 else
-        ax_pthread_ok=no
+				ax_pthread_ok=no
 
 fi
 ac_ext=c
@@ -11752,7 +11752,7 @@ ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac
 if test "x$ac_cv_header_pthread_h" = xyes; then :
 
 else
-  as_fn_error $? "
+	as_fn_error $? "
 pthread.h not found" "$LINENO" 5
 fi
 
@@ -11760,9 +11760,9 @@ fi
 
 for ac_func in strerror_r
 do :
-  ac_fn_c_check_func "$LINENO" "strerror_r" "ac_cv_func_strerror_r"
+	ac_fn_c_check_func "$LINENO" "strerror_r" "ac_cv_func_strerror_r"
 if test "x$ac_cv_func_strerror_r" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_STRERROR_R 1
 _ACEOF
 
@@ -11774,26 +11774,26 @@ done
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns int" >&5
 $as_echo_n "checking whether strerror_r returns int... " >&6; }
 if ${pgac_cv_func_strerror_r_int+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 int
 main ()
 {
 char buf[100];
-  switch (strerror_r(1, buf, sizeof(buf)))
-  { case 0: break; default: break; }
+	switch (strerror_r(1, buf, sizeof(buf)))
+	{ case 0: break; default: break; }
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_func_strerror_r_int=yes
+	pgac_cv_func_strerror_r_int=yes
 else
-  pgac_cv_func_strerror_r_int=no
+	pgac_cv_func_strerror_r_int=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
@@ -11811,7 +11811,7 @@ LIBS="$_LIBS"
 
 
 else
-   # else
+	 # else
 # do not use values from template file
 PTHREAD_CFLAGS=
 PTHREAD_LIBS=
@@ -11834,9 +11834,9 @@ fi # fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lm" >&5
 $as_echo_n "checking for main in -lm... " >&6; }
 if ${ac_cv_lib_m_main+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
+	ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -11846,42 +11846,42 @@ int
 main ()
 {
 return main ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_main=yes
+	ac_cv_lib_m_main=yes
 else
-  ac_cv_lib_m_main=no
+	ac_cv_lib_m_main=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_main" >&5
 $as_echo "$ac_cv_lib_m_main" >&6; }
 if test "x$ac_cv_lib_m_main" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBM 1
 _ACEOF
 
-  LIBS="-lm $LIBS"
+	LIBS="-lm $LIBS"
 
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing setproctitle" >&5
 $as_echo_n "checking for library containing setproctitle... " >&6; }
 if ${ac_cv_search_setproctitle+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_func_search_save_LIBS=$LIBS
+	ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -11890,30 +11890,30 @@ int
 main ()
 {
 return setproctitle ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 for ac_lib in '' util; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_setproctitle=$ac_res
+	if test -z "$ac_lib"; then
+		ac_res="none required"
+	else
+		ac_res=-l$ac_lib
+		LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+	fi
+	if ac_fn_c_try_link "$LINENO"; then :
+	ac_cv_search_setproctitle=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_setproctitle+:} false; then :
-  break
+		conftest$ac_exeext
+	if ${ac_cv_search_setproctitle+:} false; then :
+	break
 fi
 done
 if ${ac_cv_search_setproctitle+:} false; then :
 
 else
-  ac_cv_search_setproctitle=no
+	ac_cv_search_setproctitle=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
@@ -11922,7 +11922,7 @@ fi
 $as_echo "$ac_cv_search_setproctitle" >&6; }
 ac_res=$ac_cv_search_setproctitle
 if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+	test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
@@ -11932,15 +11932,15 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlsym" >&5
 $as_echo_n "checking for library containing dlsym... " >&6; }
 if ${ac_cv_search_dlsym+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_func_search_save_LIBS=$LIBS
+	ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -11949,30 +11949,30 @@ int
 main ()
 {
 return dlsym ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 for ac_lib in '' dl; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_dlsym=$ac_res
+	if test -z "$ac_lib"; then
+		ac_res="none required"
+	else
+		ac_res=-l$ac_lib
+		LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+	fi
+	if ac_fn_c_try_link "$LINENO"; then :
+	ac_cv_search_dlsym=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_dlsym+:} false; then :
-  break
+		conftest$ac_exeext
+	if ${ac_cv_search_dlsym+:} false; then :
+	break
 fi
 done
 if ${ac_cv_search_dlsym+:} false; then :
 
 else
-  ac_cv_search_dlsym=no
+	ac_cv_search_dlsym=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
@@ -11981,22 +11981,22 @@ fi
 $as_echo "$ac_cv_search_dlsym" >&6; }
 ac_res=$ac_cv_search_dlsym
 if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+	test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
 $as_echo_n "checking for library containing socket... " >&6; }
 if ${ac_cv_search_socket+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_func_search_save_LIBS=$LIBS
+	ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -12005,30 +12005,30 @@ int
 main ()
 {
 return socket ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 for ac_lib in '' socket ws2_32; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_socket=$ac_res
+	if test -z "$ac_lib"; then
+		ac_res="none required"
+	else
+		ac_res=-l$ac_lib
+		LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+	fi
+	if ac_fn_c_try_link "$LINENO"; then :
+	ac_cv_search_socket=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_socket+:} false; then :
-  break
+		conftest$ac_exeext
+	if ${ac_cv_search_socket+:} false; then :
+	break
 fi
 done
 if ${ac_cv_search_socket+:} false; then :
 
 else
-  ac_cv_search_socket=no
+	ac_cv_search_socket=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
@@ -12037,22 +12037,22 @@ fi
 $as_echo "$ac_cv_search_socket" >&6; }
 ac_res=$ac_cv_search_socket
 if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+	test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getopt_long" >&5
 $as_echo_n "checking for library containing getopt_long... " >&6; }
 if ${ac_cv_search_getopt_long+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_func_search_save_LIBS=$LIBS
+	ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -12061,30 +12061,30 @@ int
 main ()
 {
 return getopt_long ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 for ac_lib in '' getopt gnugetopt; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_getopt_long=$ac_res
+	if test -z "$ac_lib"; then
+		ac_res="none required"
+	else
+		ac_res=-l$ac_lib
+		LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+	fi
+	if ac_fn_c_try_link "$LINENO"; then :
+	ac_cv_search_getopt_long=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_getopt_long+:} false; then :
-  break
+		conftest$ac_exeext
+	if ${ac_cv_search_getopt_long+:} false; then :
+	break
 fi
 done
 if ${ac_cv_search_getopt_long+:} false; then :
 
 else
-  ac_cv_search_getopt_long=no
+	ac_cv_search_getopt_long=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
@@ -12093,22 +12093,22 @@ fi
 $as_echo "$ac_cv_search_getopt_long" >&6; }
 ac_res=$ac_cv_search_getopt_long
 if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+	test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shm_open" >&5
 $as_echo_n "checking for library containing shm_open... " >&6; }
 if ${ac_cv_search_shm_open+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_func_search_save_LIBS=$LIBS
+	ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -12117,30 +12117,30 @@ int
 main ()
 {
 return shm_open ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 for ac_lib in '' rt; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_shm_open=$ac_res
+	if test -z "$ac_lib"; then
+		ac_res="none required"
+	else
+		ac_res=-l$ac_lib
+		LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+	fi
+	if ac_fn_c_try_link "$LINENO"; then :
+	ac_cv_search_shm_open=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_shm_open+:} false; then :
-  break
+		conftest$ac_exeext
+	if ${ac_cv_search_shm_open+:} false; then :
+	break
 fi
 done
 if ${ac_cv_search_shm_open+:} false; then :
 
 else
-  ac_cv_search_shm_open=no
+	ac_cv_search_shm_open=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
@@ -12149,22 +12149,22 @@ fi
 $as_echo "$ac_cv_search_shm_open" >&6; }
 ac_res=$ac_cv_search_shm_open
 if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+	test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shm_unlink" >&5
 $as_echo_n "checking for library containing shm_unlink... " >&6; }
 if ${ac_cv_search_shm_unlink+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_func_search_save_LIBS=$LIBS
+	ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -12173,30 +12173,30 @@ int
 main ()
 {
 return shm_unlink ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 for ac_lib in '' rt; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_shm_unlink=$ac_res
+	if test -z "$ac_lib"; then
+		ac_res="none required"
+	else
+		ac_res=-l$ac_lib
+		LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+	fi
+	if ac_fn_c_try_link "$LINENO"; then :
+	ac_cv_search_shm_unlink=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_shm_unlink+:} false; then :
-  break
+		conftest$ac_exeext
+	if ${ac_cv_search_shm_unlink+:} false; then :
+	break
 fi
 done
 if ${ac_cv_search_shm_unlink+:} false; then :
 
 else
-  ac_cv_search_shm_unlink=no
+	ac_cv_search_shm_unlink=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
@@ -12205,22 +12205,22 @@ fi
 $as_echo "$ac_cv_search_shm_unlink" >&6; }
 ac_res=$ac_cv_search_shm_unlink
 if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+	test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
 $as_echo_n "checking for library containing clock_gettime... " >&6; }
 if ${ac_cv_search_clock_gettime+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_func_search_save_LIBS=$LIBS
+	ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -12229,30 +12229,30 @@ int
 main ()
 {
 return clock_gettime ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 for ac_lib in '' rt; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_clock_gettime=$ac_res
+	if test -z "$ac_lib"; then
+		ac_res="none required"
+	else
+		ac_res=-l$ac_lib
+		LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+	fi
+	if ac_fn_c_try_link "$LINENO"; then :
+	ac_cv_search_clock_gettime=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_clock_gettime+:} false; then :
-  break
+		conftest$ac_exeext
+	if ${ac_cv_search_clock_gettime+:} false; then :
+	break
 fi
 done
 if ${ac_cv_search_clock_gettime+:} false; then :
 
 else
-  ac_cv_search_clock_gettime=no
+	ac_cv_search_clock_gettime=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
@@ -12261,7 +12261,7 @@ fi
 $as_echo "$ac_cv_search_clock_gettime" >&6; }
 ac_res=$ac_cv_search_clock_gettime
 if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+	test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
@@ -12269,15 +12269,15 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shmget" >&5
 $as_echo_n "checking for library containing shmget... " >&6; }
 if ${ac_cv_search_shmget+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_func_search_save_LIBS=$LIBS
+	ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -12286,30 +12286,30 @@ int
 main ()
 {
 return shmget ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 for ac_lib in '' cygipc; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_shmget=$ac_res
+	if test -z "$ac_lib"; then
+		ac_res="none required"
+	else
+		ac_res=-l$ac_lib
+		LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+	fi
+	if ac_fn_c_try_link "$LINENO"; then :
+	ac_cv_search_shmget=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_shmget+:} false; then :
-  break
+		conftest$ac_exeext
+	if ${ac_cv_search_shmget+:} false; then :
+	break
 fi
 done
 if ${ac_cv_search_shmget+:} false; then :
 
 else
-  ac_cv_search_shmget=no
+	ac_cv_search_shmget=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
@@ -12318,7 +12318,7 @@ fi
 $as_echo "$ac_cv_search_shmget" >&6; }
 ac_res=$ac_cv_search_shmget
 if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+	test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
@@ -12326,15 +12326,15 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing backtrace_symbols" >&5
 $as_echo_n "checking for library containing backtrace_symbols... " >&6; }
 if ${ac_cv_search_backtrace_symbols+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_func_search_save_LIBS=$LIBS
+	ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -12343,30 +12343,30 @@ int
 main ()
 {
 return backtrace_symbols ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 for ac_lib in '' execinfo; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_backtrace_symbols=$ac_res
+	if test -z "$ac_lib"; then
+		ac_res="none required"
+	else
+		ac_res=-l$ac_lib
+		LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+	fi
+	if ac_fn_c_try_link "$LINENO"; then :
+	ac_cv_search_backtrace_symbols=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_backtrace_symbols+:} false; then :
-  break
+		conftest$ac_exeext
+	if ${ac_cv_search_backtrace_symbols+:} false; then :
+	break
 fi
 done
 if ${ac_cv_search_backtrace_symbols+:} false; then :
 
 else
-  ac_cv_search_backtrace_symbols=no
+	ac_cv_search_backtrace_symbols=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
@@ -12375,7 +12375,7 @@ fi
 $as_echo "$ac_cv_search_backtrace_symbols" >&6; }
 ac_res=$ac_cv_search_backtrace_symbols
 if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+	test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
@@ -12383,15 +12383,15 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_barrier_wait" >&5
 $as_echo_n "checking for library containing pthread_barrier_wait... " >&6; }
 if ${ac_cv_search_pthread_barrier_wait+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_func_search_save_LIBS=$LIBS
+	ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -12400,30 +12400,30 @@ int
 main ()
 {
 return pthread_barrier_wait ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 for ac_lib in '' pthread; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_pthread_barrier_wait=$ac_res
+	if test -z "$ac_lib"; then
+		ac_res="none required"
+	else
+		ac_res=-l$ac_lib
+		LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+	fi
+	if ac_fn_c_try_link "$LINENO"; then :
+	ac_cv_search_pthread_barrier_wait=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_pthread_barrier_wait+:} false; then :
-  break
+		conftest$ac_exeext
+	if ${ac_cv_search_pthread_barrier_wait+:} false; then :
+	break
 fi
 done
 if ${ac_cv_search_pthread_barrier_wait+:} false; then :
 
 else
-  ac_cv_search_pthread_barrier_wait=no
+	ac_cv_search_pthread_barrier_wait=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
@@ -12432,7 +12432,7 @@ fi
 $as_echo "$ac_cv_search_pthread_barrier_wait" >&6; }
 ac_res=$ac_cv_search_pthread_barrier_wait
 if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+	test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
@@ -12443,23 +12443,23 @@ if test "$with_readline" = yes; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing readline" >&5
 $as_echo_n "checking for library containing readline... " >&6; }
 if ${pgac_cv_check_readline+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_cv_check_readline=no
+	pgac_cv_check_readline=no
 pgac_save_LIBS=$LIBS
 if test x"$with_libedit_preferred" != x"yes"
 then	READLINE_ORDER="-lreadline -ledit"
 else	READLINE_ORDER="-ledit -lreadline"
 fi
 for pgac_rllib in $READLINE_ORDER ; do
-  for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do
-    LIBS="${pgac_rllib}${pgac_lib} $pgac_save_LIBS"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do
+		LIBS="${pgac_rllib}${pgac_lib} $pgac_save_LIBS"
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -12468,32 +12468,32 @@ int
 main ()
 {
 return readline ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-      # Older NetBSD and OpenBSD have a broken linker that does not
-      # recognize dependent libraries; assume curses is needed if we didn't
-      # find any dependency.
-      case $host_os in
-        netbsd* | openbsd*)
-          if test x"$pgac_lib" = x"" ; then
-            pgac_lib=" -lcurses"
-          fi ;;
-      esac
+			# Older NetBSD and OpenBSD have a broken linker that does not
+			# recognize dependent libraries; assume curses is needed if we didn't
+			# find any dependency.
+			case $host_os in
+				netbsd* | openbsd*)
+					if test x"$pgac_lib" = x"" ; then
+						pgac_lib=" -lcurses"
+					fi ;;
+			esac
 
-      pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"
-      break
+			pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"
+			break
 
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  done
-  if test "$pgac_cv_check_readline" != no ; then
-    break
-  fi
+		conftest$ac_exeext conftest.$ac_ext
+	done
+	if test "$pgac_cv_check_readline" != no ; then
+		break
+	fi
 done
 LIBS=$pgac_save_LIBS
 
@@ -12501,35 +12501,35 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_check_readline" >&5
 $as_echo "$pgac_cv_check_readline" >&6; }
 if test "$pgac_cv_check_readline" != no ; then
-  LIBS="$pgac_cv_check_readline $LIBS"
+	LIBS="$pgac_cv_check_readline $LIBS"
 
 $as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
 
 fi
 
 
-  if test x"$pgac_cv_check_readline" = x"no"; then
-    as_fn_error $? "readline library not found
+	if test x"$pgac_cv_check_readline" = x"no"; then
+		as_fn_error $? "readline library not found
 If you have readline already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-readline to disable readline support." "$LINENO" 5
-  fi
+	fi
 fi
 
 if test "$with_zlib" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5
 $as_echo_n "checking for inflate in -lz... " >&6; }
 if ${ac_cv_lib_z_inflate+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
+	ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -12538,30 +12538,30 @@ int
 main ()
 {
 return inflate ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_z_inflate=yes
+	ac_cv_lib_z_inflate=yes
 else
-  ac_cv_lib_z_inflate=no
+	ac_cv_lib_z_inflate=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflate" >&5
 $as_echo "$ac_cv_lib_z_inflate" >&6; }
 if test "x$ac_cv_lib_z_inflate" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBZ 1
 _ACEOF
 
-  LIBS="-lz $LIBS"
+	LIBS="-lz $LIBS"
 
 else
-  as_fn_error $? "zlib library not found
+	as_fn_error $? "zlib library not found
 If you have zlib already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-zlib to disable zlib support." "$LINENO" 5
@@ -12571,39 +12571,39 @@ fi
 
 if test "$with_libcurl" = yes ; then
 
-  # libcurl compiler/linker flags are kept separate from the global flags, so
-  # they have to be added back temporarily for the following tests.
-  pgac_save_CPPFLAGS=$CPPFLAGS
-  pgac_save_LDFLAGS=$LDFLAGS
-  pgac_save_LIBS=$LIBS
+	# libcurl compiler/linker flags are kept separate from the global flags, so
+	# they have to be added back temporarily for the following tests.
+	pgac_save_CPPFLAGS=$CPPFLAGS
+	pgac_save_LDFLAGS=$LDFLAGS
+	pgac_save_LIBS=$LIBS
 
-  CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
-  LDFLAGS="$LDFLAGS $LIBCURL_LDFLAGS"
+	CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
+	LDFLAGS="$LDFLAGS $LIBCURL_LDFLAGS"
 
-  ac_fn_c_check_header_mongrel "$LINENO" "curl/curl.h" "ac_cv_header_curl_curl_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "curl/curl.h" "ac_cv_header_curl_curl_h" "$ac_includes_default"
 if test "x$ac_cv_header_curl_curl_h" = xyes; then :
 
 else
-  as_fn_error $? "header file <curl/curl.h> is required for --with-libcurl" "$LINENO" 5
+	as_fn_error $? "header file <curl/curl.h> is required for --with-libcurl" "$LINENO" 5
 fi
 
 
 
-  # LIBCURL_LDLIBS is determined here. Like the compiler flags, it should not
-  # pollute the global LIBS setting.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_multi_init in -lcurl" >&5
+	# LIBCURL_LDLIBS is determined here. Like the compiler flags, it should not
+	# pollute the global LIBS setting.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_multi_init in -lcurl" >&5
 $as_echo_n "checking for curl_multi_init in -lcurl... " >&6; }
 if ${ac_cv_lib_curl_curl_multi_init+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
+	ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -12612,17 +12612,17 @@ int
 main ()
 {
 return curl_multi_init ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_curl_curl_multi_init=yes
+	ac_cv_lib_curl_curl_multi_init=yes
 else
-  ac_cv_lib_curl_curl_multi_init=no
+	ac_cv_lib_curl_curl_multi_init=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_multi_init" >&5
@@ -12636,23 +12636,23 @@ $as_echo "#define HAVE_LIBCURL 1" >>confdefs.h
 
 
 else
-  as_fn_error $? "library 'curl' does not provide curl_multi_init" "$LINENO" 5
+	as_fn_error $? "library 'curl' does not provide curl_multi_init" "$LINENO" 5
 fi
 
 
-  LIBS="$LIBCURL_LDLIBS $LIBS"
+	LIBS="$LIBCURL_LDLIBS $LIBS"
 
-  # Check to see whether the current platform supports threadsafe Curl
-  # initialization.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_global_init thread safety" >&5
+	# Check to see whether the current platform supports threadsafe Curl
+	# initialization.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_global_init thread safety" >&5
 $as_echo_n "checking for curl_global_init thread safety... " >&6; }
 if ${pgac_cv__libcurl_threadsafe_init+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then :
-  pgac_cv__libcurl_threadsafe_init=unknown
+	if test "$cross_compiling" = yes; then :
+	pgac_cv__libcurl_threadsafe_init=unknown
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <curl/curl.h>
@@ -12661,51 +12661,51 @@ int
 main ()
 {
 
-    curl_version_info_data *info;
+		curl_version_info_data *info;
 
-    if (curl_global_init(CURL_GLOBAL_ALL))
-        return -1;
+		if (curl_global_init(CURL_GLOBAL_ALL))
+				return -1;
 
-    info = curl_version_info(CURLVERSION_NOW);
+		info = curl_version_info(CURLVERSION_NOW);
 #ifdef CURL_VERSION_THREADSAFE
-    if (info->features & CURL_VERSION_THREADSAFE)
-        return 0;
+		if (info->features & CURL_VERSION_THREADSAFE)
+				return 0;
 #endif
 
-    return 1;
+		return 1;
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  pgac_cv__libcurl_threadsafe_init=yes
+	pgac_cv__libcurl_threadsafe_init=yes
 else
-  pgac_cv__libcurl_threadsafe_init=no
+	pgac_cv__libcurl_threadsafe_init=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+	conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__libcurl_threadsafe_init" >&5
 $as_echo "$pgac_cv__libcurl_threadsafe_init" >&6; }
-  if test x"$pgac_cv__libcurl_threadsafe_init" = xyes ; then
+	if test x"$pgac_cv__libcurl_threadsafe_init" = xyes ; then
 
 $as_echo "#define HAVE_THREADSAFE_CURL_GLOBAL_INIT 1" >>confdefs.h
 
-  fi
+	fi
 
-  # Fail if a thread-friendly DNS resolver isn't built.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl support for asynchronous DNS" >&5
+	# Fail if a thread-friendly DNS resolver isn't built.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl support for asynchronous DNS" >&5
 $as_echo_n "checking for curl support for asynchronous DNS... " >&6; }
 if ${pgac_cv__libcurl_async_dns+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then :
-  pgac_cv__libcurl_async_dns=unknown
+	if test "$cross_compiling" = yes; then :
+	pgac_cv__libcurl_async_dns=unknown
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <curl/curl.h>
@@ -12714,57 +12714,57 @@ int
 main ()
 {
 
-    curl_version_info_data *info;
+		curl_version_info_data *info;
 
-    if (curl_global_init(CURL_GLOBAL_ALL))
-        return -1;
+		if (curl_global_init(CURL_GLOBAL_ALL))
+				return -1;
 
-    info = curl_version_info(CURLVERSION_NOW);
-    return (info->features & CURL_VERSION_ASYNCHDNS) ? 0 : 1;
+		info = curl_version_info(CURLVERSION_NOW);
+		return (info->features & CURL_VERSION_ASYNCHDNS) ? 0 : 1;
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  pgac_cv__libcurl_async_dns=yes
+	pgac_cv__libcurl_async_dns=yes
 else
-  pgac_cv__libcurl_async_dns=no
+	pgac_cv__libcurl_async_dns=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+	conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__libcurl_async_dns" >&5
 $as_echo "$pgac_cv__libcurl_async_dns" >&6; }
-  if test x"$pgac_cv__libcurl_async_dns" = xno ; then
-    as_fn_error $? "
+	if test x"$pgac_cv__libcurl_async_dns" = xno ; then
+		as_fn_error $? "
 *** The installed version of libcurl does not support asynchronous DNS
 *** lookups. Rebuild libcurl with the AsynchDNS feature enabled in order
 *** to use it with libpq." "$LINENO" 5
-  fi
+	fi
 
-  CPPFLAGS=$pgac_save_CPPFLAGS
-  LDFLAGS=$pgac_save_LDFLAGS
-  LIBS=$pgac_save_LIBS
+	CPPFLAGS=$pgac_save_CPPFLAGS
+	LDFLAGS=$pgac_save_LDFLAGS
+	LIBS=$pgac_save_LIBS
 
 fi
 
 if test "$with_gssapi" = yes ; then
-  if test "$PORTNAME" != "win32"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gss_store_cred_into" >&5
+	if test "$PORTNAME" != "win32"; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gss_store_cred_into" >&5
 $as_echo_n "checking for library containing gss_store_cred_into... " >&6; }
 if ${ac_cv_search_gss_store_cred_into+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_func_search_save_LIBS=$LIBS
+	ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -12773,30 +12773,30 @@ int
 main ()
 {
 return gss_store_cred_into ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 for ac_lib in '' gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_gss_store_cred_into=$ac_res
+	if test -z "$ac_lib"; then
+		ac_res="none required"
+	else
+		ac_res=-l$ac_lib
+		LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+	fi
+	if ac_fn_c_try_link "$LINENO"; then :
+	ac_cv_search_gss_store_cred_into=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_gss_store_cred_into+:} false; then :
-  break
+		conftest$ac_exeext
+	if ${ac_cv_search_gss_store_cred_into+:} false; then :
+	break
 fi
 done
 if ${ac_cv_search_gss_store_cred_into+:} false; then :
 
 else
-  ac_cv_search_gss_store_cred_into=no
+	ac_cv_search_gss_store_cred_into=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
@@ -12805,15 +12805,15 @@ fi
 $as_echo "$ac_cv_search_gss_store_cred_into" >&6; }
 ac_res=$ac_cv_search_gss_store_cred_into
 if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+	test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 else
-  as_fn_error $? "could not find function 'gss_store_cred_into' required for GSSAPI" "$LINENO" 5
+	as_fn_error $? "could not find function 'gss_store_cred_into' required for GSSAPI" "$LINENO" 5
 fi
 
-  else
-    LIBS="$LIBS -lgssapi32"
-  fi
+	else
+		LIBS="$LIBS -lgssapi32"
+	fi
 fi
 
 #
@@ -12826,71 +12826,71 @@ fi
 
 # Check whether --with-ssl was given.
 if test "${with_ssl+set}" = set; then :
-  withval=$with_ssl;
-  case $withval in
-    yes)
-      as_fn_error $? "argument required for --with-ssl option" "$LINENO" 5
-      ;;
-    no)
-      as_fn_error $? "argument required for --with-ssl option" "$LINENO" 5
-      ;;
-    *)
-
-      ;;
-  esac
+	withval=$with_ssl;
+	case $withval in
+		yes)
+			as_fn_error $? "argument required for --with-ssl option" "$LINENO" 5
+			;;
+		no)
+			as_fn_error $? "argument required for --with-ssl option" "$LINENO" 5
+			;;
+		*)
+
+			;;
+	esac
 
 fi
 
 
 if test x"$with_ssl" = x"" ; then
-  with_ssl=no
+	with_ssl=no
 fi
 
 
 
 # Check whether --with-openssl was given.
 if test "${with_openssl+set}" = set; then :
-  withval=$with_openssl;
-  case $withval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-openssl option" "$LINENO" 5
-      ;;
-  esac
+	withval=$with_openssl;
+	case $withval in
+		yes)
+			:
+			;;
+		no)
+			:
+			;;
+		*)
+			as_fn_error $? "no argument expected for --with-openssl option" "$LINENO" 5
+			;;
+	esac
 
 else
-  with_openssl=no
+	with_openssl=no
 
 fi
 
 
 if test "$with_openssl" = yes ; then
-  with_ssl=openssl
+	with_ssl=openssl
 fi
 
 if test "$with_ssl" = openssl ; then
-    # Minimum required OpenSSL version is 1.1.1
+		# Minimum required OpenSSL version is 1.1.1
 
 $as_echo "#define OPENSSL_API_COMPAT 0x10101000L" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CRYPTO_new_ex_data in -lcrypto" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CRYPTO_new_ex_data in -lcrypto" >&5
 $as_echo_n "checking for CRYPTO_new_ex_data in -lcrypto... " >&6; }
 if ${ac_cv_lib_crypto_CRYPTO_new_ex_data+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
+	ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypto  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -12899,45 +12899,45 @@ int
 main ()
 {
 return CRYPTO_new_ex_data ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_crypto_CRYPTO_new_ex_data=yes
+	ac_cv_lib_crypto_CRYPTO_new_ex_data=yes
 else
-  ac_cv_lib_crypto_CRYPTO_new_ex_data=no
+	ac_cv_lib_crypto_CRYPTO_new_ex_data=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_CRYPTO_new_ex_data" >&5
 $as_echo "$ac_cv_lib_crypto_CRYPTO_new_ex_data" >&6; }
 if test "x$ac_cv_lib_crypto_CRYPTO_new_ex_data" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBCRYPTO 1
 _ACEOF
 
-  LIBS="-lcrypto $LIBS"
+	LIBS="-lcrypto $LIBS"
 
 else
-  as_fn_error $? "library 'crypto' is required for OpenSSL" "$LINENO" 5
+	as_fn_error $? "library 'crypto' is required for OpenSSL" "$LINENO" 5
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5
 $as_echo_n "checking for SSL_new in -lssl... " >&6; }
 if ${ac_cv_lib_ssl_SSL_new+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
+	ac_check_lib_save_LIBS=$LIBS
 LIBS="-lssl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -12946,65 +12946,65 @@ int
 main ()
 {
 return SSL_new ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ssl_SSL_new=yes
+	ac_cv_lib_ssl_SSL_new=yes
 else
-  ac_cv_lib_ssl_SSL_new=no
+	ac_cv_lib_ssl_SSL_new=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
 $as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
 if test "x$ac_cv_lib_ssl_SSL_new" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSSL 1
 _ACEOF
 
-  LIBS="-lssl $LIBS"
+	LIBS="-lssl $LIBS"
 
 else
-  as_fn_error $? "library 'ssl' is required for OpenSSL" "$LINENO" 5
+	as_fn_error $? "library 'ssl' is required for OpenSSL" "$LINENO" 5
 fi
 
-  # Functions introduced in OpenSSL 1.1.1.
-  for ac_func in SSL_CTX_set_ciphersuites
+	# Functions introduced in OpenSSL 1.1.1.
+	for ac_func in SSL_CTX_set_ciphersuites
 do :
-  ac_fn_c_check_func "$LINENO" "SSL_CTX_set_ciphersuites" "ac_cv_func_SSL_CTX_set_ciphersuites"
+	ac_fn_c_check_func "$LINENO" "SSL_CTX_set_ciphersuites" "ac_cv_func_SSL_CTX_set_ciphersuites"
 if test "x$ac_cv_func_SSL_CTX_set_ciphersuites" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_SSL_CTX_SET_CIPHERSUITES 1
 _ACEOF
 
 else
-  as_fn_error $? "OpenSSL version >= 1.1.1 is required for SSL support" "$LINENO" 5
+	as_fn_error $? "OpenSSL version >= 1.1.1 is required for SSL support" "$LINENO" 5
 fi
 done
 
-  # Function introduced in OpenSSL 1.0.2, not in LibreSSL.
-  for ac_func in SSL_CTX_set_cert_cb
+	# Function introduced in OpenSSL 1.0.2, not in LibreSSL.
+	for ac_func in SSL_CTX_set_cert_cb
 do :
-  ac_fn_c_check_func "$LINENO" "SSL_CTX_set_cert_cb" "ac_cv_func_SSL_CTX_set_cert_cb"
+	ac_fn_c_check_func "$LINENO" "SSL_CTX_set_cert_cb" "ac_cv_func_SSL_CTX_set_cert_cb"
 if test "x$ac_cv_func_SSL_CTX_set_cert_cb" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_SSL_CTX_SET_CERT_CB 1
 _ACEOF
 
 fi
 done
 
-  # Function introduced in OpenSSL 1.1.1, not in LibreSSL.
-  for ac_func in X509_get_signature_info SSL_CTX_set_num_tickets SSL_CTX_set_keylog_callback
+	# Function introduced in OpenSSL 1.1.1, not in LibreSSL.
+	for ac_func in X509_get_signature_info SSL_CTX_set_num_tickets SSL_CTX_set_keylog_callback
 do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+	as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
@@ -13015,24 +13015,24 @@ done
 $as_echo "#define USE_OPENSSL 1" >>confdefs.h
 
 elif test "$with_ssl" != no ; then
-  as_fn_error $? "--with-ssl must specify openssl" "$LINENO" 5
+	as_fn_error $? "--with-ssl must specify openssl" "$LINENO" 5
 fi
 
 
 if test "$with_pam" = yes ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5
 $as_echo_n "checking for pam_start in -lpam... " >&6; }
 if ${ac_cv_lib_pam_pam_start+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
+	ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpam  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -13041,48 +13041,48 @@ int
 main ()
 {
 return pam_start ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pam_pam_start=yes
+	ac_cv_lib_pam_pam_start=yes
 else
-  ac_cv_lib_pam_pam_start=no
+	ac_cv_lib_pam_pam_start=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5
 $as_echo "$ac_cv_lib_pam_pam_start" >&6; }
 if test "x$ac_cv_lib_pam_pam_start" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBPAM 1
 _ACEOF
 
-  LIBS="-lpam $LIBS"
+	LIBS="-lpam $LIBS"
 
 else
-  as_fn_error $? "library 'pam' is required for PAM" "$LINENO" 5
+	as_fn_error $? "library 'pam' is required for PAM" "$LINENO" 5
 fi
 
 fi
 
 if test "$with_libxml" = yes ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlSaveToBuffer in -lxml2" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlSaveToBuffer in -lxml2" >&5
 $as_echo_n "checking for xmlSaveToBuffer in -lxml2... " >&6; }
 if ${ac_cv_lib_xml2_xmlSaveToBuffer+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
+	ac_check_lib_save_LIBS=$LIBS
 LIBS="-lxml2  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -13091,48 +13091,48 @@ int
 main ()
 {
 return xmlSaveToBuffer ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_xml2_xmlSaveToBuffer=yes
+	ac_cv_lib_xml2_xmlSaveToBuffer=yes
 else
-  ac_cv_lib_xml2_xmlSaveToBuffer=no
+	ac_cv_lib_xml2_xmlSaveToBuffer=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml2_xmlSaveToBuffer" >&5
 $as_echo "$ac_cv_lib_xml2_xmlSaveToBuffer" >&6; }
 if test "x$ac_cv_lib_xml2_xmlSaveToBuffer" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBXML2 1
 _ACEOF
 
-  LIBS="-lxml2 $LIBS"
+	LIBS="-lxml2 $LIBS"
 
 else
-  as_fn_error $? "library 'xml2' (version >= 2.6.23) is required for XML support" "$LINENO" 5
+	as_fn_error $? "library 'xml2' (version >= 2.6.23) is required for XML support" "$LINENO" 5
 fi
 
 fi
 
 if test "$with_libxslt" = yes ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xsltCleanupGlobals in -lxslt" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xsltCleanupGlobals in -lxslt" >&5
 $as_echo_n "checking for xsltCleanupGlobals in -lxslt... " >&6; }
 if ${ac_cv_lib_xslt_xsltCleanupGlobals+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
+	ac_check_lib_save_LIBS=$LIBS
 LIBS="-lxslt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -13141,65 +13141,65 @@ int
 main ()
 {
 return xsltCleanupGlobals ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_xslt_xsltCleanupGlobals=yes
+	ac_cv_lib_xslt_xsltCleanupGlobals=yes
 else
-  ac_cv_lib_xslt_xsltCleanupGlobals=no
+	ac_cv_lib_xslt_xsltCleanupGlobals=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xslt_xsltCleanupGlobals" >&5
 $as_echo "$ac_cv_lib_xslt_xsltCleanupGlobals" >&6; }
 if test "x$ac_cv_lib_xslt_xsltCleanupGlobals" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBXSLT 1
 _ACEOF
 
-  LIBS="-lxslt $LIBS"
+	LIBS="-lxslt $LIBS"
 
 else
-  as_fn_error $? "library 'xslt' is required for XSLT support" "$LINENO" 5
+	as_fn_error $? "library 'xslt' is required for XSLT support" "$LINENO" 5
 fi
 
 fi
 
 if test "$with_liburing" = yes; then
-  _LIBS="$LIBS"
-  LIBS="$LIBURING_LIBS $LIBS"
-  for ac_func in io_uring_queue_init_mem
+	_LIBS="$LIBS"
+	LIBS="$LIBURING_LIBS $LIBS"
+	for ac_func in io_uring_queue_init_mem
 do :
-  ac_fn_c_check_func "$LINENO" "io_uring_queue_init_mem" "ac_cv_func_io_uring_queue_init_mem"
+	ac_fn_c_check_func "$LINENO" "io_uring_queue_init_mem" "ac_cv_func_io_uring_queue_init_mem"
 if test "x$ac_cv_func_io_uring_queue_init_mem" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_IO_URING_QUEUE_INIT_MEM 1
 _ACEOF
 
 fi
 done
 
-  LIBS="$_LIBS"
+	LIBS="$_LIBS"
 fi
 
 if test "$with_lz4" = yes ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LZ4_compress_default in -llz4" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LZ4_compress_default in -llz4" >&5
 $as_echo_n "checking for LZ4_compress_default in -llz4... " >&6; }
 if ${ac_cv_lib_lz4_LZ4_compress_default+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
+	ac_check_lib_save_LIBS=$LIBS
 LIBS="-llz4  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -13208,48 +13208,48 @@ int
 main ()
 {
 return LZ4_compress_default ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_lz4_LZ4_compress_default=yes
+	ac_cv_lib_lz4_LZ4_compress_default=yes
 else
-  ac_cv_lib_lz4_LZ4_compress_default=no
+	ac_cv_lib_lz4_LZ4_compress_default=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lz4_LZ4_compress_default" >&5
 $as_echo "$ac_cv_lib_lz4_LZ4_compress_default" >&6; }
 if test "x$ac_cv_lib_lz4_LZ4_compress_default" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBLZ4 1
 _ACEOF
 
-  LIBS="-llz4 $LIBS"
+	LIBS="-llz4 $LIBS"
 
 else
-  as_fn_error $? "library 'lz4' is required for LZ4 support" "$LINENO" 5
+	as_fn_error $? "library 'lz4' is required for LZ4 support" "$LINENO" 5
 fi
 
 fi
 
 if test "$with_zstd" = yes ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZSTD_compress in -lzstd" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZSTD_compress in -lzstd" >&5
 $as_echo_n "checking for ZSTD_compress in -lzstd... " >&6; }
 if ${ac_cv_lib_zstd_ZSTD_compress+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
+	ac_check_lib_save_LIBS=$LIBS
 LIBS="-lzstd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -13258,51 +13258,51 @@ int
 main ()
 {
 return ZSTD_compress ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_zstd_ZSTD_compress=yes
+	ac_cv_lib_zstd_ZSTD_compress=yes
 else
-  ac_cv_lib_zstd_ZSTD_compress=no
+	ac_cv_lib_zstd_ZSTD_compress=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zstd_ZSTD_compress" >&5
 $as_echo "$ac_cv_lib_zstd_ZSTD_compress" >&6; }
 if test "x$ac_cv_lib_zstd_ZSTD_compress" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBZSTD 1
 _ACEOF
 
-  LIBS="-lzstd $LIBS"
+	LIBS="-lzstd $LIBS"
 
 else
-  as_fn_error $? "library 'zstd' is required for ZSTD support" "$LINENO" 5
+	as_fn_error $? "library 'zstd' is required for ZSTD support" "$LINENO" 5
 fi
 
 fi
 
 # Note: We can test for libldap_r only after we know PTHREAD_LIBS
 if test "$with_ldap" = yes ; then
-  _LIBS="$LIBS"
-  if test "$PORTNAME" != "win32"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_bind in -lldap" >&5
+	_LIBS="$LIBS"
+	if test "$PORTNAME" != "win32"; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_bind in -lldap" >&5
 $as_echo_n "checking for ldap_bind in -lldap... " >&6; }
 if ${ac_cv_lib_ldap_ldap_bind+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
+	ac_check_lib_save_LIBS=$LIBS
 LIBS="-lldap $EXTRA_LDAP_LIBS $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -13311,73 +13311,73 @@ int
 main ()
 {
 return ldap_bind ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ldap_ldap_bind=yes
+	ac_cv_lib_ldap_ldap_bind=yes
 else
-  ac_cv_lib_ldap_ldap_bind=no
+	ac_cv_lib_ldap_ldap_bind=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_bind" >&5
 $as_echo "$ac_cv_lib_ldap_ldap_bind" >&6; }
 if test "x$ac_cv_lib_ldap_ldap_bind" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBLDAP 1
 _ACEOF
 
-  LIBS="-lldap $LIBS"
+	LIBS="-lldap $LIBS"
 
 else
-  as_fn_error $? "library 'ldap' is required for LDAP" "$LINENO" 5
+	as_fn_error $? "library 'ldap' is required for LDAP" "$LINENO" 5
 fi
 
-    LDAP_LIBS_BE="-lldap $EXTRA_LDAP_LIBS"
-    # This test is carried out against libldap.
-    for ac_func in ldap_initialize
+		LDAP_LIBS_BE="-lldap $EXTRA_LDAP_LIBS"
+		# This test is carried out against libldap.
+		for ac_func in ldap_initialize
 do :
-  ac_fn_c_check_func "$LINENO" "ldap_initialize" "ac_cv_func_ldap_initialize"
+	ac_fn_c_check_func "$LINENO" "ldap_initialize" "ac_cv_func_ldap_initialize"
 if test "x$ac_cv_func_ldap_initialize" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_LDAP_INITIALIZE 1
 _ACEOF
 
 fi
 done
 
-    # The separate ldap_r library only exists in OpenLDAP < 2.5, and if we
-    # have 2.5 or later, we shouldn't even probe for ldap_r (we might find a
-    # library from a separate OpenLDAP installation).  The most reliable
-    # way to check that is to check for a function introduced in 2.5.
-    ac_fn_c_check_func "$LINENO" "ldap_verify_credentials" "ac_cv_func_ldap_verify_credentials"
+		# The separate ldap_r library only exists in OpenLDAP < 2.5, and if we
+		# have 2.5 or later, we shouldn't even probe for ldap_r (we might find a
+		# library from a separate OpenLDAP installation).  The most reliable
+		# way to check that is to check for a function introduced in 2.5.
+		ac_fn_c_check_func "$LINENO" "ldap_verify_credentials" "ac_cv_func_ldap_verify_credentials"
 if test "x$ac_cv_func_ldap_verify_credentials" = xyes; then :
-  thread_safe_libldap=yes
+	thread_safe_libldap=yes
 else
-  thread_safe_libldap=no
+	thread_safe_libldap=no
 fi
 
-    if test "$thread_safe_libldap" = no; then
-      # Use ldap_r for FE if available, else assume ldap is thread-safe.
-      # On some platforms ldap_r fails to link without PTHREAD_LIBS.
-      LIBS="$_LIBS"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_bind in -lldap_r" >&5
+		if test "$thread_safe_libldap" = no; then
+			# Use ldap_r for FE if available, else assume ldap is thread-safe.
+			# On some platforms ldap_r fails to link without PTHREAD_LIBS.
+			LIBS="$_LIBS"
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_bind in -lldap_r" >&5
 $as_echo_n "checking for ldap_bind in -lldap_r... " >&6; }
 if ${ac_cv_lib_ldap_r_ldap_bind+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
+	ac_check_lib_save_LIBS=$LIBS
 LIBS="-lldap_r $PTHREAD_CFLAGS $PTHREAD_LIBS $EXTRA_LDAP_LIBS $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -13386,44 +13386,44 @@ int
 main ()
 {
 return ldap_bind ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ldap_r_ldap_bind=yes
+	ac_cv_lib_ldap_r_ldap_bind=yes
 else
-  ac_cv_lib_ldap_r_ldap_bind=no
+	ac_cv_lib_ldap_r_ldap_bind=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_r_ldap_bind" >&5
 $as_echo "$ac_cv_lib_ldap_r_ldap_bind" >&6; }
 if test "x$ac_cv_lib_ldap_r_ldap_bind" = xyes; then :
-  LDAP_LIBS_FE="-lldap_r $EXTRA_LDAP_LIBS"
+	LDAP_LIBS_FE="-lldap_r $EXTRA_LDAP_LIBS"
 else
-  LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"
+	LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"
 fi
 
-    else
-      LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_bind in -lwldap32" >&5
+		else
+			LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"
+		fi
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_bind in -lwldap32" >&5
 $as_echo_n "checking for ldap_bind in -lwldap32... " >&6; }
 if ${ac_cv_lib_wldap32_ldap_bind+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
+	ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwldap32  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -13432,55 +13432,55 @@ int
 main ()
 {
 return ldap_bind ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_wldap32_ldap_bind=yes
+	ac_cv_lib_wldap32_ldap_bind=yes
 else
-  ac_cv_lib_wldap32_ldap_bind=no
+	ac_cv_lib_wldap32_ldap_bind=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wldap32_ldap_bind" >&5
 $as_echo "$ac_cv_lib_wldap32_ldap_bind" >&6; }
 if test "x$ac_cv_lib_wldap32_ldap_bind" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBWLDAP32 1
 _ACEOF
 
-  LIBS="-lwldap32 $LIBS"
+	LIBS="-lwldap32 $LIBS"
 
 else
-  as_fn_error $? "library 'wldap32' is required for LDAP" "$LINENO" 5
+	as_fn_error $? "library 'wldap32' is required for LDAP" "$LINENO" 5
 fi
 
-    LDAP_LIBS_FE="-lwldap32"
-    LDAP_LIBS_BE="-lwldap32"
-  fi
-  LIBS="$_LIBS"
+		LDAP_LIBS_FE="-lwldap32"
+		LDAP_LIBS_BE="-lwldap32"
+	fi
+	LIBS="$_LIBS"
 fi
 
 
 
 # for contrib/sepgsql
 if test "$with_selinux" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for security_compute_create_name in -lselinux" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for security_compute_create_name in -lselinux" >&5
 $as_echo_n "checking for security_compute_create_name in -lselinux... " >&6; }
 if ${ac_cv_lib_selinux_security_compute_create_name+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
+	ac_check_lib_save_LIBS=$LIBS
 LIBS="-lselinux  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -13489,63 +13489,63 @@ int
 main ()
 {
 return security_compute_create_name ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_selinux_security_compute_create_name=yes
+	ac_cv_lib_selinux_security_compute_create_name=yes
 else
-  ac_cv_lib_selinux_security_compute_create_name=no
+	ac_cv_lib_selinux_security_compute_create_name=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_security_compute_create_name" >&5
 $as_echo "$ac_cv_lib_selinux_security_compute_create_name" >&6; }
 if test "x$ac_cv_lib_selinux_security_compute_create_name" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSELINUX 1
 _ACEOF
 
-  LIBS="-lselinux $LIBS"
+	LIBS="-lselinux $LIBS"
 
 else
-  as_fn_error $? "library 'libselinux', version 2.1.10 or newer, is required for SELinux support" "$LINENO" 5
+	as_fn_error $? "library 'libselinux', version 2.1.10 or newer, is required for SELinux support" "$LINENO" 5
 fi
 
 fi
 
 # for contrib/uuid-ossp
 if test "$with_uuid" = bsd ; then
-  # On BSD, the UUID functions are in libc
-  ac_fn_c_check_func "$LINENO" "uuid_to_string" "ac_cv_func_uuid_to_string"
+	# On BSD, the UUID functions are in libc
+	ac_fn_c_check_func "$LINENO" "uuid_to_string" "ac_cv_func_uuid_to_string"
 if test "x$ac_cv_func_uuid_to_string" = xyes; then :
-  UUID_LIBS=""
+	UUID_LIBS=""
 else
-  as_fn_error $? "BSD UUID functions are not present" "$LINENO" 5
+	as_fn_error $? "BSD UUID functions are not present" "$LINENO" 5
 fi
 
 elif test "$with_uuid" = e2fs ; then
-  # On macOS, the UUID functions are in libc
-  ac_fn_c_check_func "$LINENO" "uuid_generate" "ac_cv_func_uuid_generate"
+	# On macOS, the UUID functions are in libc
+	ac_fn_c_check_func "$LINENO" "uuid_generate" "ac_cv_func_uuid_generate"
 if test "x$ac_cv_func_uuid_generate" = xyes; then :
-  UUID_LIBS=""
+	UUID_LIBS=""
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5
 $as_echo_n "checking for uuid_generate in -luuid... " >&6; }
 if ${ac_cv_lib_uuid_uuid_generate+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
+	ac_check_lib_save_LIBS=$LIBS
 LIBS="-luuid  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -13554,43 +13554,43 @@ int
 main ()
 {
 return uuid_generate ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_uuid_uuid_generate=yes
+	ac_cv_lib_uuid_uuid_generate=yes
 else
-  ac_cv_lib_uuid_uuid_generate=no
+	ac_cv_lib_uuid_uuid_generate=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate" >&5
 $as_echo "$ac_cv_lib_uuid_uuid_generate" >&6; }
 if test "x$ac_cv_lib_uuid_uuid_generate" = xyes; then :
-  UUID_LIBS="-luuid"
+	UUID_LIBS="-luuid"
 else
-  as_fn_error $? "library 'uuid' is required for E2FS UUID" "$LINENO" 5
+	as_fn_error $? "library 'uuid' is required for E2FS UUID" "$LINENO" 5
 fi
 
 fi
 
 elif test "$with_uuid" = ossp ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_export in -lossp-uuid" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_export in -lossp-uuid" >&5
 $as_echo_n "checking for uuid_export in -lossp-uuid... " >&6; }
 if ${ac_cv_lib_ossp_uuid_uuid_export+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
+	ac_check_lib_save_LIBS=$LIBS
 LIBS="-lossp-uuid  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -13599,37 +13599,37 @@ int
 main ()
 {
 return uuid_export ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ossp_uuid_uuid_export=yes
+	ac_cv_lib_ossp_uuid_uuid_export=yes
 else
-  ac_cv_lib_ossp_uuid_uuid_export=no
+	ac_cv_lib_ossp_uuid_uuid_export=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossp_uuid_uuid_export" >&5
 $as_echo "$ac_cv_lib_ossp_uuid_uuid_export" >&6; }
 if test "x$ac_cv_lib_ossp_uuid_uuid_export" = xyes; then :
-  UUID_LIBS="-lossp-uuid"
+	UUID_LIBS="-lossp-uuid"
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_export in -luuid" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_export in -luuid" >&5
 $as_echo_n "checking for uuid_export in -luuid... " >&6; }
 if ${ac_cv_lib_uuid_uuid_export+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
+	ac_check_lib_save_LIBS=$LIBS
 LIBS="-luuid  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -13638,25 +13638,25 @@ int
 main ()
 {
 return uuid_export ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_uuid_uuid_export=yes
+	ac_cv_lib_uuid_uuid_export=yes
 else
-  ac_cv_lib_uuid_uuid_export=no
+	ac_cv_lib_uuid_uuid_export=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_export" >&5
 $as_echo "$ac_cv_lib_uuid_uuid_export" >&6; }
 if test "x$ac_cv_lib_uuid_uuid_export" = xyes; then :
-  UUID_LIBS="-luuid"
+	UUID_LIBS="-luuid"
 else
-  as_fn_error $? "library 'ossp-uuid' or 'uuid' is required for OSSP UUID" "$LINENO" 5
+	as_fn_error $? "library 'ossp-uuid' or 'uuid' is required for OSSP UUID" "$LINENO" 5
 fi
 
 fi
@@ -13671,10 +13671,10 @@ fi
 
 for ac_header in atomic.h copyfile.h execinfo.h getopt.h ifaddrs.h mbarrier.h sys/epoll.h sys/event.h sys/personality.h sys/prctl.h sys/procctl.h sys/signalfd.h sys/ucred.h termios.h uchar.h ucred.h xlocale.h
 do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
@@ -13684,25 +13684,25 @@ done
 
 
 if expr x"$pgac_cv_check_readline" : 'x-lreadline' >/dev/null ; then
-  for ac_header in readline/readline.h
+	for ac_header in readline/readline.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default"
 if test "x$ac_cv_header_readline_readline_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_READLINE_READLINE_H 1
 _ACEOF
 
 else
-  for ac_header in readline.h
+	for ac_header in readline.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "readline.h" "ac_cv_header_readline_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "readline.h" "ac_cv_header_readline_h" "$ac_includes_default"
 if test "x$ac_cv_header_readline_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_READLINE_H 1
 _ACEOF
 
 else
-  as_fn_error $? "readline header not found
+	as_fn_error $? "readline header not found
 If you have readline already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-readline to disable readline support." "$LINENO" 5
@@ -13714,25 +13714,25 @@ fi
 
 done
 
-  for ac_header in readline/history.h
+	for ac_header in readline/history.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default"
 if test "x$ac_cv_header_readline_history_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_READLINE_HISTORY_H 1
 _ACEOF
 
 else
-  for ac_header in history.h
+	for ac_header in history.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "history.h" "ac_cv_header_history_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "history.h" "ac_cv_header_history_h" "$ac_includes_default"
 if test "x$ac_cv_header_history_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_HISTORY_H 1
 _ACEOF
 
 else
-  as_fn_error $? "history header not found
+	as_fn_error $? "history header not found
 If you have readline already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-readline to disable readline support." "$LINENO" 5
@@ -13751,34 +13751,34 @@ if expr x"$pgac_cv_check_readline" : 'x-ledit' >/dev/null ; then
 # bad practice, since in combined installations readline will have its headers
 # there.  We might have to resort to AC_EGREP checks to make sure we found
 # the proper header...
-  for ac_header in editline/readline.h
+	for ac_header in editline/readline.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "editline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "editline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default"
 if test "x$ac_cv_header_editline_readline_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_EDITLINE_READLINE_H 1
 _ACEOF
 
 else
-  for ac_header in readline.h
+	for ac_header in readline.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "readline.h" "ac_cv_header_readline_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "readline.h" "ac_cv_header_readline_h" "$ac_includes_default"
 if test "x$ac_cv_header_readline_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_READLINE_H 1
 _ACEOF
 
 else
-  for ac_header in readline/readline.h
+	for ac_header in readline/readline.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default"
 if test "x$ac_cv_header_readline_readline_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_READLINE_READLINE_H 1
 _ACEOF
 
 else
-  as_fn_error $? "readline header not found
+	as_fn_error $? "readline header not found
 If you have libedit already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-readline to disable libedit support." "$LINENO" 5
@@ -13797,29 +13797,29 @@ done
 # Note: in a libedit installation, history.h is sometimes a dummy, and may
 # not be there at all.  Hence, don't complain if not found.  We must check
 # though, since in yet other versions it is an independent header.
-  for ac_header in editline/history.h
+	for ac_header in editline/history.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "editline/history.h" "ac_cv_header_editline_history_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "editline/history.h" "ac_cv_header_editline_history_h" "$ac_includes_default"
 if test "x$ac_cv_header_editline_history_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_EDITLINE_HISTORY_H 1
 _ACEOF
 
 else
-  for ac_header in history.h
+	for ac_header in history.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "history.h" "ac_cv_header_history_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "history.h" "ac_cv_header_history_h" "$ac_includes_default"
 if test "x$ac_cv_header_history_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_HISTORY_H 1
 _ACEOF
 
 else
-  for ac_header in readline/history.h
+	for ac_header in readline/history.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default"
 if test "x$ac_cv_header_readline_history_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_READLINE_HISTORY_H 1
 _ACEOF
 
@@ -13838,11 +13838,11 @@ done
 fi
 
 if test "$with_zlib" = yes; then
-  ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
 if test "x$ac_cv_header_zlib_h" = xyes; then :
 
 else
-  as_fn_error $? "zlib header not found
+	as_fn_error $? "zlib header not found
 If you have zlib already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-zlib to disable zlib support." "$LINENO" 5
@@ -13852,155 +13852,155 @@ fi
 fi
 
 if test -z "$LZ4"; then
-  for ac_prog in lz4
+	for ac_prog in lz4
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_LZ4+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $LZ4 in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_LZ4="$LZ4" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $LZ4 in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_LZ4="$LZ4" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_LZ4="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_LZ4="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 LZ4=$ac_cv_path_LZ4
 if test -n "$LZ4"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LZ4" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LZ4" >&5
 $as_echo "$LZ4" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$LZ4" && break
+	test -n "$LZ4" && break
 done
 
 else
-  # Report the value of LZ4 in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LZ4" >&5
+	# Report the value of LZ4 in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LZ4" >&5
 $as_echo_n "checking for LZ4... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LZ4" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LZ4" >&5
 $as_echo "$LZ4" >&6; }
 fi
 
 if test "$with_lz4" = yes; then
-  ac_fn_c_check_header_mongrel "$LINENO" "lz4.h" "ac_cv_header_lz4_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "lz4.h" "ac_cv_header_lz4_h" "$ac_includes_default"
 if test "x$ac_cv_header_lz4_h" = xyes; then :
 
 else
-  as_fn_error $? "lz4.h header file is required for LZ4" "$LINENO" 5
+	as_fn_error $? "lz4.h header file is required for LZ4" "$LINENO" 5
 fi
 
 
 fi
 
 if test -z "$ZSTD"; then
-  for ac_prog in zstd
+	for ac_prog in zstd
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_ZSTD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ZSTD in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ZSTD="$ZSTD" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $ZSTD in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_ZSTD="$ZSTD" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ZSTD="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_ZSTD="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 ZSTD=$ac_cv_path_ZSTD
 if test -n "$ZSTD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZSTD" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZSTD" >&5
 $as_echo "$ZSTD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$ZSTD" && break
+	test -n "$ZSTD" && break
 done
 
 else
-  # Report the value of ZSTD in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZSTD" >&5
+	# Report the value of ZSTD in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZSTD" >&5
 $as_echo_n "checking for ZSTD... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZSTD" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZSTD" >&5
 $as_echo "$ZSTD" >&6; }
 fi
 
 if test "$with_zstd" = yes; then
-  ac_fn_c_check_header_mongrel "$LINENO" "zstd.h" "ac_cv_header_zstd_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "zstd.h" "ac_cv_header_zstd_h" "$ac_includes_default"
 if test "x$ac_cv_header_zstd_h" = xyes; then :
 
 else
-  as_fn_error $? "zstd.h header file is required for ZSTD" "$LINENO" 5
+	as_fn_error $? "zstd.h header file is required for ZSTD" "$LINENO" 5
 fi
 
 
 fi
 
 if test "$with_gssapi" = yes ; then
-  for ac_header in gssapi/gssapi.h
+	for ac_header in gssapi/gssapi.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "gssapi/gssapi.h" "ac_cv_header_gssapi_gssapi_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "gssapi/gssapi.h" "ac_cv_header_gssapi_gssapi_h" "$ac_includes_default"
 if test "x$ac_cv_header_gssapi_gssapi_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_GSSAPI_GSSAPI_H 1
 _ACEOF
 
 else
-  for ac_header in gssapi.h
+	for ac_header in gssapi.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "gssapi.h" "ac_cv_header_gssapi_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "gssapi.h" "ac_cv_header_gssapi_h" "$ac_includes_default"
 if test "x$ac_cv_header_gssapi_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_GSSAPI_H 1
 _ACEOF
 
 else
-  as_fn_error $? "gssapi.h header file is required for GSSAPI" "$LINENO" 5
+	as_fn_error $? "gssapi.h header file is required for GSSAPI" "$LINENO" 5
 fi
 
 done
@@ -14009,25 +14009,25 @@ fi
 
 done
 
-  for ac_header in gssapi/gssapi_ext.h
+	for ac_header in gssapi/gssapi_ext.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "gssapi/gssapi_ext.h" "ac_cv_header_gssapi_gssapi_ext_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "gssapi/gssapi_ext.h" "ac_cv_header_gssapi_gssapi_ext_h" "$ac_includes_default"
 if test "x$ac_cv_header_gssapi_gssapi_ext_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_GSSAPI_GSSAPI_EXT_H 1
 _ACEOF
 
 else
-  for ac_header in gssapi_ext.h
+	for ac_header in gssapi_ext.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "gssapi_ext.h" "ac_cv_header_gssapi_ext_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "gssapi_ext.h" "ac_cv_header_gssapi_ext_h" "$ac_includes_default"
 if test "x$ac_cv_header_gssapi_ext_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_GSSAPI_EXT_H 1
 _ACEOF
 
 else
-  as_fn_error $? "gssapi_ext.h header file is required for GSSAPI" "$LINENO" 5
+	as_fn_error $? "gssapi_ext.h header file is required for GSSAPI" "$LINENO" 5
 fi
 
 done
@@ -14039,56 +14039,56 @@ done
 fi
 
 if test -z "$OPENSSL"; then
-  for ac_prog in openssl
+	for ac_prog in openssl
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_OPENSSL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $OPENSSL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_OPENSSL="$OPENSSL" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $OPENSSL in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_OPENSSL="$OPENSSL" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_OPENSSL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_OPENSSL="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 OPENSSL=$ac_cv_path_OPENSSL
 if test -n "$OPENSSL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL" >&5
 $as_echo "$OPENSSL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$OPENSSL" && break
+	test -n "$OPENSSL" && break
 done
 
 else
-  # Report the value of OPENSSL in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5
+	# Report the value of OPENSSL in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5
 $as_echo_n "checking for OPENSSL... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL" >&5
 $as_echo "$OPENSSL" >&6; }
 fi
 
@@ -14096,44 +14096,44 @@ pgac_openssl_version="$($OPENSSL version 2> /dev/null || echo openssl not found)
 { $as_echo "$as_me:${as_lineno-$LINENO}: using openssl: $pgac_openssl_version" >&5
 $as_echo "$as_me: using openssl: $pgac_openssl_version" >&6;}
 if test "$with_ssl" = openssl ; then
-  ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
 if test "x$ac_cv_header_openssl_ssl_h" = xyes; then :
 
 else
-  as_fn_error $? "header file <openssl/ssl.h> is required for OpenSSL" "$LINENO" 5
+	as_fn_error $? "header file <openssl/ssl.h> is required for OpenSSL" "$LINENO" 5
 fi
 
 
-  ac_fn_c_check_header_mongrel "$LINENO" "openssl/err.h" "ac_cv_header_openssl_err_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "openssl/err.h" "ac_cv_header_openssl_err_h" "$ac_includes_default"
 if test "x$ac_cv_header_openssl_err_h" = xyes; then :
 
 else
-  as_fn_error $? "header file <openssl/err.h> is required for OpenSSL" "$LINENO" 5
+	as_fn_error $? "header file <openssl/err.h> is required for OpenSSL" "$LINENO" 5
 fi
 
 
 fi
 
 if test "$with_pam" = yes ; then
-  for ac_header in security/pam_appl.h
+	for ac_header in security/pam_appl.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "security/pam_appl.h" "ac_cv_header_security_pam_appl_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "security/pam_appl.h" "ac_cv_header_security_pam_appl_h" "$ac_includes_default"
 if test "x$ac_cv_header_security_pam_appl_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_SECURITY_PAM_APPL_H 1
 _ACEOF
 
 else
-  for ac_header in pam/pam_appl.h
+	for ac_header in pam/pam_appl.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "pam/pam_appl.h" "ac_cv_header_pam_pam_appl_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "pam/pam_appl.h" "ac_cv_header_pam_pam_appl_h" "$ac_includes_default"
 if test "x$ac_cv_header_pam_pam_appl_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_PAM_PAM_APPL_H 1
 _ACEOF
 
 else
-  as_fn_error $? "header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM." "$LINENO" 5
+	as_fn_error $? "header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM." "$LINENO" 5
 fi
 
 done
@@ -14145,84 +14145,84 @@ done
 fi
 
 if test "$with_bsd_auth" = yes ; then
-  ac_fn_c_check_header_mongrel "$LINENO" "bsd_auth.h" "ac_cv_header_bsd_auth_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "bsd_auth.h" "ac_cv_header_bsd_auth_h" "$ac_includes_default"
 if test "x$ac_cv_header_bsd_auth_h" = xyes; then :
 
 else
-  as_fn_error $? "header file <bsd_auth.h> is required for BSD Authentication support" "$LINENO" 5
+	as_fn_error $? "header file <bsd_auth.h> is required for BSD Authentication support" "$LINENO" 5
 fi
 
 
 fi
 
 if test "$with_systemd" = yes ; then
-  ac_fn_c_check_header_mongrel "$LINENO" "systemd/sd-daemon.h" "ac_cv_header_systemd_sd_daemon_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "systemd/sd-daemon.h" "ac_cv_header_systemd_sd_daemon_h" "$ac_includes_default"
 if test "x$ac_cv_header_systemd_sd_daemon_h" = xyes; then :
 
 else
-  as_fn_error $? "header file <systemd/sd-daemon.h> is required for systemd support" "$LINENO" 5
+	as_fn_error $? "header file <systemd/sd-daemon.h> is required for systemd support" "$LINENO" 5
 fi
 
 
 fi
 
 if test "$with_libxml" = yes ; then
-  ac_fn_c_check_header_mongrel "$LINENO" "libxml/parser.h" "ac_cv_header_libxml_parser_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "libxml/parser.h" "ac_cv_header_libxml_parser_h" "$ac_includes_default"
 if test "x$ac_cv_header_libxml_parser_h" = xyes; then :
 
 else
-  as_fn_error $? "header file <libxml/parser.h> is required for XML support" "$LINENO" 5
+	as_fn_error $? "header file <libxml/parser.h> is required for XML support" "$LINENO" 5
 fi
 
 
 fi
 
 if test "$with_libxslt" = yes ; then
-  ac_fn_c_check_header_mongrel "$LINENO" "libxslt/xslt.h" "ac_cv_header_libxslt_xslt_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "libxslt/xslt.h" "ac_cv_header_libxslt_xslt_h" "$ac_includes_default"
 if test "x$ac_cv_header_libxslt_xslt_h" = xyes; then :
 
 else
-  as_fn_error $? "header file <libxslt/xslt.h> is required for XSLT support" "$LINENO" 5
+	as_fn_error $? "header file <libxslt/xslt.h> is required for XSLT support" "$LINENO" 5
 fi
 
 
 fi
 
 if test "$with_ldap" = yes ; then
-  if test "$PORTNAME" != "win32"; then
-     ac_fn_c_check_header_mongrel "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default"
+	if test "$PORTNAME" != "win32"; then
+		 ac_fn_c_check_header_mongrel "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default"
 if test "x$ac_cv_header_ldap_h" = xyes; then :
 
 else
-  as_fn_error $? "header file <ldap.h> is required for LDAP" "$LINENO" 5
+	as_fn_error $? "header file <ldap.h> is required for LDAP" "$LINENO" 5
 fi
 
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compatible LDAP implementation" >&5
+		 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compatible LDAP implementation" >&5
 $as_echo_n "checking for compatible LDAP implementation... " >&6; }
 if ${pgac_cv_ldap_safe+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ldap.h>
 #if !defined(LDAP_VENDOR_VERSION) || \
-     (defined(LDAP_API_FEATURE_X_OPENLDAP) && \
-      LDAP_VENDOR_VERSION >= 20424 && LDAP_VENDOR_VERSION <= 20431)
+		 (defined(LDAP_API_FEATURE_X_OPENLDAP) && \
+			LDAP_VENDOR_VERSION >= 20424 && LDAP_VENDOR_VERSION <= 20431)
 choke me
 #endif
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_ldap_safe=yes
+	pgac_cv_ldap_safe=yes
 else
-  pgac_cv_ldap_safe=no
+	pgac_cv_ldap_safe=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
@@ -14230,7 +14230,7 @@ fi
 $as_echo "$pgac_cv_ldap_safe" >&6; }
 
 if test "$pgac_cv_ldap_safe" != yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
 *** With OpenLDAP versions 2.4.24 through 2.4.31, inclusive, each backend
 *** process that loads libpq (via WAL receiver, dblink, or postgres_fdw) and
 *** also uses LDAP will crash on exit." >&5
@@ -14239,27 +14239,27 @@ $as_echo "$as_me: WARNING:
 *** process that loads libpq (via WAL receiver, dblink, or postgres_fdw) and
 *** also uses LDAP will crash on exit." >&2;}
 fi
-  else
-     ac_fn_c_check_header_compile "$LINENO" "winldap.h" "ac_cv_header_winldap_h" "$ac_includes_default
+	else
+		 ac_fn_c_check_header_compile "$LINENO" "winldap.h" "ac_cv_header_winldap_h" "$ac_includes_default
 #include <windows.h>
 
 "
 if test "x$ac_cv_header_winldap_h" = xyes; then :
 
 else
-  as_fn_error $? "header file <winldap.h> is required for LDAP" "$LINENO" 5
+	as_fn_error $? "header file <winldap.h> is required for LDAP" "$LINENO" 5
 fi
 
 
-  fi
+	fi
 fi
 
 if test "$with_bonjour" = yes ; then
-  ac_fn_c_check_header_mongrel "$LINENO" "dns_sd.h" "ac_cv_header_dns_sd_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "dns_sd.h" "ac_cv_header_dns_sd_h" "$ac_includes_default"
 if test "x$ac_cv_header_dns_sd_h" = xyes; then :
 
 else
-  as_fn_error $? "header file <dns_sd.h> is required for Bonjour" "$LINENO" 5
+	as_fn_error $? "header file <dns_sd.h> is required for Bonjour" "$LINENO" 5
 fi
 
 
@@ -14267,11 +14267,11 @@ fi
 
 # for contrib/uuid-ossp
 if test "$with_uuid" = bsd ; then
-  for ac_header in uuid.h
+	for ac_header in uuid.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "uuid.h" "ac_cv_header_uuid_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "uuid.h" "ac_cv_header_uuid_h" "$ac_includes_default"
 if test "x$ac_cv_header_uuid_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_UUID_H 1
 _ACEOF
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14280,25 +14280,25 @@ _ACEOF
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uuid_to_string" >/dev/null 2>&1; then :
+	$EGREP "uuid_to_string" >/dev/null 2>&1; then :
 
 else
-  as_fn_error $? "header file <uuid.h> does not match BSD UUID library" "$LINENO" 5
+	as_fn_error $? "header file <uuid.h> does not match BSD UUID library" "$LINENO" 5
 fi
 rm -f conftest*
 
 else
-  as_fn_error $? "header file <uuid.h> is required for BSD UUID" "$LINENO" 5
+	as_fn_error $? "header file <uuid.h> is required for BSD UUID" "$LINENO" 5
 fi
 
 done
 
 elif test "$with_uuid" = e2fs ; then
-  for ac_header in uuid/uuid.h
+	for ac_header in uuid/uuid.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
 if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_UUID_UUID_H 1
 _ACEOF
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14307,19 +14307,19 @@ _ACEOF
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uuid_generate" >/dev/null 2>&1; then :
+	$EGREP "uuid_generate" >/dev/null 2>&1; then :
 
 else
-  as_fn_error $? "header file <uuid/uuid.h> does not match E2FS UUID library" "$LINENO" 5
+	as_fn_error $? "header file <uuid/uuid.h> does not match E2FS UUID library" "$LINENO" 5
 fi
 rm -f conftest*
 
 else
-  for ac_header in uuid.h
+	for ac_header in uuid.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "uuid.h" "ac_cv_header_uuid_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "uuid.h" "ac_cv_header_uuid_h" "$ac_includes_default"
 if test "x$ac_cv_header_uuid_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_UUID_H 1
 _ACEOF
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14328,15 +14328,15 @@ _ACEOF
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uuid_generate" >/dev/null 2>&1; then :
+	$EGREP "uuid_generate" >/dev/null 2>&1; then :
 
 else
-  as_fn_error $? "header file <uuid.h> does not match E2FS UUID library" "$LINENO" 5
+	as_fn_error $? "header file <uuid.h> does not match E2FS UUID library" "$LINENO" 5
 fi
 rm -f conftest*
 
 else
-  as_fn_error $? "header file <uuid/uuid.h> or <uuid.h> is required for E2FS UUID" "$LINENO" 5
+	as_fn_error $? "header file <uuid/uuid.h> or <uuid.h> is required for E2FS UUID" "$LINENO" 5
 fi
 
 done
@@ -14346,11 +14346,11 @@ fi
 done
 
 elif test "$with_uuid" = ossp ; then
-  for ac_header in ossp/uuid.h
+	for ac_header in ossp/uuid.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "ossp/uuid.h" "ac_cv_header_ossp_uuid_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "ossp/uuid.h" "ac_cv_header_ossp_uuid_h" "$ac_includes_default"
 if test "x$ac_cv_header_ossp_uuid_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_OSSP_UUID_H 1
 _ACEOF
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14359,19 +14359,19 @@ _ACEOF
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uuid_export" >/dev/null 2>&1; then :
+	$EGREP "uuid_export" >/dev/null 2>&1; then :
 
 else
-  as_fn_error $? "header file <ossp/uuid.h> does not match OSSP UUID library" "$LINENO" 5
+	as_fn_error $? "header file <ossp/uuid.h> does not match OSSP UUID library" "$LINENO" 5
 fi
 rm -f conftest*
 
 else
-  for ac_header in uuid.h
+	for ac_header in uuid.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "uuid.h" "ac_cv_header_uuid_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "uuid.h" "ac_cv_header_uuid_h" "$ac_includes_default"
 if test "x$ac_cv_header_uuid_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_UUID_H 1
 _ACEOF
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14380,15 +14380,15 @@ _ACEOF
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uuid_export" >/dev/null 2>&1; then :
+	$EGREP "uuid_export" >/dev/null 2>&1; then :
 
 else
-  as_fn_error $? "header file <uuid.h> does not match OSSP UUID library" "$LINENO" 5
+	as_fn_error $? "header file <uuid.h> does not match OSSP UUID library" "$LINENO" 5
 fi
 rm -f conftest*
 
 else
-  as_fn_error $? "header file <ossp/uuid.h> or <uuid.h> is required for OSSP UUID" "$LINENO" 5
+	as_fn_error $? "header file <ossp/uuid.h> or <uuid.h> is required for OSSP UUID" "$LINENO" 5
 fi
 
 done
@@ -14400,11 +14400,11 @@ done
 fi
 
 if test "$PORTNAME" = "win32" ; then
-   for ac_header in crtdefs.h
+	 for ac_header in crtdefs.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "crtdefs.h" "ac_cv_header_crtdefs_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "crtdefs.h" "ac_cv_header_crtdefs_h" "$ac_includes_default"
 if test "x$ac_cv_header_crtdefs_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_CRTDEFS_H 1
 _ACEOF
 
@@ -14415,29 +14415,29 @@ done
 fi
 
 if test "$with_libcurl" = yes ; then
-  # Error out early if this platform can't support libpq-oauth.
-  if test "$ac_cv_header_sys_event_h" != yes -a "$ac_cv_header_sys_epoll_h" != yes; then
-    as_fn_error $? "client-side OAuth is not supported on this platform" "$LINENO" 5
-  fi
+	# Error out early if this platform can't support libpq-oauth.
+	if test "$ac_cv_header_sys_event_h" != yes -a "$ac_cv_header_sys_epoll_h" != yes; then
+		as_fn_error $? "client-side OAuth is not supported on this platform" "$LINENO" 5
+	fi
 fi
 
 ##
 ## Types, structures, compiler characteristics
 ##
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
 if ${ac_cv_c_bigendian+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_cv_c_bigendian=unknown
-    # See if we're dealing with a universal compiler.
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	ac_cv_c_bigendian=unknown
+		# See if we're dealing with a universal compiler.
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __APPLE_CC__
-	       not a universal capable compiler
-	     #endif
-	     typedef int dummy;
+				 not a universal capable compiler
+			 #endif
+			 typedef int dummy;
 
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
@@ -14448,45 +14448,45 @@ if ac_fn_c_try_compile "$LINENO"; then :
 	ac_prev=
 	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
 	 if test -n "$ac_prev"; then
-	   case $ac_word in
-	     i?86 | x86_64 | ppc | ppc64)
-	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+		 case $ac_word in
+			 i?86 | x86_64 | ppc | ppc64)
+				 if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
 		 ac_arch=$ac_word
-	       else
+				 else
 		 ac_cv_c_bigendian=universal
 		 break
-	       fi
-	       ;;
-	   esac
-	   ac_prev=
+				 fi
+				 ;;
+		 esac
+		 ac_prev=
 	 elif test "x$ac_word" = "x-arch"; then
-	   ac_prev=arch
+		 ac_prev=arch
 	 fi
-       done
+			 done
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if sys/param.h defines the BYTE_ORDER macro.
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+		if test $ac_cv_c_bigendian = unknown; then
+			# See if sys/param.h defines the BYTE_ORDER macro.
+			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
-	     #include <sys/param.h>
+			 #include <sys/param.h>
 
 int
 main ()
 {
 #if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-		     && LITTLE_ENDIAN)
-	      bogus endian macros
-	     #endif
+				 && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+				 && LITTLE_ENDIAN)
+				bogus endian macros
+			 #endif
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to BIG_ENDIAN or not.
+	# It does; now see whether it defined to BIG_ENDIAN or not.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
@@ -14499,22 +14499,22 @@ main ()
 		 not big endian
 		#endif
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_bigendian=yes
+	ac_cv_c_bigendian=yes
 else
-  ac_cv_c_bigendian=no
+	ac_cv_c_bigendian=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+		fi
+		if test $ac_cv_c_bigendian = unknown; then
+			# See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <limits.h>
 
@@ -14522,15 +14522,15 @@ int
 main ()
 {
 #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-	      bogus endian macros
-	     #endif
+				bogus endian macros
+			 #endif
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	# It does; now see whether it defined to _BIG_ENDIAN or not.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <limits.h>
@@ -14542,38 +14542,38 @@ main ()
 		 not big endian
 		#endif
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_bigendian=yes
+	ac_cv_c_bigendian=yes
 else
-  ac_cv_c_bigendian=no
+	ac_cv_c_bigendian=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # Compile a test program.
-      if test "$cross_compiling" = yes; then :
-  # Try to guess by grepping values from an object file.
+		fi
+		if test $ac_cv_c_bigendian = unknown; then
+			# Compile a test program.
+			if test "$cross_compiling" = yes; then :
+	# Try to guess by grepping values from an object file.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 short int ascii_mm[] =
-		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+			{ 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
 		short int ascii_ii[] =
-		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+			{ 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
 		int use_ascii (int i) {
-		  return ascii_mm[i] + ascii_ii[i];
+			return ascii_mm[i] + ascii_ii[i];
 		}
 		short int ebcdic_ii[] =
-		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+			{ 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
 		short int ebcdic_mm[] =
-		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+			{ 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
 		int use_ebcdic (int i) {
-		  return ebcdic_mm[i] + ebcdic_ii[i];
+			return ebcdic_mm[i] + ebcdic_ii[i];
 		}
 		extern int foo;
 
@@ -14581,82 +14581,82 @@ int
 main ()
 {
 return use_ascii (foo) == use_ebcdic (foo);
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-	      ac_cv_c_bigendian=yes
-	    fi
-	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-	      if test "$ac_cv_c_bigendian" = unknown; then
+	if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+				ac_cv_c_bigendian=yes
+			fi
+			if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+				if test "$ac_cv_c_bigendian" = unknown; then
 		ac_cv_c_bigendian=no
-	      else
+				else
 		# finding both strings is unlikely to happen, but who knows?
 		ac_cv_c_bigendian=unknown
-	      fi
-	    fi
+				fi
+			fi
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
 main ()
 {
 
-	     /* Are we little or big endian?  From Harbison&Steele.  */
-	     union
-	     {
-	       long int l;
-	       char c[sizeof (long int)];
-	     } u;
-	     u.l = 1;
-	     return u.c[sizeof (long int) - 1] == 1;
-
-  ;
-  return 0;
+			 /* Are we little or big endian?  From Harbison&Steele.  */
+			 union
+			 {
+				 long int l;
+				 char c[sizeof (long int)];
+			 } u;
+			 u.l = 1;
+			 return u.c[sizeof (long int) - 1] == 1;
+
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_c_bigendian=no
+	ac_cv_c_bigendian=no
 else
-  ac_cv_c_bigendian=yes
+	ac_cv_c_bigendian=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+	conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-    fi
+		fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
 $as_echo "$ac_cv_c_bigendian" >&6; }
  case $ac_cv_c_bigendian in #(
-   yes)
-     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+	 yes)
+		 $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
 ;; #(
-   no)
-      ;; #(
-   universal)
+	 no)
+			;; #(
+	 universal)
 
 $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
-     ;; #(
-   *)
-     as_fn_error $? "unknown endianness
+		 ;; #(
+	 *)
+		 as_fn_error $? "unknown endianness
  presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
  esac
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 $as_echo_n "checking for inline... " >&6; }
 if ${ac_cv_c_inline+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_cv_c_inline=no
+	ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __cplusplus
 typedef int foo_t;
@@ -14666,10 +14666,10 @@ $ac_kw foo_t foo () {return 0; }
 
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_inline=$ac_kw
+	ac_cv_c_inline=$ac_kw
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  test "$ac_cv_c_inline" != no && break
+	test "$ac_cv_c_inline" != no && break
 done
 
 fi
@@ -14677,26 +14677,26 @@ fi
 $as_echo "$ac_cv_c_inline" >&6; }
 
 case $ac_cv_c_inline in
-  inline | yes) ;;
-  *)
-    case $ac_cv_c_inline in
-      no) ac_val=;;
-      *) ac_val=$ac_cv_c_inline;;
-    esac
-    cat >>confdefs.h <<_ACEOF
+	inline | yes) ;;
+	*)
+		case $ac_cv_c_inline in
+			no) ac_val=;;
+			*) ac_val=$ac_cv_c_inline;;
+		esac
+		cat >>confdefs.h <<_ACEOF
 #ifndef __cplusplus
 #define inline $ac_val
 #endif
 _ACEOF
-    ;;
+		;;
 esac
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C printf format archetype" >&5
 $as_echo_n "checking for C printf format archetype... " >&6; }
 if ${pgac_cv_printf_archetype+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_cv_printf_archetype=gnu_printf
+	pgac_cv_printf_archetype=gnu_printf
 ac_save_c_werror_flag=$ac_c_werror_flag
 ac_c_werror_flag=yes
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14707,21 +14707,21 @@ int
 main ()
 {
 pgac_write(0, "error %s: %m", "foo");
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_archetype_ok=yes
+	ac_archetype_ok=yes
 else
-  ac_archetype_ok=no
+	ac_archetype_ok=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
 
 if [ "$ac_archetype_ok" = no ]; then
-  pgac_cv_printf_archetype=__syslog__
-  ac_save_c_werror_flag=$ac_c_werror_flag
+	pgac_cv_printf_archetype=__syslog__
+	ac_save_c_werror_flag=$ac_c_werror_flag
 ac_c_werror_flag=yes
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -14731,21 +14731,21 @@ int
 main ()
 {
 pgac_write(0, "error %s: %m", "foo");
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_archetype_ok=yes
+	ac_archetype_ok=yes
 else
-  ac_archetype_ok=no
+	ac_archetype_ok=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
 
-  if [ "$ac_archetype_ok" = no ]; then
-    pgac_cv_printf_archetype=printf
-  fi
+	if [ "$ac_archetype_ok" = no ]; then
+		pgac_cv_printf_archetype=printf
+	fi
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_printf_archetype" >&5
@@ -14760,9 +14760,9 @@ _ACEOF
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ printf format archetype" >&5
 $as_echo_n "checking for C++ printf format archetype... " >&6; }
 if ${pgac_cv_cxx_printf_archetype+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_cv_cxx_printf_archetype=gnu_printf
+	pgac_cv_cxx_printf_archetype=gnu_printf
 ac_save_cxx_werror_flag=$ac_cxx_werror_flag
 ac_cxx_werror_flag=yes
 ac_ext=cpp
@@ -14779,14 +14779,14 @@ int
 main ()
 {
 pgac_write(0, "error %s: %m", "foo");
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_archetype_ok=yes
+	ac_archetype_ok=yes
 else
-  ac_archetype_ok=no
+	ac_archetype_ok=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
@@ -14798,8 +14798,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 
 if [ "$ac_archetype_ok" = no ]; then
-  pgac_cv_cxx_printf_archetype=__syslog__
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+	pgac_cv_cxx_printf_archetype=__syslog__
+	ac_save_cxx_werror_flag=$ac_cxx_werror_flag
 ac_cxx_werror_flag=yes
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -14815,14 +14815,14 @@ int
 main ()
 {
 pgac_write(0, "error %s: %m", "foo");
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_archetype_ok=yes
+	ac_archetype_ok=yes
 else
-  ac_archetype_ok=no
+	ac_archetype_ok=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
@@ -14833,9 +14833,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 
-  if [ "$ac_archetype_ok" = no ]; then
-    pgac_cv_cxx_printf_archetype=printf
-  fi
+	if [ "$ac_archetype_ok" = no ]; then
+		pgac_cv_cxx_printf_archetype=printf
+	fi
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_cxx_printf_archetype" >&5
@@ -14849,26 +14849,26 @@ _ACEOF
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for statement expressions" >&5
 $as_echo_n "checking for statement expressions... " >&6; }
 if ${pgac_cv_statement_expressions+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 ({ _Static_assert(1, "foo"); })
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv_statement_expressions=yes
+	pgac_cv_statement_expressions=yes
 else
-  pgac_cv_statement_expressions=no
+	pgac_cv_statement_expressions=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_statement_expressions" >&5
 $as_echo "$pgac_cv_statement_expressions" >&6; }
@@ -14880,11 +14880,11 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for typeof" >&5
 $as_echo_n "checking for typeof... " >&6; }
 if ${pgac_cv_c_typeof+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_cv_c_typeof=no
+	pgac_cv_c_typeof=no
 for pgac_kw in typeof __typeof__; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -14894,15 +14894,15 @@ int x = 0;
 $pgac_kw(x) y;
 y = x;
 return y;
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_c_typeof=$pgac_kw
+	pgac_cv_c_typeof=$pgac_kw
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  test "$pgac_cv_c_typeof" != no && break
+	test "$pgac_cv_c_typeof" != no && break
 done
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_c_typeof" >&5
@@ -14911,34 +14911,34 @@ if test "$pgac_cv_c_typeof" != no; then
 
 $as_echo "#define HAVE_TYPEOF 1" >>confdefs.h
 
-  if test "$pgac_cv_c_typeof" != typeof; then
+	if test "$pgac_cv_c_typeof" != typeof; then
 
 cat >>confdefs.h <<_ACEOF
 #define typeof $pgac_cv_c_typeof
 _ACEOF
 
-  fi
+	fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_types_compatible_p" >&5
 $as_echo_n "checking for __builtin_types_compatible_p... " >&6; }
 if ${pgac_cv__types_compatible+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
  int x; static int y[__builtin_types_compatible_p(__typeof__(x), int)];
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv__types_compatible=yes
+	pgac_cv__types_compatible=yes
 else
-  pgac_cv__types_compatible=no
+	pgac_cv__types_compatible=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
@@ -14952,20 +14952,20 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_constant_p" >&5
 $as_echo_n "checking for __builtin_constant_p... " >&6; }
 if ${pgac_cv__builtin_constant_p+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 static int x;
-  static int y[__builtin_constant_p(x) ? x : 1];
-  static int z[__builtin_constant_p("string literal") ? 1 : x];
+	static int y[__builtin_constant_p(x) ? x : 1];
+	static int z[__builtin_constant_p("string literal") ? 1 : x];
 
 
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv__builtin_constant_p=yes
+	pgac_cv__builtin_constant_p=yes
 else
-  pgac_cv__builtin_constant_p=no
+	pgac_cv__builtin_constant_p=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
@@ -14979,9 +14979,9 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_mul_overflow" >&5
 $as_echo_n "checking for __builtin_mul_overflow... " >&6; }
 if ${pgac_cv__builtin_op_overflow+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdint.h>
@@ -14994,17 +14994,17 @@ int
 main ()
 {
 oflo = __builtin_mul_overflow(a, b, &result);
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv__builtin_op_overflow=yes
+	pgac_cv__builtin_op_overflow=yes
 else
-  pgac_cv__builtin_op_overflow=no
+	pgac_cv__builtin_op_overflow=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__builtin_op_overflow" >&5
 $as_echo "$pgac_cv__builtin_op_overflow" >&6; }
@@ -15016,26 +15016,26 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_unreachable" >&5
 $as_echo_n "checking for __builtin_unreachable... " >&6; }
 if ${pgac_cv__builtin_unreachable+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 __builtin_unreachable();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv__builtin_unreachable=yes
+	pgac_cv__builtin_unreachable=yes
 else
-  pgac_cv__builtin_unreachable=no
+	pgac_cv__builtin_unreachable=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__builtin_unreachable" >&5
 $as_echo "$pgac_cv__builtin_unreachable" >&6; }
@@ -15047,27 +15047,27 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for computed goto support" >&5
 $as_echo_n "checking for computed goto support... " >&6; }
 if ${pgac_cv_computed_goto+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 void *labeladdrs[] = {&&my_label};
-  goto *labeladdrs[0];
-  my_label:
-  return 1;
+	goto *labeladdrs[0];
+	my_label:
+	return 1;
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_computed_goto=yes
+	pgac_cv_computed_goto=yes
 else
-  pgac_cv_computed_goto=no
+	pgac_cv_computed_goto=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
@@ -15138,17 +15138,17 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
 $as_echo_n "checking for C/C++ restrict keyword... " >&6; }
 if ${ac_cv_c_restrict+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_cv_c_restrict=no
-   # The order here caters to the fact that C++ does not require restrict.
-   for ac_kw in __restrict __restrict__ _Restrict restrict; do
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	ac_cv_c_restrict=no
+	 # The order here caters to the fact that C++ does not require restrict.
+	 for ac_kw in __restrict __restrict__ _Restrict restrict; do
+		 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 typedef int * int_ptr;
 	int foo (int_ptr $ac_kw ip) {
 	return ip[0];
-       }
+			 }
 int
 main ()
 {
@@ -15156,26 +15156,26 @@ int s[1];
 	int * $ac_kw t = s;
 	t[0] = 0;
 	return foo(t)
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_restrict=$ac_kw
+	ac_cv_c_restrict=$ac_kw
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-     test "$ac_cv_c_restrict" != no && break
-   done
+		 test "$ac_cv_c_restrict" != no && break
+	 done
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
 $as_echo "$ac_cv_c_restrict" >&6; }
 
  case $ac_cv_c_restrict in
-   restrict) ;;
-   no) $as_echo "#define restrict /**/" >>confdefs.h
+	 restrict) ;;
+	 no) $as_echo "#define restrict /**/" >>confdefs.h
  ;;
-   *)  cat >>confdefs.h <<_ACEOF
+	 *)  cat >>confdefs.h <<_ACEOF
 #define restrict $ac_cv_c_restrict
 _ACEOF
  ;;
@@ -15197,14 +15197,14 @@ fi
 
 
 case $host_cpu in
-  x86_64)
-    # On x86_64, check if we can compile a popcntq instruction
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether assembler supports x86_64 popcntq" >&5
+	x86_64)
+		# On x86_64, check if we can compile a popcntq instruction
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether assembler supports x86_64 popcntq" >&5
 $as_echo_n "checking whether assembler supports x86_64 popcntq... " >&6; }
 if ${pgac_cv_have_x86_64_popcntq+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -15212,67 +15212,67 @@ main ()
 {
 long long x = 1; long long r;
 	 __asm__ __volatile__ (" popcntq %1,%0\n" : "=q"(r) : "rm"(x));
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_have_x86_64_popcntq=yes
+	pgac_cv_have_x86_64_popcntq=yes
 else
-  pgac_cv_have_x86_64_popcntq=no
+	pgac_cv_have_x86_64_popcntq=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_have_x86_64_popcntq" >&5
 $as_echo "$pgac_cv_have_x86_64_popcntq" >&6; }
-    if test x"$pgac_cv_have_x86_64_popcntq" = xyes ; then
+		if test x"$pgac_cv_have_x86_64_popcntq" = xyes ; then
 
 $as_echo "#define HAVE_X86_64_POPCNTQ 1" >>confdefs.h
 
-    fi
-  ;;
-  ppc*|powerpc*)
-    # On PPC, check if compiler accepts "i"(x) when __builtin_constant_p(x).
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __builtin_constant_p(x) implies \"i\"(x) acceptance" >&5
+		fi
+	;;
+	ppc*|powerpc*)
+		# On PPC, check if compiler accepts "i"(x) when __builtin_constant_p(x).
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __builtin_constant_p(x) implies \"i\"(x) acceptance" >&5
 $as_echo_n "checking whether __builtin_constant_p(x) implies \"i\"(x) acceptance... " >&6; }
 if ${pgac_cv_have_i_constraint__builtin_constant_p+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 static inline int
-     addi(int ra, int si)
-     {
-         int res = 0;
-         if (__builtin_constant_p(si))
-             __asm__ __volatile__(
-                 " addi %0,%1,%2\n" : "=r"(res) : "b"(ra), "i"(si));
-         return res;
-     }
-     int test_adds(int x) { return addi(3, x) + addi(x, 5); }
+		 addi(int ra, int si)
+		 {
+				 int res = 0;
+				 if (__builtin_constant_p(si))
+						 __asm__ __volatile__(
+								 " addi %0,%1,%2\n" : "=r"(res) : "b"(ra), "i"(si));
+				 return res;
+		 }
+		 int test_adds(int x) { return addi(3, x) + addi(x, 5); }
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_have_i_constraint__builtin_constant_p=yes
+	pgac_cv_have_i_constraint__builtin_constant_p=yes
 else
-  pgac_cv_have_i_constraint__builtin_constant_p=no
+	pgac_cv_have_i_constraint__builtin_constant_p=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_have_i_constraint__builtin_constant_p" >&5
 $as_echo "$pgac_cv_have_i_constraint__builtin_constant_p" >&6; }
-    if test x"$pgac_cv_have_i_constraint__builtin_constant_p" = xyes ; then
+		if test x"$pgac_cv_have_i_constraint__builtin_constant_p" = xyes ; then
 
 $as_echo "#define HAVE_I_CONSTRAINT__BUILTIN_CONSTANT_P 1" >>confdefs.h
 
-    fi
-  ;;
+		fi
+	;;
 esac
 
 # Check largefile support.  You might think this is a system service not a
@@ -15280,202 +15280,202 @@ esac
 # probing existence of related functions such as fseeko, since the largefile
 # defines can affect what is generated for that.
 if test "$PORTNAME" != "win32"; then
-   # Check whether --enable-largefile was given.
+	 # Check whether --enable-largefile was given.
 if test "${enable_largefile+set}" = set; then :
-  enableval=$enable_largefile;
+	enableval=$enable_largefile;
 fi
 
 if test "$enable_largefile" != no; then
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
 $as_echo_n "checking for special C compiler options needed for large files... " >&6; }
 if ${ac_cv_sys_largefile_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_cv_sys_largefile_CC=no
-     if test "$GCC" != yes; then
-       ac_save_CC=$CC
-       while :; do
+	ac_cv_sys_largefile_CC=no
+		 if test "$GCC" != yes; then
+			 ac_save_CC=$CC
+			 while :; do
 	 # IRIX 6.2 and later do not support large files by default,
 	 # so use the C compiler's -n32 option if that helps.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
+		We can't simply define LARGE_OFF_T to be 9223372036854775807,
+		since some C++ compilers masquerading as C compilers
+		incorrectly reject 9223372036854775807.  */
 #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
+	int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+					 && LARGE_OFF_T % 2147483647 == 1)
+					? 1 : -1];
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 	 if ac_fn_c_try_compile "$LINENO"; then :
-  break
+	break
 fi
 rm -f core conftest.err conftest.$ac_objext
 	 CC="$CC -n32"
 	 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_largefile_CC=' -n32'; break
+	ac_cv_sys_largefile_CC=' -n32'; break
 fi
 rm -f core conftest.err conftest.$ac_objext
 	 break
-       done
-       CC=$ac_save_CC
-       rm -f conftest.$ac_ext
-    fi
+			 done
+			 CC=$ac_save_CC
+			 rm -f conftest.$ac_ext
+		fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
 $as_echo "$ac_cv_sys_largefile_CC" >&6; }
-  if test "$ac_cv_sys_largefile_CC" != no; then
-    CC=$CC$ac_cv_sys_largefile_CC
-  fi
+	if test "$ac_cv_sys_largefile_CC" != no; then
+		CC=$CC$ac_cv_sys_largefile_CC
+	fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
 if ${ac_cv_sys_file_offset_bits+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	while :; do
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
+		We can't simply define LARGE_OFF_T to be 9223372036854775807,
+		since some C++ compilers masquerading as C compilers
+		incorrectly reject 9223372036854775807.  */
 #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
+	int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+					 && LARGE_OFF_T % 2147483647 == 1)
+					? 1 : -1];
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_file_offset_bits=no; break
+	ac_cv_sys_file_offset_bits=no; break
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
+		We can't simply define LARGE_OFF_T to be 9223372036854775807,
+		since some C++ compilers masquerading as C compilers
+		incorrectly reject 9223372036854775807.  */
 #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
+	int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+					 && LARGE_OFF_T % 2147483647 == 1)
+					? 1 : -1];
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_file_offset_bits=64; break
+	ac_cv_sys_file_offset_bits=64; break
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_file_offset_bits=unknown
-  break
+	ac_cv_sys_file_offset_bits=unknown
+	break
 done
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
 $as_echo "$ac_cv_sys_file_offset_bits" >&6; }
 case $ac_cv_sys_file_offset_bits in #(
-  no | unknown) ;;
-  *)
+	no | unknown) ;;
+	*)
 cat >>confdefs.h <<_ACEOF
 #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
 _ACEOF
 ;;
 esac
 rm -rf conftest*
-  if test $ac_cv_sys_file_offset_bits = unknown; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+	if test $ac_cv_sys_file_offset_bits = unknown; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
 $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
 if ${ac_cv_sys_large_files+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	while :; do
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
+		We can't simply define LARGE_OFF_T to be 9223372036854775807,
+		since some C++ compilers masquerading as C compilers
+		incorrectly reject 9223372036854775807.  */
 #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
+	int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+					 && LARGE_OFF_T % 2147483647 == 1)
+					? 1 : -1];
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_large_files=no; break
+	ac_cv_sys_large_files=no; break
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _LARGE_FILES 1
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
+		We can't simply define LARGE_OFF_T to be 9223372036854775807,
+		since some C++ compilers masquerading as C compilers
+		incorrectly reject 9223372036854775807.  */
 #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
+	int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+					 && LARGE_OFF_T % 2147483647 == 1)
+					? 1 : -1];
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_large_files=1; break
+	ac_cv_sys_large_files=1; break
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_large_files=unknown
-  break
+	ac_cv_sys_large_files=unknown
+	break
 done
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
 $as_echo "$ac_cv_sys_large_files" >&6; }
 case $ac_cv_sys_large_files in #(
-  no | unknown) ;;
-  *)
+	no | unknown) ;;
+	*)
 cat >>confdefs.h <<_ACEOF
 #define _LARGE_FILES $ac_cv_sys_large_files
 _ACEOF
 ;;
 esac
 rm -rf conftest*
-  fi
+	fi
 
 
 fi
@@ -15490,19 +15490,19 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
 $as_echo_n "checking size of off_t... " >&6; }
 if ${ac_cv_sizeof_off_t+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t"        "$ac_includes_default"; then :
+	if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t"        "$ac_includes_default"; then :
 
 else
-  if test "$ac_cv_type_off_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+	if test "$ac_cv_type_off_t" = yes; then
+		 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (off_t)
 See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_off_t=0
-   fi
+	 else
+		 ac_cv_sizeof_off_t=0
+	 fi
 fi
 
 fi
@@ -15519,9 +15519,9 @@ _ACEOF
 
 # If we don't have largefile support, can't handle segment size >= 2GB.
 if test "$ac_cv_sizeof_off_t" -lt 8; then
-  if expr $RELSEG_SIZE '*' $blocksize '>=' 2 '*' 1024 '*' 1024 >/dev/null; then
-    as_fn_error $? "Large file support is not enabled. Segment size cannot be larger than 1GB." "$LINENO" 5
-  fi
+	if expr $RELSEG_SIZE '*' $blocksize '>=' 2 '*' 1024 '*' 1024 >/dev/null; then
+		as_fn_error $? "Large file support is not enabled. Segment size cannot be larger than 1GB." "$LINENO" 5
+	fi
 fi
 
 
@@ -15532,9 +15532,9 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int timezone" >&5
 $as_echo_n "checking for int timezone... " >&6; }
 if ${pgac_cv_var_int_timezone+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
 int res;
@@ -15546,17 +15546,17 @@ res = timezone / 60;
 #else
 res = _timezone / 60;
 #endif
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv_var_int_timezone=yes
+	pgac_cv_var_int_timezone=yes
 else
-  pgac_cv_var_int_timezone=no
+	pgac_cv_var_int_timezone=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_var_int_timezone" >&5
 $as_echo "$pgac_cv_var_int_timezone" >&6; }
@@ -15575,10 +15575,10 @@ LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
 
 for ac_func in backtrace_symbols copyfile copy_file_range elf_aux_info getauxval getifaddrs getpeerucred inet_pton kqueue localeconv_l mbstowcs_l posix_fallocate ppoll pthread_is_threaded_np setproctitle setproctitle_fast strsignal syncfs sync_file_range uselocale wcstombs_l
 do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+	as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
@@ -15590,31 +15590,31 @@ done
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_bswap16" >&5
 $as_echo_n "checking for __builtin_bswap16... " >&6; }
 if ${pgac_cv__builtin_bswap16+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 call__builtin_bswap16(int x)
 {
-    return __builtin_bswap16(x);
+		return __builtin_bswap16(x);
 }
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv__builtin_bswap16=yes
+	pgac_cv__builtin_bswap16=yes
 else
-  pgac_cv__builtin_bswap16=no
+	pgac_cv__builtin_bswap16=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__builtin_bswap16" >&5
 $as_echo "$pgac_cv__builtin_bswap16" >&6; }
@@ -15628,31 +15628,31 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_bswap32" >&5
 $as_echo_n "checking for __builtin_bswap32... " >&6; }
 if ${pgac_cv__builtin_bswap32+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 call__builtin_bswap32(int x)
 {
-    return __builtin_bswap32(x);
+		return __builtin_bswap32(x);
 }
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv__builtin_bswap32=yes
+	pgac_cv__builtin_bswap32=yes
 else
-  pgac_cv__builtin_bswap32=no
+	pgac_cv__builtin_bswap32=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__builtin_bswap32" >&5
 $as_echo "$pgac_cv__builtin_bswap32" >&6; }
@@ -15666,31 +15666,31 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_bswap64" >&5
 $as_echo_n "checking for __builtin_bswap64... " >&6; }
 if ${pgac_cv__builtin_bswap64+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 call__builtin_bswap64(long int x)
 {
-    return __builtin_bswap64(x);
+		return __builtin_bswap64(x);
 }
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv__builtin_bswap64=yes
+	pgac_cv__builtin_bswap64=yes
 else
-  pgac_cv__builtin_bswap64=no
+	pgac_cv__builtin_bswap64=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__builtin_bswap64" >&5
 $as_echo "$pgac_cv__builtin_bswap64" >&6; }
@@ -15705,31 +15705,31 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_clz" >&5
 $as_echo_n "checking for __builtin_clz... " >&6; }
 if ${pgac_cv__builtin_clz+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 call__builtin_clz(unsigned int x)
 {
-    return __builtin_clz(x);
+		return __builtin_clz(x);
 }
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv__builtin_clz=yes
+	pgac_cv__builtin_clz=yes
 else
-  pgac_cv__builtin_clz=no
+	pgac_cv__builtin_clz=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__builtin_clz" >&5
 $as_echo "$pgac_cv__builtin_clz" >&6; }
@@ -15743,31 +15743,31 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_ctz" >&5
 $as_echo_n "checking for __builtin_ctz... " >&6; }
 if ${pgac_cv__builtin_ctz+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 call__builtin_ctz(unsigned int x)
 {
-    return __builtin_ctz(x);
+		return __builtin_ctz(x);
 }
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv__builtin_ctz=yes
+	pgac_cv__builtin_ctz=yes
 else
-  pgac_cv__builtin_ctz=no
+	pgac_cv__builtin_ctz=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__builtin_ctz" >&5
 $as_echo "$pgac_cv__builtin_ctz" >&6; }
@@ -15781,31 +15781,31 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_popcount" >&5
 $as_echo_n "checking for __builtin_popcount... " >&6; }
 if ${pgac_cv__builtin_popcount+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 call__builtin_popcount(unsigned int x)
 {
-    return __builtin_popcount(x);
+		return __builtin_popcount(x);
 }
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv__builtin_popcount=yes
+	pgac_cv__builtin_popcount=yes
 else
-  pgac_cv__builtin_popcount=no
+	pgac_cv__builtin_popcount=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__builtin_popcount" >&5
 $as_echo "$pgac_cv__builtin_popcount" >&6; }
@@ -15821,31 +15821,31 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_frame_address" >&5
 $as_echo_n "checking for __builtin_frame_address... " >&6; }
 if ${pgac_cv__builtin_frame_address+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 void *
 call__builtin_frame_address(void)
 {
-    return __builtin_frame_address(0);
+		return __builtin_frame_address(0);
 }
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv__builtin_frame_address=yes
+	pgac_cv__builtin_frame_address=yes
 else
-  pgac_cv__builtin_frame_address=no
+	pgac_cv__builtin_frame_address=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__builtin_frame_address" >&5
 $as_echo "$pgac_cv__builtin_frame_address" >&6; }
@@ -15862,55 +15862,55 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
 $as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
 if ${ac_cv_sys_largefile_source+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	while :; do
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h> /* for off_t */
-     #include <stdio.h>
+		 #include <stdio.h>
 int
 main ()
 {
 int (*fp) (FILE *, off_t, int) = fseeko;
-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-  ;
-  return 0;
+		 return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_sys_largefile_source=no; break
+	ac_cv_sys_largefile_source=no; break
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _LARGEFILE_SOURCE 1
 #include <sys/types.h> /* for off_t */
-     #include <stdio.h>
+		 #include <stdio.h>
 int
 main ()
 {
 int (*fp) (FILE *, off_t, int) = fseeko;
-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-  ;
-  return 0;
+		 return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_sys_largefile_source=1; break
+	ac_cv_sys_largefile_source=1; break
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  ac_cv_sys_largefile_source=unknown
-  break
+		conftest$ac_exeext conftest.$ac_ext
+	ac_cv_sys_largefile_source=unknown
+	break
 done
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5
 $as_echo "$ac_cv_sys_largefile_source" >&6; }
 case $ac_cv_sys_largefile_source in #(
-  no | unknown) ;;
-  *)
+	no | unknown) ;;
+	*)
 cat >>confdefs.h <<_ACEOF
 #define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
 _ACEOF
@@ -15943,27 +15943,27 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how $CC reports undeclared, standard C functions" >&5
 $as_echo_n "checking how $CC reports undeclared, standard C functions... " >&6; }
 if ${ac_cv_c_decl_report+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 (void) strchr;
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  if test -s conftest.err; then :
-      # For AC_CHECK_DECL to react to warnings, the compiler must be silent on
-    # valid AC_CHECK_DECL input.  No library function is consistently available
-    # on freestanding implementations, so test against a dummy declaration.
-    # Include always-available headers on the off chance that they somehow
-    # elicit warnings.
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	if test -s conftest.err; then :
+			# For AC_CHECK_DECL to react to warnings, the compiler must be silent on
+		# valid AC_CHECK_DECL input.  No library function is consistently available
+		# on freestanding implementations, so test against a dummy declaration.
+		# Include always-available headers on the off chance that they somehow
+		# elicit warnings.
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <float.h>
 #include <limits.h>
@@ -15974,40 +15974,40 @@ int
 main ()
 {
 #ifdef __cplusplus
-  (void) ac_decl ((int) 0, (char *) 0);
-  (void) ac_decl;
+	(void) ac_decl ((int) 0, (char *) 0);
+	(void) ac_decl;
 #else
-  (void) ac_decl;
+	(void) ac_decl;
 #endif
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  if test -s conftest.err; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+	if test -s conftest.err; then :
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot detect from compiler exit status or warnings
 See \`config.log' for more details" "$LINENO" 5; }
 else
-  ac_cv_c_decl_report=warning
+	ac_cv_c_decl_report=warning
 fi
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compile a simple declaration test
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "compiler does not report undeclared identifiers
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 else
-  ac_cv_c_decl_report=error
+	ac_cv_c_decl_report=error
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
@@ -16015,17 +16015,17 @@ fi
 $as_echo "$ac_cv_c_decl_report" >&6; }
 
 case $ac_cv_c_decl_report in
-  warning) ac_c_decl_warn_flag=yes ;;
-  *) ac_c_decl_warn_flag= ;;
+	warning) ac_c_decl_warn_flag=yes ;;
+	*) ac_c_decl_warn_flag= ;;
 esac
 
 if test "$PORTNAME" != "solaris"; then :
 
 for ac_func in posix_fadvise
 do :
-  ac_fn_c_check_func "$LINENO" "posix_fadvise" "ac_cv_func_posix_fadvise"
+	ac_fn_c_check_func "$LINENO" "posix_fadvise" "ac_cv_func_posix_fadvise"
 if test "x$ac_cv_func_posix_fadvise" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define HAVE_POSIX_FADVISE 1
 _ACEOF
 
@@ -16035,9 +16035,9 @@ done
 ac_fn_c_check_decl "$LINENO" "posix_fadvise" "ac_cv_have_decl_posix_fadvise" "#include <fcntl.h>
 "
 if test "x$ac_cv_have_decl_posix_fadvise" = xyes; then :
-  ac_have_decl=1
+	ac_have_decl=1
 else
-  ac_have_decl=0
+	ac_have_decl=0
 fi
 
 cat >>confdefs.h <<_ACEOF
@@ -16050,9 +16050,9 @@ fi # fi
 ac_fn_c_check_decl "$LINENO" "fdatasync" "ac_cv_have_decl_fdatasync" "#include <unistd.h>
 "
 if test "x$ac_cv_have_decl_fdatasync" = xyes; then :
-  ac_have_decl=1
+	ac_have_decl=1
 else
-  ac_have_decl=0
+	ac_have_decl=0
 fi
 
 cat >>confdefs.h <<_ACEOF
@@ -16061,9 +16061,9 @@ _ACEOF
 
 ac_fn_c_check_decl "$LINENO" "strlcat" "ac_cv_have_decl_strlcat" "$ac_includes_default"
 if test "x$ac_cv_have_decl_strlcat" = xyes; then :
-  ac_have_decl=1
+	ac_have_decl=1
 else
-  ac_have_decl=0
+	ac_have_decl=0
 fi
 
 cat >>confdefs.h <<_ACEOF
@@ -16071,9 +16071,9 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 ac_fn_c_check_decl "$LINENO" "strlcpy" "ac_cv_have_decl_strlcpy" "$ac_includes_default"
 if test "x$ac_cv_have_decl_strlcpy" = xyes; then :
-  ac_have_decl=1
+	ac_have_decl=1
 else
-  ac_have_decl=0
+	ac_have_decl=0
 fi
 
 cat >>confdefs.h <<_ACEOF
@@ -16081,9 +16081,9 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 ac_fn_c_check_decl "$LINENO" "strnlen" "ac_cv_have_decl_strnlen" "$ac_includes_default"
 if test "x$ac_cv_have_decl_strnlen" = xyes; then :
-  ac_have_decl=1
+	ac_have_decl=1
 else
-  ac_have_decl=0
+	ac_have_decl=0
 fi
 
 cat >>confdefs.h <<_ACEOF
@@ -16091,9 +16091,9 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 ac_fn_c_check_decl "$LINENO" "strsep" "ac_cv_have_decl_strsep" "$ac_includes_default"
 if test "x$ac_cv_have_decl_strsep" = xyes; then :
-  ac_have_decl=1
+	ac_have_decl=1
 else
-  ac_have_decl=0
+	ac_have_decl=0
 fi
 
 cat >>confdefs.h <<_ACEOF
@@ -16101,9 +16101,9 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 ac_fn_c_check_decl "$LINENO" "timingsafe_bcmp" "ac_cv_have_decl_timingsafe_bcmp" "$ac_includes_default"
 if test "x$ac_cv_have_decl_timingsafe_bcmp" = xyes; then :
-  ac_have_decl=1
+	ac_have_decl=1
 else
-  ac_have_decl=0
+	ac_have_decl=0
 fi
 
 cat >>confdefs.h <<_ACEOF
@@ -16116,9 +16116,9 @@ _ACEOF
 ac_fn_c_check_decl "$LINENO" "preadv" "ac_cv_have_decl_preadv" "#include <sys/uio.h>
 "
 if test "x$ac_cv_have_decl_preadv" = xyes; then :
-  ac_have_decl=1
+	ac_have_decl=1
 else
-  ac_have_decl=0
+	ac_have_decl=0
 fi
 
 cat >>confdefs.h <<_ACEOF
@@ -16128,9 +16128,9 @@ _ACEOF
 ac_fn_c_check_decl "$LINENO" "pwritev" "ac_cv_have_decl_pwritev" "#include <sys/uio.h>
 "
 if test "x$ac_cv_have_decl_pwritev" = xyes; then :
-  ac_have_decl=1
+	ac_have_decl=1
 else
-  ac_have_decl=0
+	ac_have_decl=0
 fi
 
 cat >>confdefs.h <<_ACEOF
@@ -16140,9 +16140,9 @@ _ACEOF
 ac_fn_c_check_decl "$LINENO" "strchrnul" "ac_cv_have_decl_strchrnul" "#include <string.h>
 "
 if test "x$ac_cv_have_decl_strchrnul" = xyes; then :
-  ac_have_decl=1
+	ac_have_decl=1
 else
-  ac_have_decl=0
+	ac_have_decl=0
 fi
 
 cat >>confdefs.h <<_ACEOF
@@ -16153,9 +16153,9 @@ ac_fn_c_check_decl "$LINENO" "memset_s" "ac_cv_have_decl_memset_s" "#define __ST
 #include <string.h>
 "
 if test "x$ac_cv_have_decl_memset_s" = xyes; then :
-  ac_have_decl=1
+	ac_have_decl=1
 else
-  ac_have_decl=0
+	ac_have_decl=0
 fi
 
 cat >>confdefs.h <<_ACEOF
@@ -16167,9 +16167,9 @@ _ACEOF
 ac_fn_c_check_decl "$LINENO" "F_FULLFSYNC" "ac_cv_have_decl_F_FULLFSYNC" "#include <fcntl.h>
 "
 if test "x$ac_cv_have_decl_F_FULLFSYNC" = xyes; then :
-  ac_have_decl=1
+	ac_have_decl=1
 else
-  ac_have_decl=0
+	ac_have_decl=0
 fi
 
 cat >>confdefs.h <<_ACEOF
@@ -16179,12 +16179,12 @@ _ACEOF
 
 ac_fn_c_check_func "$LINENO" "explicit_bzero" "ac_cv_func_explicit_bzero"
 if test "x$ac_cv_func_explicit_bzero" = xyes; then :
-  $as_echo "#define HAVE_EXPLICIT_BZERO 1" >>confdefs.h
+	$as_echo "#define HAVE_EXPLICIT_BZERO 1" >>confdefs.h
 
 else
-  case " $LIBOBJS " in
-  *" explicit_bzero.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS explicit_bzero.$ac_objext"
+	case " $LIBOBJS " in
+	*" explicit_bzero.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS explicit_bzero.$ac_objext"
  ;;
 esac
 
@@ -16192,12 +16192,12 @@ fi
 
 ac_fn_c_check_func "$LINENO" "getopt" "ac_cv_func_getopt"
 if test "x$ac_cv_func_getopt" = xyes; then :
-  $as_echo "#define HAVE_GETOPT 1" >>confdefs.h
+	$as_echo "#define HAVE_GETOPT 1" >>confdefs.h
 
 else
-  case " $LIBOBJS " in
-  *" getopt.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS getopt.$ac_objext"
+	case " $LIBOBJS " in
+	*" getopt.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS getopt.$ac_objext"
  ;;
 esac
 
@@ -16205,12 +16205,12 @@ fi
 
 ac_fn_c_check_func "$LINENO" "getpeereid" "ac_cv_func_getpeereid"
 if test "x$ac_cv_func_getpeereid" = xyes; then :
-  $as_echo "#define HAVE_GETPEEREID 1" >>confdefs.h
+	$as_echo "#define HAVE_GETPEEREID 1" >>confdefs.h
 
 else
-  case " $LIBOBJS " in
-  *" getpeereid.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS getpeereid.$ac_objext"
+	case " $LIBOBJS " in
+	*" getpeereid.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS getpeereid.$ac_objext"
  ;;
 esac
 
@@ -16218,12 +16218,12 @@ fi
 
 ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton"
 if test "x$ac_cv_func_inet_aton" = xyes; then :
-  $as_echo "#define HAVE_INET_ATON 1" >>confdefs.h
+	$as_echo "#define HAVE_INET_ATON 1" >>confdefs.h
 
 else
-  case " $LIBOBJS " in
-  *" inet_aton.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS inet_aton.$ac_objext"
+	case " $LIBOBJS " in
+	*" inet_aton.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS inet_aton.$ac_objext"
  ;;
 esac
 
@@ -16231,12 +16231,12 @@ fi
 
 ac_fn_c_check_func "$LINENO" "mkdtemp" "ac_cv_func_mkdtemp"
 if test "x$ac_cv_func_mkdtemp" = xyes; then :
-  $as_echo "#define HAVE_MKDTEMP 1" >>confdefs.h
+	$as_echo "#define HAVE_MKDTEMP 1" >>confdefs.h
 
 else
-  case " $LIBOBJS " in
-  *" mkdtemp.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS mkdtemp.$ac_objext"
+	case " $LIBOBJS " in
+	*" mkdtemp.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS mkdtemp.$ac_objext"
  ;;
 esac
 
@@ -16244,12 +16244,12 @@ fi
 
 ac_fn_c_check_func "$LINENO" "strlcat" "ac_cv_func_strlcat"
 if test "x$ac_cv_func_strlcat" = xyes; then :
-  $as_echo "#define HAVE_STRLCAT 1" >>confdefs.h
+	$as_echo "#define HAVE_STRLCAT 1" >>confdefs.h
 
 else
-  case " $LIBOBJS " in
-  *" strlcat.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS strlcat.$ac_objext"
+	case " $LIBOBJS " in
+	*" strlcat.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS strlcat.$ac_objext"
  ;;
 esac
 
@@ -16257,12 +16257,12 @@ fi
 
 ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy"
 if test "x$ac_cv_func_strlcpy" = xyes; then :
-  $as_echo "#define HAVE_STRLCPY 1" >>confdefs.h
+	$as_echo "#define HAVE_STRLCPY 1" >>confdefs.h
 
 else
-  case " $LIBOBJS " in
-  *" strlcpy.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS strlcpy.$ac_objext"
+	case " $LIBOBJS " in
+	*" strlcpy.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS strlcpy.$ac_objext"
  ;;
 esac
 
@@ -16270,12 +16270,12 @@ fi
 
 ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen"
 if test "x$ac_cv_func_strnlen" = xyes; then :
-  $as_echo "#define HAVE_STRNLEN 1" >>confdefs.h
+	$as_echo "#define HAVE_STRNLEN 1" >>confdefs.h
 
 else
-  case " $LIBOBJS " in
-  *" strnlen.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS strnlen.$ac_objext"
+	case " $LIBOBJS " in
+	*" strnlen.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS strnlen.$ac_objext"
  ;;
 esac
 
@@ -16283,12 +16283,12 @@ fi
 
 ac_fn_c_check_func "$LINENO" "strsep" "ac_cv_func_strsep"
 if test "x$ac_cv_func_strsep" = xyes; then :
-  $as_echo "#define HAVE_STRSEP 1" >>confdefs.h
+	$as_echo "#define HAVE_STRSEP 1" >>confdefs.h
 
 else
-  case " $LIBOBJS " in
-  *" strsep.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS strsep.$ac_objext"
+	case " $LIBOBJS " in
+	*" strsep.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS strsep.$ac_objext"
  ;;
 esac
 
@@ -16296,12 +16296,12 @@ fi
 
 ac_fn_c_check_func "$LINENO" "timingsafe_bcmp" "ac_cv_func_timingsafe_bcmp"
 if test "x$ac_cv_func_timingsafe_bcmp" = xyes; then :
-  $as_echo "#define HAVE_TIMINGSAFE_BCMP 1" >>confdefs.h
+	$as_echo "#define HAVE_TIMINGSAFE_BCMP 1" >>confdefs.h
 
 else
-  case " $LIBOBJS " in
-  *" timingsafe_bcmp.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS timingsafe_bcmp.$ac_objext"
+	case " $LIBOBJS " in
+	*" timingsafe_bcmp.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS timingsafe_bcmp.$ac_objext"
  ;;
 esac
 
@@ -16311,12 +16311,12 @@ fi
 
 ac_fn_c_check_func "$LINENO" "pthread_barrier_wait" "ac_cv_func_pthread_barrier_wait"
 if test "x$ac_cv_func_pthread_barrier_wait" = xyes; then :
-  $as_echo "#define HAVE_PTHREAD_BARRIER_WAIT 1" >>confdefs.h
+	$as_echo "#define HAVE_PTHREAD_BARRIER_WAIT 1" >>confdefs.h
 
 else
-  case " $LIBOBJS " in
-  *" pthread_barrier_wait.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS pthread_barrier_wait.$ac_objext"
+	case " $LIBOBJS " in
+	*" pthread_barrier_wait.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS pthread_barrier_wait.$ac_objext"
  ;;
 esac
 
@@ -16330,8 +16330,8 @@ if test "$PORTNAME" = "win32" -o "$PORTNAME" = "cygwin"; then
 	# That's not a perfect fix, since it doesn't avoid double-rounding,
 	# but we have no better options.
 	case " $LIBOBJS " in
-  *" strtof.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS strtof.$ac_objext"
+	*" strtof.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS strtof.$ac_objext"
  ;;
 esac
 
@@ -16341,14 +16341,14 @@ fi
 
 # Similarly, use system's getopt_long() only if system provides struct option.
 if test x"$ac_cv_type_struct_option" = xyes ; then
-  ac_fn_c_check_func "$LINENO" "getopt_long" "ac_cv_func_getopt_long"
+	ac_fn_c_check_func "$LINENO" "getopt_long" "ac_cv_func_getopt_long"
 if test "x$ac_cv_func_getopt_long" = xyes; then :
-  $as_echo "#define HAVE_GETOPT_LONG 1" >>confdefs.h
+	$as_echo "#define HAVE_GETOPT_LONG 1" >>confdefs.h
 
 else
-  case " $LIBOBJS " in
-  *" getopt_long.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS getopt_long.$ac_objext"
+	case " $LIBOBJS " in
+	*" getopt_long.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS getopt_long.$ac_objext"
  ;;
 esac
 
@@ -16356,9 +16356,9 @@ fi
 
 
 else
-  case " $LIBOBJS " in
-  *" getopt_long.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS getopt_long.$ac_objext"
+	case " $LIBOBJS " in
+	*" getopt_long.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS getopt_long.$ac_objext"
  ;;
 esac
 
@@ -16367,9 +16367,9 @@ fi
 # On OpenBSD and Solaris, getopt() doesn't do what we want for long options
 # (i.e., allow '-' as a flag character), so use our version on those platforms.
 if test "$PORTNAME" = "openbsd" -o "$PORTNAME" = "solaris"; then
-  case " $LIBOBJS " in
-  *" getopt.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS getopt.$ac_objext"
+	case " $LIBOBJS " in
+	*" getopt.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS getopt.$ac_objext"
  ;;
 esac
 
@@ -16378,15 +16378,15 @@ fi
 # mingw has adopted a GNU-centric interpretation of optind/optreset,
 # so always use our version on Windows.
 if test "$PORTNAME" = "win32"; then
-  case " $LIBOBJS " in
-  *" getopt.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS getopt.$ac_objext"
+	case " $LIBOBJS " in
+	*" getopt.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS getopt.$ac_objext"
  ;;
 esac
 
-  case " $LIBOBJS " in
-  *" getopt_long.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS getopt_long.$ac_objext"
+	case " $LIBOBJS " in
+	*" getopt_long.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS getopt_long.$ac_objext"
  ;;
 esac
 
@@ -16394,120 +16394,120 @@ fi
 
 # Win32 (really MinGW) support
 if test "$PORTNAME" = "win32"; then
-  case " $LIBOBJS " in
-  *" dirmod.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS dirmod.$ac_objext"
+	case " $LIBOBJS " in
+	*" dirmod.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS dirmod.$ac_objext"
  ;;
 esac
 
-  case " $LIBOBJS " in
-  *" kill.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS kill.$ac_objext"
+	case " $LIBOBJS " in
+	*" kill.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS kill.$ac_objext"
  ;;
 esac
 
-  case " $LIBOBJS " in
-  *" open.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS open.$ac_objext"
+	case " $LIBOBJS " in
+	*" open.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS open.$ac_objext"
  ;;
 esac
 
-  case " $LIBOBJS " in
-  *" system.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS system.$ac_objext"
+	case " $LIBOBJS " in
+	*" system.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS system.$ac_objext"
  ;;
 esac
 
-  case " $LIBOBJS " in
-  *" win32common.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS win32common.$ac_objext"
+	case " $LIBOBJS " in
+	*" win32common.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS win32common.$ac_objext"
  ;;
 esac
 
-  case " $LIBOBJS " in
-  *" win32dlopen.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS win32dlopen.$ac_objext"
+	case " $LIBOBJS " in
+	*" win32dlopen.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS win32dlopen.$ac_objext"
  ;;
 esac
 
-  case " $LIBOBJS " in
-  *" win32env.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS win32env.$ac_objext"
+	case " $LIBOBJS " in
+	*" win32env.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS win32env.$ac_objext"
  ;;
 esac
 
-  case " $LIBOBJS " in
-  *" win32error.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS win32error.$ac_objext"
+	case " $LIBOBJS " in
+	*" win32error.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS win32error.$ac_objext"
  ;;
 esac
 
-  case " $LIBOBJS " in
-  *" win32fdatasync.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS win32fdatasync.$ac_objext"
+	case " $LIBOBJS " in
+	*" win32fdatasync.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS win32fdatasync.$ac_objext"
  ;;
 esac
 
-  case " $LIBOBJS " in
-  *" win32gai_strerror.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS win32gai_strerror.$ac_objext"
+	case " $LIBOBJS " in
+	*" win32gai_strerror.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS win32gai_strerror.$ac_objext"
  ;;
 esac
 
-  case " $LIBOBJS " in
-  *" win32getrusage.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS win32getrusage.$ac_objext"
+	case " $LIBOBJS " in
+	*" win32getrusage.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS win32getrusage.$ac_objext"
  ;;
 esac
 
-  case " $LIBOBJS " in
-  *" win32link.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS win32link.$ac_objext"
+	case " $LIBOBJS " in
+	*" win32link.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS win32link.$ac_objext"
  ;;
 esac
 
-  case " $LIBOBJS " in
-  *" win32ntdll.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS win32ntdll.$ac_objext"
+	case " $LIBOBJS " in
+	*" win32ntdll.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS win32ntdll.$ac_objext"
  ;;
 esac
 
-  case " $LIBOBJS " in
-  *" win32pread.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS win32pread.$ac_objext"
+	case " $LIBOBJS " in
+	*" win32pread.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS win32pread.$ac_objext"
  ;;
 esac
 
-  case " $LIBOBJS " in
-  *" win32pwrite.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS win32pwrite.$ac_objext"
+	case " $LIBOBJS " in
+	*" win32pwrite.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS win32pwrite.$ac_objext"
  ;;
 esac
 
-  case " $LIBOBJS " in
-  *" win32security.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS win32security.$ac_objext"
+	case " $LIBOBJS " in
+	*" win32security.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS win32security.$ac_objext"
  ;;
 esac
 
-  case " $LIBOBJS " in
-  *" win32setlocale.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS win32setlocale.$ac_objext"
+	case " $LIBOBJS " in
+	*" win32setlocale.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS win32setlocale.$ac_objext"
  ;;
 esac
 
-  case " $LIBOBJS " in
-  *" win32stat.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS win32stat.$ac_objext"
+	case " $LIBOBJS " in
+	*" win32stat.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS win32stat.$ac_objext"
  ;;
 esac
 
 fi
 # Cygwin needs only a bit of that
 if test "$PORTNAME" = "cygwin"; then
-  case " $LIBOBJS " in
-  *" dirmod.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS dirmod.$ac_objext"
+	case " $LIBOBJS " in
+	*" dirmod.$ac_objext "* ) ;;
+	*) LIBOBJS="$LIBOBJS dirmod.$ac_objext"
  ;;
 esac
 
@@ -16515,7 +16515,7 @@ fi
 
 ac_fn_c_check_func "$LINENO" "syslog" "ac_cv_func_syslog"
 if test "x$ac_cv_func_syslog" = xyes; then :
-  ac_fn_c_check_header_mongrel "$LINENO" "syslog.h" "ac_cv_header_syslog_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "syslog.h" "ac_cv_header_syslog_h" "$ac_includes_default"
 if test "x$ac_cv_header_syslog_h" = xyes; then :
 
 $as_echo "#define HAVE_SYSLOG 1" >>confdefs.h
@@ -16529,26 +16529,26 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opterr" >&5
 $as_echo_n "checking for opterr... " >&6; }
 if ${pgac_cv_var_int_opterr+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
 int
 main ()
 {
 extern int opterr; opterr = 1;
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv_var_int_opterr=yes
+	pgac_cv_var_int_opterr=yes
 else
-  pgac_cv_var_int_opterr=no
+	pgac_cv_var_int_opterr=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_var_int_opterr" >&5
 $as_echo "$pgac_cv_var_int_opterr" >&6; }
@@ -16561,26 +16561,26 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optreset" >&5
 $as_echo_n "checking for optreset... " >&6; }
 if ${pgac_cv_var_int_optreset+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
 int
 main ()
 {
 extern int optreset; optreset = 1;
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv_var_int_optreset=yes
+	pgac_cv_var_int_optreset=yes
 else
-  pgac_cv_var_int_optreset=no
+	pgac_cv_var_int_optreset=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_var_int_optreset" >&5
 $as_echo "$pgac_cv_var_int_optreset" >&6; }
@@ -16591,33 +16591,33 @@ $as_echo "#define HAVE_INT_OPTRESET 1" >>confdefs.h
 fi
 
 if test "$with_icu" = yes; then
-  ac_save_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="$CPPFLAGS $ICU_CFLAGS"
+	ac_save_CPPFLAGS=$CPPFLAGS
+	CPPFLAGS="$CPPFLAGS $ICU_CFLAGS"
 
-  # Verify we have ICU's header files
-  ac_fn_c_check_header_mongrel "$LINENO" "unicode/ucol.h" "ac_cv_header_unicode_ucol_h" "$ac_includes_default"
+	# Verify we have ICU's header files
+	ac_fn_c_check_header_mongrel "$LINENO" "unicode/ucol.h" "ac_cv_header_unicode_ucol_h" "$ac_includes_default"
 if test "x$ac_cv_header_unicode_ucol_h" = xyes; then :
 
 else
-  as_fn_error $? "header file <unicode/ucol.h> is required for ICU" "$LINENO" 5
+	as_fn_error $? "header file <unicode/ucol.h> is required for ICU" "$LINENO" 5
 fi
 
 
 
-  CPPFLAGS=$ac_save_CPPFLAGS
+	CPPFLAGS=$ac_save_CPPFLAGS
 fi
 
 if test "$with_llvm" = yes; then
 
-  # Check which functionality is present
-  SAVE_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS $LLVM_CPPFLAGS"
-  ac_fn_c_check_decl "$LINENO" "LLVMCreateGDBRegistrationListener" "ac_cv_have_decl_LLVMCreateGDBRegistrationListener" "#include <llvm-c/ExecutionEngine.h>
+	# Check which functionality is present
+	SAVE_CPPFLAGS="$CPPFLAGS"
+	CPPFLAGS="$CPPFLAGS $LLVM_CPPFLAGS"
+	ac_fn_c_check_decl "$LINENO" "LLVMCreateGDBRegistrationListener" "ac_cv_have_decl_LLVMCreateGDBRegistrationListener" "#include <llvm-c/ExecutionEngine.h>
 "
 if test "x$ac_cv_have_decl_LLVMCreateGDBRegistrationListener" = xyes; then :
-  ac_have_decl=1
+	ac_have_decl=1
 else
-  ac_have_decl=0
+	ac_have_decl=0
 fi
 
 cat >>confdefs.h <<_ACEOF
@@ -16626,16 +16626,16 @@ _ACEOF
 ac_fn_c_check_decl "$LINENO" "LLVMCreatePerfJITEventListener" "ac_cv_have_decl_LLVMCreatePerfJITEventListener" "#include <llvm-c/ExecutionEngine.h>
 "
 if test "x$ac_cv_have_decl_LLVMCreatePerfJITEventListener" = xyes; then :
-  ac_have_decl=1
+	ac_have_decl=1
 else
-  ac_have_decl=0
+	ac_have_decl=0
 fi
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_LLVMCREATEPERFJITEVENTLISTENER $ac_have_decl
 _ACEOF
 
-  CPPFLAGS="$SAVE_CPPFLAGS"
+	CPPFLAGS="$SAVE_CPPFLAGS"
 
 fi
 
@@ -16643,12 +16643,12 @@ fi
 LIBS="$LIBS_including_readline"
 
 if test "$with_readline" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_suppress_quote" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_suppress_quote" >&5
 $as_echo_n "checking for rl_completion_suppress_quote... " >&6; }
 if ${pgac_cv_var_rl_completion_suppress_quote+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 #if defined(HAVE_READLINE_READLINE_H)
@@ -16663,17 +16663,17 @@ int
 main ()
 {
 rl_completion_suppress_quote = 1;
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv_var_rl_completion_suppress_quote=yes
+	pgac_cv_var_rl_completion_suppress_quote=yes
 else
-  pgac_cv_var_rl_completion_suppress_quote=no
+	pgac_cv_var_rl_completion_suppress_quote=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_var_rl_completion_suppress_quote" >&5
 $as_echo "$pgac_cv_var_rl_completion_suppress_quote" >&6; }
@@ -16685,9 +16685,9 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_filename_quote_characters" >&5
 $as_echo_n "checking for rl_filename_quote_characters... " >&6; }
 if ${pgac_cv_var_rl_filename_quote_characters+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 #if defined(HAVE_READLINE_READLINE_H)
@@ -16702,17 +16702,17 @@ int
 main ()
 {
 rl_filename_quote_characters = "x";
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv_var_rl_filename_quote_characters=yes
+	pgac_cv_var_rl_filename_quote_characters=yes
 else
-  pgac_cv_var_rl_filename_quote_characters=no
+	pgac_cv_var_rl_filename_quote_characters=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_var_rl_filename_quote_characters" >&5
 $as_echo "$pgac_cv_var_rl_filename_quote_characters" >&6; }
@@ -16724,9 +16724,9 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_filename_quoting_function" >&5
 $as_echo_n "checking for rl_filename_quoting_function... " >&6; }
 if ${pgac_cv_var_rl_filename_quoting_function+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 #if defined(HAVE_READLINE_READLINE_H)
@@ -16741,17 +16741,17 @@ int
 main ()
 {
 rl_filename_quoting_function = 0;
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv_var_rl_filename_quoting_function=yes
+	pgac_cv_var_rl_filename_quoting_function=yes
 else
-  pgac_cv_var_rl_filename_quoting_function=no
+	pgac_cv_var_rl_filename_quoting_function=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_var_rl_filename_quoting_function" >&5
 $as_echo "$pgac_cv_var_rl_filename_quoting_function" >&6; }
@@ -16761,12 +16761,12 @@ $as_echo "#define HAVE_RL_FILENAME_QUOTING_FUNCTION 1" >>confdefs.h
 
 fi
 
-  for ac_func in append_history history_truncate_file rl_completion_matches rl_filename_completion_function rl_reset_screen_size rl_variable_bind
+	for ac_func in append_history history_truncate_file rl_completion_matches rl_filename_completion_function rl_reset_screen_size rl_variable_bind
 do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+	as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
+	cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
@@ -16783,18 +16783,18 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking test program" >&5
 $as_echo_n "checking test program... " >&6; }
 if test "$cross_compiling" = yes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compiling" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compiling" >&5
 $as_echo "cross-compiling" >&6; }
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main() { return 0; }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
 $as_echo "failed" >&6; }
 as_fn_error $? "
 Could not execute a simple test program.  This may be a problem
@@ -16802,7 +16802,7 @@ related to locating shared libraries.  Check the file 'config.log'
 for the exact reason." "$LINENO" 5
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+	conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
@@ -16818,19 +16818,19 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
 $as_echo_n "checking size of void *... " >&6; }
 if ${ac_cv_sizeof_void_p+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
+	if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
 
 else
-  if test "$ac_cv_type_void_p" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+	if test "$ac_cv_type_void_p" = yes; then
+		 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (void *)
 See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_void_p=0
-   fi
+	 else
+		 ac_cv_sizeof_void_p=0
+	 fi
 fi
 
 fi
@@ -16851,19 +16851,19 @@ _ACEOF
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
 $as_echo_n "checking size of size_t... " >&6; }
 if ${ac_cv_sizeof_size_t+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"; then :
+	if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"; then :
 
 else
-  if test "$ac_cv_type_size_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+	if test "$ac_cv_type_size_t" = yes; then
+		 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (size_t)
 See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_size_t=0
-   fi
+	 else
+		 ac_cv_sizeof_size_t=0
+	 fi
 fi
 
 fi
@@ -16884,19 +16884,19 @@ _ACEOF
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
 $as_echo_n "checking size of long... " >&6; }
 if ${ac_cv_sizeof_long+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+	if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
 
 else
-  if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+	if test "$ac_cv_type_long" = yes; then
+		 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
 See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_long=0
-   fi
+	 else
+		 ac_cv_sizeof_long=0
+	 fi
 fi
 
 fi
@@ -16917,19 +16917,19 @@ _ACEOF
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
 $as_echo_n "checking size of long long... " >&6; }
 if ${ac_cv_sizeof_long_long+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
+	if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
 
 else
-  if test "$ac_cv_type_long_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+	if test "$ac_cv_type_long_long" = yes; then
+		 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long long)
 See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_long_long=0
-   fi
+	 else
+		 ac_cv_sizeof_long_long=0
+	 fi
 fi
 
 fi
@@ -16950,19 +16950,19 @@ _ACEOF
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of intmax_t" >&5
 $as_echo_n "checking size of intmax_t... " >&6; }
 if ${ac_cv_sizeof_intmax_t+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (intmax_t))" "ac_cv_sizeof_intmax_t"        "$ac_includes_default"; then :
+	if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (intmax_t))" "ac_cv_sizeof_intmax_t"        "$ac_includes_default"; then :
 
 else
-  if test "$ac_cv_type_intmax_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+	if test "$ac_cv_type_intmax_t" = yes; then
+		 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (intmax_t)
 See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_intmax_t=0
-   fi
+	 else
+		 ac_cv_sizeof_intmax_t=0
+	 fi
 fi
 
 fi
@@ -16984,23 +16984,23 @@ _ACEOF
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of short" >&5
 $as_echo_n "checking alignment of short... " >&6; }
 if ${ac_cv_alignof_short+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_short"        "$ac_includes_default
+	if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_short"        "$ac_includes_default
 #ifndef offsetof
 # define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
 #endif
 typedef struct { char x; short y; } ac__type_alignof_;"; then :
 
 else
-  if test "$ac_cv_type_short" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+	if test "$ac_cv_type_short" = yes; then
+		 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute alignment of short
 See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_alignof_short=0
-   fi
+	 else
+		 ac_cv_alignof_short=0
+	 fi
 fi
 
 fi
@@ -17019,23 +17019,23 @@ _ACEOF
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of int" >&5
 $as_echo_n "checking alignment of int... " >&6; }
 if ${ac_cv_alignof_int+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_int"        "$ac_includes_default
+	if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_int"        "$ac_includes_default
 #ifndef offsetof
 # define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
 #endif
 typedef struct { char x; int y; } ac__type_alignof_;"; then :
 
 else
-  if test "$ac_cv_type_int" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+	if test "$ac_cv_type_int" = yes; then
+		 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute alignment of int
 See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_alignof_int=0
-   fi
+	 else
+		 ac_cv_alignof_int=0
+	 fi
 fi
 
 fi
@@ -17054,23 +17054,23 @@ _ACEOF
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of long" >&5
 $as_echo_n "checking alignment of long... " >&6; }
 if ${ac_cv_alignof_long+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_long"        "$ac_includes_default
+	if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_long"        "$ac_includes_default
 #ifndef offsetof
 # define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
 #endif
 typedef struct { char x; long y; } ac__type_alignof_;"; then :
 
 else
-  if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+	if test "$ac_cv_type_long" = yes; then
+		 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute alignment of long
 See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_alignof_long=0
-   fi
+	 else
+		 ac_cv_alignof_long=0
+	 fi
 fi
 
 fi
@@ -17089,23 +17089,23 @@ _ACEOF
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of int64_t" >&5
 $as_echo_n "checking alignment of int64_t... " >&6; }
 if ${ac_cv_alignof_int64_t+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_int64_t"        "$ac_includes_default
+	if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_int64_t"        "$ac_includes_default
 #ifndef offsetof
 # define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
 #endif
 typedef struct { char x; int64_t y; } ac__type_alignof_;"; then :
 
 else
-  if test "$ac_cv_type_int64_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+	if test "$ac_cv_type_int64_t" = yes; then
+		 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute alignment of int64_t
 See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_alignof_int64_t=0
-   fi
+	 else
+		 ac_cv_alignof_int64_t=0
+	 fi
 fi
 
 fi
@@ -17124,23 +17124,23 @@ _ACEOF
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of double" >&5
 $as_echo_n "checking alignment of double... " >&6; }
 if ${ac_cv_alignof_double+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_double"        "$ac_includes_default
+	if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_double"        "$ac_includes_default
 #ifndef offsetof
 # define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
 #endif
 typedef struct { char x; double y; } ac__type_alignof_;"; then :
 
 else
-  if test "$ac_cv_type_double" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+	if test "$ac_cv_type_double" = yes; then
+		 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute alignment of double
 See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_alignof_double=0
-   fi
+	 else
+		 ac_cv_alignof_double=0
+	 fi
 fi
 
 fi
@@ -17174,10 +17174,10 @@ _ACEOF
 MAX_ALIGNOF=$ac_cv_alignof_double
 
 if test $ac_cv_alignof_long -gt $MAX_ALIGNOF ; then
-  as_fn_error $? "alignment of 'long' is greater than the alignment of 'double'" "$LINENO" 5
+	as_fn_error $? "alignment of 'long' is greater than the alignment of 'double'" "$LINENO" 5
 fi
 if test $ac_cv_alignof_int64_t -gt $MAX_ALIGNOF ; then
-  as_fn_error $? "alignment of 'int64_t' is greater than the alignment of 'double'" "$LINENO" 5
+	as_fn_error $? "alignment of 'int64_t' is greater than the alignment of 'double'" "$LINENO" 5
 fi
 
 cat >>confdefs.h <<_ACEOF
@@ -17189,9 +17189,9 @@ _ACEOF
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __int128" >&5
 $as_echo_n "checking for __int128... " >&6; }
 if ${pgac_cv__128bit_int+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /*
@@ -17217,36 +17217,36 @@ c = a * b;
 d = (c + b) / b;
 /* must use the results, else compiler may optimize arithmetic away */
 if (d != a+1)
-  return 1;
+	return 1;
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv__128bit_int=yes
+	pgac_cv__128bit_int=yes
 else
-  pgac_cv__128bit_int=no
+	pgac_cv__128bit_int=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__128bit_int" >&5
 $as_echo "$pgac_cv__128bit_int" >&6; }
 if test x"$pgac_cv__128bit_int" = xyes ; then
-  # Use of non-default alignment with __int128 tickles bugs in some compilers.
-  # If not cross-compiling, we can test for bugs and disable use of __int128
-  # with buggy compilers.  If cross-compiling, hope for the best.
-  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83925
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __int128 alignment bug" >&5
+	# Use of non-default alignment with __int128 tickles bugs in some compilers.
+	# If not cross-compiling, we can test for bugs and disable use of __int128
+	# with buggy compilers.  If cross-compiling, hope for the best.
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83925
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __int128 alignment bug" >&5
 $as_echo_n "checking for __int128 alignment bug... " >&6; }
 if ${pgac_cv__128bit_int_bug+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then :
-  pgac_cv__128bit_int_bug="assuming ok"
+	if test "$cross_compiling" = yes; then :
+	pgac_cv__128bit_int_bug="assuming ok"
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* This must match the corresponding code in c.h: */
@@ -17272,50 +17272,50 @@ int128a q;
 pass_by_val(main, (int128a) i64);
 q = (int128a) i64;
 if (q != holder)
-  return 1;
+	return 1;
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  pgac_cv__128bit_int_bug=ok
+	pgac_cv__128bit_int_bug=ok
 else
-  pgac_cv__128bit_int_bug=broken
+	pgac_cv__128bit_int_bug=broken
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+	conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__128bit_int_bug" >&5
 $as_echo "$pgac_cv__128bit_int_bug" >&6; }
-  if test x"$pgac_cv__128bit_int_bug" != xbroken ; then
+	if test x"$pgac_cv__128bit_int_bug" != xbroken ; then
 
 $as_echo "#define PG_INT128_TYPE __int128" >>confdefs.h
 
-    # The cast to long int works around a bug in the HP C Compiler,
+		# The cast to long int works around a bug in the HP C Compiler,
 # see AC_CHECK_SIZEOF for more information.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of PG_INT128_TYPE" >&5
 $as_echo_n "checking alignment of PG_INT128_TYPE... " >&6; }
 if ${ac_cv_alignof_PG_INT128_TYPE+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_PG_INT128_TYPE"        "$ac_includes_default
+	if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_PG_INT128_TYPE"        "$ac_includes_default
 #ifndef offsetof
 # define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
 #endif
 typedef struct { char x; PG_INT128_TYPE y; } ac__type_alignof_;"; then :
 
 else
-  if test "$ac_cv_type_PG_INT128_TYPE" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+	if test "$ac_cv_type_PG_INT128_TYPE" = yes; then
+		 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute alignment of PG_INT128_TYPE
 See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_alignof_PG_INT128_TYPE=0
-   fi
+	 else
+		 ac_cv_alignof_PG_INT128_TYPE=0
+	 fi
 fi
 
 fi
@@ -17329,7 +17329,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-  fi
+	fi
 fi
 
 # Check for various atomic operations now that we have checked how to declare
@@ -17337,28 +17337,28 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for builtin __sync char locking functions" >&5
 $as_echo_n "checking for builtin __sync char locking functions... " >&6; }
 if ${pgac_cv_gcc_sync_char_tas+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 char lock = 0;
-   __sync_lock_test_and_set(&lock, 1);
-   __sync_lock_release(&lock);
-  ;
-  return 0;
+	 __sync_lock_test_and_set(&lock, 1);
+	 __sync_lock_release(&lock);
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv_gcc_sync_char_tas="yes"
+	pgac_cv_gcc_sync_char_tas="yes"
 else
-  pgac_cv_gcc_sync_char_tas="no"
+	pgac_cv_gcc_sync_char_tas="no"
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_gcc_sync_char_tas" >&5
 $as_echo "$pgac_cv_gcc_sync_char_tas" >&6; }
@@ -17370,28 +17370,28 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for builtin __sync int32 locking functions" >&5
 $as_echo_n "checking for builtin __sync int32 locking functions... " >&6; }
 if ${pgac_cv_gcc_sync_int32_tas+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 int lock = 0;
-   __sync_lock_test_and_set(&lock, 1);
-   __sync_lock_release(&lock);
-  ;
-  return 0;
+	 __sync_lock_test_and_set(&lock, 1);
+	 __sync_lock_release(&lock);
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv_gcc_sync_int32_tas="yes"
+	pgac_cv_gcc_sync_int32_tas="yes"
 else
-  pgac_cv_gcc_sync_int32_tas="no"
+	pgac_cv_gcc_sync_int32_tas="no"
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_gcc_sync_int32_tas" >&5
 $as_echo "$pgac_cv_gcc_sync_int32_tas" >&6; }
@@ -17403,27 +17403,27 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for builtin __sync int32 atomic operations" >&5
 $as_echo_n "checking for builtin __sync int32 atomic operations... " >&6; }
 if ${pgac_cv_gcc_sync_int32_cas+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 int val = 0;
-   __sync_val_compare_and_swap(&val, 0, 37);
-  ;
-  return 0;
+	 __sync_val_compare_and_swap(&val, 0, 37);
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv_gcc_sync_int32_cas="yes"
+	pgac_cv_gcc_sync_int32_cas="yes"
 else
-  pgac_cv_gcc_sync_int32_cas="no"
+	pgac_cv_gcc_sync_int32_cas="no"
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_gcc_sync_int32_cas" >&5
 $as_echo "$pgac_cv_gcc_sync_int32_cas" >&6; }
@@ -17435,27 +17435,27 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for builtin __sync int64 atomic operations" >&5
 $as_echo_n "checking for builtin __sync int64 atomic operations... " >&6; }
 if ${pgac_cv_gcc_sync_int64_cas+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdint.h>
 int
 main ()
 {
 int64_t lock = 0;
-   __sync_val_compare_and_swap(&lock, 0, (int64_t) 37);
-  ;
-  return 0;
+	 __sync_val_compare_and_swap(&lock, 0, (int64_t) 37);
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv_gcc_sync_int64_cas="yes"
+	pgac_cv_gcc_sync_int64_cas="yes"
 else
-  pgac_cv_gcc_sync_int64_cas="no"
+	pgac_cv_gcc_sync_int64_cas="no"
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_gcc_sync_int64_cas" >&5
 $as_echo "$pgac_cv_gcc_sync_int64_cas" >&6; }
@@ -17467,28 +17467,28 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for builtin __atomic int32 atomic operations" >&5
 $as_echo_n "checking for builtin __atomic int32 atomic operations... " >&6; }
 if ${pgac_cv_gcc_atomic_int32_cas+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 int val = 0;
-   int expect = 0;
-   __atomic_compare_exchange_n(&val, &expect, 37, 0, __ATOMIC_SEQ_CST, __ATOMIC_RELAXED);
-  ;
-  return 0;
+	 int expect = 0;
+	 __atomic_compare_exchange_n(&val, &expect, 37, 0, __ATOMIC_SEQ_CST, __ATOMIC_RELAXED);
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv_gcc_atomic_int32_cas="yes"
+	pgac_cv_gcc_atomic_int32_cas="yes"
 else
-  pgac_cv_gcc_atomic_int32_cas="no"
+	pgac_cv_gcc_atomic_int32_cas="no"
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_gcc_atomic_int32_cas" >&5
 $as_echo "$pgac_cv_gcc_atomic_int32_cas" >&6; }
@@ -17500,28 +17500,28 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for builtin __atomic int64 atomic operations" >&5
 $as_echo_n "checking for builtin __atomic int64 atomic operations... " >&6; }
 if ${pgac_cv_gcc_atomic_int64_cas+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdint.h>
 int
 main ()
 {
 int64_t val = 0;
-   int64_t expect = 0;
-   __atomic_compare_exchange_n(&val, &expect, 37, 0, __ATOMIC_SEQ_CST, __ATOMIC_RELAXED);
-  ;
-  return 0;
+	 int64_t expect = 0;
+	 __atomic_compare_exchange_n(&val, &expect, 37, 0, __ATOMIC_SEQ_CST, __ATOMIC_RELAXED);
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv_gcc_atomic_int64_cas="yes"
+	pgac_cv_gcc_atomic_int64_cas="yes"
 else
-  pgac_cv_gcc_atomic_int64_cas="no"
+	pgac_cv_gcc_atomic_int64_cas="no"
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_gcc_atomic_int64_cas" >&5
 $as_echo "$pgac_cv_gcc_atomic_int64_cas" >&6; }
@@ -17536,28 +17536,28 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __get_cpuid" >&5
 $as_echo_n "checking for __get_cpuid... " >&6; }
 if ${pgac_cv__get_cpuid+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <cpuid.h>
 int
 main ()
 {
 unsigned int exx[4] = {0, 0, 0, 0};
-  __get_cpuid(1, &exx[0], &exx[1], &exx[2], &exx[3]);
+	__get_cpuid(1, &exx[0], &exx[1], &exx[2], &exx[3]);
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv__get_cpuid="yes"
+	pgac_cv__get_cpuid="yes"
 else
-  pgac_cv__get_cpuid="no"
+	pgac_cv__get_cpuid="no"
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__get_cpuid" >&5
 $as_echo "$pgac_cv__get_cpuid" >&6; }
@@ -17566,68 +17566,68 @@ if test x"$pgac_cv__get_cpuid" = x"yes"; then
 $as_echo "#define HAVE__GET_CPUID 1" >>confdefs.h
 
 else
-  # __cpuid()
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __cpuid" >&5
+	# __cpuid()
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __cpuid" >&5
 $as_echo_n "checking for __cpuid... " >&6; }
 if ${pgac_cv__cpuid+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <intrin.h>
 int
 main ()
 {
 unsigned int exx[4] = {0, 0, 0, 0};
-    __cpuid(exx, 1);
+		__cpuid(exx, 1);
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv__cpuid="yes"
+	pgac_cv__cpuid="yes"
 else
-  pgac_cv__cpuid="no"
+	pgac_cv__cpuid="no"
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__cpuid" >&5
 $as_echo "$pgac_cv__cpuid" >&6; }
-  if test x"$pgac_cv__cpuid" = x"yes"; then
+	if test x"$pgac_cv__cpuid" = x"yes"; then
 
 $as_echo "#define HAVE__CPUID 1" >>confdefs.h
 
-  fi
+	fi
 fi
 
 # Check for __get_cpuid_count() and __cpuidex() in a similar fashion.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __get_cpuid_count" >&5
 $as_echo_n "checking for __get_cpuid_count... " >&6; }
 if ${pgac_cv__get_cpuid_count+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <cpuid.h>
 int
 main ()
 {
 unsigned int exx[4] = {0, 0, 0, 0};
-  __get_cpuid_count(7, 0, &exx[0], &exx[1], &exx[2], &exx[3]);
+	__get_cpuid_count(7, 0, &exx[0], &exx[1], &exx[2], &exx[3]);
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv__get_cpuid_count="yes"
+	pgac_cv__get_cpuid_count="yes"
 else
-  pgac_cv__get_cpuid_count="no"
+	pgac_cv__get_cpuid_count="no"
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__get_cpuid_count" >&5
 $as_echo "$pgac_cv__get_cpuid_count" >&6; }
@@ -17636,40 +17636,40 @@ if test x"$pgac_cv__get_cpuid_count" = x"yes"; then
 $as_echo "#define HAVE__GET_CPUID_COUNT 1" >>confdefs.h
 
 else
-  # __cpuidex()
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __cpuidex" >&5
+	# __cpuidex()
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __cpuidex" >&5
 $as_echo_n "checking for __cpuidex... " >&6; }
 if ${pgac_cv__cpuidex+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <intrin.h>
 int
 main ()
 {
 unsigned int exx[4] = {0, 0, 0, 0};
-    __cpuidex(exx, 7, 0);
+		__cpuidex(exx, 7, 0);
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv__cpuidex="yes"
+	pgac_cv__cpuidex="yes"
 else
-  pgac_cv__cpuidex="no"
+	pgac_cv__cpuidex="no"
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__cpuidex" >&5
 $as_echo "$pgac_cv__cpuidex" >&6; }
-  if test x"$pgac_cv__cpuidex" = x"yes"; then
+	if test x"$pgac_cv__cpuidex" = x"yes"; then
 
 $as_echo "#define HAVE__CPUIDEX 1" >>confdefs.h
 
-  fi
+	fi
 fi
 
 # Check for XSAVE intrinsics
@@ -17677,38 +17677,38 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _xgetbv" >&5
 $as_echo_n "checking for _xgetbv... " >&6; }
 if ${pgac_cv_xsave_intrinsics+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <immintrin.h>
-    #if defined(__has_attribute) && __has_attribute (target)
-    __attribute__((target("xsave")))
-    #endif
-    static int xsave_test(void)
-    {
-      return _xgetbv(0) & 0xe0;
-    }
+		#if defined(__has_attribute) && __has_attribute (target)
+		__attribute__((target("xsave")))
+		#endif
+		static int xsave_test(void)
+		{
+			return _xgetbv(0) & 0xe0;
+		}
 int
 main ()
 {
 return xsave_test();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv_xsave_intrinsics=yes
+	pgac_cv_xsave_intrinsics=yes
 else
-  pgac_cv_xsave_intrinsics=no
+	pgac_cv_xsave_intrinsics=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_xsave_intrinsics" >&5
 $as_echo "$pgac_cv_xsave_intrinsics" >&6; }
 if test x"$pgac_cv_xsave_intrinsics" = x"yes"; then
-  pgac_xsave_intrinsics=yes
+	pgac_xsave_intrinsics=yes
 fi
 
 if test x"$pgac_xsave_intrinsics" = x"yes"; then
@@ -17720,68 +17720,68 @@ fi
 # Check for AVX-512 popcount intrinsics
 #
 if test x"$host_cpu" = x"x86_64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _mm512_popcnt_epi64" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _mm512_popcnt_epi64" >&5
 $as_echo_n "checking for _mm512_popcnt_epi64... " >&6; }
 if ${pgac_cv_avx512_popcnt_intrinsics+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <immintrin.h>
-    #include <stdint.h>
-    char buf[sizeof(__m512i)];
-
-    #if defined(__has_attribute) && __has_attribute (target)
-    __attribute__((target("avx512vpopcntdq,avx512bw")))
-    #endif
-    static int popcount_test(void)
-    {
-      int64_t popcnt = 0;
-      __m512i accum = _mm512_setzero_si512();
-      __m512i val = _mm512_maskz_loadu_epi8((__mmask64) 0xf0f0f0f0f0f0f0f0, (const __m512i *) buf);
-      __m512i cnt = _mm512_popcnt_epi64(val);
-      accum = _mm512_add_epi64(accum, cnt);
-      popcnt = _mm512_reduce_add_epi64(accum);
-      return (int) popcnt;
-    }
+		#include <stdint.h>
+		char buf[sizeof(__m512i)];
+
+		#if defined(__has_attribute) && __has_attribute (target)
+		__attribute__((target("avx512vpopcntdq,avx512bw")))
+		#endif
+		static int popcount_test(void)
+		{
+			int64_t popcnt = 0;
+			__m512i accum = _mm512_setzero_si512();
+			__m512i val = _mm512_maskz_loadu_epi8((__mmask64) 0xf0f0f0f0f0f0f0f0, (const __m512i *) buf);
+			__m512i cnt = _mm512_popcnt_epi64(val);
+			accum = _mm512_add_epi64(accum, cnt);
+			popcnt = _mm512_reduce_add_epi64(accum);
+			return (int) popcnt;
+		}
 int
 main ()
 {
 return popcount_test();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv_avx512_popcnt_intrinsics=yes
+	pgac_cv_avx512_popcnt_intrinsics=yes
 else
-  pgac_cv_avx512_popcnt_intrinsics=no
+	pgac_cv_avx512_popcnt_intrinsics=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_avx512_popcnt_intrinsics" >&5
 $as_echo "$pgac_cv_avx512_popcnt_intrinsics" >&6; }
 if test x"$pgac_cv_avx512_popcnt_intrinsics" = x"yes"; then
-  pgac_avx512_popcnt_intrinsics=yes
+	pgac_avx512_popcnt_intrinsics=yes
 fi
 
-  if test x"$pgac_avx512_popcnt_intrinsics" = x"yes"; then
+	if test x"$pgac_avx512_popcnt_intrinsics" = x"yes"; then
 
 $as_echo "#define USE_AVX512_POPCNT_WITH_RUNTIME_CHECK 1" >>confdefs.h
 
-  fi
+	fi
 fi
 
 # Check for SVE popcount intrinsics
 #
 if test x"$host_cpu" = x"aarch64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for svcnt_x" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for svcnt_x" >&5
 $as_echo_n "checking for svcnt_x... " >&6; }
 if ${pgac_cv_sve_popcnt_intrinsics+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <arm_sve.h>
 
@@ -17819,29 +17819,86 @@ int
 main ()
 {
 return popcount_test();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv_sve_popcnt_intrinsics=yes
+	pgac_cv_sve_popcnt_intrinsics=yes
 else
-  pgac_cv_sve_popcnt_intrinsics=no
+	pgac_cv_sve_popcnt_intrinsics=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_sve_popcnt_intrinsics" >&5
 $as_echo "$pgac_cv_sve_popcnt_intrinsics" >&6; }
 if test x"$pgac_cv_sve_popcnt_intrinsics" = x"yes"; then
-  pgac_sve_popcnt_intrinsics=yes
+	pgac_sve_popcnt_intrinsics=yes
 fi
 
-  if test x"$pgac_sve_popcnt_intrinsics" = x"yes"; then
+	if test x"$pgac_sve_popcnt_intrinsics" = x"yes"; then
 
 $as_echo "#define USE_SVE_POPCNT_WITH_RUNTIME_CHECK 1" >>confdefs.h
 
-  fi
+	fi
+fi
+
+
+# Check for SVE2 CRC32C intrinsics
+if test x"$host_cpu" = x"aarch64"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SVE2 CRC32C intrinsics" >&5
+$as_echo_n "checking for SVE2 CRC32C intrinsics... " >&6; }
+if ${pgac_cv_sve2_crc32c_intrinsics+:} false; then :
+	$as_echo_n "(cached) " >&6
+else
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <arm_sve.h>
+#include <stdint.h>
+
+#if defined(__has_attribute) && __has_attribute(target)
+__attribute__((target("arch=armv9-a+sve2-aes")))
+#endif
+static int crc32c_sve2_test(void)
+{
+	svbool_t pg = svptrue_b64();
+	const uint64_t data[2] = { 0x1234567890abcdef, 0xfedcba0987654321 };
+	svuint64_t x1 = svld1_u64(pg, data);
+	svuint64_t x2 = svld1_u64(pg, data + 1);
+
+	// test key CRC folding ops
+	svuint64_t m1 = svpmullb_pair_u64(x1, x2);
+	svuint64_t m2 = svpmullt_pair_u64(x1, x2);
+	svuint64_t res = sveor3_u64(m1, m2, x2);
+	return (int)svaddv_u64(pg, res) & 1;
+}
+
+int main(void)
+{
+	return crc32c_sve2_test();
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+	pgac_cv_sve2_crc32c_intrinsics=yes
+else
+	pgac_cv_sve2_crc32c_intrinsics=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+		conftest$ac_exeext conftest.$ac_ext
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_sve2_crc32c_intrinsics" >&5
+$as_echo "$pgac_cv_sve2_crc32c_intrinsics" >&6; }
+
+if test x"$pgac_cv_sve2_crc32c_intrinsics" = x"yes"; then
+	pgac_sve2_crc32c_intrinsics=yes
+fi
+
+if test x"$pgac_sve2_crc32c_intrinsics" = x"yes"; then
+	$as_echo "#define USE_SVE2_CRC32C_WITH_RUNTIME_CHECK 1" >>confdefs.h
+fi
+
 fi
 
 # Check for Intel SSE 4.2 intrinsics to do CRC calculations.
@@ -17849,42 +17906,42 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _mm_crc32_u8 and _mm_crc32_u32" >&5
 $as_echo_n "checking for _mm_crc32_u8 and _mm_crc32_u32... " >&6; }
 if ${pgac_cv_sse42_crc32_intrinsics+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <nmmintrin.h>
-    unsigned int crc;
-    #if defined(__has_attribute) && __has_attribute (target)
-    __attribute__((target("sse4.2")))
-    #endif
-    static int crc32_sse42_test(void)
-    {
-      crc = _mm_crc32_u8(crc, 0);
-      crc = _mm_crc32_u32(crc, 0);
-      /* return computed value, to prevent the above being optimized away */
-      return crc == 0;
-    }
+		unsigned int crc;
+		#if defined(__has_attribute) && __has_attribute (target)
+		__attribute__((target("sse4.2")))
+		#endif
+		static int crc32_sse42_test(void)
+		{
+			crc = _mm_crc32_u8(crc, 0);
+			crc = _mm_crc32_u32(crc, 0);
+			/* return computed value, to prevent the above being optimized away */
+			return crc == 0;
+		}
 int
 main ()
 {
 return crc32_sse42_test();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv_sse42_crc32_intrinsics=yes
+	pgac_cv_sse42_crc32_intrinsics=yes
 else
-  pgac_cv_sse42_crc32_intrinsics=no
+	pgac_cv_sse42_crc32_intrinsics=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_sse42_crc32_intrinsics" >&5
 $as_echo "$pgac_cv_sse42_crc32_intrinsics" >&6; }
 if test x"$pgac_cv_sse42_crc32_intrinsics" = x"yes"; then
-  pgac_sse42_crc32_intrinsics=yes
+	pgac_sse42_crc32_intrinsics=yes
 fi
 
 
@@ -17901,12 +17958,12 @@ main ()
 #error __SSE4_2__ not defined
 #endif
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  SSE4_2_TARGETED=1
+	SSE4_2_TARGETED=1
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -17919,9 +17976,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __crc32cb, __crc32ch, __crc32cw, and __crc32cd with CFLAGS=" >&5
 $as_echo_n "checking for __crc32cb, __crc32ch, __crc32cw, and __crc32cd with CFLAGS=... " >&6; }
 if ${pgac_cv_armv8_crc32c_intrinsics_+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 CFLAGS="$pgac_save_CFLAGS "
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -17931,38 +17988,38 @@ int
 main ()
 {
 crc = __crc32cb(crc, 0);
-   crc = __crc32ch(crc, 0);
-   crc = __crc32cw(crc, 0);
-   crc = __crc32cd(crc, 0);
-   /* return computed value, to prevent the above being optimized away */
-   return crc == 0;
-  ;
-  return 0;
+	 crc = __crc32ch(crc, 0);
+	 crc = __crc32cw(crc, 0);
+	 crc = __crc32cd(crc, 0);
+	 /* return computed value, to prevent the above being optimized away */
+	 return crc == 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv_armv8_crc32c_intrinsics_=yes
+	pgac_cv_armv8_crc32c_intrinsics_=yes
 else
-  pgac_cv_armv8_crc32c_intrinsics_=no
+	pgac_cv_armv8_crc32c_intrinsics_=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 CFLAGS="$pgac_save_CFLAGS"
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_armv8_crc32c_intrinsics_" >&5
 $as_echo "$pgac_cv_armv8_crc32c_intrinsics_" >&6; }
 if test x"$pgac_cv_armv8_crc32c_intrinsics_" = x"yes"; then
-  CFLAGS_CRC=""
-  pgac_armv8_crc32c_intrinsics=yes
+	CFLAGS_CRC=""
+	pgac_armv8_crc32c_intrinsics=yes
 fi
 
 if test x"$pgac_armv8_crc32c_intrinsics" != x"yes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __crc32cb, __crc32ch, __crc32cw, and __crc32cd with CFLAGS=-march=armv8-a+crc+simd" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __crc32cb, __crc32ch, __crc32cw, and __crc32cd with CFLAGS=-march=armv8-a+crc+simd" >&5
 $as_echo_n "checking for __crc32cb, __crc32ch, __crc32cw, and __crc32cd with CFLAGS=-march=armv8-a+crc+simd... " >&6; }
 if ${pgac_cv_armv8_crc32c_intrinsics__march_armv8_apcrcpsimd+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 CFLAGS="$pgac_save_CFLAGS -march=armv8-a+crc+simd"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -17972,38 +18029,38 @@ int
 main ()
 {
 crc = __crc32cb(crc, 0);
-   crc = __crc32ch(crc, 0);
-   crc = __crc32cw(crc, 0);
-   crc = __crc32cd(crc, 0);
-   /* return computed value, to prevent the above being optimized away */
-   return crc == 0;
-  ;
-  return 0;
+	 crc = __crc32ch(crc, 0);
+	 crc = __crc32cw(crc, 0);
+	 crc = __crc32cd(crc, 0);
+	 /* return computed value, to prevent the above being optimized away */
+	 return crc == 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv_armv8_crc32c_intrinsics__march_armv8_apcrcpsimd=yes
+	pgac_cv_armv8_crc32c_intrinsics__march_armv8_apcrcpsimd=yes
 else
-  pgac_cv_armv8_crc32c_intrinsics__march_armv8_apcrcpsimd=no
+	pgac_cv_armv8_crc32c_intrinsics__march_armv8_apcrcpsimd=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 CFLAGS="$pgac_save_CFLAGS"
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_armv8_crc32c_intrinsics__march_armv8_apcrcpsimd" >&5
 $as_echo "$pgac_cv_armv8_crc32c_intrinsics__march_armv8_apcrcpsimd" >&6; }
 if test x"$pgac_cv_armv8_crc32c_intrinsics__march_armv8_apcrcpsimd" = x"yes"; then
-  CFLAGS_CRC="-march=armv8-a+crc+simd"
-  pgac_armv8_crc32c_intrinsics=yes
+	CFLAGS_CRC="-march=armv8-a+crc+simd"
+	pgac_armv8_crc32c_intrinsics=yes
 fi
 
-  if test x"$pgac_armv8_crc32c_intrinsics" != x"yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __crc32cb, __crc32ch, __crc32cw, and __crc32cd with CFLAGS=-march=armv8-a+crc" >&5
+	if test x"$pgac_armv8_crc32c_intrinsics" != x"yes"; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __crc32cb, __crc32ch, __crc32cw, and __crc32cd with CFLAGS=-march=armv8-a+crc" >&5
 $as_echo_n "checking for __crc32cb, __crc32ch, __crc32cw, and __crc32cd with CFLAGS=-march=armv8-a+crc... " >&6; }
 if ${pgac_cv_armv8_crc32c_intrinsics__march_armv8_apcrc+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_CFLAGS=$CFLAGS
+	pgac_save_CFLAGS=$CFLAGS
 CFLAGS="$pgac_save_CFLAGS -march=armv8-a+crc"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -18013,32 +18070,32 @@ int
 main ()
 {
 crc = __crc32cb(crc, 0);
-   crc = __crc32ch(crc, 0);
-   crc = __crc32cw(crc, 0);
-   crc = __crc32cd(crc, 0);
-   /* return computed value, to prevent the above being optimized away */
-   return crc == 0;
-  ;
-  return 0;
+	 crc = __crc32ch(crc, 0);
+	 crc = __crc32cw(crc, 0);
+	 crc = __crc32cd(crc, 0);
+	 /* return computed value, to prevent the above being optimized away */
+	 return crc == 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv_armv8_crc32c_intrinsics__march_armv8_apcrc=yes
+	pgac_cv_armv8_crc32c_intrinsics__march_armv8_apcrc=yes
 else
-  pgac_cv_armv8_crc32c_intrinsics__march_armv8_apcrc=no
+	pgac_cv_armv8_crc32c_intrinsics__march_armv8_apcrc=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 CFLAGS="$pgac_save_CFLAGS"
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_armv8_crc32c_intrinsics__march_armv8_apcrc" >&5
 $as_echo "$pgac_cv_armv8_crc32c_intrinsics__march_armv8_apcrc" >&6; }
 if test x"$pgac_cv_armv8_crc32c_intrinsics__march_armv8_apcrc" = x"yes"; then
-  CFLAGS_CRC="-march=armv8-a+crc"
-  pgac_armv8_crc32c_intrinsics=yes
+	CFLAGS_CRC="-march=armv8-a+crc"
+	pgac_armv8_crc32c_intrinsics=yes
 fi
 
-  fi
+	fi
 fi
 
 # Check for LoongArch CRC intrinsics to do CRC calculations.
@@ -18048,36 +18105,36 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_loongarch_crcc_w_b_w, __builtin_loongarch_crcc_w_h_w, __builtin_loongarch_crcc_w_w_w and __builtin_loongarch_crcc_w_d_w" >&5
 $as_echo_n "checking for __builtin_loongarch_crcc_w_b_w, __builtin_loongarch_crcc_w_h_w, __builtin_loongarch_crcc_w_w_w and __builtin_loongarch_crcc_w_d_w... " >&6; }
 if ${pgac_cv_loongarch_crc32c_intrinsics+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 unsigned int crc;
 int
 main ()
 {
 crc = __builtin_loongarch_crcc_w_b_w(0, crc);
-   crc = __builtin_loongarch_crcc_w_h_w(0, crc);
-   crc = __builtin_loongarch_crcc_w_w_w(0, crc);
-   crc = __builtin_loongarch_crcc_w_d_w(0, crc);
-   /* return computed value, to prevent the above being optimized away */
-   return crc == 0;
-  ;
-  return 0;
+	 crc = __builtin_loongarch_crcc_w_h_w(0, crc);
+	 crc = __builtin_loongarch_crcc_w_w_w(0, crc);
+	 crc = __builtin_loongarch_crcc_w_d_w(0, crc);
+	 /* return computed value, to prevent the above being optimized away */
+	 return crc == 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv_loongarch_crc32c_intrinsics=yes
+	pgac_cv_loongarch_crc32c_intrinsics=yes
 else
-  pgac_cv_loongarch_crc32c_intrinsics=no
+	pgac_cv_loongarch_crc32c_intrinsics=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_loongarch_crc32c_intrinsics" >&5
 $as_echo "$pgac_cv_loongarch_crc32c_intrinsics" >&6; }
 if test x"$pgac_cv_loongarch_crc32c_intrinsics" = x"yes"; then
-  pgac_loongarch_crc32c_intrinsics=yes
+	pgac_loongarch_crc32c_intrinsics=yes
 fi
 
 
@@ -18112,35 +18169,35 @@ fi
 # If we are targeting a LoongArch processor, CRC instructions are
 # always available (at least on 64 bit), so no runtime check is needed.
 if test x"$USE_SLICING_BY_8_CRC32C" = x"" && test x"$USE_SSE42_CRC32C" = x"" && test x"$USE_SSE42_CRC32C_WITH_RUNTIME_CHECK" = x"" && test x"$USE_ARMV8_CRC32C" = x"" && test x"$USE_ARMV8_CRC32C_WITH_RUNTIME_CHECK" = x"" && test x"$USE_LOONGARCH_CRC32C" = x""; then
-  # Use Intel SSE 4.2 if available.
-  if test x"$pgac_sse42_crc32_intrinsics" = x"yes" && test x"$SSE4_2_TARGETED" = x"1" ; then
-    USE_SSE42_CRC32C=1
-  else
-    # Intel SSE 4.2, with runtime check? The CPUID instruction is needed for
-    # the runtime check.
-    if test x"$pgac_sse42_crc32_intrinsics" = x"yes" && (test x"$pgac_cv__get_cpuid" = x"yes" || test x"$pgac_cv__cpuid" = x"yes"); then
-      USE_SSE42_CRC32C_WITH_RUNTIME_CHECK=1
-    else
-      # Use ARM CRC Extension if available.
-      if test x"$pgac_armv8_crc32c_intrinsics" = x"yes" && test x"$CFLAGS_CRC" = x""; then
-        USE_ARMV8_CRC32C=1
-      else
-        # ARM CRC Extension, with runtime check?
-        if test x"$pgac_armv8_crc32c_intrinsics" = x"yes"; then
-          USE_ARMV8_CRC32C_WITH_RUNTIME_CHECK=1
-        else
-          # LoongArch CRCC instructions.
-          if test x"$pgac_loongarch_crc32c_intrinsics" = x"yes"; then
-            USE_LOONGARCH_CRC32C=1
-          else
-            # fall back to slicing-by-8 algorithm, which doesn't require any
-            # special CPU support.
-            USE_SLICING_BY_8_CRC32C=1
-          fi
-        fi
-      fi
-    fi
-  fi
+	# Use Intel SSE 4.2 if available.
+	if test x"$pgac_sse42_crc32_intrinsics" = x"yes" && test x"$SSE4_2_TARGETED" = x"1" ; then
+		USE_SSE42_CRC32C=1
+	else
+		# Intel SSE 4.2, with runtime check? The CPUID instruction is needed for
+		# the runtime check.
+		if test x"$pgac_sse42_crc32_intrinsics" = x"yes" && (test x"$pgac_cv__get_cpuid" = x"yes" || test x"$pgac_cv__cpuid" = x"yes"); then
+			USE_SSE42_CRC32C_WITH_RUNTIME_CHECK=1
+		else
+			# Use ARM CRC Extension if available.
+			if test x"$pgac_armv8_crc32c_intrinsics" = x"yes" && test x"$CFLAGS_CRC" = x""; then
+				USE_ARMV8_CRC32C=1
+			else
+				# ARM CRC Extension, with runtime check?
+				if test x"$pgac_armv8_crc32c_intrinsics" = x"yes"; then
+					USE_ARMV8_CRC32C_WITH_RUNTIME_CHECK=1
+				else
+					# LoongArch CRCC instructions.
+					if test x"$pgac_loongarch_crc32c_intrinsics" = x"yes"; then
+						USE_LOONGARCH_CRC32C=1
+					else
+						# fall back to slicing-by-8 algorithm, which doesn't require any
+						# special CPU support.
+						USE_SLICING_BY_8_CRC32C=1
+					fi
+				fi
+			fi
+		fi
+	fi
 fi
 
 # Set PG_CRC32C_OBJS appropriately depending on the selected implementation.
@@ -18150,105 +18207,105 @@ if test x"$USE_SSE42_CRC32C" = x"1"; then
 
 $as_echo "#define USE_SSE42_CRC32C 1" >>confdefs.h
 
-  PG_CRC32C_OBJS="pg_crc32c_sse42.o pg_crc32c_sse42_choose.o"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: SSE 4.2" >&5
+	PG_CRC32C_OBJS="pg_crc32c_sse42.o pg_crc32c_sse42_choose.o"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: SSE 4.2" >&5
 $as_echo "SSE 4.2" >&6; }
 else
-  if test x"$USE_SSE42_CRC32C_WITH_RUNTIME_CHECK" = x"1"; then
+	if test x"$USE_SSE42_CRC32C_WITH_RUNTIME_CHECK" = x"1"; then
 
 $as_echo "#define USE_SSE42_CRC32C_WITH_RUNTIME_CHECK 1" >>confdefs.h
 
-    PG_CRC32C_OBJS="pg_crc32c_sse42.o pg_crc32c_sb8.o pg_crc32c_sse42_choose.o"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SSE 4.2 with runtime check" >&5
+		PG_CRC32C_OBJS="pg_crc32c_sse42.o pg_crc32c_sb8.o pg_crc32c_sse42_choose.o"
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: SSE 4.2 with runtime check" >&5
 $as_echo "SSE 4.2 with runtime check" >&6; }
-  else
-    if test x"$USE_ARMV8_CRC32C" = x"1"; then
+	else
+		if test x"$USE_ARMV8_CRC32C" = x"1"; then
 
 $as_echo "#define USE_ARMV8_CRC32C 1" >>confdefs.h
 
-      PG_CRC32C_OBJS="pg_crc32c_armv8.o"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ARMv8 CRC instructions" >&5
+			PG_CRC32C_OBJS="pg_crc32c_armv8.o"
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ARMv8 CRC instructions" >&5
 $as_echo "ARMv8 CRC instructions" >&6; }
-    else
-      if test x"$USE_ARMV8_CRC32C_WITH_RUNTIME_CHECK" = x"1"; then
+		else
+			if test x"$USE_ARMV8_CRC32C_WITH_RUNTIME_CHECK" = x"1"; then
 
 $as_echo "#define USE_ARMV8_CRC32C_WITH_RUNTIME_CHECK 1" >>confdefs.h
 
-        PG_CRC32C_OBJS="pg_crc32c_armv8.o pg_crc32c_sb8.o pg_crc32c_armv8_choose.o"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ARMv8 CRC instructions with runtime check" >&5
+				PG_CRC32C_OBJS="pg_crc32c_armv8.o pg_crc32c_sb8.o pg_crc32c_armv8_choose.o"
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ARMv8 CRC instructions with runtime check" >&5
 $as_echo "ARMv8 CRC instructions with runtime check" >&6; }
-      else
-        if test x"$USE_LOONGARCH_CRC32C" = x"1"; then
+			else
+				if test x"$USE_LOONGARCH_CRC32C" = x"1"; then
 
 $as_echo "#define USE_LOONGARCH_CRC32C 1" >>confdefs.h
 
-          PG_CRC32C_OBJS="pg_crc32c_loongarch.o"
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: LoongArch CRCC instructions" >&5
+					PG_CRC32C_OBJS="pg_crc32c_loongarch.o"
+					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: LoongArch CRCC instructions" >&5
 $as_echo "LoongArch CRCC instructions" >&6; }
-        else
+				else
 
 $as_echo "#define USE_SLICING_BY_8_CRC32C 1" >>confdefs.h
 
-          PG_CRC32C_OBJS="pg_crc32c_sb8.o"
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: slicing-by-8" >&5
+					PG_CRC32C_OBJS="pg_crc32c_sb8.o"
+					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: slicing-by-8" >&5
 $as_echo "slicing-by-8" >&6; }
-        fi
-      fi
-    fi
-  fi
+				fi
+			fi
+		fi
+	fi
 fi
 
 
 # Check for carryless multiplication intrinsics to do vectorized CRC calculations.
 #
 if test x"$host_cpu" = x"x86_64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _mm512_clmulepi64_epi128" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _mm512_clmulepi64_epi128" >&5
 $as_echo_n "checking for _mm512_clmulepi64_epi128... " >&6; }
 if ${pgac_cv_avx512_pclmul_intrinsics+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <immintrin.h>
-    __m512i x;
-    __m512i y;
-
-    #if defined(__has_attribute) && __has_attribute (target)
-    __attribute__((target("vpclmulqdq,avx512vl")))
-    #endif
-    static int avx512_pclmul_test(void)
-    {
-      __m128i z;
-
-      x = _mm512_xor_si512(_mm512_zextsi128_si512(_mm_cvtsi32_si128(0)), x);
-      y = _mm512_clmulepi64_epi128(x, y, 0);
-      z = _mm_ternarylogic_epi64(
-                _mm512_castsi512_si128(y),
-                _mm512_extracti32x4_epi32(y, 1),
-                _mm512_extracti32x4_epi32(y, 2),
-                0x96);
-      return _mm_crc32_u64(0, _mm_extract_epi64(z, 0));
-    }
+		__m512i x;
+		__m512i y;
+
+		#if defined(__has_attribute) && __has_attribute (target)
+		__attribute__((target("vpclmulqdq,avx512vl")))
+		#endif
+		static int avx512_pclmul_test(void)
+		{
+			__m128i z;
+
+			x = _mm512_xor_si512(_mm512_zextsi128_si512(_mm_cvtsi32_si128(0)), x);
+			y = _mm512_clmulepi64_epi128(x, y, 0);
+			z = _mm_ternarylogic_epi64(
+								_mm512_castsi512_si128(y),
+								_mm512_extracti32x4_epi32(y, 1),
+								_mm512_extracti32x4_epi32(y, 2),
+								0x96);
+			return _mm_crc32_u64(0, _mm_extract_epi64(z, 0));
+		}
 int
 main ()
 {
 return avx512_pclmul_test();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv_avx512_pclmul_intrinsics=yes
+	pgac_cv_avx512_pclmul_intrinsics=yes
 else
-  pgac_cv_avx512_pclmul_intrinsics=no
+	pgac_cv_avx512_pclmul_intrinsics=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+		conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_avx512_pclmul_intrinsics" >&5
 $as_echo "$pgac_cv_avx512_pclmul_intrinsics" >&6; }
 if test x"$pgac_cv_avx512_pclmul_intrinsics" = x"yes"; then
-  pgac_avx512_pclmul_intrinsics=yes
+	pgac_avx512_pclmul_intrinsics=yes
 fi
 
 fi
@@ -18259,29 +18316,29 @@ if test x"$pgac_avx512_pclmul_intrinsics" = x"yes"; then
 
 $as_echo "#define USE_AVX512_CRC32C_WITH_RUNTIME_CHECK 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: AVX-512 with runtime check" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: AVX-512 with runtime check" >&5
 $as_echo "AVX-512 with runtime check" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
 $as_echo "none" >&6; }
 fi
 
 # Select semaphore implementation type.
 if test "$PORTNAME" != "win32"; then
-  if test x"$PREFERRED_SEMAPHORES" = x"NAMED_POSIX" ; then
-    # Need sem_open for this
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sem_open" >&5
+	if test x"$PREFERRED_SEMAPHORES" = x"NAMED_POSIX" ; then
+		# Need sem_open for this
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sem_open" >&5
 $as_echo_n "checking for library containing sem_open... " >&6; }
 if ${ac_cv_search_sem_open+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_func_search_save_LIBS=$LIBS
+	ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -18290,30 +18347,30 @@ int
 main ()
 {
 return sem_open ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 for ac_lib in '' rt pthread; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_sem_open=$ac_res
+	if test -z "$ac_lib"; then
+		ac_res="none required"
+	else
+		ac_res=-l$ac_lib
+		LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+	fi
+	if ac_fn_c_try_link "$LINENO"; then :
+	ac_cv_search_sem_open=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_sem_open+:} false; then :
-  break
+		conftest$ac_exeext
+	if ${ac_cv_search_sem_open+:} false; then :
+	break
 fi
 done
 if ${ac_cv_search_sem_open+:} false; then :
 
 else
-  ac_cv_search_sem_open=no
+	ac_cv_search_sem_open=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
@@ -18322,25 +18379,25 @@ fi
 $as_echo "$ac_cv_search_sem_open" >&6; }
 ac_res=$ac_cv_search_sem_open
 if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-  USE_NAMED_POSIX_SEMAPHORES=1
+	test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+	USE_NAMED_POSIX_SEMAPHORES=1
 fi
 
-  fi
-  if test x"$PREFERRED_SEMAPHORES" = x"UNNAMED_POSIX" ; then
-    # Need sem_init for this
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sem_init" >&5
+	fi
+	if test x"$PREFERRED_SEMAPHORES" = x"UNNAMED_POSIX" ; then
+		# Need sem_init for this
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sem_init" >&5
 $as_echo_n "checking for library containing sem_init... " >&6; }
 if ${ac_cv_search_sem_init+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_func_search_save_LIBS=$LIBS
+	ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -18349,30 +18406,30 @@ int
 main ()
 {
 return sem_init ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 for ac_lib in '' rt pthread; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_sem_init=$ac_res
+	if test -z "$ac_lib"; then
+		ac_res="none required"
+	else
+		ac_res=-l$ac_lib
+		LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+	fi
+	if ac_fn_c_try_link "$LINENO"; then :
+	ac_cv_search_sem_init=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_sem_init+:} false; then :
-  break
+		conftest$ac_exeext
+	if ${ac_cv_search_sem_init+:} false; then :
+	break
 fi
 done
 if ${ac_cv_search_sem_init+:} false; then :
 
 else
-  ac_cv_search_sem_init=no
+	ac_cv_search_sem_init=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
@@ -18381,41 +18438,41 @@ fi
 $as_echo "$ac_cv_search_sem_init" >&6; }
 ac_res=$ac_cv_search_sem_init
 if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-  USE_UNNAMED_POSIX_SEMAPHORES=1
+	test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+	USE_UNNAMED_POSIX_SEMAPHORES=1
 fi
 
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which semaphore API to use" >&5
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which semaphore API to use" >&5
 $as_echo_n "checking which semaphore API to use... " >&6; }
-  if test x"$USE_NAMED_POSIX_SEMAPHORES" = x"1" ; then
+	if test x"$USE_NAMED_POSIX_SEMAPHORES" = x"1" ; then
 
 $as_echo "#define USE_NAMED_POSIX_SEMAPHORES 1" >>confdefs.h
 
-    SEMA_IMPLEMENTATION="src/backend/port/posix_sema.c"
-    sematype="named POSIX"
-  else
-    if test x"$USE_UNNAMED_POSIX_SEMAPHORES" = x"1" ; then
+		SEMA_IMPLEMENTATION="src/backend/port/posix_sema.c"
+		sematype="named POSIX"
+	else
+		if test x"$USE_UNNAMED_POSIX_SEMAPHORES" = x"1" ; then
 
 $as_echo "#define USE_UNNAMED_POSIX_SEMAPHORES 1" >>confdefs.h
 
-      SEMA_IMPLEMENTATION="src/backend/port/posix_sema.c"
-      sematype="unnamed POSIX"
-    else
+			SEMA_IMPLEMENTATION="src/backend/port/posix_sema.c"
+			sematype="unnamed POSIX"
+		else
 
 $as_echo "#define USE_SYSV_SEMAPHORES 1" >>confdefs.h
 
-      SEMA_IMPLEMENTATION="src/backend/port/sysv_sema.c"
-      sematype="System V"
-    fi
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $sematype" >&5
+			SEMA_IMPLEMENTATION="src/backend/port/sysv_sema.c"
+			sematype="System V"
+		fi
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sematype" >&5
 $as_echo "$sematype" >&6; }
 else
 
 $as_echo "#define USE_WIN32_SEMAPHORES 1" >>confdefs.h
 
-  SEMA_IMPLEMENTATION="src/backend/port/win32_sema.c"
+	SEMA_IMPLEMENTATION="src/backend/port/win32_sema.c"
 fi
 
 
@@ -18424,12 +18481,12 @@ if test "$PORTNAME" != "win32"; then
 
 $as_echo "#define USE_SYSV_SHARED_MEMORY 1" >>confdefs.h
 
-  SHMEM_IMPLEMENTATION="src/backend/port/sysv_shmem.c"
+	SHMEM_IMPLEMENTATION="src/backend/port/sysv_shmem.c"
 else
 
 $as_echo "#define USE_WIN32_SHARED_MEMORY 1" >>confdefs.h
 
-  SHMEM_IMPLEMENTATION="src/backend/port/win32_shmem.c"
+	SHMEM_IMPLEMENTATION="src/backend/port/win32_shmem.c"
 fi
 
 # Select random number source. If a TLS library is used then it will be the
@@ -18438,28 +18495,28 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking which random number source to use" >&5
 $as_echo_n "checking which random number source to use... " >&6; }
 if test x"$with_ssl" = x"openssl" ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenSSL" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenSSL" >&5
 $as_echo "OpenSSL" >&6; }
 elif test x"$PORTNAME" = x"win32" ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Windows native" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Windows native" >&5
 $as_echo "Windows native" >&6; }
 elif test x"$cross_compiling" = x"yes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming /dev/urandom" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming /dev/urandom" >&5
 $as_echo "assuming /dev/urandom" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: /dev/urandom" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: /dev/urandom" >&5
 $as_echo "/dev/urandom" >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/urandom" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/urandom" >&5
 $as_echo_n "checking for /dev/urandom... " >&6; }
 if ${ac_cv_file__dev_urandom+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+	test "$cross_compiling" = yes &&
+	as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/dev/urandom"; then
-  ac_cv_file__dev_urandom=yes
+	ac_cv_file__dev_urandom=yes
 else
-  ac_cv_file__dev_urandom=no
+	ac_cv_file__dev_urandom=no
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__dev_urandom" >&5
@@ -18469,16 +18526,16 @@ if test "x$ac_cv_file__dev_urandom" = xyes; then :
 fi
 
 
-  if test x"$ac_cv_file__dev_urandom" = x"no" ; then
-    as_fn_error $? "
+	if test x"$ac_cv_file__dev_urandom" = x"no" ; then
+		as_fn_error $? "
 no source of strong random numbers was found
 PostgreSQL can use OpenSSL, native Windows API or /dev/urandom as a source of random numbers." "$LINENO" 5
-  fi
+	fi
 fi
 
 # If not set in template file, set bytes to use libc memset()
 if test x"$MEMSET_LOOP_LIMIT" = x"" ; then
-  MEMSET_LOOP_LIMIT=1024
+	MEMSET_LOOP_LIMIT=1024
 fi
 
 cat >>confdefs.h <<_ACEOF
@@ -18489,18 +18546,18 @@ _ACEOF
 
 if test "$enable_nls" = yes ; then
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing bind_textdomain_codeset" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing bind_textdomain_codeset" >&5
 $as_echo_n "checking for library containing bind_textdomain_codeset... " >&6; }
 if ${ac_cv_search_bind_textdomain_codeset+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  ac_func_search_save_LIBS=$LIBS
+	ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+	 Use char because int might match the return type of a GCC
+	 builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -18509,30 +18566,30 @@ int
 main ()
 {
 return bind_textdomain_codeset ();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 for ac_lib in '' intl; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_bind_textdomain_codeset=$ac_res
+	if test -z "$ac_lib"; then
+		ac_res="none required"
+	else
+		ac_res=-l$ac_lib
+		LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+	fi
+	if ac_fn_c_try_link "$LINENO"; then :
+	ac_cv_search_bind_textdomain_codeset=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_bind_textdomain_codeset+:} false; then :
-  break
+		conftest$ac_exeext
+	if ${ac_cv_search_bind_textdomain_codeset+:} false; then :
+	break
 fi
 done
 if ${ac_cv_search_bind_textdomain_codeset+:} false; then :
 
 else
-  ac_cv_search_bind_textdomain_codeset=no
+	ac_cv_search_bind_textdomain_codeset=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
@@ -18541,195 +18598,195 @@ fi
 $as_echo "$ac_cv_search_bind_textdomain_codeset" >&6; }
 ac_res=$ac_cv_search_bind_textdomain_codeset
 if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+	test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 else
-  as_fn_error $? "a gettext implementation is required for NLS" "$LINENO" 5
+	as_fn_error $? "a gettext implementation is required for NLS" "$LINENO" 5
 fi
 
-  ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
+	ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
 if test "x$ac_cv_header_libintl_h" = xyes; then :
 
 else
-  as_fn_error $? "header file <libintl.h> is required for NLS" "$LINENO" 5
+	as_fn_error $? "header file <libintl.h> is required for NLS" "$LINENO" 5
 fi
 
 
-  if test -z "$MSGFMT"; then
-  for ac_prog in msgfmt
+	if test -z "$MSGFMT"; then
+	for ac_prog in msgfmt
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_MSGFMT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $MSGFMT in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 MSGFMT=$ac_cv_path_MSGFMT
 if test -n "$MSGFMT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
 $as_echo "$MSGFMT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$MSGFMT" && break
+	test -n "$MSGFMT" && break
 done
 
 else
-  # Report the value of MSGFMT in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MSGFMT" >&5
+	# Report the value of MSGFMT in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MSGFMT" >&5
 $as_echo_n "checking for MSGFMT... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
 $as_echo "$MSGFMT" >&6; }
 fi
 
-    if test -z "$MSGFMT"; then
-    as_fn_error $? "msgfmt is required for NLS" "$LINENO" 5
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msgfmt flags" >&5
+		if test -z "$MSGFMT"; then
+		as_fn_error $? "msgfmt is required for NLS" "$LINENO" 5
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for msgfmt flags" >&5
 $as_echo_n "checking for msgfmt flags... " >&6; }
 if ${pgac_cv_msgfmt_flags+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  if test x"$MSGFMT" != x"" && "$MSGFMT" --version 2>&1 | grep "GNU" >/dev/null; then
-    pgac_cv_msgfmt_flags=-c
+	if test x"$MSGFMT" != x"" && "$MSGFMT" --version 2>&1 | grep "GNU" >/dev/null; then
+		pgac_cv_msgfmt_flags=-c
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_msgfmt_flags" >&5
 $as_echo "$pgac_cv_msgfmt_flags" >&6; }
-  MSGFMT_FLAGS=$pgac_cv_msgfmt_flags
+	MSGFMT_FLAGS=$pgac_cv_msgfmt_flags
 
-  if test -z "$MSGMERGE"; then
-  for ac_prog in msgmerge
+	if test -z "$MSGMERGE"; then
+	for ac_prog in msgmerge
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_MSGMERGE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MSGMERGE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $MSGMERGE in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 MSGMERGE=$ac_cv_path_MSGMERGE
 if test -n "$MSGMERGE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
 $as_echo "$MSGMERGE" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$MSGMERGE" && break
+	test -n "$MSGMERGE" && break
 done
 
 else
-  # Report the value of MSGMERGE in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MSGMERGE" >&5
+	# Report the value of MSGMERGE in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MSGMERGE" >&5
 $as_echo_n "checking for MSGMERGE... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
 $as_echo "$MSGMERGE" >&6; }
 fi
 
-  if test -z "$XGETTEXT"; then
-  for ac_prog in xgettext
+	if test -z "$XGETTEXT"; then
+	for ac_prog in xgettext
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_XGETTEXT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $XGETTEXT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $XGETTEXT in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 XGETTEXT=$ac_cv_path_XGETTEXT
 if test -n "$XGETTEXT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
 $as_echo "$XGETTEXT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$XGETTEXT" && break
+	test -n "$XGETTEXT" && break
 done
 
 else
-  # Report the value of XGETTEXT in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XGETTEXT" >&5
+	# Report the value of XGETTEXT in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XGETTEXT" >&5
 $as_echo_n "checking for XGETTEXT... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
 $as_echo "$XGETTEXT" >&6; }
 fi
 
@@ -18738,152 +18795,152 @@ fi
 
 # Check for Tcl configuration script tclConfig.sh
 if test "$with_tcl" = yes; then
-    if test -z "$TCLSH"; then
-  for ac_prog in tclsh tcl tclsh8.6 tclsh86 tclsh8.5 tclsh85 tclsh8.4 tclsh84
+		if test -z "$TCLSH"; then
+	for ac_prog in tclsh tcl tclsh8.6 tclsh86 tclsh8.5 tclsh85 tclsh8.4 tclsh84
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_TCLSH+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $TCLSH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $TCLSH in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 TCLSH=$ac_cv_path_TCLSH
 if test -n "$TCLSH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH" >&5
 $as_echo "$TCLSH" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$TCLSH" && break
+	test -n "$TCLSH" && break
 done
 
 else
-  # Report the value of TCLSH in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TCLSH" >&5
+	# Report the value of TCLSH in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TCLSH" >&5
 $as_echo_n "checking for TCLSH... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH" >&5
 $as_echo "$TCLSH" >&6; }
 fi
 
 if test x"$TCLSH" = x""; then
-  as_fn_error $? "Tcl shell not found" "$LINENO" 5
+	as_fn_error $? "Tcl shell not found" "$LINENO" 5
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclConfig.sh" >&5
 $as_echo_n "checking for tclConfig.sh... " >&6; }
 # Let user override test
 if test -z "$TCL_CONFIG_SH"; then
-    pgac_test_dirs="$with_tclconfig"
-
-    set X $pgac_test_dirs; shift
-    if test $# -eq 0; then
-        test -z "$TCLSH" && as_fn_error $? "unable to locate tclConfig.sh because no Tcl shell was found" "$LINENO" 5
-        pgac_test_dirs=`echo 'puts $auto_path' | $TCLSH`
-        # On newer macOS, $auto_path frequently doesn't include the place
-        # where tclConfig.sh actually lives.  Append that to the end, so as not
-        # to break cases where a non-default Tcl installation is being used.
-        if test -d "$PG_SYSROOT/System/Library/Frameworks/Tcl.framework" ; then
-            pgac_test_dirs="$pgac_test_dirs $PG_SYSROOT/System/Library/Frameworks/Tcl.framework"
-        fi
-        set X $pgac_test_dirs; shift
-    fi
-
-    for pgac_dir do
-        if test -r "$pgac_dir/tclConfig.sh"; then
-            TCL_CONFIG_SH=$pgac_dir/tclConfig.sh
-            break
-        fi
-    done
+		pgac_test_dirs="$with_tclconfig"
+
+		set X $pgac_test_dirs; shift
+		if test $# -eq 0; then
+				test -z "$TCLSH" && as_fn_error $? "unable to locate tclConfig.sh because no Tcl shell was found" "$LINENO" 5
+				pgac_test_dirs=`echo 'puts $auto_path' | $TCLSH`
+				# On newer macOS, $auto_path frequently doesn't include the place
+				# where tclConfig.sh actually lives.  Append that to the end, so as not
+				# to break cases where a non-default Tcl installation is being used.
+				if test -d "$PG_SYSROOT/System/Library/Frameworks/Tcl.framework" ; then
+						pgac_test_dirs="$pgac_test_dirs $PG_SYSROOT/System/Library/Frameworks/Tcl.framework"
+				fi
+				set X $pgac_test_dirs; shift
+		fi
+
+		for pgac_dir do
+				if test -r "$pgac_dir/tclConfig.sh"; then
+						TCL_CONFIG_SH=$pgac_dir/tclConfig.sh
+						break
+				fi
+		done
 fi
 
 if test -z "$TCL_CONFIG_SH"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-    as_fn_error $? "file 'tclConfig.sh' is required for Tcl" "$LINENO" 5
+		as_fn_error $? "file 'tclConfig.sh' is required for Tcl" "$LINENO" 5
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCL_CONFIG_SH" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCL_CONFIG_SH" >&5
 $as_echo "$TCL_CONFIG_SH" >&6; }
 fi
 
 
 
-    . "$TCL_CONFIG_SH"
+		. "$TCL_CONFIG_SH"
 eval TCL_INCLUDE_SPEC=\"$TCL_INCLUDE_SPEC\"
 eval TCL_LIBS=\"$TCL_LIBS\"
 eval TCL_LIB_SPEC=\"$TCL_LIB_SPEC\"
 eval TCL_SHARED_BUILD=\"$TCL_SHARED_BUILD\"
 
-    if test "$TCL_SHARED_BUILD" != 1; then
-      as_fn_error $? "cannot build PL/Tcl because Tcl is not a shared library
+		if test "$TCL_SHARED_BUILD" != 1; then
+			as_fn_error $? "cannot build PL/Tcl because Tcl is not a shared library
 Use --without-tcl to disable building PL/Tcl." "$LINENO" 5
-    fi
-    # now that we have TCL_INCLUDE_SPEC, we can check for <tcl.h>
-    ac_save_CPPFLAGS=$CPPFLAGS
-    CPPFLAGS="$CPPFLAGS $TCL_INCLUDE_SPEC"
-    ac_fn_c_check_header_mongrel "$LINENO" "tcl.h" "ac_cv_header_tcl_h" "$ac_includes_default"
+		fi
+		# now that we have TCL_INCLUDE_SPEC, we can check for <tcl.h>
+		ac_save_CPPFLAGS=$CPPFLAGS
+		CPPFLAGS="$CPPFLAGS $TCL_INCLUDE_SPEC"
+		ac_fn_c_check_header_mongrel "$LINENO" "tcl.h" "ac_cv_header_tcl_h" "$ac_includes_default"
 if test "x$ac_cv_header_tcl_h" = xyes; then :
 
 else
-  as_fn_error $? "header file <tcl.h> is required for Tcl" "$LINENO" 5
+	as_fn_error $? "header file <tcl.h> is required for Tcl" "$LINENO" 5
 fi
 
 
-    CPPFLAGS=$ac_save_CPPFLAGS
+		CPPFLAGS=$ac_save_CPPFLAGS
 fi
 
 # check for <perl.h>
 if test "$with_perl" = yes; then
-  ac_save_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="$CPPFLAGS $perl_includespec"
-  ac_fn_c_check_header_compile "$LINENO" "perl.h" "ac_cv_header_perl_h" "#include <EXTERN.h>
+	ac_save_CPPFLAGS=$CPPFLAGS
+	CPPFLAGS="$CPPFLAGS $perl_includespec"
+	ac_fn_c_check_header_compile "$LINENO" "perl.h" "ac_cv_header_perl_h" "#include <EXTERN.h>
 "
 if test "x$ac_cv_header_perl_h" = xyes; then :
 
 else
-  as_fn_error $? "header file <perl.h> is required for Perl" "$LINENO" 5
+	as_fn_error $? "header file <perl.h> is required for Perl" "$LINENO" 5
 fi
 
 
-  # While we're at it, check that we can link to libperl.
-  # On most platforms, if perl.h is there then libperl.so will be too, but at
-  # this writing Debian packages them separately.  There is no known reason to
-  # waste cycles on separate probes for the Tcl or Python libraries, though.
-  # On some Red Hat platforms, the link attempt can fail if we don't use
-  # CFLAGS_SL while building the test program.
-  ac_save_CFLAGS=$CFLAGS
-  CFLAGS="$CFLAGS $CFLAGS_SL"
-  pgac_save_LIBS=$LIBS
-  LIBS="$perl_embed_ldflags"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libperl" >&5
+	# While we're at it, check that we can link to libperl.
+	# On most platforms, if perl.h is there then libperl.so will be too, but at
+	# this writing Debian packages them separately.  There is no known reason to
+	# waste cycles on separate probes for the Tcl or Python libraries, though.
+	# On some Red Hat platforms, the link attempt can fail if we don't use
+	# CFLAGS_SL while building the test program.
+	ac_save_CFLAGS=$CFLAGS
+	CFLAGS="$CFLAGS $CFLAGS_SL"
+	pgac_save_LIBS=$LIBS
+	LIBS="$perl_embed_ldflags"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libperl" >&5
 $as_echo_n "checking for libperl... " >&6; }
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <EXTERN.h>
@@ -18893,256 +18950,256 @@ int
 main ()
 {
 perl_alloc();
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-     as_fn_error $? "libperl library is required for Perl" "$LINENO" 5
+		 as_fn_error $? "libperl library is required for Perl" "$LINENO" 5
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  LIBS=$pgac_save_LIBS
-  CFLAGS=$ac_save_CFLAGS
-  CPPFLAGS=$ac_save_CPPFLAGS
+		conftest$ac_exeext conftest.$ac_ext
+	LIBS=$pgac_save_LIBS
+	CFLAGS=$ac_save_CFLAGS
+	CPPFLAGS=$ac_save_CPPFLAGS
 fi
 
 # check for <Python.h>
 if test "$with_python" = yes; then
-  ac_save_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="$CPPFLAGS $python_includespec"
-  ac_fn_c_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default"
+	ac_save_CPPFLAGS=$CPPFLAGS
+	CPPFLAGS="$CPPFLAGS $python_includespec"
+	ac_fn_c_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default"
 if test "x$ac_cv_header_Python_h" = xyes; then :
 
 else
-  as_fn_error $? "header file <Python.h> is required for Python" "$LINENO" 5
+	as_fn_error $? "header file <Python.h> is required for Python" "$LINENO" 5
 fi
 
 
-  CPPFLAGS=$ac_save_CPPFLAGS
+	CPPFLAGS=$ac_save_CPPFLAGS
 fi
 
 #
 # Check for documentation-building tools
 #
 if test -z "$XMLLINT"; then
-  for ac_prog in xmllint
+	for ac_prog in xmllint
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_XMLLINT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $XMLLINT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_XMLLINT="$XMLLINT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $XMLLINT in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_XMLLINT="$XMLLINT" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_XMLLINT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_XMLLINT="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 XMLLINT=$ac_cv_path_XMLLINT
 if test -n "$XMLLINT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5
 $as_echo "$XMLLINT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$XMLLINT" && break
+	test -n "$XMLLINT" && break
 done
 
 else
-  # Report the value of XMLLINT in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XMLLINT" >&5
+	# Report the value of XMLLINT in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XMLLINT" >&5
 $as_echo_n "checking for XMLLINT... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5
 $as_echo "$XMLLINT" >&6; }
 fi
 
 if test -z "$XSLTPROC"; then
-  for ac_prog in xsltproc
+	for ac_prog in xsltproc
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_XSLTPROC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $XSLTPROC in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $XSLTPROC in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 XSLTPROC=$ac_cv_path_XSLTPROC
 if test -n "$XSLTPROC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
 $as_echo "$XSLTPROC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$XSLTPROC" && break
+	test -n "$XSLTPROC" && break
 done
 
 else
-  # Report the value of XSLTPROC in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XSLTPROC" >&5
+	# Report the value of XSLTPROC in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XSLTPROC" >&5
 $as_echo_n "checking for XSLTPROC... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
 $as_echo "$XSLTPROC" >&6; }
 fi
 
 if test -z "$FOP"; then
-  for ac_prog in fop
+	for ac_prog in fop
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_FOP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $FOP in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_FOP="$FOP" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $FOP in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_FOP="$FOP" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_FOP="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_FOP="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 FOP=$ac_cv_path_FOP
 if test -n "$FOP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5
 $as_echo "$FOP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$FOP" && break
+	test -n "$FOP" && break
 done
 
 else
-  # Report the value of FOP in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FOP" >&5
+	# Report the value of FOP in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FOP" >&5
 $as_echo_n "checking for FOP... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5
 $as_echo "$FOP" >&6; }
 fi
 
 if test -z "$DBTOEPUB"; then
-  for ac_prog in dbtoepub
+	for ac_prog in dbtoepub
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_DBTOEPUB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $DBTOEPUB in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_DBTOEPUB="$DBTOEPUB" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $DBTOEPUB in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_DBTOEPUB="$DBTOEPUB" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_DBTOEPUB="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_DBTOEPUB="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 DBTOEPUB=$ac_cv_path_DBTOEPUB
 if test -n "$DBTOEPUB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBTOEPUB" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBTOEPUB" >&5
 $as_echo "$DBTOEPUB" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$DBTOEPUB" && break
+	test -n "$DBTOEPUB" && break
 done
 
 else
-  # Report the value of DBTOEPUB in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBTOEPUB" >&5
+	# Report the value of DBTOEPUB in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBTOEPUB" >&5
 $as_echo_n "checking for DBTOEPUB... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBTOEPUB" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBTOEPUB" >&5
 $as_echo "$DBTOEPUB" >&6; }
 fi
 
@@ -19151,82 +19208,82 @@ fi
 # Check for test tools
 #
 if test "$enable_tap_tests" = yes; then
-  # Make sure we know where prove is.
-  if test -z "$PROVE"; then
-  for ac_prog in prove
+	# Make sure we know where prove is.
+	if test -z "$PROVE"; then
+	for ac_prog in prove
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+	# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_PROVE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PROVE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PROVE="$PROVE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	$as_echo_n "(cached) " >&6
+else
+	case $PROVE in
+	[\\/]* | ?:[\\/]*)
+	ac_cv_path_PROVE="$PROVE" # Let the user override the test with a path.
+	;;
+	*)
+	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PROVE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+		ac_cv_path_PROVE="$as_dir/$ac_word$ac_exec_ext"
+		$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+		break 2
+	fi
 done
-  done
+	done
 IFS=$as_save_IFS
 
-  ;;
+	;;
 esac
 fi
 PROVE=$ac_cv_path_PROVE
 if test -n "$PROVE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROVE" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROVE" >&5
 $as_echo "$PROVE" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$PROVE" && break
+	test -n "$PROVE" && break
 done
 
 else
-  # Report the value of PROVE in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PROVE" >&5
+	# Report the value of PROVE in configure's output in all cases.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PROVE" >&5
 $as_echo_n "checking for PROVE... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROVE" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROVE" >&5
 $as_echo "$PROVE" >&6; }
 fi
 
-  if test -z "$PROVE"; then
-    as_fn_error $? "prove not found" "$LINENO" 5
-  fi
-  # Check for necessary Perl modules.  You might think we should use
-  # AX_PROG_PERL_MODULES here, but prove might be part of a different Perl
-  # installation than perl, eg on MSys, so we have to check using prove.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Perl modules required for TAP tests" >&5
+	if test -z "$PROVE"; then
+		as_fn_error $? "prove not found" "$LINENO" 5
+	fi
+	# Check for necessary Perl modules.  You might think we should use
+	# AX_PROG_PERL_MODULES here, but prove might be part of a different Perl
+	# installation than perl, eg on MSys, so we have to check using prove.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Perl modules required for TAP tests" >&5
 $as_echo_n "checking for Perl modules required for TAP tests... " >&6; }
-  __CONFIG_HOST_OS__=$host_os; export __CONFIG_HOST_OS__
-  modulestderr=`"$PROVE" "$srcdir/config/check_modules.pl" 2>&1 >/dev/null`
-  if test $? -eq 0; then
-    # log the module version details, but don't show them interactively
-    echo "$modulestderr" >&5
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+	__CONFIG_HOST_OS__=$host_os; export __CONFIG_HOST_OS__
+	modulestderr=`"$PROVE" "$srcdir/config/check_modules.pl" 2>&1 >/dev/null`
+	if test $? -eq 0; then
+		# log the module version details, but don't show them interactively
+		echo "$modulestderr" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-  else
-    # on failure, though, show the results to the user
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $modulestderr" >&5
+	else
+		# on failure, though, show the results to the user
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $modulestderr" >&5
 $as_echo "$modulestderr" >&6; }
-    as_fn_error $? "Additional Perl modules are required to run TAP tests" "$LINENO" 5
-  fi
+		as_fn_error $? "Additional Perl modules are required to run TAP tests" "$LINENO" 5
+	fi
 fi
 
 # If compiler will take -Wl,--as-needed (or various platform-specific
@@ -19236,40 +19293,40 @@ fi
 # libreadline; therefore we postpone testing it until we know what library
 # dependencies readline has.  The test code will try to link with $LIBS.
 if test "$with_readline" = yes; then
-  link_test_func=readline
+	link_test_func=readline
 else
-  link_test_func=exit
+	link_test_func=exit
 fi
 
 if test "$PORTNAME" = "darwin"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wl,-dead_strip_dylibs, for LDFLAGS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wl,-dead_strip_dylibs, for LDFLAGS" >&5
 $as_echo_n "checking whether $CC supports -Wl,-dead_strip_dylibs, for LDFLAGS... " >&6; }
 if ${pgac_cv_prog_cc_LDFLAGS__Wl__dead_strip_dylibs+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_LDFLAGS=$LDFLAGS
+	pgac_save_LDFLAGS=$LDFLAGS
 LDFLAGS="$pgac_save_LDFLAGS -Wl,-dead_strip_dylibs"
 if test "$cross_compiling" = yes; then :
-  pgac_cv_prog_cc_LDFLAGS__Wl__dead_strip_dylibs="assuming no"
+	pgac_cv_prog_cc_LDFLAGS__Wl__dead_strip_dylibs="assuming no"
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 extern void $link_test_func (); void (*fptr) () = $link_test_func;
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  pgac_cv_prog_cc_LDFLAGS__Wl__dead_strip_dylibs=yes
+	pgac_cv_prog_cc_LDFLAGS__Wl__dead_strip_dylibs=yes
 else
-  pgac_cv_prog_cc_LDFLAGS__Wl__dead_strip_dylibs=no
+	pgac_cv_prog_cc_LDFLAGS__Wl__dead_strip_dylibs=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+	conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 LDFLAGS="$pgac_save_LDFLAGS"
@@ -19277,39 +19334,39 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_cc_LDFLAGS__Wl__dead_strip_dylibs" >&5
 $as_echo "$pgac_cv_prog_cc_LDFLAGS__Wl__dead_strip_dylibs" >&6; }
 if test x"$pgac_cv_prog_cc_LDFLAGS__Wl__dead_strip_dylibs" = x"yes"; then
-  LDFLAGS="${LDFLAGS} -Wl,-dead_strip_dylibs"
+	LDFLAGS="${LDFLAGS} -Wl,-dead_strip_dylibs"
 fi
 
 
 elif test "$PORTNAME" = "openbsd"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wl,-Bdynamic, for LDFLAGS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wl,-Bdynamic, for LDFLAGS" >&5
 $as_echo_n "checking whether $CC supports -Wl,-Bdynamic, for LDFLAGS... " >&6; }
 if ${pgac_cv_prog_cc_LDFLAGS__Wl__Bdynamic+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_LDFLAGS=$LDFLAGS
+	pgac_save_LDFLAGS=$LDFLAGS
 LDFLAGS="$pgac_save_LDFLAGS -Wl,-Bdynamic"
 if test "$cross_compiling" = yes; then :
-  pgac_cv_prog_cc_LDFLAGS__Wl__Bdynamic="assuming no"
+	pgac_cv_prog_cc_LDFLAGS__Wl__Bdynamic="assuming no"
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 extern void $link_test_func (); void (*fptr) () = $link_test_func;
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  pgac_cv_prog_cc_LDFLAGS__Wl__Bdynamic=yes
+	pgac_cv_prog_cc_LDFLAGS__Wl__Bdynamic=yes
 else
-  pgac_cv_prog_cc_LDFLAGS__Wl__Bdynamic=no
+	pgac_cv_prog_cc_LDFLAGS__Wl__Bdynamic=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+	conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 LDFLAGS="$pgac_save_LDFLAGS"
@@ -19317,39 +19374,39 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_cc_LDFLAGS__Wl__Bdynamic" >&5
 $as_echo "$pgac_cv_prog_cc_LDFLAGS__Wl__Bdynamic" >&6; }
 if test x"$pgac_cv_prog_cc_LDFLAGS__Wl__Bdynamic" = x"yes"; then
-  LDFLAGS="${LDFLAGS} -Wl,-Bdynamic"
+	LDFLAGS="${LDFLAGS} -Wl,-Bdynamic"
 fi
 
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wl,--as-needed, for LDFLAGS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wl,--as-needed, for LDFLAGS" >&5
 $as_echo_n "checking whether $CC supports -Wl,--as-needed, for LDFLAGS... " >&6; }
 if ${pgac_cv_prog_cc_LDFLAGS__Wl___as_needed+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_LDFLAGS=$LDFLAGS
+	pgac_save_LDFLAGS=$LDFLAGS
 LDFLAGS="$pgac_save_LDFLAGS -Wl,--as-needed"
 if test "$cross_compiling" = yes; then :
-  pgac_cv_prog_cc_LDFLAGS__Wl___as_needed="assuming no"
+	pgac_cv_prog_cc_LDFLAGS__Wl___as_needed="assuming no"
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 extern void $link_test_func (); void (*fptr) () = $link_test_func;
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  pgac_cv_prog_cc_LDFLAGS__Wl___as_needed=yes
+	pgac_cv_prog_cc_LDFLAGS__Wl___as_needed=yes
 else
-  pgac_cv_prog_cc_LDFLAGS__Wl___as_needed=no
+	pgac_cv_prog_cc_LDFLAGS__Wl___as_needed=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+	conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 LDFLAGS="$pgac_save_LDFLAGS"
@@ -19357,7 +19414,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_cc_LDFLAGS__Wl___as_needed" >&5
 $as_echo "$pgac_cv_prog_cc_LDFLAGS__Wl___as_needed" >&6; }
 if test x"$pgac_cv_prog_cc_LDFLAGS__Wl___as_needed" = x"yes"; then
-  LDFLAGS="${LDFLAGS} -Wl,--as-needed"
+	LDFLAGS="${LDFLAGS} -Wl,--as-needed"
 fi
 
 
@@ -19372,31 +19429,31 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wl,--export-dynamic, for LDFLAGS_EX_BE" >&5
 $as_echo_n "checking whether $CC supports -Wl,--export-dynamic, for LDFLAGS_EX_BE... " >&6; }
 if ${pgac_cv_prog_cc_LDFLAGS_EX_BE__Wl___export_dynamic+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_LDFLAGS=$LDFLAGS
+	pgac_save_LDFLAGS=$LDFLAGS
 LDFLAGS="$pgac_save_LDFLAGS -Wl,--export-dynamic"
 if test "$cross_compiling" = yes; then :
-  pgac_cv_prog_cc_LDFLAGS_EX_BE__Wl___export_dynamic="assuming no"
+	pgac_cv_prog_cc_LDFLAGS_EX_BE__Wl___export_dynamic="assuming no"
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 extern void $link_test_func (); void (*fptr) () = $link_test_func;
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  pgac_cv_prog_cc_LDFLAGS_EX_BE__Wl___export_dynamic=yes
+	pgac_cv_prog_cc_LDFLAGS_EX_BE__Wl___export_dynamic=yes
 else
-  pgac_cv_prog_cc_LDFLAGS_EX_BE__Wl___export_dynamic=no
+	pgac_cv_prog_cc_LDFLAGS_EX_BE__Wl___export_dynamic=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+	conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 LDFLAGS="$pgac_save_LDFLAGS"
@@ -19404,38 +19461,38 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_cc_LDFLAGS_EX_BE__Wl___export_dynamic" >&5
 $as_echo "$pgac_cv_prog_cc_LDFLAGS_EX_BE__Wl___export_dynamic" >&6; }
 if test x"$pgac_cv_prog_cc_LDFLAGS_EX_BE__Wl___export_dynamic" = x"yes"; then
-  LDFLAGS_EX_BE="${LDFLAGS_EX_BE} -Wl,--export-dynamic"
+	LDFLAGS_EX_BE="${LDFLAGS_EX_BE} -Wl,--export-dynamic"
 fi
 
 if test x"$LDFLAGS_EX_BE" = x""; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wl,-export_dynamic, for LDFLAGS_EX_BE" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wl,-export_dynamic, for LDFLAGS_EX_BE" >&5
 $as_echo_n "checking whether $CC supports -Wl,-export_dynamic, for LDFLAGS_EX_BE... " >&6; }
 if ${pgac_cv_prog_cc_LDFLAGS_EX_BE__Wl__export_dynamic+:} false; then :
-  $as_echo_n "(cached) " >&6
+	$as_echo_n "(cached) " >&6
 else
-  pgac_save_LDFLAGS=$LDFLAGS
+	pgac_save_LDFLAGS=$LDFLAGS
 LDFLAGS="$pgac_save_LDFLAGS -Wl,-export_dynamic"
 if test "$cross_compiling" = yes; then :
-  pgac_cv_prog_cc_LDFLAGS_EX_BE__Wl__export_dynamic="assuming no"
+	pgac_cv_prog_cc_LDFLAGS_EX_BE__Wl__export_dynamic="assuming no"
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 extern void $link_test_func (); void (*fptr) () = $link_test_func;
 int
 main ()
 {
 
-  ;
-  return 0;
+	;
+	return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  pgac_cv_prog_cc_LDFLAGS_EX_BE__Wl__export_dynamic=yes
+	pgac_cv_prog_cc_LDFLAGS_EX_BE__Wl__export_dynamic=yes
 else
-  pgac_cv_prog_cc_LDFLAGS_EX_BE__Wl__export_dynamic=no
+	pgac_cv_prog_cc_LDFLAGS_EX_BE__Wl__export_dynamic=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+	conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 LDFLAGS="$pgac_save_LDFLAGS"
@@ -19443,7 +19500,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_cc_LDFLAGS_EX_BE__Wl__export_dynamic" >&5
 $as_echo "$pgac_cv_prog_cc_LDFLAGS_EX_BE__Wl__export_dynamic" >&6; }
 if test x"$pgac_cv_prog_cc_LDFLAGS_EX_BE__Wl__export_dynamic" = x"yes"; then
-  LDFLAGS_EX_BE="${LDFLAGS_EX_BE} -Wl,-export_dynamic"
+	LDFLAGS_EX_BE="${LDFLAGS_EX_BE} -Wl,-export_dynamic"
 fi
 
 fi
@@ -19451,10 +19508,10 @@ fi
 
 # Create compiler version string
 if test x"$GCC" = x"yes" ; then
-  cc_string=`${CC} --version | sed q`
-  case $cc_string in [A-Za-z]*) ;; *) cc_string="GCC $cc_string";; esac
+	cc_string=`${CC} --version | sed q`
+	case $cc_string in [A-Za-z]*) ;; *) cc_string="GCC $cc_string";; esac
 else
-  cc_string=$CC
+	cc_string=$CC
 fi
 
 
@@ -19480,8 +19537,8 @@ _ACEOF
 # we've finished all configure checks that depend on CPPFLAGS.
 # The same for LDFLAGS, too.
 if test x"$PG_SYSROOT" != x; then
-  CPPFLAGS=`echo "$CPPFLAGS" | sed -e "s| $PG_SYSROOT | \\\$(PG_SYSROOT) |"`
-  LDFLAGS=`echo "$LDFLAGS" | sed -e "s| $PG_SYSROOT | \\\$(PG_SYSROOT) |"`
+	CPPFLAGS=`echo "$CPPFLAGS" | sed -e "s| $PG_SYSROOT | \\\$(PG_SYSROOT) |"`
+	LDFLAGS=`echo "$LDFLAGS" | sed -e "s| $PG_SYSROOT | \\\$(PG_SYSROOT) |"`
 fi
 
 
@@ -19498,15 +19555,15 @@ $as_echo "$as_me: using CPPFLAGS=$CPPFLAGS" >&6;}
 $as_echo "$as_me: using LDFLAGS=$LDFLAGS" >&6;}
 # Currently only used when LLVM is used
 if test "$with_llvm" = yes ; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: using CXX=$CXX" >&5
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: using CXX=$CXX" >&5
 $as_echo "$as_me: using CXX=$CXX" >&6;}
-   { $as_echo "$as_me:${as_lineno-$LINENO}: using CXXFLAGS=$CXXFLAGS" >&5
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: using CXXFLAGS=$CXXFLAGS" >&5
 $as_echo "$as_me: using CXXFLAGS=$CXXFLAGS" >&6;}
-   { $as_echo "$as_me:${as_lineno-$LINENO}: using CLANG=$CLANG" >&5
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: using CLANG=$CLANG" >&5
 $as_echo "$as_me: using CLANG=$CLANG" >&6;}
-   { $as_echo "$as_me:${as_lineno-$LINENO}: using BITCODE_CFLAGS=$BITCODE_CFLAGS" >&5
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: using BITCODE_CFLAGS=$BITCODE_CFLAGS" >&5
 $as_echo "$as_me: using BITCODE_CFLAGS=$BITCODE_CFLAGS" >&6;}
-   { $as_echo "$as_me:${as_lineno-$LINENO}: using BITCODE_CXXFLAGS=$BITCODE_CXXFLAGS" >&5
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: using BITCODE_CXXFLAGS=$BITCODE_CXXFLAGS" >&5
 $as_echo "$as_me: using BITCODE_CXXFLAGS=$BITCODE_CXXFLAGS" >&6;}
 fi
 
@@ -19515,17 +19572,17 @@ fi
 # Note 2: /bin/pwd might be better than shell's built-in at getting
 #         a symlink-free name.
 if ( test "$srcdir" -ef . ) >/dev/null 2>&1 || test "`cd $srcdir && /bin/pwd`" = "`/bin/pwd`"; then
-  vpath_build=no
-else
-  vpath_build=yes
-  if test "$no_create" != yes; then
-    $as_echo_n "preparing build tree... " >&6
-    pgac_abs_top_srcdir=`cd "$srcdir" && pwd`
-    $SHELL "$ac_aux_dir/prep_buildtree" "$pgac_abs_top_srcdir" "." \
-      || as_fn_error $? "failed" "$LINENO" 5
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+	vpath_build=no
+else
+	vpath_build=yes
+	if test "$no_create" != yes; then
+		$as_echo_n "preparing build tree... " >&6
+		pgac_abs_top_srcdir=`cd "$srcdir" && pwd`
+		$SHELL "$ac_aux_dir/prep_buildtree" "$pgac_abs_top_srcdir" "." \
+			|| as_fn_error $? "failed" "$LINENO" 5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
 $as_echo "done" >&6; }
-  fi
+	fi
 fi
 
 
@@ -19569,67 +19626,67 @@ _ACEOF
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+	for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+		eval ac_val=\$$ac_var
+		case $ac_val in #(
+		*${as_nl}*)
+			case $ac_var in #(
+			*_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
+			esac
+			case $ac_var in #(
+			_ | IFS | as_nl) ;; #(
+			BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+			*) { eval $ac_var=; unset $ac_var;} ;;
+			esac ;;
+		esac
+	done
+
+	(set) 2>&1 |
+		case $as_nl`(ac_space=' '; set) 2>&1` in #(
+		*${as_nl}ac_space=\ *)
+			# `set' does not quote correctly, so add quotes: double-quote
+			# substitution turns \\\\ into \\, and sed turns \\ into \.
+			sed -n \
 	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
+		s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+			;; #(
+		*)
+			# `set' quotes correctly as required by POSIX, so do not add quotes.
+			sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+			;;
+		esac |
+		sort
 ) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
+	sed '
+		 /^ac_cv_env_/b end
+		 t clear
+		 :clear
+		 s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+		 t end
+		 s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+		 :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+	if test -w "$cache_file"; then
+		if test "x$cache_file" != "x/dev/null"; then
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
+			if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
+			else
+				case $cache_file in #(
+				*/* | ?:*)
+		mv -f confcache "$cache_file"$$ &&
+		mv -f "$cache_file"$$ "$cache_file" ;; #(
+				*)
+		mv -f confcache "$cache_file" ;;
 	esac
-      fi
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+			fi
+		fi
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
+	fi
 fi
 rm -f confcache
 
@@ -19643,13 +19700,13 @@ ac_libobjs=
 ac_ltlibobjs=
 U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+	# 1. Remove the extension, and $U if already installed.
+	ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+	ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+	# 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+	#    will be set to the directory where LIBOBJS objects are built.
+	as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+	as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -19687,18 +19744,18 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
+	emulate sh
+	NULLCMD=:
+	# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+	# is contrary to our usage.  Disable this feature.
+	alias -g '${1+"$@"}'='"$@"'
+	setopt NO_GLOB_SUBST
+else
+	case `(set -o) 2>/dev/null` in #(
+	*posix*) :
+		set -o posix ;; #(
+	*) :
+		 ;;
 esac
 fi
 
@@ -19713,41 +19770,41 @@ as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
 # Prefer a ksh shell builtin over an external printf program on Solaris,
 # but without wasting forks for bash or zsh.
 if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
+		&& (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+	as_echo='print -r --'
+	as_echo_n='print -rn --'
 elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
+	as_echo='printf %s\n'
+	as_echo_n='printf %s'
+else
+	if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+		as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+		as_echo_n='/usr/ucb/echo -n'
+	else
+		as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+		as_echo_n_body='eval
+			arg=$1;
+			case $arg in #(
+			*"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
+			esac;
+			expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+		'
+		export as_echo_n_body
+		as_echo_n='sh -c $as_echo_n_body as_echo'
+	fi
+	export as_echo_body
+	as_echo='sh -c $as_echo_body as_echo'
 fi
 
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
+	PATH_SEPARATOR=:
+	(PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+		(PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+			PATH_SEPARATOR=';'
+	}
 fi
 
 
@@ -19761,26 +19818,26 @@ IFS=" ""	$as_nl"
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+	*[\\/]* ) as_myself=$0 ;;
+	*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
+	IFS=$as_save_IFS
+	test -z "$as_dir" && as_dir=.
+		test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+	done
 IFS=$as_save_IFS
 
-     ;;
+		 ;;
 esac
 # We did not find ourselves, most probably we were run as `sh COMMAND'
 # in which case we are not to be found in the path.
 if test "x$as_myself" = x; then
-  as_myself=$0
+	as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
+	$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+	exit 1
 fi
 
 # Unset variables that we do not need and which cause bugs (e.g. in
@@ -19789,7 +19846,7 @@ fi
 # trigger a bug in pdksh 5.2.14.
 for as_var in BASH_ENV ENV MAIL MAILPATH
 do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+	&& ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -19812,13 +19869,13 @@ export LANGUAGE
 # script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
+	as_status=$1; test $as_status -eq 0 && as_status=1
+	if test "$4"; then
+		as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+		$as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+	fi
+	$as_echo "$as_me: error: $2" >&2
+	as_fn_exit $as_status
 } # as_fn_error
 
 
@@ -19827,7 +19884,7 @@ as_fn_error ()
 # Set $? to STATUS, without forking.
 as_fn_set_status ()
 {
-  return $1
+	return $1
 } # as_fn_set_status
 
 # as_fn_exit STATUS
@@ -19835,9 +19892,9 @@ as_fn_set_status ()
 # Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
 as_fn_exit ()
 {
-  set +e
-  as_fn_set_status $1
-  exit $1
+	set +e
+	as_fn_set_status $1
+	exit $1
 } # as_fn_exit
 
 # as_fn_unset VAR
@@ -19845,7 +19902,7 @@ as_fn_exit ()
 # Portably unset VAR.
 as_fn_unset ()
 {
-  { eval $1=; unset $1;}
+	{ eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
 # as_fn_append VAR VALUE
@@ -19855,15 +19912,15 @@ as_unset=as_fn_unset
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
 if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
+	eval 'as_fn_append ()
+	{
+		eval $1+=\$2
+	}'
+else
+	as_fn_append ()
+	{
+		eval $1=\$$1\$2
+	}
 fi # as_fn_append
 
 # as_fn_arith ARG...
@@ -19872,35 +19929,35 @@ fi # as_fn_append
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
 if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
+	eval 'as_fn_arith ()
+	{
+		as_val=$(( $* ))
+	}'
+else
+	as_fn_arith ()
+	{
+		as_val=`expr "$@" || test $? -eq 1`
+	}
 fi # as_fn_arith
 
 
 if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
+	 test "X`expr 00001 : '.*\(...\)'`" = X001; then
+	as_expr=expr
 else
-  as_expr=false
+	as_expr=false
 fi
 
 if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
+	as_basename=basename
 else
-  as_basename=false
+	as_basename=false
 fi
 
 if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
+	as_dirname=dirname
 else
-  as_dirname=false
+	as_dirname=false
 fi
 
 as_me=`$as_basename -- "$0" ||
@@ -19908,19 +19965,19 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
+		sed '/^.*\/\([^/][^/]*\)\/*$/{
+			s//\1/
+			q
+		}
+		/^X\/\(\/\/\)$/{
+			s//\1/
+			q
+		}
+		/^X\/\(\/\).*/{
+			s//\1/
+			q
+		}
+		s/.*/./; q'`
 
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
@@ -19932,39 +19989,39 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
+	case `echo 'xy\c'` in
+	*c*) ECHO_T='	';;	# ECHO_T is single tab character.
+	xy)  ECHO_C='\c';;
+	*)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+			 ECHO_T='	';;
+	esac;;
 *)
-  ECHO_N='-n';;
+	ECHO_N='-n';;
 esac
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
+	rm -f conf$$.dir/conf$$.file
 else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
+	rm -f conf$$.dir
+	mkdir conf$$.dir 2>/dev/null
 fi
 if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
+	if ln -s conf$$.file conf$$ 2>/dev/null; then
+		as_ln_s='ln -s'
+		# ... but there are two gotchas:
+		# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+		# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+		# In both cases, we have to default to `cp -pR'.
+		ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+			as_ln_s='cp -pR'
+	elif ln conf$$.file conf$$ 2>/dev/null; then
+		as_ln_s=ln
+	else
+		as_ln_s='cp -pR'
+	fi
+else
+	as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -19976,52 +20033,52 @@ rmdir conf$$.dir 2>/dev/null
 as_fn_mkdir_p ()
 {
 
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
+	case $as_dir in #(
+	-*) as_dir=./$as_dir;;
+	esac
+	test -d "$as_dir" || eval $as_mkdir_p || {
+		as_dirs=
+		while :; do
+			case $as_dir in #(
+			*\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+			*) as_qdir=$as_dir;;
+			esac
+			as_dirs="'$as_qdir' $as_dirs"
+			as_dir=`$as_dirname -- "$as_dir" ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+		sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+			s//\1/
+			q
+		}
+		/^X\(\/\/\)[^/].*/{
+			s//\1/
+			q
+		}
+		/^X\(\/\/\)$/{
+			s//\1/
+			q
+		}
+		/^X\(\/\).*/{
+			s//\1/
+			q
+		}
+		s/.*/./; q'`
+			test -d "$as_dir" && break
+		done
+		test -z "$as_dirs" || eval "mkdir $as_dirs"
+	} || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
+	as_mkdir_p='mkdir -p "$as_dir"'
 else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
+	test -d ./-p && rmdir ./-p
+	as_mkdir_p=false
 fi
 
 
@@ -20030,7 +20087,7 @@ fi
 # Test if FILE is an executable regular file.
 as_fn_executable_p ()
 {
-  test -f "$1" && test -x "$1"
+	test -f "$1" && test -x "$1"
 } # as_fn_executable_p
 as_test_x='test -x'
 as_executable_p=as_fn_executable_p
@@ -20057,11 +20114,11 @@ ac_log="
 This file was extended by PostgreSQL $as_me 19devel, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
+	CONFIG_FILES    = $CONFIG_FILES
+	CONFIG_HEADERS  = $CONFIG_HEADERS
+	CONFIG_LINKS    = $CONFIG_LINKS
+	CONFIG_COMMANDS = $CONFIG_COMMANDS
+	$ $0 $@
 
 on `(hostname || uname -n) 2>/dev/null | sed 1q`
 "
@@ -20094,17 +20151,17 @@ and actions are specified as TAGs, all are instantiated by default.
 
 Usage: $0 [OPTION]... [TAG]...
 
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
+	-h, --help       print this help, then exit
+	-V, --version    print version number and configuration settings, then exit
+			--config     print configuration, then exit
+	-q, --quiet, --silent
+									 do not print progress messages
+	-d, --debug      don't remove temporary files
+			--recheck    update $as_me by reconfiguring in the same conditions
+			--file=FILE[:TEMPLATE]
+									 instantiate the configuration file FILE
+			--header=FILE[:TEMPLATE]
+									 instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -20127,7 +20184,7 @@ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g
 ac_cs_version="\\
 PostgreSQL config.status 19devel
 configured by $0, generated by GNU Autoconf 2.69,
-  with options \\"\$ac_cs_config\\"
+	with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
@@ -20146,97 +20203,97 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_need_defaults=:
 while test $# != 0
 do
-  case $1 in
-  --*=?*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
+	case $1 in
+	--*=?*)
+		ac_option=`expr "X$1" : 'X\([^=]*\)='`
+		ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+		ac_shift=:
+		;;
+	--*=)
+		ac_option=`expr "X$1" : 'X\([^=]*\)='`
+		ac_optarg=
+		ac_shift=:
+		;;
+	*)
+		ac_option=$1
+		ac_optarg=$2
+		ac_shift=shift
+		;;
+	esac
+
+	case $ac_option in
+	# Handling of the options.
+	-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+		ac_cs_recheck=: ;;
+	--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+		$as_echo "$ac_cs_version"; exit ;;
+	--config | --confi | --conf | --con | --co | --c )
+		$as_echo "$ac_cs_config"; exit ;;
+	--debug | --debu | --deb | --de | --d | -d )
+		debug=: ;;
+	--file | --fil | --fi | --f )
+		$ac_shift
+		case $ac_optarg in
+		*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+		'') as_fn_error $? "missing file argument" ;;
+		esac
+		as_fn_append CONFIG_FILES " '$ac_optarg'"
+		ac_need_defaults=false;;
+	--header | --heade | --head | --hea )
+		$ac_shift
+		case $ac_optarg in
+		*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+		esac
+		as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+		ac_need_defaults=false;;
+	--he | --h)
+		# Conflict between --help and --header
+		as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
+	--help | --hel | -h )
+		$as_echo "$ac_cs_usage"; exit ;;
+	-q | -quiet | --quiet | --quie | --qui | --qu | --q \
+	| -silent | --silent | --silen | --sile | --sil | --si | --s)
+		ac_cs_silent=: ;;
+
+	# This is an error.
+	-*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
+	*) as_fn_append ac_config_targets " $1"
+		 ac_need_defaults=false ;;
 
-  esac
-  shift
+	esac
+	shift
 done
 
 ac_configure_extra_args=
 
 if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
+	exec 6>/dev/null
+	ac_configure_extra_args="$ac_configure_extra_args --silent"
 fi
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
+	set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+	shift
+	\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+	CONFIG_SHELL='$SHELL'
+	export CONFIG_SHELL
+	exec "\$@"
 fi
 
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+	echo
+	sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  $as_echo "$ac_log"
+	$as_echo "$ac_log"
 } >&5
 
 _ACEOF
@@ -20248,19 +20305,19 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
 do
-  case $ac_config_target in
-    "GNUmakefile") CONFIG_FILES="$CONFIG_FILES GNUmakefile" ;;
-    "src/Makefile.global") CONFIG_FILES="$CONFIG_FILES src/Makefile.global" ;;
-    "src/backend/port/pg_sema.c") CONFIG_LINKS="$CONFIG_LINKS src/backend/port/pg_sema.c:${SEMA_IMPLEMENTATION}" ;;
-    "src/backend/port/pg_shmem.c") CONFIG_LINKS="$CONFIG_LINKS src/backend/port/pg_shmem.c:${SHMEM_IMPLEMENTATION}" ;;
-    "src/include/pg_config_os.h") CONFIG_LINKS="$CONFIG_LINKS src/include/pg_config_os.h:src/include/port/${template}.h" ;;
-    "src/Makefile.port") CONFIG_LINKS="$CONFIG_LINKS src/Makefile.port:src/makefiles/Makefile.${template}" ;;
-    "check_win32_symlinks") CONFIG_COMMANDS="$CONFIG_COMMANDS check_win32_symlinks" ;;
-    "src/include/pg_config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/include/pg_config.h" ;;
-    "src/interfaces/ecpg/include/ecpg_config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/interfaces/ecpg/include/ecpg_config.h" ;;
-
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-  esac
+	case $ac_config_target in
+		"GNUmakefile") CONFIG_FILES="$CONFIG_FILES GNUmakefile" ;;
+		"src/Makefile.global") CONFIG_FILES="$CONFIG_FILES src/Makefile.global" ;;
+		"src/backend/port/pg_sema.c") CONFIG_LINKS="$CONFIG_LINKS src/backend/port/pg_sema.c:${SEMA_IMPLEMENTATION}" ;;
+		"src/backend/port/pg_shmem.c") CONFIG_LINKS="$CONFIG_LINKS src/backend/port/pg_shmem.c:${SHMEM_IMPLEMENTATION}" ;;
+		"src/include/pg_config_os.h") CONFIG_LINKS="$CONFIG_LINKS src/include/pg_config_os.h:src/include/port/${template}.h" ;;
+		"src/Makefile.port") CONFIG_LINKS="$CONFIG_LINKS src/Makefile.port:src/makefiles/Makefile.${template}" ;;
+		"check_win32_symlinks") CONFIG_COMMANDS="$CONFIG_COMMANDS check_win32_symlinks" ;;
+		"src/include/pg_config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/include/pg_config.h" ;;
+		"src/interfaces/ecpg/include/ecpg_config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/interfaces/ecpg/include/ecpg_config.h" ;;
+
+	*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+	esac
 done
 
 
@@ -20269,10 +20326,10 @@ done
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+	test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+	test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+	test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links
+	test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
@@ -20283,22 +20340,22 @@ fi
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp= ac_tmp=
-  trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+	tmp= ac_tmp=
+	trap 'exit_status=$?
+	: "${ac_tmp:=$tmp}"
+	{ test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
-  trap 'as_fn_exit 1' 1 2 13 15
+	trap 'as_fn_exit 1' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 
 {
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
+	tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+	test -d "$tmp"
 }  ||
 {
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
+	tmp=./conf$$-$RANDOM
+	(umask 077 && mkdir "$tmp")
 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
 ac_tmp=$tmp
 
@@ -20313,13 +20370,13 @@ ac_cr=`echo X | tr X '\015'`
 # But we know of no other shell where ac_cr would be empty at this
 # point, so we can use a bashism as a fallback.
 if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
+	eval ac_cr=\$\'\\r\'
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
+	ac_cs_awk_cr='\\r'
 else
-  ac_cs_awk_cr=$ac_cr
+	ac_cs_awk_cr=$ac_cr
 fi
 
 echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
@@ -20327,25 +20384,25 @@ _ACEOF
 
 
 {
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
+	echo "cat >conf$$subs.awk <<_ACEOF" &&
+	echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+	echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+	as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
+	. ./conf$$subs.sh ||
+		as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+	ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+	if test $ac_delim_n = $ac_delim_num; then
+		break
+	elif $ac_last_try; then
+		as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+	else
+		ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+	fi
 done
 rm -f conf$$subs.sh
 
@@ -20391,47 +20448,47 @@ s/.\{148\}//
 t delim
 ' <conf$$subs.awk | sed '
 /^[^""]/{
-  N
-  s/\n//
+	N
+	s/\n//
 }
 ' >>$CONFIG_STATUS || ac_write_fail=1
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
 cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
+	for (key in S) S_is_set[key] = 1
+	FS = ""
 
 }
 {
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
+	line = $ 0
+	nfields = split(line, field, "@")
+	substed = 0
+	len = length(field[1])
+	for (i = 2; i < nfields; i++) {
+		key = field[i]
+		keylen = length(key)
+		if (S_is_set[key]) {
+			value = S[key]
+			line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+			len += length(value) + length(field[++i])
+			substed = 1
+		} else
+			len += 1 + keylen
+	}
+
+	print line
 }
 
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+	sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
-  cat
+	cat
 fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+	|| as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
 # VPATH may cause trouble with some makes, so we remove sole $(srcdir),
@@ -20439,7 +20496,7 @@ _ACEOF
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+	ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
 h
 s///
 s/^/:/
@@ -20476,14 +20533,14 @@ _ACEOF
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_tt"; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
+	ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+	if test -z "$ac_tt"; then
+		break
+	elif $ac_last_try; then
+		as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+	else
+		ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+	fi
 done
 
 # For the awk script, D is an array of macro values keyed by name,
@@ -20531,41 +20588,41 @@ s/'"$ac_delim"'/"\\\
 "/g' >>$CONFIG_STATUS || ac_write_fail=1
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
+	for (key in D) D_is_set[key] = 1
+	FS = ""
 }
 /^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
+	line = \$ 0
+	split(line, arg, " ")
+	if (arg[1] == "#") {
+		defundef = arg[2]
+		mac1 = arg[3]
+	} else {
+		defundef = substr(arg[1], 2)
+		mac1 = arg[2]
+	}
+	split(mac1, mac2, "(") #)
+	macro = mac2[1]
+	prefix = substr(line, 1, index(line, defundef) - 1)
+	if (D_is_set[macro]) {
+		# Preserve the white space surrounding the "#".
+		print prefix "define", macro P[macro] D[macro]
+		next
+	} else {
+		# Replace #undef with comments.  This is necessary, for example,
+		# in the case of _POSIX_SOURCE, which is predefined and required
+		# on some systems where configure will not decide to define it.
+		if (defundef == "undef") {
+			print "/*", prefix defundef, macro, "*/"
+			next
+		}
+	}
 }
 { print }
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+	as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -20573,107 +20630,107 @@ eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS  :L $CONFIG_LINKS  :C $CONFIG
 shift
 for ac_tag
 do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
+	case $ac_tag in
+	:[FHLC]) ac_mode=$ac_tag; continue;;
+	esac
+	case $ac_mode$ac_tag in
+	:[FHL]*:*);;
+	:L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+	:[FH]-) ac_tag=-:-;;
+	:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+	esac
+	ac_save_IFS=$IFS
+	IFS=:
+	set x $ac_tag
+	IFS=$ac_save_IFS
+	shift
+	ac_file=$1
+	shift
+
+	case $ac_mode in
+	:L) ac_source=$1;;
+	:[FH])
+		ac_file_inputs=
+		for ac_f
+		do
+			case $ac_f in
+			-) ac_f="$ac_tmp/stdin";;
+			*) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
 	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+		 case $ac_f in
+		 [\\/$]*) false;;
+		 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+		 esac ||
+		 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+			esac
+			case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+			as_fn_append ac_file_inputs " '$ac_f'"
+		done
+
+		# Let's still pretend it is `configure' which instantiates (i.e., don't
+		# use $as_me), people would be surprised to read:
+		#    /* config.h.  Generated by config.status.  */
+		configure_input='Generated from '`
+		$as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+		if test x"$ac_file" != x-; then
+			configure_input="$ac_file.  $configure_input"
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
 $as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
+		fi
+		# Neutralize special characters interpreted by sed in replacement strings.
+		case $configure_input in #(
+		*\&* | *\|* | *\\* )
+			 ac_sed_conf_input=`$as_echo "$configure_input" |
+			 sed 's/[\\\\&|]/\\\\&/g'`;; #(
+		*) ac_sed_conf_input=$configure_input;;
+		esac
+
+		case $ac_tag in
+		*:-:* | *:-) cat >"$ac_tmp/stdin" \
+			|| as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+		esac
+		;;
+	esac
+
+	ac_dir=`$as_dirname -- "$ac_file" ||
 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
+		sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+			s//\1/
+			q
+		}
+		/^X\(\/\/\)[^/].*/{
+			s//\1/
+			q
+		}
+		/^X\(\/\/\)$/{
+			s//\1/
+			q
+		}
+		/^X\(\/\).*/{
+			s//\1/
+			q
+		}
+		s/.*/./; q'`
+	as_dir="$ac_dir"; as_fn_mkdir_p
+	ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
+	ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+	# A ".." for each directory in $ac_dir_suffix.
+	ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+	case $ac_top_builddir_sub in
+	"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+	*)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+	esac ;;
 esac
 ac_abs_top_builddir=$ac_pwd
 ac_abs_builddir=$ac_pwd$ac_dir_suffix
@@ -20681,37 +20738,37 @@ ac_abs_builddir=$ac_pwd$ac_dir_suffix
 ac_top_builddir=$ac_top_build_prefix
 
 case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+	.)  # We are building in place.
+		ac_srcdir=.
+		ac_top_srcdir=$ac_top_builddir_sub
+		ac_abs_top_srcdir=$ac_pwd ;;
+	[\\/]* | ?:[\\/]* )  # Absolute name.
+		ac_srcdir=$srcdir$ac_dir_suffix;
+		ac_top_srcdir=$srcdir
+		ac_abs_top_srcdir=$srcdir ;;
+	*) # Relative name.
+		ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+		ac_top_srcdir=$ac_top_build_prefix$srcdir
+		ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
 esac
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
 
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
+	case $ac_mode in
+	:F)
+	#
+	# CONFIG_FILE
+	#
 
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
+	case $INSTALL in
+	[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+	*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+	esac
+	ac_MKDIR_P=$MKDIR_P
+	case $MKDIR_P in
+	[\\/$]* | ?:[\\/]* ) ;;
+	*/*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+	esac
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -20720,8 +20777,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_datarootdir_hack=; ac_datarootdir_seen=
 ac_sed_dataroot='
 /datarootdir/ {
-  p
-  q
+	p
+	q
 }
 /@datadir@/p
 /@docdir@/p
@@ -20731,17 +20788,17 @@ ac_sed_dataroot='
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
+	ac_datarootdir_hack='
+	s&@datadir@&$datadir&g
+	s&@docdir@&$docdir&g
+	s&@infodir@&$infodir&g
+	s&@localedir@&$localedir&g
+	s&@mandir@&$mandir&g
+	s&\\\${datarootdir}&$datarootdir&g' ;;
 esac
 _ACEOF
 
@@ -20770,88 +20827,88 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+	>$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+	{ ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+	{ ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+			"$ac_tmp/out"`; test -z "$ac_out"; } &&
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$ac_tmp/stdin"
-  case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+	rm -f "$ac_tmp/stdin"
+	case $ac_file in
+	-) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+	*) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+	esac \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-    } >"$ac_tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+	:H)
+	#
+	# CONFIG_HEADER
+	#
+	if test x"$ac_file" != x-; then
+		{
+			$as_echo "/* $configure_input  */" \
+			&& eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+		} >"$ac_tmp/config.h" \
+			|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+		if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$ac_tmp/config.h" "$ac_file" \
+		else
+			rm -f "$ac_file"
+			mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
-  fi
+		fi
+	else
+		$as_echo "/* $configure_input  */" \
+			&& eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+			|| as_fn_error $? "could not create -" "$LINENO" 5
+	fi
  ;;
-  :L)
-  #
-  # CONFIG_LINK
-  #
-
-  if test "$ac_source" = "$ac_file" && test "$srcdir" = '.'; then
-    :
-  else
-    # Prefer the file from the source tree if names are identical.
-    if test "$ac_source" = "$ac_file" || test ! -r "$ac_source"; then
-      ac_source=$srcdir/$ac_source
-    fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5
+	:L)
+	#
+	# CONFIG_LINK
+	#
+
+	if test "$ac_source" = "$ac_file" && test "$srcdir" = '.'; then
+		:
+	else
+		# Prefer the file from the source tree if names are identical.
+		if test "$ac_source" = "$ac_file" || test ! -r "$ac_source"; then
+			ac_source=$srcdir/$ac_source
+		fi
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5
 $as_echo "$as_me: linking $ac_source to $ac_file" >&6;}
 
-    if test ! -r "$ac_source"; then
-      as_fn_error $? "$ac_source: file not found" "$LINENO" 5
-    fi
-    rm -f "$ac_file"
+		if test ! -r "$ac_source"; then
+			as_fn_error $? "$ac_source: file not found" "$LINENO" 5
+		fi
+		rm -f "$ac_file"
 
-    # Try a relative symlink, then a hard link, then a copy.
-    case $ac_source in
-    [\\/$]* | ?:[\\/]* ) ac_rel_source=$ac_source ;;
+		# Try a relative symlink, then a hard link, then a copy.
+		case $ac_source in
+		[\\/$]* | ?:[\\/]* ) ac_rel_source=$ac_source ;;
 	*) ac_rel_source=$ac_top_build_prefix$ac_source ;;
-    esac
-    ln -s "$ac_rel_source" "$ac_file" 2>/dev/null ||
-      ln "$ac_source" "$ac_file" 2>/dev/null ||
-      cp -p "$ac_source" "$ac_file" ||
-      as_fn_error $? "cannot link or copy $ac_source to $ac_file" "$LINENO" 5
-  fi
+		esac
+		ln -s "$ac_rel_source" "$ac_file" 2>/dev/null ||
+			ln "$ac_source" "$ac_file" 2>/dev/null ||
+			cp -p "$ac_source" "$ac_file" ||
+			as_fn_error $? "cannot link or copy $ac_source to $ac_file" "$LINENO" 5
+	fi
  ;;
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+	:C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
 $as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
-  esac
+	esac
 
 
-  case $ac_file$ac_mode in
-    "check_win32_symlinks":C)
+	case $ac_file$ac_mode in
+		"check_win32_symlinks":C)
 # Links sometimes fail undetected on Mingw -
 # so here we detect it and warn the user
 for FILE in $CONFIG_LINKS
@@ -20861,13 +20918,13 @@ for FILE in $CONFIG_LINKS
 $as_echo "$as_me: WARNING: *** link for $FILE -- please fix by hand" >&2;}
  done
  ;;
-    "src/include/pg_config.h":H)
+		"src/include/pg_config.h":H)
 # Update timestamp for pg_config.h (see Makefile.global)
 echo >src/include/stamp-h
  ;;
-    "src/interfaces/ecpg/include/ecpg_config.h":H) echo >src/interfaces/ecpg/include/stamp-h ;;
+		"src/interfaces/ecpg/include/ecpg_config.h":H) echo >src/interfaces/ecpg/include/stamp-h ;;
 
-  esac
+	esac
 done # for ac_tag
 
 
@@ -20876,7 +20933,7 @@ _ACEOF
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+	as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -20888,19 +20945,19 @@ test $ac_write_fail = 0 ||
 # appended to by config.status.  When coming back to configure, we
 # need to make the FD available again.
 if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
+	ac_cs_success=:
+	ac_config_status_args=
+	test "$silent" = yes &&
+		ac_config_status_args="$ac_config_status_args --quiet"
+	exec 5>/dev/null
+	$SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+	exec 5>>config.log
+	# Use ||, not &&, to avoid exiting from the if with $? = 1, which
+	# would make configure fail if this is the last instruction.
+	$ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
@@ -20908,5 +20965,5 @@ fi
 # Ensure that any meson build directories would reconfigure and see that
 # there's a conflicting in-tree build and can error out.
 if test "$vpath_build" = "no"; then
-  touch meson.build
+	touch meson.build
 fi
diff --git a/configure.ac b/configure.ac
index 01b3bbc1be8..32fae8081ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,8 +38,8 @@ AC_DEFINE_UNQUOTED(PG_MAJORVERSION_NUM, $PG_MAJORVERSION, [PostgreSQL major vers
 AC_DEFINE_UNQUOTED(PG_MINORVERSION_NUM, $PG_MINORVERSION, [PostgreSQL minor version number])
 
 PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
-             [PG_VERSION="$PACKAGE_VERSION$withval"],
-             [PG_VERSION="$PACKAGE_VERSION"])
+						 [PG_VERSION="$PACKAGE_VERSION$withval"],
+						 [PG_VERSION="$PACKAGE_VERSION"])
 AC_DEFINE_UNQUOTED(PG_VERSION, "$PG_VERSION", [PostgreSQL version as a string])
 
 AC_CANONICAL_HOST
@@ -49,33 +49,33 @@ AC_MSG_CHECKING([which template to use])
 
 PGAC_ARG_REQ(with, template, [NAME], [override operating system template],
 [
-  case $withval in
-    list)   echo; ls "$srcdir/src/template"; exit;;
-    *)      if test -f "$srcdir/src/template/$with_template" ; then
-              template=$withval
-            else
-              AC_MSG_ERROR(['$withval' is not a valid template name. Use 'list' for a list.])
-            fi;;
-  esac
+	case $withval in
+		list)   echo; ls "$srcdir/src/template"; exit;;
+		*)      if test -f "$srcdir/src/template/$with_template" ; then
+							template=$withval
+						else
+							AC_MSG_ERROR(['$withval' is not a valid template name. Use 'list' for a list.])
+						fi;;
+	esac
 ],
 [
 # --with-template not given
 
 case $host_os in
-  cygwin*|msys*) template=cygwin ;;
-  darwin*) template=darwin ;;
+	cygwin*|msys*) template=cygwin ;;
+	darwin*) template=darwin ;;
 dragonfly*) template=netbsd ;;
  freebsd*) template=freebsd ;;
  linux*|gnu*|k*bsd*-gnu)
-           template=linux ;;
-   mingw*) template=win32 ;;
-  netbsd*) template=netbsd ;;
+					 template=linux ;;
+	 mingw*) template=win32 ;;
+	netbsd*) template=netbsd ;;
  openbsd*) template=openbsd ;;
  solaris*) template=solaris ;;
 esac
 
-  if test x"$template" = x"" ; then
-    AC_MSG_ERROR([[
+	if test x"$template" = x"" ; then
+		AC_MSG_ERROR([[
 *******************************************************************
 PostgreSQL has apparently not been ported to your platform yet.
 To try a manual configuration, look into the src/template directory
@@ -86,7 +86,7 @@ rectifying this.  Include the above 'checking host system type...'
 line.
 *******************************************************************
 ]])
-  fi
+	fi
 
 ])
 
@@ -114,10 +114,10 @@ PGAC_ARG_REQ(with, includes, [DIRS], [look for additional header files in DIRS])
 # Add non-standard directories to the library search path
 #
 PGAC_ARG_REQ(with, libraries, [DIRS], [look for additional libraries in DIRS],
-             [LIBRARY_DIRS=$withval])
+						 [LIBRARY_DIRS=$withval])
 
 PGAC_ARG_REQ(with, libs,      [DIRS], [alternative spelling of --with-libraries],
-             [LIBRARY_DIRS=$withval])
+						 [LIBRARY_DIRS=$withval])
 
 
 #
@@ -126,8 +126,8 @@ PGAC_ARG_REQ(with, libs,      [DIRS], [alternative spelling of --with-libraries]
 # "--enable-integer-datetimes" switch.
 #
 PGAC_ARG_BOOL(enable, integer-datetimes, yes, [obsolete option, no longer supported],
-              [],
-              [AC_MSG_ERROR([--disable-integer-datetimes is no longer supported])])
+							[],
+							[AC_MSG_ERROR([--disable-integer-datetimes is no longer supported])])
 
 
 #
@@ -135,11 +135,11 @@ PGAC_ARG_BOOL(enable, integer-datetimes, yes, [obsolete option, no longer suppor
 #
 AC_MSG_CHECKING([whether NLS is wanted])
 PGAC_ARG_OPTARG(enable, nls,
-                [LANGUAGES], [enable Native Language Support],
-                [],
-                [WANTED_LANGUAGES=$enableval],
-                [AC_DEFINE(ENABLE_NLS, 1,
-                           [Define to 1 if you want National Language Support. (--enable-nls)])])
+								[LANGUAGES], [enable Native Language Support],
+								[],
+								[WANTED_LANGUAGES=$enableval],
+								[AC_DEFINE(ENABLE_NLS, 1,
+													 [Define to 1 if you want National Language Support. (--enable-nls)])])
 AC_MSG_RESULT([$enable_nls])
 AC_SUBST(enable_nls)
 AC_SUBST(WANTED_LANGUAGES)
@@ -149,8 +149,8 @@ AC_SUBST(WANTED_LANGUAGES)
 #
 AC_MSG_CHECKING([for default port number])
 PGAC_ARG_REQ(with, pgport, [PORTNUM], [set default port number [5432]],
-             [default_port=$withval],
-             [default_port=5432])
+						 [default_port=$withval],
+						 [default_port=5432])
 AC_MSG_RESULT([$default_port])
 # Need both of these because some places want an integer and some a string
 AC_DEFINE_UNQUOTED(DEF_PGPORT, ${default_port},
@@ -159,56 +159,56 @@ to which clients will try to connect.  This can be overridden at run-time,
 but it's convenient if your clients have the right default compiled in.
 (--with-pgport=PORTNUM)])
 AC_DEFINE_UNQUOTED(DEF_PGPORT_STR, "${default_port}",
-                   [Define to the default TCP port number as a string constant.])
+									 [Define to the default TCP port number as a string constant.])
 AC_SUBST(default_port)
 
 # It's worth validating port; you can get very confusing errors otherwise
 if test x"$default_port" = x""; then
-  AC_MSG_ERROR([invalid --with-pgport specification: empty string])
+	AC_MSG_ERROR([invalid --with-pgport specification: empty string])
 elif test ! x`echo "$default_port" | sed -e 's/[[0-9]]*//'` = x""; then
-  AC_MSG_ERROR([invalid --with-pgport specification: must be a number])
+	AC_MSG_ERROR([invalid --with-pgport specification: must be a number])
 elif test ! x`echo "$default_port" | sed -e 's/^0.//'` = x"$default_port"; then
-  AC_MSG_ERROR([invalid --with-pgport specification: must not have leading 0])
+	AC_MSG_ERROR([invalid --with-pgport specification: must not have leading 0])
 elif test "$default_port" -lt "1" -o "$default_port" -gt "65535"; then
-  AC_MSG_ERROR([invalid --with-pgport specification: must be between 1 and 65535])
+	AC_MSG_ERROR([invalid --with-pgport specification: must be between 1 and 65535])
 fi
 
 #
 # '-rpath'-like feature can be disabled
 #
 PGAC_ARG_BOOL(enable, rpath, yes,
-              [do not embed shared library search path in executables])
+							[do not embed shared library search path in executables])
 AC_SUBST(enable_rpath)
 
 #
 # --enable-debug adds -g to compiler flags
 #
 PGAC_ARG_BOOL(enable, debug, no,
-              [build with debugging symbols (-g)])
+							[build with debugging symbols (-g)])
 AC_SUBST(enable_debug)
 
 #
 # --enable-profiling enables gcc profiling
 #
 PGAC_ARG_BOOL(enable, profiling, no,
-              [build with profiling enabled ])
+							[build with profiling enabled ])
 
 #
 # --enable-coverage enables generation of code coverage metrics with gcov
 #
 PGAC_ARG_BOOL(enable, coverage, no,
-              [build with coverage testing instrumentation],
+							[build with coverage testing instrumentation],
 [PGAC_PATH_PROGS(GCOV, gcov)
 if test -z "$GCOV"; then
-  AC_MSG_ERROR([gcov not found])
+	AC_MSG_ERROR([gcov not found])
 fi
 PGAC_PATH_PROGS(LCOV, lcov)
 if test -z "$LCOV"; then
-  AC_MSG_ERROR([lcov not found])
+	AC_MSG_ERROR([lcov not found])
 fi
 PGAC_PATH_PROGS(GENHTML, genhtml)
 if test -z "$GENHTML"; then
-  AC_MSG_ERROR([genhtml not found])
+	AC_MSG_ERROR([genhtml not found])
 fi])
 AC_SUBST(enable_coverage)
 
@@ -216,10 +216,10 @@ AC_SUBST(enable_coverage)
 # DTrace
 #
 PGAC_ARG_BOOL(enable, dtrace, no,
-              [build with DTrace support],
+							[build with DTrace support],
 [PGAC_PATH_PROGS(DTRACE, dtrace)
 if test -z "$DTRACE"; then
-  AC_MSG_ERROR([dtrace not found])
+	AC_MSG_ERROR([dtrace not found])
 fi
 AC_SUBST(DTRACEFLAGS)])
 AC_SUBST(enable_dtrace)
@@ -228,16 +228,16 @@ AC_SUBST(enable_dtrace)
 # TAP tests
 #
 PGAC_ARG_BOOL(enable, tap-tests, no,
-              [enable TAP tests (requires Perl and IPC::Run)])
+							[enable TAP tests (requires Perl and IPC::Run)])
 AC_SUBST(enable_tap_tests)
 AC_ARG_VAR(PG_TEST_EXTRA,
-           [enable selected extra tests (overridden at runtime by PG_TEST_EXTRA environment variable)])
+					 [enable selected extra tests (overridden at runtime by PG_TEST_EXTRA environment variable)])
 
 #
 # Injection points
 #
 PGAC_ARG_BOOL(enable, injection-points, no, [enable injection points (for testing)],
-              [AC_DEFINE([USE_INJECTION_POINTS], 1, [Define to 1 to build with injection points. (--enable-injection-points)])])
+							[AC_DEFINE([USE_INJECTION_POINTS], 1, [Define to 1 to build with injection points. (--enable-injection-points)])])
 AC_SUBST(enable_injection_points)
 
 #
@@ -245,16 +245,16 @@ AC_SUBST(enable_injection_points)
 #
 AC_MSG_CHECKING([for block size])
 PGAC_ARG_REQ(with, blocksize, [BLOCKSIZE], [set table block size in kB [8]],
-             [blocksize=$withval],
-             [blocksize=8])
+						 [blocksize=$withval],
+						 [blocksize=8])
 case ${blocksize} in
-  1) BLCKSZ=1024;;
-  2) BLCKSZ=2048;;
-  4) BLCKSZ=4096;;
-  8) BLCKSZ=8192;;
+	1) BLCKSZ=1024;;
+	2) BLCKSZ=2048;;
+	4) BLCKSZ=4096;;
+	8) BLCKSZ=8192;;
  16) BLCKSZ=16384;;
  32) BLCKSZ=32768;;
-  *) AC_MSG_ERROR([Invalid block size. Allowed values are 1,2,4,8,16,32.])
+	*) AC_MSG_ERROR([Invalid block size. Allowed values are 1,2,4,8,16,32.])
 esac
 AC_MSG_RESULT([${blocksize}kB])
 
@@ -276,29 +276,29 @@ AC_DEFINE_UNQUOTED([BLCKSZ], ${BLCKSZ}, [
 # Relation segment size
 #
 PGAC_ARG_REQ(with, segsize, [SEGSIZE], [set table segment size in GB [1]],
-             [segsize=$withval],
-             [segsize=1])
+						 [segsize=$withval],
+						 [segsize=1])
 PGAC_ARG_REQ(with, segsize-blocks, [SEGSIZE_BLOCKS], [set table segment size in blocks [0]],
-             [segsize_blocks=$withval],
-             [segsize_blocks=0])
+						 [segsize_blocks=$withval],
+						 [segsize_blocks=0])
 
 # If --with-segsize-blocks is non-zero, it is used, --with-segsize
 # otherwise. segsize-blocks is only really useful for developers wanting to
 # test segment related code. Warn if both are used.
 if test $segsize_blocks -ne 0 -a $segsize -ne 1; then
-  AC_MSG_WARN([both --with-segsize and --with-segsize-blocks specified, --with-segsize-blocks wins])
+	AC_MSG_WARN([both --with-segsize and --with-segsize-blocks specified, --with-segsize-blocks wins])
 fi
 
 AC_MSG_CHECKING([for segment size])
 if test $segsize_blocks -eq 0; then
-  # this expression is set up to avoid unnecessary integer overflow
-  # blocksize is already guaranteed to be a factor of 1024
-  RELSEG_SIZE=`expr '(' 1024 / ${blocksize} ')' '*' ${segsize} '*' 1024`
-  test $? -eq 0 || exit 1
-  AC_MSG_RESULT([${segsize}GB])
+	# this expression is set up to avoid unnecessary integer overflow
+	# blocksize is already guaranteed to be a factor of 1024
+	RELSEG_SIZE=`expr '(' 1024 / ${blocksize} ')' '*' ${segsize} '*' 1024`
+	test $? -eq 0 || exit 1
+	AC_MSG_RESULT([${segsize}GB])
 else
-  RELSEG_SIZE=$segsize_blocks
-  AC_MSG_RESULT([${RELSEG_SIZE} blocks])
+	RELSEG_SIZE=$segsize_blocks
+	AC_MSG_RESULT([${RELSEG_SIZE} blocks])
 fi
 
 AC_DEFINE_UNQUOTED([RELSEG_SIZE], ${RELSEG_SIZE}, [
@@ -325,17 +325,17 @@ AC_DEFINE_UNQUOTED([RELSEG_SIZE], ${RELSEG_SIZE}, [
 #
 AC_MSG_CHECKING([for WAL block size])
 PGAC_ARG_REQ(with, wal-blocksize, [BLOCKSIZE], [set WAL block size in kB [8]],
-             [wal_blocksize=$withval],
-             [wal_blocksize=8])
+						 [wal_blocksize=$withval],
+						 [wal_blocksize=8])
 case ${wal_blocksize} in
-  1) XLOG_BLCKSZ=1024;;
-  2) XLOG_BLCKSZ=2048;;
-  4) XLOG_BLCKSZ=4096;;
-  8) XLOG_BLCKSZ=8192;;
+	1) XLOG_BLCKSZ=1024;;
+	2) XLOG_BLCKSZ=2048;;
+	4) XLOG_BLCKSZ=4096;;
+	8) XLOG_BLCKSZ=8192;;
  16) XLOG_BLCKSZ=16384;;
  32) XLOG_BLCKSZ=32768;;
  64) XLOG_BLCKSZ=65536;;
-  *) AC_MSG_ERROR([Invalid WAL block size. Allowed values are 1,2,4,8,16,32,64.])
+	*) AC_MSG_ERROR([Invalid WAL block size. Allowed values are 1,2,4,8,16,32,64.])
 esac
 AC_MSG_RESULT([${wal_blocksize}kB])
 
@@ -366,22 +366,22 @@ AC_CACHE_VAL([pgac_cv_prog_cc_c11],
 [pgac_cv_prog_cc_c11=no
 pgac_save_CC=$CC
 for pgac_arg in '' '-std=gnu11' '-std=c11'; do
-  CC="$pgac_save_CC $pgac_arg"
-  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
+	CC="$pgac_save_CC $pgac_arg"
+	AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
 # error "Compiler does not advertise C11 conformance"
 #endif]])], [[pgac_cv_prog_cc_c11=$pgac_arg]])
-  test x"$pgac_cv_prog_cc_c11" != x"no" && break
+	test x"$pgac_cv_prog_cc_c11" != x"no" && break
 done
 CC=$pgac_save_CC])
 
 if test x"$pgac_cv_prog_cc_c11" = x"no"; then
-  AC_MSG_RESULT([unsupported])
-  AC_MSG_ERROR([C compiler "$CC" does not support C11])
+	AC_MSG_RESULT([unsupported])
+	AC_MSG_ERROR([C compiler "$CC" does not support C11])
 elif test x"$pgac_cv_prog_cc_c11" = x""; then
-  AC_MSG_RESULT([none needed])
+	AC_MSG_RESULT([none needed])
 else
-  AC_MSG_RESULT([$pgac_cv_prog_cc_c11])
-  CC="$CC $pgac_cv_prog_cc_c11"
+	AC_MSG_RESULT([$pgac_cv_prog_cc_c11])
+	CC="$CC $pgac_cv_prog_cc_c11"
 fi
 
 
@@ -400,11 +400,11 @@ choke me
 #
 # Checked early because subsequent tests depend on it.
 PGAC_ARG_BOOL(with, llvm, no, [build with LLVM based JIT support],
-              [AC_DEFINE([USE_LLVM], 1, [Define to 1 to build with LLVM based JIT support. (--with-llvm)])])
+							[AC_DEFINE([USE_LLVM], 1, [Define to 1 to build with LLVM based JIT support. (--with-llvm)])])
 AC_SUBST(with_llvm)
 dnl must use AS_IF here, else AC_REQUIRES inside PGAC_LLVM_SUPPORT malfunctions
 AS_IF([test "$with_llvm" = yes], [
-  PGAC_LLVM_SUPPORT()
+	PGAC_LLVM_SUPPORT()
 ]) # fi
 
 
@@ -424,33 +424,33 @@ unset CXXFLAGS
 # else:  If the compiler is something else, then we use -O, unless debugging.
 
 if test "$ac_env_CFLAGS_set" = set; then
-  CFLAGS=$ac_env_CFLAGS_value
+	CFLAGS=$ac_env_CFLAGS_value
 elif test "${CFLAGS+set}" = set; then
-  : # (keep what template set)
+	: # (keep what template set)
 elif test "$enable_coverage" = yes; then
-  : # no optimization by default
+	: # no optimization by default
 elif test "$GCC" = yes; then
-  CFLAGS="-O2"
+	CFLAGS="-O2"
 else
-  # if the user selected debug mode, don't use -O
-  if test "$enable_debug" != yes; then
-    CFLAGS="-O"
-  fi
+	# if the user selected debug mode, don't use -O
+	if test "$enable_debug" != yes; then
+		CFLAGS="-O"
+	fi
 fi
 
 if test "$ac_env_CXXFLAGS_set" = set; then
-  CXXFLAGS=$ac_env_CXXFLAGS_value
+	CXXFLAGS=$ac_env_CXXFLAGS_value
 elif test "${CXXFLAGS+set}" = set; then
-  : # (keep what template set)
+	: # (keep what template set)
 elif test "$enable_coverage" = yes; then
-  : # no optimization by default
+	: # no optimization by default
 elif test "$GCC" = yes; then
-  CXXFLAGS="-O2"
+	CXXFLAGS="-O2"
 else
-  # if the user selected debug mode, don't use -O
-  if test "$enable_debug" != yes; then
-    CXXFLAGS="-O"
-  fi
+	# if the user selected debug mode, don't use -O
+	if test "$enable_debug" != yes; then
+		CXXFLAGS="-O"
+	fi
 fi
 
 # When generating bitcode (for inlining) we always want to use -O2
@@ -460,14 +460,14 @@ fi
 # attributes everywhere), which is bad for testing.  Still allow the
 # environment to override if done explicitly.
 if test "$ac_env_BITCODE_CFLAGS_set" = set; then
-  BITCODE_CFLAGS=$ac_env_BITCODE_CFLAGS_value
+	BITCODE_CFLAGS=$ac_env_BITCODE_CFLAGS_value
 else
-  BITCODE_CFLAGS="-O2 $BITCODE_CFLAGS"
+	BITCODE_CFLAGS="-O2 $BITCODE_CFLAGS"
 fi
 if test "$ac_env_BITCODE_CXXFLAGS_set" = set; then
-  BITCODE_CXXFLAGS=$ac_env_BITCODE_CXXFLAGS_value
+	BITCODE_CXXFLAGS=$ac_env_BITCODE_CXXFLAGS_value
 else
-  BITCODE_CXXFLAGS="-O2 $BITCODE_CXXFLAGS"
+	BITCODE_CXXFLAGS="-O2 $BITCODE_CXXFLAGS"
 fi
 
 # C[XX]FLAGS we determined above will be added back at the end
@@ -482,10 +482,10 @@ BITCODE_CXXFLAGS=""
 
 # set CFLAGS_UNROLL_LOOPS and CFLAGS_VECTORIZE from the environment, if present
 if test "$ac_env_CFLAGS_UNROLL_LOOPS_set" = set; then
-  CFLAGS_UNROLL_LOOPS=$ac_env_CFLAGS_UNROLL_LOOPS_value
+	CFLAGS_UNROLL_LOOPS=$ac_env_CFLAGS_UNROLL_LOOPS_value
 fi
 if test "$ac_env_CFLAGS_VECTORIZE_set" = set; then
-  CFLAGS_VECTORIZE=$ac_env_CFLAGS_VECTORIZE_value
+	CFLAGS_VECTORIZE=$ac_env_CFLAGS_VECTORIZE_value
 fi
 
 # Some versions of GCC support some additional useful warning flags.
@@ -494,104 +494,104 @@ fi
 # but has its own.  Also check other compiler-specific flags here.
 
 if test "$GCC" = yes -a "$ICC" = no; then
-  CFLAGS="-Wall -Wmissing-prototypes -Wpointer-arith"
-  CXXFLAGS="-Wall -Wpointer-arith"
-  # These work in some but not all gcc versions
-  save_CFLAGS=$CFLAGS
-  PGAC_PROG_CC_CFLAGS_OPT([-Wdeclaration-after-statement])
-  # -Wdeclaration-after-statement isn't applicable for C++.  Specific C files
-  # disable it, so AC_SUBST the negative form.
-  PERMIT_DECLARATION_AFTER_STATEMENT=
-  if test x"$save_CFLAGS" != x"$CFLAGS"; then
-    PERMIT_DECLARATION_AFTER_STATEMENT=-Wno-declaration-after-statement
-  fi
-  AC_SUBST(PERMIT_DECLARATION_AFTER_STATEMENT)
-  # Really don't want VLAs to be used in our dialect of C
-  PGAC_PROG_CC_CFLAGS_OPT([-Werror=vla])
-  # On macOS, complain about usage of symbols newer than the deployment target
-  PGAC_PROG_CC_CFLAGS_OPT([-Werror=unguarded-availability-new])
-  PGAC_PROG_CXX_CFLAGS_OPT([-Werror=unguarded-availability-new])
-  # -Wvla is not applicable for C++
-  PGAC_PROG_CC_CFLAGS_OPT([-Wendif-labels])
-  PGAC_PROG_CXX_CFLAGS_OPT([-Wendif-labels])
-  PGAC_PROG_CC_CFLAGS_OPT([-Wmissing-format-attribute])
-  PGAC_PROG_CXX_CFLAGS_OPT([-Wmissing-format-attribute])
-  PGAC_PROG_CC_CFLAGS_OPT([-Wimplicit-fallthrough=3])
-  PGAC_PROG_CXX_CFLAGS_OPT([-Wimplicit-fallthrough=3])
-  PGAC_PROG_CC_CFLAGS_OPT([-Wcast-function-type])
-  PGAC_PROG_CXX_CFLAGS_OPT([-Wcast-function-type])
-  PGAC_PROG_CC_CFLAGS_OPT([-Wshadow=compatible-local])
-  PGAC_PROG_CXX_CFLAGS_OPT([-Wshadow=compatible-local])
-  # This was included in -Wall/-Wformat in older GCC versions
-  PGAC_PROG_CC_CFLAGS_OPT([-Wformat-security])
-  PGAC_PROG_CXX_CFLAGS_OPT([-Wformat-security])
-  # gcc 14+, clang for a while
-  # (Supported in C++ by clang but not gcc.  For consistency, omit in C++.)
-  save_CFLAGS=$CFLAGS
-  PGAC_PROG_CC_CFLAGS_OPT([-Wmissing-variable-declarations])
-  PERMIT_MISSING_VARIABLE_DECLARATIONS=
-  if test x"$save_CFLAGS" != x"$CFLAGS"; then
-    PERMIT_MISSING_VARIABLE_DECLARATIONS=-Wno-missing-variable-declarations
-  fi
-  AC_SUBST(PERMIT_MISSING_VARIABLE_DECLARATIONS)
-  # Disable strict-aliasing rules; needed for gcc 3.3+
-  PGAC_PROG_CC_CFLAGS_OPT([-fno-strict-aliasing])
-  PGAC_PROG_CXX_CFLAGS_OPT([-fno-strict-aliasing])
-  # Disable optimizations that assume no overflow; needed for gcc 4.3+
-  PGAC_PROG_CC_CFLAGS_OPT([-fwrapv])
-  PGAC_PROG_CXX_CFLAGS_OPT([-fwrapv])
-  # Disable FP optimizations that cause various errors on gcc 4.5+ or maybe 4.6+
-  PGAC_PROG_CC_CFLAGS_OPT([-fexcess-precision=standard])
-  PGAC_PROG_CXX_CFLAGS_OPT([-fexcess-precision=standard])
-  # Optimization flags for specific files that benefit from loop unrolling
-  PGAC_PROG_CC_VAR_OPT(CFLAGS_UNROLL_LOOPS, [-funroll-loops])
-  # Optimization flags for specific files that benefit from vectorization
-  PGAC_PROG_CC_VAR_OPT(CFLAGS_VECTORIZE, [-ftree-vectorize])
-  #
-  # The following tests want to suppress various unhelpful warnings by adding
-  # -Wno-foo switches.  But gcc won't complain about unrecognized -Wno-foo
-  # switches, so we have to test for the positive form and if that works,
-  # add the negative form.  Note that tests of this form typically need to
-  # be duplicated in the BITCODE_CFLAGS setup stanza below.
-  #
-  # Suppress clang's unhelpful unused-command-line-argument warnings.
-  NOT_THE_CFLAGS=""
-  PGAC_PROG_CC_VAR_OPT(NOT_THE_CFLAGS, [-Wunused-command-line-argument])
-  if test -n "$NOT_THE_CFLAGS"; then
-    CFLAGS="$CFLAGS -Wno-unused-command-line-argument"
-  fi
-  # Remove clang 12+'s compound-token-split-by-macro, as this causes a lot
-  # of warnings when building plperl because of usages in the Perl headers.
-  NOT_THE_CFLAGS=""
-  PGAC_PROG_CC_VAR_OPT(NOT_THE_CFLAGS, [-Wcompound-token-split-by-macro])
-  if test -n "$NOT_THE_CFLAGS"; then
-    CFLAGS="$CFLAGS -Wno-compound-token-split-by-macro"
-  fi
-  # Similarly disable useless truncation warnings from gcc 8+
-  NOT_THE_CFLAGS=""
-  PGAC_PROG_CC_VAR_OPT(NOT_THE_CFLAGS, [-Wformat-truncation])
-  if test -n "$NOT_THE_CFLAGS"; then
-    CFLAGS="$CFLAGS -Wno-format-truncation"
-  fi
-  NOT_THE_CFLAGS=""
-  PGAC_PROG_CC_VAR_OPT(NOT_THE_CFLAGS, [-Wstringop-truncation])
-  if test -n "$NOT_THE_CFLAGS"; then
-    CFLAGS="$CFLAGS -Wno-stringop-truncation"
-  fi
-  # Suppress clang 16's strict warnings about function casts
-  NOT_THE_CFLAGS=""
-  PGAC_PROG_CC_VAR_OPT(NOT_THE_CFLAGS, [-Wcast-function-type-strict])
-  if test -n "$NOT_THE_CFLAGS"; then
-    CFLAGS="$CFLAGS -Wno-cast-function-type-strict"
-  fi
+	CFLAGS="-Wall -Wmissing-prototypes -Wpointer-arith"
+	CXXFLAGS="-Wall -Wpointer-arith"
+	# These work in some but not all gcc versions
+	save_CFLAGS=$CFLAGS
+	PGAC_PROG_CC_CFLAGS_OPT([-Wdeclaration-after-statement])
+	# -Wdeclaration-after-statement isn't applicable for C++.  Specific C files
+	# disable it, so AC_SUBST the negative form.
+	PERMIT_DECLARATION_AFTER_STATEMENT=
+	if test x"$save_CFLAGS" != x"$CFLAGS"; then
+		PERMIT_DECLARATION_AFTER_STATEMENT=-Wno-declaration-after-statement
+	fi
+	AC_SUBST(PERMIT_DECLARATION_AFTER_STATEMENT)
+	# Really don't want VLAs to be used in our dialect of C
+	PGAC_PROG_CC_CFLAGS_OPT([-Werror=vla])
+	# On macOS, complain about usage of symbols newer than the deployment target
+	PGAC_PROG_CC_CFLAGS_OPT([-Werror=unguarded-availability-new])
+	PGAC_PROG_CXX_CFLAGS_OPT([-Werror=unguarded-availability-new])
+	# -Wvla is not applicable for C++
+	PGAC_PROG_CC_CFLAGS_OPT([-Wendif-labels])
+	PGAC_PROG_CXX_CFLAGS_OPT([-Wendif-labels])
+	PGAC_PROG_CC_CFLAGS_OPT([-Wmissing-format-attribute])
+	PGAC_PROG_CXX_CFLAGS_OPT([-Wmissing-format-attribute])
+	PGAC_PROG_CC_CFLAGS_OPT([-Wimplicit-fallthrough=3])
+	PGAC_PROG_CXX_CFLAGS_OPT([-Wimplicit-fallthrough=3])
+	PGAC_PROG_CC_CFLAGS_OPT([-Wcast-function-type])
+	PGAC_PROG_CXX_CFLAGS_OPT([-Wcast-function-type])
+	PGAC_PROG_CC_CFLAGS_OPT([-Wshadow=compatible-local])
+	PGAC_PROG_CXX_CFLAGS_OPT([-Wshadow=compatible-local])
+	# This was included in -Wall/-Wformat in older GCC versions
+	PGAC_PROG_CC_CFLAGS_OPT([-Wformat-security])
+	PGAC_PROG_CXX_CFLAGS_OPT([-Wformat-security])
+	# gcc 14+, clang for a while
+	# (Supported in C++ by clang but not gcc.  For consistency, omit in C++.)
+	save_CFLAGS=$CFLAGS
+	PGAC_PROG_CC_CFLAGS_OPT([-Wmissing-variable-declarations])
+	PERMIT_MISSING_VARIABLE_DECLARATIONS=
+	if test x"$save_CFLAGS" != x"$CFLAGS"; then
+		PERMIT_MISSING_VARIABLE_DECLARATIONS=-Wno-missing-variable-declarations
+	fi
+	AC_SUBST(PERMIT_MISSING_VARIABLE_DECLARATIONS)
+	# Disable strict-aliasing rules; needed for gcc 3.3+
+	PGAC_PROG_CC_CFLAGS_OPT([-fno-strict-aliasing])
+	PGAC_PROG_CXX_CFLAGS_OPT([-fno-strict-aliasing])
+	# Disable optimizations that assume no overflow; needed for gcc 4.3+
+	PGAC_PROG_CC_CFLAGS_OPT([-fwrapv])
+	PGAC_PROG_CXX_CFLAGS_OPT([-fwrapv])
+	# Disable FP optimizations that cause various errors on gcc 4.5+ or maybe 4.6+
+	PGAC_PROG_CC_CFLAGS_OPT([-fexcess-precision=standard])
+	PGAC_PROG_CXX_CFLAGS_OPT([-fexcess-precision=standard])
+	# Optimization flags for specific files that benefit from loop unrolling
+	PGAC_PROG_CC_VAR_OPT(CFLAGS_UNROLL_LOOPS, [-funroll-loops])
+	# Optimization flags for specific files that benefit from vectorization
+	PGAC_PROG_CC_VAR_OPT(CFLAGS_VECTORIZE, [-ftree-vectorize])
+	#
+	# The following tests want to suppress various unhelpful warnings by adding
+	# -Wno-foo switches.  But gcc won't complain about unrecognized -Wno-foo
+	# switches, so we have to test for the positive form and if that works,
+	# add the negative form.  Note that tests of this form typically need to
+	# be duplicated in the BITCODE_CFLAGS setup stanza below.
+	#
+	# Suppress clang's unhelpful unused-command-line-argument warnings.
+	NOT_THE_CFLAGS=""
+	PGAC_PROG_CC_VAR_OPT(NOT_THE_CFLAGS, [-Wunused-command-line-argument])
+	if test -n "$NOT_THE_CFLAGS"; then
+		CFLAGS="$CFLAGS -Wno-unused-command-line-argument"
+	fi
+	# Remove clang 12+'s compound-token-split-by-macro, as this causes a lot
+	# of warnings when building plperl because of usages in the Perl headers.
+	NOT_THE_CFLAGS=""
+	PGAC_PROG_CC_VAR_OPT(NOT_THE_CFLAGS, [-Wcompound-token-split-by-macro])
+	if test -n "$NOT_THE_CFLAGS"; then
+		CFLAGS="$CFLAGS -Wno-compound-token-split-by-macro"
+	fi
+	# Similarly disable useless truncation warnings from gcc 8+
+	NOT_THE_CFLAGS=""
+	PGAC_PROG_CC_VAR_OPT(NOT_THE_CFLAGS, [-Wformat-truncation])
+	if test -n "$NOT_THE_CFLAGS"; then
+		CFLAGS="$CFLAGS -Wno-format-truncation"
+	fi
+	NOT_THE_CFLAGS=""
+	PGAC_PROG_CC_VAR_OPT(NOT_THE_CFLAGS, [-Wstringop-truncation])
+	if test -n "$NOT_THE_CFLAGS"; then
+		CFLAGS="$CFLAGS -Wno-stringop-truncation"
+	fi
+	# Suppress clang 16's strict warnings about function casts
+	NOT_THE_CFLAGS=""
+	PGAC_PROG_CC_VAR_OPT(NOT_THE_CFLAGS, [-Wcast-function-type-strict])
+	if test -n "$NOT_THE_CFLAGS"; then
+		CFLAGS="$CFLAGS -Wno-cast-function-type-strict"
+	fi
 elif test "$ICC" = yes; then
-  # Intel's compiler has a bug/misoptimization in checking for
-  # division by NAN (NaN == 0), -mp1 fixes it, so add it to the CFLAGS.
-  PGAC_PROG_CC_CFLAGS_OPT([-mp1])
-  PGAC_PROG_CXX_CFLAGS_OPT([-mp1])
-  # Make sure strict aliasing is off (though this is said to be the default)
-  PGAC_PROG_CC_CFLAGS_OPT([-fno-strict-aliasing])
-  PGAC_PROG_CXX_CFLAGS_OPT([-fno-strict-aliasing])
+	# Intel's compiler has a bug/misoptimization in checking for
+	# division by NAN (NaN == 0), -mp1 fixes it, so add it to the CFLAGS.
+	PGAC_PROG_CC_CFLAGS_OPT([-mp1])
+	PGAC_PROG_CXX_CFLAGS_OPT([-mp1])
+	# Make sure strict aliasing is off (though this is said to be the default)
+	PGAC_PROG_CC_CFLAGS_OPT([-fno-strict-aliasing])
+	PGAC_PROG_CXX_CFLAGS_OPT([-fno-strict-aliasing])
 fi
 
 # If the compiler knows how to hide symbols, add the switch needed for that to
@@ -605,16 +605,16 @@ fi
 # compiler that supports one of the supported variants of -fvisibility=hidden
 # but uses a different syntax to mark a symbol as exported.
 if test "$GCC" = yes; then
-  PGAC_PROG_CC_VAR_OPT(CFLAGS_SL_MODULE, [-fvisibility=hidden])
-  # For C++ we additionally want -fvisibility-inlines-hidden
-  PGAC_PROG_VARCXX_VARFLAGS_OPT(CXX, CXXFLAGS_SL_MODULE, [-fvisibility=hidden])
-  PGAC_PROG_VARCXX_VARFLAGS_OPT(CXX, CXXFLAGS_SL_MODULE, [-fvisibility-inlines-hidden])
-  have_visibility_attribute=$pgac_cv_prog_CC_cflags__fvisibility_hidden
+	PGAC_PROG_CC_VAR_OPT(CFLAGS_SL_MODULE, [-fvisibility=hidden])
+	# For C++ we additionally want -fvisibility-inlines-hidden
+	PGAC_PROG_VARCXX_VARFLAGS_OPT(CXX, CXXFLAGS_SL_MODULE, [-fvisibility=hidden])
+	PGAC_PROG_VARCXX_VARFLAGS_OPT(CXX, CXXFLAGS_SL_MODULE, [-fvisibility-inlines-hidden])
+	have_visibility_attribute=$pgac_cv_prog_CC_cflags__fvisibility_hidden
 fi
 
 if test "$have_visibility_attribute" = "yes"; then
-  AC_DEFINE([HAVE_VISIBILITY_ATTRIBUTE], 1,
-            [Define to 1 if your compiler knows the visibility("hidden") attribute.])
+	AC_DEFINE([HAVE_VISIBILITY_ATTRIBUTE], 1,
+						[Define to 1 if your compiler knows the visibility("hidden") attribute.])
 fi
 
 AC_SUBST(CFLAGS_UNROLL_LOOPS)
@@ -629,84 +629,84 @@ AC_SUBST(CXXFLAGS_SL_MODULE)
 # warning in the main build is enough.
 # 3. But we must duplicate -Wno-warning flags, else we'll see those anyway.
 if test "$with_llvm" = yes ; then
-  CLANGXX="$CLANG -xc++"
-
-  PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, BITCODE_CFLAGS, [-fno-strict-aliasing])
-  PGAC_PROG_VARCXX_VARFLAGS_OPT(CLANGXX, BITCODE_CXXFLAGS, [-fno-strict-aliasing])
-  PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, BITCODE_CFLAGS, [-fwrapv])
-  PGAC_PROG_VARCXX_VARFLAGS_OPT(CLANGXX, BITCODE_CXXFLAGS, [-fwrapv])
-  PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, BITCODE_CFLAGS, [-fexcess-precision=standard])
-  PGAC_PROG_VARCXX_VARFLAGS_OPT(CLANGXX, BITCODE_CXXFLAGS, [-fexcess-precision=standard])
-
-  # Ideally bitcode should perhaps match $CC's use, or not, of outline atomic
-  # functions, but for now we err on the side of suppressing them in bitcode,
-  # because we can't assume they're available at runtime.  This affects aarch64
-  # builds using the basic armv8-a ISA without LSE support.
-  PGAC_PROG_VARCXX_VARFLAGS_OPT(CLANG, BITCODE_CFLAGS, [-mno-outline-atomics])
-  PGAC_PROG_VARCXX_VARFLAGS_OPT(CLANG, BITCODE_CXXFLAGS, [-mno-outline-atomics])
-
-  NOT_THE_CFLAGS=""
-  PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, NOT_THE_CFLAGS, [-Wunused-command-line-argument])
-  if test -n "$NOT_THE_CFLAGS"; then
-    BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-unused-command-line-argument"
-  fi
-  NOT_THE_CFLAGS=""
-  PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, NOT_THE_CFLAGS, [-Wcompound-token-split-by-macro])
-  if test -n "$NOT_THE_CFLAGS"; then
-    BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-compound-token-split-by-macro"
-  fi
-  NOT_THE_CFLAGS=""
-  PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, NOT_THE_CFLAGS, [-Wformat-truncation])
-  if test -n "$NOT_THE_CFLAGS"; then
-    BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-format-truncation"
-  fi
-  NOT_THE_CFLAGS=""
-  PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, NOT_THE_CFLAGS, [-Wstringop-truncation])
-  if test -n "$NOT_THE_CFLAGS"; then
-    BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-stringop-truncation"
-  fi
+	CLANGXX="$CLANG -xc++"
+
+	PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, BITCODE_CFLAGS, [-fno-strict-aliasing])
+	PGAC_PROG_VARCXX_VARFLAGS_OPT(CLANGXX, BITCODE_CXXFLAGS, [-fno-strict-aliasing])
+	PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, BITCODE_CFLAGS, [-fwrapv])
+	PGAC_PROG_VARCXX_VARFLAGS_OPT(CLANGXX, BITCODE_CXXFLAGS, [-fwrapv])
+	PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, BITCODE_CFLAGS, [-fexcess-precision=standard])
+	PGAC_PROG_VARCXX_VARFLAGS_OPT(CLANGXX, BITCODE_CXXFLAGS, [-fexcess-precision=standard])
+
+	# Ideally bitcode should perhaps match $CC's use, or not, of outline atomic
+	# functions, but for now we err on the side of suppressing them in bitcode,
+	# because we can't assume they're available at runtime.  This affects aarch64
+	# builds using the basic armv8-a ISA without LSE support.
+	PGAC_PROG_VARCXX_VARFLAGS_OPT(CLANG, BITCODE_CFLAGS, [-mno-outline-atomics])
+	PGAC_PROG_VARCXX_VARFLAGS_OPT(CLANG, BITCODE_CXXFLAGS, [-mno-outline-atomics])
+
+	NOT_THE_CFLAGS=""
+	PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, NOT_THE_CFLAGS, [-Wunused-command-line-argument])
+	if test -n "$NOT_THE_CFLAGS"; then
+		BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-unused-command-line-argument"
+	fi
+	NOT_THE_CFLAGS=""
+	PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, NOT_THE_CFLAGS, [-Wcompound-token-split-by-macro])
+	if test -n "$NOT_THE_CFLAGS"; then
+		BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-compound-token-split-by-macro"
+	fi
+	NOT_THE_CFLAGS=""
+	PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, NOT_THE_CFLAGS, [-Wformat-truncation])
+	if test -n "$NOT_THE_CFLAGS"; then
+		BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-format-truncation"
+	fi
+	NOT_THE_CFLAGS=""
+	PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, NOT_THE_CFLAGS, [-Wstringop-truncation])
+	if test -n "$NOT_THE_CFLAGS"; then
+		BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-stringop-truncation"
+	fi
 fi
 
 # supply -g if --enable-debug
 if test "$enable_debug" = yes && test "$ac_cv_prog_cc_g" = yes; then
-  CFLAGS="$CFLAGS -g"
+	CFLAGS="$CFLAGS -g"
 fi
 
 if test "$enable_debug" = yes && test "$ac_cv_prog_cxx_g" = yes; then
-  CXXFLAGS="$CXXFLAGS -g"
+	CXXFLAGS="$CXXFLAGS -g"
 fi
 
 # enable code coverage if --enable-coverage
 if test "$enable_coverage" = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
-    CXXFLAGS="$CXXFLAGS -fprofile-arcs -ftest-coverage"
-  else
-    AC_MSG_ERROR([--enable-coverage is supported only when using GCC])
-  fi
+	if test "$GCC" = yes; then
+		CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
+		CXXFLAGS="$CXXFLAGS -fprofile-arcs -ftest-coverage"
+	else
+		AC_MSG_ERROR([--enable-coverage is supported only when using GCC])
+	fi
 fi
 
 # enable profiling if --enable-profiling
 if test "$enable_profiling" = yes && test "$ac_cv_prog_cc_g" = yes; then
-  if test "$GCC" = yes; then
-    AC_DEFINE([PROFILE_PID_DIR], 1,
-           [Define to 1 to allow profiling output to be saved separately for each process.])
-    CFLAGS="$CFLAGS -pg $PLATFORM_PROFILE_FLAGS"
-    CXXFLAGS="$CXXFLAGS -pg $PLATFORM_PROFILE_FLAGS"
-  else
-    AC_MSG_ERROR([--enable-profiling is supported only when using GCC])
-  fi
+	if test "$GCC" = yes; then
+		AC_DEFINE([PROFILE_PID_DIR], 1,
+					 [Define to 1 to allow profiling output to be saved separately for each process.])
+		CFLAGS="$CFLAGS -pg $PLATFORM_PROFILE_FLAGS"
+		CXXFLAGS="$CXXFLAGS -pg $PLATFORM_PROFILE_FLAGS"
+	else
+		AC_MSG_ERROR([--enable-profiling is supported only when using GCC])
+	fi
 fi
 
 # On Solaris, we need these #defines to get POSIX-conforming versions
 # of many interfaces (sigwait, getpwuid_r, shmdt, ...).
 if test "$PORTNAME" = "solaris"; then
-  CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS"
+	CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS"
 fi
 
 # We already have this in Makefile.win32, but configure needs it too
 if test "$PORTNAME" = "win32"; then
-  CPPFLAGS="$CPPFLAGS -I$srcdir/src/include/port/win32"
+	CPPFLAGS="$CPPFLAGS -I$srcdir/src/include/port/win32"
 fi
 
 # Now that we're done automatically adding stuff to C[XX]FLAGS, put back the
@@ -727,9 +727,9 @@ AC_SUBST(CFLAGS_SL)
 # (note, we're not checking that for CXX, which is optional)
 AC_MSG_CHECKING([whether the C compiler still works])
 AC_LINK_IFELSE([AC_LANG_PROGRAM([], [return 0;])],
-  [AC_MSG_RESULT(yes)],
-  [AC_MSG_RESULT(no)
-   AC_MSG_ERROR([cannot proceed])])
+	[AC_MSG_RESULT(yes)],
+	[AC_MSG_RESULT(no)
+	 AC_MSG_ERROR([cannot proceed])])
 
 # Defend against gcc -ffast-math
 if test "$GCC" = yes; then
@@ -762,7 +762,7 @@ AC_SUBST(GCC)
 
 AC_SUBST(DLSUFFIX)dnl
 AC_DEFINE_UNQUOTED([DLSUFFIX], ["$DLSUFFIX"],
-                   [Define to the file name extension of dynamically-loadable modules.])
+									 [Define to the file name extension of dynamically-loadable modules.])
 
 #
 # Set up pkg_config in case we need it below
@@ -773,7 +773,7 @@ PKG_PROG_PKG_CONFIG
 # Automatic dependency tracking
 #
 PGAC_ARG_BOOL(enable, depend, no, [turn on automatic dependency tracking],
-              [autodepend=yes])
+							[autodepend=yes])
 AC_SUBST(autodepend)
 
 
@@ -781,8 +781,8 @@ AC_SUBST(autodepend)
 # Enable assert checks
 #
 PGAC_ARG_BOOL(enable, cassert, no, [enable assertion checks (for debugging)],
-              [AC_DEFINE([USE_ASSERT_CHECKING], 1,
-                         [Define to 1 to build with assertion checks. (--enable-cassert)])])
+							[AC_DEFINE([USE_ASSERT_CHECKING], 1,
+												 [Define to 1 to build with assertion checks. (--enable-cassert)])])
 
 
 #
@@ -792,11 +792,11 @@ ac_save_IFS=$IFS
 IFS="${IFS}${PATH_SEPARATOR}"
 # SRCH_INC comes from the template file
 for dir in $with_includes $SRCH_INC; do
-  if test -d "$dir"; then
-    INCLUDES="$INCLUDES -I$dir"
-  else
-    AC_MSG_WARN([*** Include directory $dir does not exist.])
-  fi
+	if test -d "$dir"; then
+		INCLUDES="$INCLUDES -I$dir"
+	else
+		AC_MSG_WARN([*** Include directory $dir does not exist.])
+	fi
 done
 IFS=$ac_save_IFS
 
@@ -808,11 +808,11 @@ ac_save_IFS=$IFS
 IFS="${IFS}${PATH_SEPARATOR}"
 # LIBRARY_DIRS comes from command line, SRCH_LIB from template file.
 for dir in $LIBRARY_DIRS $SRCH_LIB; do
-  if test -d "$dir"; then
-    LIBDIRS="$LIBDIRS -L$dir"
-  else
-    AC_MSG_WARN([*** Library directory $dir does not exist.])
-  fi
+	if test -d "$dir"; then
+		LIBDIRS="$LIBDIRS -L$dir"
+	else
+		AC_MSG_WARN([*** Library directory $dir does not exist.])
+	fi
 done
 IFS=$ac_save_IFS
 
@@ -821,12 +821,12 @@ IFS=$ac_save_IFS
 #
 AC_MSG_CHECKING([whether to build with ICU support])
 PGAC_ARG_BOOL(with, icu, yes, [build without ICU support],
-              [AC_DEFINE([USE_ICU], 1, [Define to build with ICU support. (--with-icu)])])
+							[AC_DEFINE([USE_ICU], 1, [Define to build with ICU support. (--with-icu)])])
 AC_MSG_RESULT([$with_icu])
 AC_SUBST(with_icu)
 
 if test "$with_icu" = yes; then
-  PKG_CHECK_MODULES(ICU, icu-uc icu-i18n)
+	PKG_CHECK_MODULES(ICU, icu-uc icu-i18n)
 fi
 
 #
@@ -864,8 +864,8 @@ AC_SUBST(with_python)
 AC_MSG_CHECKING([whether to build with GSSAPI support])
 PGAC_ARG_BOOL(with, gssapi, no, [build with GSSAPI support],
 [
-  AC_DEFINE(ENABLE_GSS, 1, [Define to build with GSSAPI support. (--with-gssapi)])
-  krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
+	AC_DEFINE(ENABLE_GSS, 1, [Define to build with GSSAPI support. (--with-gssapi)])
+	krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
 ])
 AC_MSG_RESULT([$with_gssapi])
 AC_SUBST(with_gssapi)
@@ -878,12 +878,12 @@ AC_SUBST(krb_srvtab)
 # Kerberos configuration parameters
 #
 PGAC_ARG_REQ(with, krb-srvnam,
-             [NAME], [default service principal name in Kerberos (GSSAPI) [postgres]],
-             [],
-             [with_krb_srvnam="postgres"])
+						 [NAME], [default service principal name in Kerberos (GSSAPI) [postgres]],
+						 [],
+						 [with_krb_srvnam="postgres"])
 AC_SUBST(with_krb_srvnam)
 AC_DEFINE_UNQUOTED([PG_KRB_SRVNAM], ["$with_krb_srvnam"],
-                   [Define to the name of the default PostgreSQL service principal in Kerberos (GSSAPI). (--with-krb-srvnam=NAME)])
+									 [Define to the name of the default PostgreSQL service principal in Kerberos (GSSAPI). (--with-krb-srvnam=NAME)])
 
 
 #
@@ -891,8 +891,8 @@ AC_DEFINE_UNQUOTED([PG_KRB_SRVNAM], ["$with_krb_srvnam"],
 #
 AC_MSG_CHECKING([whether to build with PAM support])
 PGAC_ARG_BOOL(with, pam, no,
-              [build with PAM support],
-              [AC_DEFINE([USE_PAM], 1, [Define to 1 to build with PAM support. (--with-pam)])])
+							[build with PAM support],
+							[AC_DEFINE([USE_PAM], 1, [Define to 1 to build with PAM support. (--with-pam)])])
 AC_MSG_RESULT([$with_pam])
 
 
@@ -901,8 +901,8 @@ AC_MSG_RESULT([$with_pam])
 #
 AC_MSG_CHECKING([whether to build with BSD Authentication support])
 PGAC_ARG_BOOL(with, bsd-auth, no,
-              [build with BSD Authentication support],
-              [AC_DEFINE([USE_BSD_AUTH], 1, [Define to 1 to build with BSD Authentication support. (--with-bsd-auth)])])
+							[build with BSD Authentication support],
+							[AC_DEFINE([USE_BSD_AUTH], 1, [Define to 1 to build with BSD Authentication support. (--with-bsd-auth)])])
 AC_MSG_RESULT([$with_bsd_auth])
 
 
@@ -911,8 +911,8 @@ AC_MSG_RESULT([$with_bsd_auth])
 #
 AC_MSG_CHECKING([whether to build with LDAP support])
 PGAC_ARG_BOOL(with, ldap, no,
-              [build with LDAP support],
-              [AC_DEFINE([USE_LDAP], 1, [Define to 1 to build with LDAP support. (--with-ldap)])])
+							[build with LDAP support],
+							[AC_DEFINE([USE_LDAP], 1, [Define to 1 to build with LDAP support. (--with-ldap)])])
 AC_MSG_RESULT([$with_ldap])
 AC_SUBST(with_ldap)
 
@@ -922,8 +922,8 @@ AC_SUBST(with_ldap)
 #
 AC_MSG_CHECKING([whether to build with Bonjour support])
 PGAC_ARG_BOOL(with, bonjour, no,
-              [build with Bonjour support],
-              [AC_DEFINE([USE_BONJOUR], 1, [Define to 1 to build with Bonjour support. (--with-bonjour)])])
+							[build with Bonjour support],
+							[AC_DEFINE([USE_BONJOUR], 1, [Define to 1 to build with Bonjour support. (--with-bonjour)])])
 AC_MSG_RESULT([$with_bonjour])
 
 
@@ -940,7 +940,7 @@ AC_MSG_RESULT([$with_selinux])
 #
 AC_MSG_CHECKING([whether to build with systemd support])
 PGAC_ARG_BOOL(with, systemd, no, [build with systemd support],
-              [AC_DEFINE([USE_SYSTEMD], 1, [Define to build with systemd support. (--with-systemd)])])
+							[AC_DEFINE([USE_SYSTEMD], 1, [Define to build with systemd support. (--with-systemd)])])
 AC_SUBST(with_systemd)
 AC_MSG_RESULT([$with_systemd])
 
@@ -948,15 +948,15 @@ AC_MSG_RESULT([$with_systemd])
 # Readline
 #
 PGAC_ARG_BOOL(with, readline, yes,
-              [do not use GNU Readline nor BSD Libedit for editing])
+							[do not use GNU Readline nor BSD Libedit for editing])
 # readline on MinGW has problems with backslashes in psql and other bugs.
 # This is particularly a problem with non-US code pages.
 # Therefore disable its use until we understand the cause. 2004-07-20
 if test "$PORTNAME" = "win32"; then
-  if test "$with_readline" = yes; then
-    AC_MSG_WARN([*** Readline does not work on MinGW --- disabling])
-    with_readline=no
-  fi
+	if test "$with_readline" = yes; then
+		AC_MSG_WARN([*** Readline does not work on MinGW --- disabling])
+		with_readline=no
+	fi
 fi
 AC_SUBST(with_readline)
 
@@ -965,19 +965,19 @@ AC_SUBST(with_readline)
 # Prefer libedit
 #
 PGAC_ARG_BOOL(with, libedit-preferred, no,
-              [prefer BSD Libedit over GNU Readline])
+							[prefer BSD Libedit over GNU Readline])
 
 #
 # liburing
 #
 AC_MSG_CHECKING([whether to build with liburing support])
 PGAC_ARG_BOOL(with, liburing, no, [build with io_uring support, for asynchronous I/O],
-              [AC_DEFINE([USE_LIBURING], 1, [Define to build with io_uring support. (--with-liburing)])])
+							[AC_DEFINE([USE_LIBURING], 1, [Define to build with io_uring support. (--with-liburing)])])
 AC_MSG_RESULT([$with_liburing])
 AC_SUBST(with_liburing)
 
 if test "$with_liburing" = yes; then
-  PKG_CHECK_MODULES(LIBURING, liburing)
+	PKG_CHECK_MODULES(LIBURING, liburing)
 fi
 
 #
@@ -990,23 +990,23 @@ fi
 #
 PGAC_ARG_REQ(with, uuid, [LIB], [build contrib/uuid-ossp using LIB (bsd,e2fs,ossp)])
 if test x"$with_uuid" = x"" ; then
-  with_uuid=no
+	with_uuid=no
 fi
 PGAC_ARG_BOOL(with, ossp-uuid, no, [obsolete spelling of --with-uuid=ossp])
 if test "$with_ossp_uuid" = yes ; then
-  with_uuid=ossp
+	with_uuid=ossp
 fi
 
 if test "$with_uuid" != no ; then
-  if test "$with_uuid" = bsd ; then
-    AC_DEFINE([HAVE_UUID_BSD], 1, [Define to 1 if you have BSD UUID support.])
-  elif test "$with_uuid" = e2fs ; then
-    AC_DEFINE([HAVE_UUID_E2FS], 1, [Define to 1 if you have E2FS UUID support.])
-  elif test "$with_uuid" = ossp ; then
-    AC_DEFINE([HAVE_UUID_OSSP], 1, [Define to 1 if you have OSSP UUID support.])
-  else
-    AC_MSG_ERROR([--with-uuid must specify one of bsd, e2fs, or ossp])
-  fi
+	if test "$with_uuid" = bsd ; then
+		AC_DEFINE([HAVE_UUID_BSD], 1, [Define to 1 if you have BSD UUID support.])
+	elif test "$with_uuid" = e2fs ; then
+		AC_DEFINE([HAVE_UUID_E2FS], 1, [Define to 1 if you have E2FS UUID support.])
+	elif test "$with_uuid" = ossp ; then
+		AC_DEFINE([HAVE_UUID_OSSP], 1, [Define to 1 if you have OSSP UUID support.])
+	else
+		AC_MSG_ERROR([--with-uuid must specify one of bsd, e2fs, or ossp])
+	fi
 fi
 AC_SUBST(with_uuid)
 
@@ -1016,40 +1016,40 @@ AC_SUBST(with_uuid)
 #
 AC_MSG_CHECKING([whether to build with libcurl support])
 PGAC_ARG_BOOL(with, libcurl, no, [build with libcurl support],
-              [AC_DEFINE([USE_LIBCURL], 1, [Define to 1 to build with libcurl support. (--with-libcurl)])])
+							[AC_DEFINE([USE_LIBCURL], 1, [Define to 1 to build with libcurl support. (--with-libcurl)])])
 AC_MSG_RESULT([$with_libcurl])
 AC_SUBST(with_libcurl)
 
 if test "$with_libcurl" = yes ; then
-  # Check for libcurl 7.61.0 or higher (corresponding to RHEL8 and the ability
-  # to explicitly set TLS 1.3 ciphersuites).
-  PKG_CHECK_MODULES(LIBCURL, [libcurl >= 7.61.0])
+	# Check for libcurl 7.61.0 or higher (corresponding to RHEL8 and the ability
+	# to explicitly set TLS 1.3 ciphersuites).
+	PKG_CHECK_MODULES(LIBCURL, [libcurl >= 7.61.0])
 
-  # Curl's flags are kept separate from the standard CPPFLAGS/LDFLAGS. We use
-  # them only for libpq-oauth.
-  LIBCURL_CPPFLAGS=
-  LIBCURL_LDFLAGS=
+	# Curl's flags are kept separate from the standard CPPFLAGS/LDFLAGS. We use
+	# them only for libpq-oauth.
+	LIBCURL_CPPFLAGS=
+	LIBCURL_LDFLAGS=
 
-  # We only care about -I, -D, and -L switches. Note that -lcurl will be added
-  # to LIBCURL_LDLIBS by PGAC_CHECK_LIBCURL, below.
-  for pgac_option in $LIBCURL_CFLAGS; do
-    case $pgac_option in
-      -I*|-D*) LIBCURL_CPPFLAGS="$LIBCURL_CPPFLAGS $pgac_option";;
-    esac
-  done
-  for pgac_option in $LIBCURL_LIBS; do
-    case $pgac_option in
-      -L*) LIBCURL_LDFLAGS="$LIBCURL_LDFLAGS $pgac_option";;
-    esac
-  done
+	# We only care about -I, -D, and -L switches. Note that -lcurl will be added
+	# to LIBCURL_LDLIBS by PGAC_CHECK_LIBCURL, below.
+	for pgac_option in $LIBCURL_CFLAGS; do
+		case $pgac_option in
+			-I*|-D*) LIBCURL_CPPFLAGS="$LIBCURL_CPPFLAGS $pgac_option";;
+		esac
+	done
+	for pgac_option in $LIBCURL_LIBS; do
+		case $pgac_option in
+			-L*) LIBCURL_LDFLAGS="$LIBCURL_LDFLAGS $pgac_option";;
+		esac
+	done
 
-  AC_SUBST(LIBCURL_CPPFLAGS)
-  AC_SUBST(LIBCURL_LDFLAGS)
+	AC_SUBST(LIBCURL_CPPFLAGS)
+	AC_SUBST(LIBCURL_LDFLAGS)
 
-  # OAuth requires python for testing
-  if test "$with_python" != yes; then
-    AC_MSG_WARN([*** OAuth support tests require --with-python to run])
-  fi
+	# OAuth requires python for testing
+	if test "$with_python" != yes; then
+		AC_MSG_WARN([*** OAuth support tests require --with-python to run])
+	fi
 fi
 
 
@@ -1058,13 +1058,13 @@ fi
 #
 AC_MSG_CHECKING([whether to build with libnuma support])
 PGAC_ARG_BOOL(with, libnuma, no, [build with libnuma support],
-              [AC_DEFINE([USE_LIBNUMA], 1, [Define to build with NUMA support. (--with-libnuma)])])
+							[AC_DEFINE([USE_LIBNUMA], 1, [Define to build with NUMA support. (--with-libnuma)])])
 AC_MSG_RESULT([$with_libnuma])
 AC_SUBST(with_libnuma)
 
 if test "$with_libnuma" = yes ; then
-  AC_CHECK_LIB(numa,    numa_available, [], [AC_MSG_ERROR([library 'libnuma' is required for NUMA support])])
-  PKG_CHECK_MODULES(LIBNUMA, numa)
+	AC_CHECK_LIB(numa,    numa_available, [], [AC_MSG_ERROR([library 'libnuma' is required for NUMA support])])
+	PKG_CHECK_MODULES(LIBNUMA, numa)
 fi
 
 #
@@ -1072,37 +1072,37 @@ fi
 #
 AC_MSG_CHECKING([whether to build with XML support])
 PGAC_ARG_BOOL(with, libxml, no, [build with XML support],
-              [AC_DEFINE([USE_LIBXML], 1, [Define to 1 to build with XML support. (--with-libxml)])])
+							[AC_DEFINE([USE_LIBXML], 1, [Define to 1 to build with XML support. (--with-libxml)])])
 AC_MSG_RESULT([$with_libxml])
 AC_SUBST(with_libxml)
 
 if test "$with_libxml" = yes ; then
-  # Check pkg-config, then xml2-config.  But for backwards compatibility,
-  # setting XML2_CONFIG overrides pkg-config.
-  AC_ARG_VAR(XML2_CONFIG, [path to xml2-config utility])dnl
-  have_libxml2_pkg_config=no
-  if test -z "$XML2_CONFIG" -a -n "$PKG_CONFIG"; then
-    PKG_CHECK_MODULES(XML2, [libxml-2.0 >= 2.6.23],
-                      [have_libxml2_pkg_config=yes], [# do nothing])
-  fi
-  if test "$have_libxml2_pkg_config" = no ; then
-    PGAC_PATH_PROGS(XML2_CONFIG, xml2-config)
-    if test -n "$XML2_CONFIG"; then
-      XML2_CFLAGS=`$XML2_CONFIG --cflags`
-      XML2_LIBS=`$XML2_CONFIG --libs`
-    fi
-  fi
-  # Note the user could also set XML2_CFLAGS/XML2_LIBS directly
-  for pgac_option in $XML2_CFLAGS; do
-    case $pgac_option in
-      -I*|-D*) INCLUDES="$INCLUDES $pgac_option";;
-    esac
-  done
-  for pgac_option in $XML2_LIBS; do
-    case $pgac_option in
-      -L*) LIBDIRS="$LIBDIRS $pgac_option";;
-    esac
-  done
+	# Check pkg-config, then xml2-config.  But for backwards compatibility,
+	# setting XML2_CONFIG overrides pkg-config.
+	AC_ARG_VAR(XML2_CONFIG, [path to xml2-config utility])dnl
+	have_libxml2_pkg_config=no
+	if test -z "$XML2_CONFIG" -a -n "$PKG_CONFIG"; then
+		PKG_CHECK_MODULES(XML2, [libxml-2.0 >= 2.6.23],
+											[have_libxml2_pkg_config=yes], [# do nothing])
+	fi
+	if test "$have_libxml2_pkg_config" = no ; then
+		PGAC_PATH_PROGS(XML2_CONFIG, xml2-config)
+		if test -n "$XML2_CONFIG"; then
+			XML2_CFLAGS=`$XML2_CONFIG --cflags`
+			XML2_LIBS=`$XML2_CONFIG --libs`
+		fi
+	fi
+	# Note the user could also set XML2_CFLAGS/XML2_LIBS directly
+	for pgac_option in $XML2_CFLAGS; do
+		case $pgac_option in
+			-I*|-D*) INCLUDES="$INCLUDES $pgac_option";;
+		esac
+	done
+	for pgac_option in $XML2_LIBS; do
+		case $pgac_option in
+			-L*) LIBDIRS="$LIBDIRS $pgac_option";;
+		esac
+	done
 fi
 
 
@@ -1110,7 +1110,7 @@ fi
 # XSLT
 #
 PGAC_ARG_BOOL(with, libxslt, no, [use XSLT support when building contrib/xml2],
-              [AC_DEFINE([USE_LIBXSLT], 1, [Define to 1 to use XSLT support when building contrib/xml2. (--with-libxslt)])])
+							[AC_DEFINE([USE_LIBXSLT], 1, [Define to 1 to use XSLT support when building contrib/xml2. (--with-libxslt)])])
 
 
 AC_SUBST(with_libxslt)
@@ -1119,14 +1119,14 @@ AC_SUBST(with_libxslt)
 # tzdata
 #
 PGAC_ARG_REQ(with, system-tzdata,
-             [DIR], [use system time zone data in DIR])
+						 [DIR], [use system time zone data in DIR])
 AC_SUBST(with_system_tzdata)
 
 #
 # Zlib
 #
 PGAC_ARG_BOOL(with, zlib, yes,
-              [do not use Zlib])
+							[do not use Zlib])
 AC_SUBST(with_zlib)
 
 #
@@ -1134,24 +1134,24 @@ AC_SUBST(with_zlib)
 #
 AC_MSG_CHECKING([whether to build with LZ4 support])
 PGAC_ARG_BOOL(with, lz4, no, [build with LZ4 support],
-              [AC_DEFINE([USE_LZ4], 1, [Define to 1 to build with LZ4 support. (--with-lz4)])])
+							[AC_DEFINE([USE_LZ4], 1, [Define to 1 to build with LZ4 support. (--with-lz4)])])
 AC_MSG_RESULT([$with_lz4])
 AC_SUBST(with_lz4)
 
 if test "$with_lz4" = yes; then
-  PKG_CHECK_MODULES(LZ4, liblz4)
-  # We only care about -I, -D, and -L switches;
-  # note that -llz4 will be added by AC_CHECK_LIB below.
-  for pgac_option in $LZ4_CFLAGS; do
-    case $pgac_option in
-      -I*|-D*) INCLUDES="$INCLUDES $pgac_option";;
-    esac
-  done
-  for pgac_option in $LZ4_LIBS; do
-    case $pgac_option in
-      -L*) LIBDIRS="$LIBDIRS $pgac_option";;
-    esac
-  done
+	PKG_CHECK_MODULES(LZ4, liblz4)
+	# We only care about -I, -D, and -L switches;
+	# note that -llz4 will be added by AC_CHECK_LIB below.
+	for pgac_option in $LZ4_CFLAGS; do
+		case $pgac_option in
+			-I*|-D*) INCLUDES="$INCLUDES $pgac_option";;
+		esac
+	done
+	for pgac_option in $LZ4_LIBS; do
+		case $pgac_option in
+			-L*) LIBDIRS="$LIBDIRS $pgac_option";;
+		esac
+	done
 fi
 
 #
@@ -1159,24 +1159,24 @@ fi
 #
 AC_MSG_CHECKING([whether to build with ZSTD support])
 PGAC_ARG_BOOL(with, zstd, no, [build with ZSTD support],
-              [AC_DEFINE([USE_ZSTD], 1, [Define to 1 to build with ZSTD support. (--with-zstd)])])
+							[AC_DEFINE([USE_ZSTD], 1, [Define to 1 to build with ZSTD support. (--with-zstd)])])
 AC_MSG_RESULT([$with_zstd])
 AC_SUBST(with_zstd)
 
 if test "$with_zstd" = yes; then
-  PKG_CHECK_MODULES(ZSTD, libzstd >= 1.4.0)
-  # We only care about -I, -D, and -L switches;
-  # note that -lzstd will be added by AC_CHECK_LIB below.
-  for pgac_option in $ZSTD_CFLAGS; do
-    case $pgac_option in
-      -I*|-D*) INCLUDES="$INCLUDES $pgac_option";;
-    esac
-  done
-  for pgac_option in $ZSTD_LIBS; do
-    case $pgac_option in
-      -L*) LIBDIRS="$LIBDIRS $pgac_option";;
-    esac
-  done
+	PKG_CHECK_MODULES(ZSTD, libzstd >= 1.4.0)
+	# We only care about -I, -D, and -L switches;
+	# note that -lzstd will be added by AC_CHECK_LIB below.
+	for pgac_option in $ZSTD_CFLAGS; do
+		case $pgac_option in
+			-I*|-D*) INCLUDES="$INCLUDES $pgac_option";;
+		esac
+	done
+	for pgac_option in $ZSTD_LIBS; do
+		case $pgac_option in
+			-L*) LIBDIRS="$LIBDIRS $pgac_option";;
+		esac
+	done
 fi
 #
 # Assignments
@@ -1191,7 +1191,7 @@ AC_ARG_VAR(LDFLAGS_SL, [extra linker flags for linking shared libraries only])
 PGAC_CHECK_STRIP
 AC_CHECK_TOOL(AR, ar, ar)
 if test "$PORTNAME" = "win32"; then
-  AC_CHECK_TOOL(WINDRES, windres, windres)
+	AC_CHECK_TOOL(WINDRES, windres, windres)
 fi
 
 AC_PROG_INSTALL
@@ -1199,8 +1199,8 @@ AC_PROG_INSTALL
 # a relative path to it in each makefile where it substitutes it. This clashes
 # with our Makefile.global concept. This workaround helps.
 case $INSTALL in
-  *install-sh*) install_bin='';;
-  *) install_bin=$INSTALL;;
+	*install-sh*) install_bin='';;
+	*) install_bin=$INSTALL;;
 esac
 AC_SUBST(install_bin)
 
@@ -1211,7 +1211,7 @@ AC_PROG_MKDIR_P
 # a relative path to it in each makefile where it substitutes it. This clashes
 # with our Makefile.global concept. This workaround helps.
 case $MKDIR_P in
-  *install-sh*) MKDIR_P='\${SHELL} \${top_srcdir}/config/install-sh -c -d';;
+	*install-sh*) MKDIR_P='\${SHELL} \${top_srcdir}/config/install-sh -c -d';;
 esac
 
 AC_PATH_PROG(NM, nm)
@@ -1221,43 +1221,43 @@ PGAC_PATH_FLEX
 
 PGAC_PATH_PERL
 if test "$with_perl" = yes; then
-  if test -z "$PERL"; then
-    AC_MSG_ERROR([Perl not found])
-  fi
-  PGAC_CHECK_PERL_CONFIGS([archlibexp,privlibexp,useshrplib])
-  if test "$perl_useshrplib" != yes && test "$perl_useshrplib" != true; then
-    AC_MSG_ERROR([cannot build PL/Perl because libperl is not a shared library
+	if test -z "$PERL"; then
+		AC_MSG_ERROR([Perl not found])
+	fi
+	PGAC_CHECK_PERL_CONFIGS([archlibexp,privlibexp,useshrplib])
+	if test "$perl_useshrplib" != yes && test "$perl_useshrplib" != true; then
+		AC_MSG_ERROR([cannot build PL/Perl because libperl is not a shared library
 You might have to rebuild your Perl installation.  Refer to the
 documentation for details.  Use --without-perl to disable building
 PL/Perl.])
-  fi
-  # On most platforms, archlibexp is also where the Perl include files live ...
-  perl_includespec="-I$perl_archlibexp/CORE"
-  # ... but on newer macOS versions, we must use -iwithsysroot to look
-  # under $PG_SYSROOT
-  if test \! -f "$perl_archlibexp/CORE/perl.h" ; then
-    if test -f "$PG_SYSROOT$perl_archlibexp/CORE/perl.h" ; then
-      perl_includespec="-iwithsysroot $perl_archlibexp/CORE"
-    fi
-  fi
-  AC_SUBST(perl_includespec)dnl
-  PGAC_CHECK_PERL_EMBED_CCFLAGS
-  PGAC_CHECK_PERL_EMBED_LDFLAGS
+	fi
+	# On most platforms, archlibexp is also where the Perl include files live ...
+	perl_includespec="-I$perl_archlibexp/CORE"
+	# ... but on newer macOS versions, we must use -iwithsysroot to look
+	# under $PG_SYSROOT
+	if test \! -f "$perl_archlibexp/CORE/perl.h" ; then
+		if test -f "$PG_SYSROOT$perl_archlibexp/CORE/perl.h" ; then
+			perl_includespec="-iwithsysroot $perl_archlibexp/CORE"
+		fi
+	fi
+	AC_SUBST(perl_includespec)dnl
+	PGAC_CHECK_PERL_EMBED_CCFLAGS
+	PGAC_CHECK_PERL_EMBED_LDFLAGS
 fi
 
 if test "$with_python" = yes; then
-  PGAC_PATH_PYTHON
-  PGAC_CHECK_PYTHON_EMBED_SETUP
+	PGAC_PATH_PYTHON
+	PGAC_CHECK_PYTHON_EMBED_SETUP
 fi
 
 if test x"$cross_compiling" = x"yes" && test -z "$with_system_tzdata"; then
-  PGAC_PATH_PROGS(ZIC, zic)
-  if test -z "$ZIC"; then
-    AC_MSG_ERROR([
+	PGAC_PATH_PROGS(ZIC, zic)
+	if test -z "$ZIC"; then
+		AC_MSG_ERROR([
 When cross-compiling, either use the option --with-system-tzdata to use
 existing time-zone data, or set the environment variable ZIC to a zic
 program to use during the build.])
-  fi
+	fi
 fi
 
 #
@@ -1339,34 +1339,34 @@ AC_SEARCH_LIBS(backtrace_symbols, execinfo)
 AC_SEARCH_LIBS(pthread_barrier_wait, pthread)
 
 if test "$with_readline" = yes; then
-  PGAC_CHECK_READLINE
-  if test x"$pgac_cv_check_readline" = x"no"; then
-    AC_MSG_ERROR([readline library not found
+	PGAC_CHECK_READLINE
+	if test x"$pgac_cv_check_readline" = x"no"; then
+		AC_MSG_ERROR([readline library not found
 If you have readline already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-readline to disable readline support.])
-  fi
+	fi
 fi
 
 if test "$with_zlib" = yes; then
-  AC_CHECK_LIB(z, inflate, [],
-               [AC_MSG_ERROR([zlib library not found
+	AC_CHECK_LIB(z, inflate, [],
+							 [AC_MSG_ERROR([zlib library not found
 If you have zlib already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-zlib to disable zlib support.])])
 fi
 
 if test "$with_libcurl" = yes ; then
-  PGAC_CHECK_LIBCURL
+	PGAC_CHECK_LIBCURL
 fi
 
 if test "$with_gssapi" = yes ; then
-  if test "$PORTNAME" != "win32"; then
-    AC_SEARCH_LIBS(gss_store_cred_into, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [],
-                   [AC_MSG_ERROR([could not find function 'gss_store_cred_into' required for GSSAPI])])
-  else
-    LIBS="$LIBS -lgssapi32"
-  fi
+	if test "$PORTNAME" != "win32"; then
+		AC_SEARCH_LIBS(gss_store_cred_into, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [],
+									 [AC_MSG_ERROR([could not find function 'gss_store_cred_into' required for GSSAPI])])
+	else
+		LIBS="$LIBS -lgssapi32"
+	fi
 fi
 
 #
@@ -1376,122 +1376,122 @@ fi
 #
 PGAC_ARG_REQ(with, ssl, [LIB], [use LIB for SSL/TLS support (openssl)])
 if test x"$with_ssl" = x"" ; then
-  with_ssl=no
+	with_ssl=no
 fi
 PGAC_ARG_BOOL(with, openssl, no, [obsolete spelling of --with-ssl=openssl])
 if test "$with_openssl" = yes ; then
-  with_ssl=openssl
+	with_ssl=openssl
 fi
 
 if test "$with_ssl" = openssl ; then
-  dnl Order matters!
-  # Minimum required OpenSSL version is 1.1.1
-  AC_DEFINE(OPENSSL_API_COMPAT, [0x10101000L],
-            [Define to the OpenSSL API version in use. This avoids deprecation warnings from newer OpenSSL versions.])
-  AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])
-  AC_CHECK_LIB(ssl,    SSL_new, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
-  # Functions introduced in OpenSSL 1.1.1.
-  AC_CHECK_FUNCS([SSL_CTX_set_ciphersuites], [], [AC_MSG_ERROR([OpenSSL version >= 1.1.1 is required for SSL support])])
-  # Function introduced in OpenSSL 1.0.2, not in LibreSSL.
-  AC_CHECK_FUNCS([SSL_CTX_set_cert_cb])
-  # Function introduced in OpenSSL 1.1.1, not in LibreSSL.
-  AC_CHECK_FUNCS([X509_get_signature_info SSL_CTX_set_num_tickets SSL_CTX_set_keylog_callback])
-  AC_DEFINE([USE_OPENSSL], 1, [Define to 1 to build with OpenSSL support. (--with-ssl=openssl)])
+	dnl Order matters!
+	# Minimum required OpenSSL version is 1.1.1
+	AC_DEFINE(OPENSSL_API_COMPAT, [0x10101000L],
+						[Define to the OpenSSL API version in use. This avoids deprecation warnings from newer OpenSSL versions.])
+	AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])
+	AC_CHECK_LIB(ssl,    SSL_new, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
+	# Functions introduced in OpenSSL 1.1.1.
+	AC_CHECK_FUNCS([SSL_CTX_set_ciphersuites], [], [AC_MSG_ERROR([OpenSSL version >= 1.1.1 is required for SSL support])])
+	# Function introduced in OpenSSL 1.0.2, not in LibreSSL.
+	AC_CHECK_FUNCS([SSL_CTX_set_cert_cb])
+	# Function introduced in OpenSSL 1.1.1, not in LibreSSL.
+	AC_CHECK_FUNCS([X509_get_signature_info SSL_CTX_set_num_tickets SSL_CTX_set_keylog_callback])
+	AC_DEFINE([USE_OPENSSL], 1, [Define to 1 to build with OpenSSL support. (--with-ssl=openssl)])
 elif test "$with_ssl" != no ; then
-  AC_MSG_ERROR([--with-ssl must specify openssl])
+	AC_MSG_ERROR([--with-ssl must specify openssl])
 fi
 AC_SUBST(with_ssl)
 
 if test "$with_pam" = yes ; then
-  AC_CHECK_LIB(pam,    pam_start, [], [AC_MSG_ERROR([library 'pam' is required for PAM])])
+	AC_CHECK_LIB(pam,    pam_start, [], [AC_MSG_ERROR([library 'pam' is required for PAM])])
 fi
 
 if test "$with_libxml" = yes ; then
-  AC_CHECK_LIB(xml2, xmlSaveToBuffer, [], [AC_MSG_ERROR([library 'xml2' (version >= 2.6.23) is required for XML support])])
+	AC_CHECK_LIB(xml2, xmlSaveToBuffer, [], [AC_MSG_ERROR([library 'xml2' (version >= 2.6.23) is required for XML support])])
 fi
 
 if test "$with_libxslt" = yes ; then
-  AC_CHECK_LIB(xslt, xsltCleanupGlobals, [], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])])
+	AC_CHECK_LIB(xslt, xsltCleanupGlobals, [], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])])
 fi
 
 if test "$with_liburing" = yes; then
-  _LIBS="$LIBS"
-  LIBS="$LIBURING_LIBS $LIBS"
-  AC_CHECK_FUNCS([io_uring_queue_init_mem])
-  LIBS="$_LIBS"
+	_LIBS="$LIBS"
+	LIBS="$LIBURING_LIBS $LIBS"
+	AC_CHECK_FUNCS([io_uring_queue_init_mem])
+	LIBS="$_LIBS"
 fi
 
 if test "$with_lz4" = yes ; then
-  AC_CHECK_LIB(lz4, LZ4_compress_default, [], [AC_MSG_ERROR([library 'lz4' is required for LZ4 support])])
+	AC_CHECK_LIB(lz4, LZ4_compress_default, [], [AC_MSG_ERROR([library 'lz4' is required for LZ4 support])])
 fi
 
 if test "$with_zstd" = yes ; then
-  AC_CHECK_LIB(zstd, ZSTD_compress, [], [AC_MSG_ERROR([library 'zstd' is required for ZSTD support])])
+	AC_CHECK_LIB(zstd, ZSTD_compress, [], [AC_MSG_ERROR([library 'zstd' is required for ZSTD support])])
 fi
 
 # Note: We can test for libldap_r only after we know PTHREAD_LIBS
 if test "$with_ldap" = yes ; then
-  _LIBS="$LIBS"
-  if test "$PORTNAME" != "win32"; then
-    AC_CHECK_LIB(ldap, ldap_bind, [],
+	_LIBS="$LIBS"
+	if test "$PORTNAME" != "win32"; then
+		AC_CHECK_LIB(ldap, ldap_bind, [],
 		 [AC_MSG_ERROR([library 'ldap' is required for LDAP])],
 		 [$EXTRA_LDAP_LIBS])
-    LDAP_LIBS_BE="-lldap $EXTRA_LDAP_LIBS"
-    # This test is carried out against libldap.
-    AC_CHECK_FUNCS([ldap_initialize])
-    # The separate ldap_r library only exists in OpenLDAP < 2.5, and if we
-    # have 2.5 or later, we shouldn't even probe for ldap_r (we might find a
-    # library from a separate OpenLDAP installation).  The most reliable
-    # way to check that is to check for a function introduced in 2.5.
-    AC_CHECK_FUNC([ldap_verify_credentials],
-		  [thread_safe_libldap=yes],
-		  [thread_safe_libldap=no])
-    if test "$thread_safe_libldap" = no; then
-      # Use ldap_r for FE if available, else assume ldap is thread-safe.
-      # On some platforms ldap_r fails to link without PTHREAD_LIBS.
-      LIBS="$_LIBS"
-      AC_CHECK_LIB(ldap_r, ldap_bind,
-		   [LDAP_LIBS_FE="-lldap_r $EXTRA_LDAP_LIBS"],
-		   [LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"],
-		   [$PTHREAD_CFLAGS $PTHREAD_LIBS $EXTRA_LDAP_LIBS])
-    else
-      LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"
-    fi
-  else
-    AC_CHECK_LIB(wldap32, ldap_bind, [], [AC_MSG_ERROR([library 'wldap32' is required for LDAP])])
-    LDAP_LIBS_FE="-lwldap32"
-    LDAP_LIBS_BE="-lwldap32"
-  fi
-  LIBS="$_LIBS"
+		LDAP_LIBS_BE="-lldap $EXTRA_LDAP_LIBS"
+		# This test is carried out against libldap.
+		AC_CHECK_FUNCS([ldap_initialize])
+		# The separate ldap_r library only exists in OpenLDAP < 2.5, and if we
+		# have 2.5 or later, we shouldn't even probe for ldap_r (we might find a
+		# library from a separate OpenLDAP installation).  The most reliable
+		# way to check that is to check for a function introduced in 2.5.
+		AC_CHECK_FUNC([ldap_verify_credentials],
+			[thread_safe_libldap=yes],
+			[thread_safe_libldap=no])
+		if test "$thread_safe_libldap" = no; then
+			# Use ldap_r for FE if available, else assume ldap is thread-safe.
+			# On some platforms ldap_r fails to link without PTHREAD_LIBS.
+			LIBS="$_LIBS"
+			AC_CHECK_LIB(ldap_r, ldap_bind,
+			 [LDAP_LIBS_FE="-lldap_r $EXTRA_LDAP_LIBS"],
+			 [LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"],
+			 [$PTHREAD_CFLAGS $PTHREAD_LIBS $EXTRA_LDAP_LIBS])
+		else
+			LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"
+		fi
+	else
+		AC_CHECK_LIB(wldap32, ldap_bind, [], [AC_MSG_ERROR([library 'wldap32' is required for LDAP])])
+		LDAP_LIBS_FE="-lwldap32"
+		LDAP_LIBS_BE="-lwldap32"
+	fi
+	LIBS="$_LIBS"
 fi
 AC_SUBST(LDAP_LIBS_FE)
 AC_SUBST(LDAP_LIBS_BE)
 
 # for contrib/sepgsql
 if test "$with_selinux" = yes; then
-  AC_CHECK_LIB(selinux, security_compute_create_name, [],
-               [AC_MSG_ERROR([library 'libselinux', version 2.1.10 or newer, is required for SELinux support])])
+	AC_CHECK_LIB(selinux, security_compute_create_name, [],
+							 [AC_MSG_ERROR([library 'libselinux', version 2.1.10 or newer, is required for SELinux support])])
 fi
 
 # for contrib/uuid-ossp
 if test "$with_uuid" = bsd ; then
-  # On BSD, the UUID functions are in libc
-  AC_CHECK_FUNC(uuid_to_string,
-    [UUID_LIBS=""],
-    [AC_MSG_ERROR([BSD UUID functions are not present])])
+	# On BSD, the UUID functions are in libc
+	AC_CHECK_FUNC(uuid_to_string,
+		[UUID_LIBS=""],
+		[AC_MSG_ERROR([BSD UUID functions are not present])])
 elif test "$with_uuid" = e2fs ; then
-  # On macOS, the UUID functions are in libc
-  AC_CHECK_FUNC(uuid_generate,
-    [UUID_LIBS=""],
-    [AC_CHECK_LIB(uuid, uuid_generate,
-      [UUID_LIBS="-luuid"],
-      [AC_MSG_ERROR([library 'uuid' is required for E2FS UUID])])])
+	# On macOS, the UUID functions are in libc
+	AC_CHECK_FUNC(uuid_generate,
+		[UUID_LIBS=""],
+		[AC_CHECK_LIB(uuid, uuid_generate,
+			[UUID_LIBS="-luuid"],
+			[AC_MSG_ERROR([library 'uuid' is required for E2FS UUID])])])
 elif test "$with_uuid" = ossp ; then
-  AC_CHECK_LIB(ossp-uuid, uuid_export,
-    [UUID_LIBS="-lossp-uuid"],
-    [AC_CHECK_LIB(uuid, uuid_export,
-      [UUID_LIBS="-luuid"],
-      [AC_MSG_ERROR([library 'ossp-uuid' or 'uuid' is required for OSSP UUID])])])
+	AC_CHECK_LIB(ossp-uuid, uuid_export,
+		[UUID_LIBS="-lossp-uuid"],
+		[AC_CHECK_LIB(uuid, uuid_export,
+			[UUID_LIBS="-luuid"],
+			[AC_MSG_ERROR([library 'ossp-uuid' or 'uuid' is required for OSSP UUID])])])
 fi
 AC_SUBST(UUID_LIBS)
 
@@ -1521,15 +1521,15 @@ AC_CHECK_HEADERS(m4_normalize([
 ]))
 
 if expr x"$pgac_cv_check_readline" : 'x-lreadline' >/dev/null ; then
-  AC_CHECK_HEADERS(readline/readline.h, [],
-        [AC_CHECK_HEADERS(readline.h, [],
-                [AC_MSG_ERROR([readline header not found
+	AC_CHECK_HEADERS(readline/readline.h, [],
+				[AC_CHECK_HEADERS(readline.h, [],
+								[AC_MSG_ERROR([readline header not found
 If you have readline already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-readline to disable readline support.])])])
-  AC_CHECK_HEADERS(readline/history.h, [],
-        [AC_CHECK_HEADERS(history.h, [],
-                [AC_MSG_ERROR([history header not found
+	AC_CHECK_HEADERS(readline/history.h, [],
+				[AC_CHECK_HEADERS(history.h, [],
+								[AC_MSG_ERROR([history header not found
 If you have readline already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-readline to disable readline support.])])])
@@ -1540,23 +1540,23 @@ if expr x"$pgac_cv_check_readline" : 'x-ledit' >/dev/null ; then
 # bad practice, since in combined installations readline will have its headers
 # there.  We might have to resort to AC_EGREP checks to make sure we found
 # the proper header...
-  AC_CHECK_HEADERS(editline/readline.h, [],
-        [AC_CHECK_HEADERS(readline.h, [],
-                [AC_CHECK_HEADERS(readline/readline.h, [],
-                        [AC_MSG_ERROR([readline header not found
+	AC_CHECK_HEADERS(editline/readline.h, [],
+				[AC_CHECK_HEADERS(readline.h, [],
+								[AC_CHECK_HEADERS(readline/readline.h, [],
+												[AC_MSG_ERROR([readline header not found
 If you have libedit already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-readline to disable libedit support.])])])])
 # Note: in a libedit installation, history.h is sometimes a dummy, and may
 # not be there at all.  Hence, don't complain if not found.  We must check
 # though, since in yet other versions it is an independent header.
-  AC_CHECK_HEADERS(editline/history.h, [],
-        [AC_CHECK_HEADERS(history.h, [],
-                [AC_CHECK_HEADERS(readline/history.h)])])
+	AC_CHECK_HEADERS(editline/history.h, [],
+				[AC_CHECK_HEADERS(history.h, [],
+								[AC_CHECK_HEADERS(readline/history.h)])])
 fi
 
 if test "$with_zlib" = yes; then
-  AC_CHECK_HEADER(zlib.h, [], [AC_MSG_ERROR([zlib header not found
+	AC_CHECK_HEADER(zlib.h, [], [AC_MSG_ERROR([zlib header not found
 If you have zlib already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-zlib to disable zlib support.])])
@@ -1564,18 +1564,18 @@ fi
 
 PGAC_PATH_PROGS(LZ4, lz4)
 if test "$with_lz4" = yes; then
-  AC_CHECK_HEADER(lz4.h, [], [AC_MSG_ERROR([lz4.h header file is required for LZ4])])
+	AC_CHECK_HEADER(lz4.h, [], [AC_MSG_ERROR([lz4.h header file is required for LZ4])])
 fi
 
 PGAC_PATH_PROGS(ZSTD, zstd)
 if test "$with_zstd" = yes; then
-  AC_CHECK_HEADER(zstd.h, [], [AC_MSG_ERROR([zstd.h header file is required for ZSTD])])
+	AC_CHECK_HEADER(zstd.h, [], [AC_MSG_ERROR([zstd.h header file is required for ZSTD])])
 fi
 
 if test "$with_gssapi" = yes ; then
-  AC_CHECK_HEADERS(gssapi/gssapi.h, [],
+	AC_CHECK_HEADERS(gssapi/gssapi.h, [],
 	[AC_CHECK_HEADERS(gssapi.h, [], [AC_MSG_ERROR([gssapi.h header file is required for GSSAPI])])])
-  AC_CHECK_HEADERS(gssapi/gssapi_ext.h, [],
+	AC_CHECK_HEADERS(gssapi/gssapi_ext.h, [],
 	[AC_CHECK_HEADERS(gssapi_ext.h, [], [AC_MSG_ERROR([gssapi_ext.h header file is required for GSSAPI])])])
 fi
 
@@ -1583,48 +1583,48 @@ PGAC_PATH_PROGS(OPENSSL, openssl)
 pgac_openssl_version="$($OPENSSL version 2> /dev/null || echo openssl not found)"
 AC_MSG_NOTICE([using openssl: $pgac_openssl_version])
 if test "$with_ssl" = openssl ; then
-  AC_CHECK_HEADER(openssl/ssl.h, [], [AC_MSG_ERROR([header file <openssl/ssl.h> is required for OpenSSL])])
-  AC_CHECK_HEADER(openssl/err.h, [], [AC_MSG_ERROR([header file <openssl/err.h> is required for OpenSSL])])
+	AC_CHECK_HEADER(openssl/ssl.h, [], [AC_MSG_ERROR([header file <openssl/ssl.h> is required for OpenSSL])])
+	AC_CHECK_HEADER(openssl/err.h, [], [AC_MSG_ERROR([header file <openssl/err.h> is required for OpenSSL])])
 fi
 
 if test "$with_pam" = yes ; then
-  AC_CHECK_HEADERS(security/pam_appl.h, [],
-                   [AC_CHECK_HEADERS(pam/pam_appl.h, [],
-                                     [AC_MSG_ERROR([header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM.])])])
+	AC_CHECK_HEADERS(security/pam_appl.h, [],
+									 [AC_CHECK_HEADERS(pam/pam_appl.h, [],
+																		 [AC_MSG_ERROR([header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM.])])])
 fi
 
 if test "$with_bsd_auth" = yes ; then
-  AC_CHECK_HEADER(bsd_auth.h, [], [AC_MSG_ERROR([header file <bsd_auth.h> is required for BSD Authentication support])])
+	AC_CHECK_HEADER(bsd_auth.h, [], [AC_MSG_ERROR([header file <bsd_auth.h> is required for BSD Authentication support])])
 fi
 
 if test "$with_systemd" = yes ; then
-  AC_CHECK_HEADER(systemd/sd-daemon.h, [], [AC_MSG_ERROR([header file <systemd/sd-daemon.h> is required for systemd support])])
+	AC_CHECK_HEADER(systemd/sd-daemon.h, [], [AC_MSG_ERROR([header file <systemd/sd-daemon.h> is required for systemd support])])
 fi
 
 if test "$with_libxml" = yes ; then
-  AC_CHECK_HEADER(libxml/parser.h, [], [AC_MSG_ERROR([header file <libxml/parser.h> is required for XML support])])
+	AC_CHECK_HEADER(libxml/parser.h, [], [AC_MSG_ERROR([header file <libxml/parser.h> is required for XML support])])
 fi
 
 if test "$with_libxslt" = yes ; then
-  AC_CHECK_HEADER(libxslt/xslt.h, [], [AC_MSG_ERROR([header file <libxslt/xslt.h> is required for XSLT support])])
+	AC_CHECK_HEADER(libxslt/xslt.h, [], [AC_MSG_ERROR([header file <libxslt/xslt.h> is required for XSLT support])])
 fi
 
 if test "$with_ldap" = yes ; then
-  if test "$PORTNAME" != "win32"; then
-     AC_CHECK_HEADER(ldap.h, [],
-                     [AC_MSG_ERROR([header file <ldap.h> is required for LDAP])])
-     PGAC_LDAP_SAFE
-  else
-     AC_CHECK_HEADER(winldap.h, [],
-                     [AC_MSG_ERROR([header file <winldap.h> is required for LDAP])],
-                     [AC_INCLUDES_DEFAULT
+	if test "$PORTNAME" != "win32"; then
+		 AC_CHECK_HEADER(ldap.h, [],
+										 [AC_MSG_ERROR([header file <ldap.h> is required for LDAP])])
+		 PGAC_LDAP_SAFE
+	else
+		 AC_CHECK_HEADER(winldap.h, [],
+										 [AC_MSG_ERROR([header file <winldap.h> is required for LDAP])],
+										 [AC_INCLUDES_DEFAULT
 #include <windows.h>
-                     ])
-  fi
+										 ])
+	fi
 fi
 
 if test "$with_bonjour" = yes ; then
-  AC_CHECK_HEADER(dns_sd.h, [], [AC_MSG_ERROR([header file <dns_sd.h> is required for Bonjour])])
+	AC_CHECK_HEADER(dns_sd.h, [], [AC_MSG_ERROR([header file <dns_sd.h> is required for Bonjour])])
 dnl At some point we might add something like
 dnl AC_SEARCH_LIBS(DNSServiceRegister, dns_sd)
 dnl but right now, what that would mainly accomplish is to encourage
@@ -1635,37 +1635,37 @@ fi
 
 # for contrib/uuid-ossp
 if test "$with_uuid" = bsd ; then
-  AC_CHECK_HEADERS(uuid.h,
-    [AC_EGREP_HEADER([uuid_to_string], uuid.h, [],
-      [AC_MSG_ERROR([header file <uuid.h> does not match BSD UUID library])])],
-    [AC_MSG_ERROR([header file <uuid.h> is required for BSD UUID])])
+	AC_CHECK_HEADERS(uuid.h,
+		[AC_EGREP_HEADER([uuid_to_string], uuid.h, [],
+			[AC_MSG_ERROR([header file <uuid.h> does not match BSD UUID library])])],
+		[AC_MSG_ERROR([header file <uuid.h> is required for BSD UUID])])
 elif test "$with_uuid" = e2fs ; then
-  AC_CHECK_HEADERS(uuid/uuid.h,
-    [AC_EGREP_HEADER([uuid_generate], uuid/uuid.h, [],
-      [AC_MSG_ERROR([header file <uuid/uuid.h> does not match E2FS UUID library])])],
-    [AC_CHECK_HEADERS(uuid.h,
-      [AC_EGREP_HEADER([uuid_generate], uuid.h, [],
-        [AC_MSG_ERROR([header file <uuid.h> does not match E2FS UUID library])])],
-      [AC_MSG_ERROR([header file <uuid/uuid.h> or <uuid.h> is required for E2FS UUID])])])
+	AC_CHECK_HEADERS(uuid/uuid.h,
+		[AC_EGREP_HEADER([uuid_generate], uuid/uuid.h, [],
+			[AC_MSG_ERROR([header file <uuid/uuid.h> does not match E2FS UUID library])])],
+		[AC_CHECK_HEADERS(uuid.h,
+			[AC_EGREP_HEADER([uuid_generate], uuid.h, [],
+				[AC_MSG_ERROR([header file <uuid.h> does not match E2FS UUID library])])],
+			[AC_MSG_ERROR([header file <uuid/uuid.h> or <uuid.h> is required for E2FS UUID])])])
 elif test "$with_uuid" = ossp ; then
-  AC_CHECK_HEADERS(ossp/uuid.h,
-    [AC_EGREP_HEADER([uuid_export], ossp/uuid.h, [],
-      [AC_MSG_ERROR([header file <ossp/uuid.h> does not match OSSP UUID library])])],
-    [AC_CHECK_HEADERS(uuid.h,
-      [AC_EGREP_HEADER([uuid_export], uuid.h, [],
-        [AC_MSG_ERROR([header file <uuid.h> does not match OSSP UUID library])])],
-      [AC_MSG_ERROR([header file <ossp/uuid.h> or <uuid.h> is required for OSSP UUID])])])
+	AC_CHECK_HEADERS(ossp/uuid.h,
+		[AC_EGREP_HEADER([uuid_export], ossp/uuid.h, [],
+			[AC_MSG_ERROR([header file <ossp/uuid.h> does not match OSSP UUID library])])],
+		[AC_CHECK_HEADERS(uuid.h,
+			[AC_EGREP_HEADER([uuid_export], uuid.h, [],
+				[AC_MSG_ERROR([header file <uuid.h> does not match OSSP UUID library])])],
+			[AC_MSG_ERROR([header file <ossp/uuid.h> or <uuid.h> is required for OSSP UUID])])])
 fi
 
 if test "$PORTNAME" = "win32" ; then
-   AC_CHECK_HEADERS(crtdefs.h)
+	 AC_CHECK_HEADERS(crtdefs.h)
 fi
 
 if test "$with_libcurl" = yes ; then
-  # Error out early if this platform can't support libpq-oauth.
-  if test "$ac_cv_header_sys_event_h" != yes -a "$ac_cv_header_sys_epoll_h" != yes; then
-    AC_MSG_ERROR([client-side OAuth is not supported on this platform])
-  fi
+	# Error out early if this platform can't support libpq-oauth.
+	if test "$ac_cv_header_sys_event_h" != yes -a "$ac_cv_header_sys_epoll_h" != yes; then
+		AC_MSG_ERROR([client-side OAuth is not supported on this platform])
+	fi
 fi
 
 ##
@@ -1701,41 +1701,41 @@ AC_CHECK_TYPES([struct option], [], [],
 #endif])
 
 case $host_cpu in
-  x86_64)
-    # On x86_64, check if we can compile a popcntq instruction
-    AC_CACHE_CHECK([whether assembler supports x86_64 popcntq],
-                   [pgac_cv_have_x86_64_popcntq],
-    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
+	x86_64)
+		# On x86_64, check if we can compile a popcntq instruction
+		AC_CACHE_CHECK([whether assembler supports x86_64 popcntq],
+									 [pgac_cv_have_x86_64_popcntq],
+		[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
 	[long long x = 1; long long r;
 	 __asm__ __volatile__ (" popcntq %1,%0\n" : "=q"(r) : "rm"(x));])],
 	[pgac_cv_have_x86_64_popcntq=yes],
 	[pgac_cv_have_x86_64_popcntq=no])])
-    if test x"$pgac_cv_have_x86_64_popcntq" = xyes ; then
+		if test x"$pgac_cv_have_x86_64_popcntq" = xyes ; then
 	AC_DEFINE(HAVE_X86_64_POPCNTQ, 1, [Define to 1 if the assembler supports X86_64's POPCNTQ instruction.])
-    fi
-  ;;
-  ppc*|powerpc*)
-    # On PPC, check if compiler accepts "i"(x) when __builtin_constant_p(x).
-    AC_CACHE_CHECK([whether __builtin_constant_p(x) implies "i"(x) acceptance],
-                   [pgac_cv_have_i_constraint__builtin_constant_p],
-    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-    [static inline int
-     addi(int ra, int si)
-     {
-         int res = 0;
-         if (__builtin_constant_p(si))
-             __asm__ __volatile__(
-                 " addi %0,%1,%2\n" : "=r"(res) : "b"(ra), "i"(si));
-         return res;
-     }
-     int test_adds(int x) { return addi(3, x) + addi(x, 5); }], [])],
-    [pgac_cv_have_i_constraint__builtin_constant_p=yes],
-    [pgac_cv_have_i_constraint__builtin_constant_p=no])])
-    if test x"$pgac_cv_have_i_constraint__builtin_constant_p" = xyes ; then
-      AC_DEFINE(HAVE_I_CONSTRAINT__BUILTIN_CONSTANT_P, 1,
-                [Define to 1 if __builtin_constant_p(x) implies "i"(x) acceptance.])
-    fi
-  ;;
+		fi
+	;;
+	ppc*|powerpc*)
+		# On PPC, check if compiler accepts "i"(x) when __builtin_constant_p(x).
+		AC_CACHE_CHECK([whether __builtin_constant_p(x) implies "i"(x) acceptance],
+									 [pgac_cv_have_i_constraint__builtin_constant_p],
+		[AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+		[static inline int
+		 addi(int ra, int si)
+		 {
+				 int res = 0;
+				 if (__builtin_constant_p(si))
+						 __asm__ __volatile__(
+								 " addi %0,%1,%2\n" : "=r"(res) : "b"(ra), "i"(si));
+				 return res;
+		 }
+		 int test_adds(int x) { return addi(3, x) + addi(x, 5); }], [])],
+		[pgac_cv_have_i_constraint__builtin_constant_p=yes],
+		[pgac_cv_have_i_constraint__builtin_constant_p=no])])
+		if test x"$pgac_cv_have_i_constraint__builtin_constant_p" = xyes ; then
+			AC_DEFINE(HAVE_I_CONSTRAINT__BUILTIN_CONSTANT_P, 1,
+								[Define to 1 if __builtin_constant_p(x) implies "i"(x) acceptance.])
+		fi
+	;;
 esac
 
 # Check largefile support.  You might think this is a system service not a
@@ -1743,12 +1743,12 @@ esac
 # probing existence of related functions such as fseeko, since the largefile
 # defines can affect what is generated for that.
 if test "$PORTNAME" != "win32"; then
-   AC_SYS_LARGEFILE
-   dnl Autoconf 2.69's AC_SYS_LARGEFILE believes it's a good idea to #define
-   dnl _DARWIN_USE_64_BIT_INODE, but it isn't: on macOS 10.5 that activates a
-   dnl bug that causes readdir() to sometimes return EINVAL.  On later macOS
-   dnl versions where the feature actually works, it's on by default anyway.
-   AH_VERBATIM([_DARWIN_USE_64_BIT_INODE],[])
+	 AC_SYS_LARGEFILE
+	 dnl Autoconf 2.69's AC_SYS_LARGEFILE believes it's a good idea to #define
+	 dnl _DARWIN_USE_64_BIT_INODE, but it isn't: on macOS 10.5 that activates a
+	 dnl bug that causes readdir() to sometimes return EINVAL.  On later macOS
+	 dnl versions where the feature actually works, it's on by default anyway.
+	 AH_VERBATIM([_DARWIN_USE_64_BIT_INODE],[])
 fi
 
 dnl Check for largefile support (must be after AC_SYS_LARGEFILE)
@@ -1756,9 +1756,9 @@ AC_CHECK_SIZEOF([off_t])
 
 # If we don't have largefile support, can't handle segment size >= 2GB.
 if test "$ac_cv_sizeof_off_t" -lt 8; then
-  if expr $RELSEG_SIZE '*' $blocksize '>=' 2 '*' 1024 '*' 1024 >/dev/null; then
-    AC_MSG_ERROR([Large file support is not enabled. Segment size cannot be larger than 1GB.])
-  fi
+	if expr $RELSEG_SIZE '*' $blocksize '>=' 2 '*' 1024 '*' 1024 >/dev/null; then
+		AC_MSG_ERROR([Large file support is not enabled. Segment size cannot be larger than 1GB.])
+	fi
 fi
 
 
@@ -1864,100 +1864,100 @@ fi
 
 # Similarly, use system's getopt_long() only if system provides struct option.
 if test x"$ac_cv_type_struct_option" = xyes ; then
-  AC_REPLACE_FUNCS([getopt_long])
+	AC_REPLACE_FUNCS([getopt_long])
 else
-  AC_LIBOBJ(getopt_long)
+	AC_LIBOBJ(getopt_long)
 fi
 
 # On OpenBSD and Solaris, getopt() doesn't do what we want for long options
 # (i.e., allow '-' as a flag character), so use our version on those platforms.
 if test "$PORTNAME" = "openbsd" -o "$PORTNAME" = "solaris"; then
-  AC_LIBOBJ(getopt)
+	AC_LIBOBJ(getopt)
 fi
 
 # mingw has adopted a GNU-centric interpretation of optind/optreset,
 # so always use our version on Windows.
 if test "$PORTNAME" = "win32"; then
-  AC_LIBOBJ(getopt)
-  AC_LIBOBJ(getopt_long)
+	AC_LIBOBJ(getopt)
+	AC_LIBOBJ(getopt_long)
 fi
 
 # Win32 (really MinGW) support
 if test "$PORTNAME" = "win32"; then
-  AC_LIBOBJ(dirmod)
-  AC_LIBOBJ(kill)
-  AC_LIBOBJ(open)
-  AC_LIBOBJ(system)
-  AC_LIBOBJ(win32common)
-  AC_LIBOBJ(win32dlopen)
-  AC_LIBOBJ(win32env)
-  AC_LIBOBJ(win32error)
-  AC_LIBOBJ(win32fdatasync)
-  AC_LIBOBJ(win32gai_strerror)
-  AC_LIBOBJ(win32getrusage)
-  AC_LIBOBJ(win32link)
-  AC_LIBOBJ(win32ntdll)
-  AC_LIBOBJ(win32pread)
-  AC_LIBOBJ(win32pwrite)
-  AC_LIBOBJ(win32security)
-  AC_LIBOBJ(win32setlocale)
-  AC_LIBOBJ(win32stat)
+	AC_LIBOBJ(dirmod)
+	AC_LIBOBJ(kill)
+	AC_LIBOBJ(open)
+	AC_LIBOBJ(system)
+	AC_LIBOBJ(win32common)
+	AC_LIBOBJ(win32dlopen)
+	AC_LIBOBJ(win32env)
+	AC_LIBOBJ(win32error)
+	AC_LIBOBJ(win32fdatasync)
+	AC_LIBOBJ(win32gai_strerror)
+	AC_LIBOBJ(win32getrusage)
+	AC_LIBOBJ(win32link)
+	AC_LIBOBJ(win32ntdll)
+	AC_LIBOBJ(win32pread)
+	AC_LIBOBJ(win32pwrite)
+	AC_LIBOBJ(win32security)
+	AC_LIBOBJ(win32setlocale)
+	AC_LIBOBJ(win32stat)
 fi
 # Cygwin needs only a bit of that
 if test "$PORTNAME" = "cygwin"; then
-  AC_LIBOBJ(dirmod)
+	AC_LIBOBJ(dirmod)
 fi
 
 AC_CHECK_FUNC(syslog,
-              [AC_CHECK_HEADER(syslog.h,
-                               [AC_DEFINE(HAVE_SYSLOG, 1, [Define to 1 if you have the syslog interface.])])])
+							[AC_CHECK_HEADER(syslog.h,
+															 [AC_DEFINE(HAVE_SYSLOG, 1, [Define to 1 if you have the syslog interface.])])])
 
 AC_CACHE_CHECK([for opterr], pgac_cv_var_int_opterr,
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <unistd.h>],
-  [extern int opterr; opterr = 1;])],
-  [pgac_cv_var_int_opterr=yes],
-  [pgac_cv_var_int_opterr=no])])
+	[extern int opterr; opterr = 1;])],
+	[pgac_cv_var_int_opterr=yes],
+	[pgac_cv_var_int_opterr=no])])
 if test x"$pgac_cv_var_int_opterr" = x"yes"; then
-  AC_DEFINE(HAVE_INT_OPTERR, 1, [Define to 1 if you have the global variable 'int opterr'.])
+	AC_DEFINE(HAVE_INT_OPTERR, 1, [Define to 1 if you have the global variable 'int opterr'.])
 fi
 
 AC_CACHE_CHECK([for optreset], pgac_cv_var_int_optreset,
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <unistd.h>],
-  [extern int optreset; optreset = 1;])],
-  [pgac_cv_var_int_optreset=yes],
-  [pgac_cv_var_int_optreset=no])])
+	[extern int optreset; optreset = 1;])],
+	[pgac_cv_var_int_optreset=yes],
+	[pgac_cv_var_int_optreset=no])])
 if test x"$pgac_cv_var_int_optreset" = x"yes"; then
-  AC_DEFINE(HAVE_INT_OPTRESET, 1, [Define to 1 if you have the global variable 'int optreset'.])
+	AC_DEFINE(HAVE_INT_OPTRESET, 1, [Define to 1 if you have the global variable 'int optreset'.])
 fi
 
 if test "$with_icu" = yes; then
-  ac_save_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="$CPPFLAGS $ICU_CFLAGS"
+	ac_save_CPPFLAGS=$CPPFLAGS
+	CPPFLAGS="$CPPFLAGS $ICU_CFLAGS"
 
-  # Verify we have ICU's header files
-  AC_CHECK_HEADER(unicode/ucol.h, [],
-        [AC_MSG_ERROR([header file <unicode/ucol.h> is required for ICU])])
+	# Verify we have ICU's header files
+	AC_CHECK_HEADER(unicode/ucol.h, [],
+				[AC_MSG_ERROR([header file <unicode/ucol.h> is required for ICU])])
 
-  CPPFLAGS=$ac_save_CPPFLAGS
+	CPPFLAGS=$ac_save_CPPFLAGS
 fi
 
 if test "$with_llvm" = yes; then
-  PGAC_CHECK_LLVM_FUNCTIONS()
+	PGAC_CHECK_LLVM_FUNCTIONS()
 fi
 
 # Lastly, restore full LIBS list and check for readline/libedit symbols
 LIBS="$LIBS_including_readline"
 
 if test "$with_readline" = yes; then
-  PGAC_READLINE_VARIABLES
-  AC_CHECK_FUNCS(m4_normalize([
+	PGAC_READLINE_VARIABLES
+	AC_CHECK_FUNCS(m4_normalize([
 	append_history
 	history_truncate_file
 	rl_completion_matches
 	rl_filename_completion_function
 	rl_reset_screen_size
 	rl_variable_bind
-  ]))
+	]))
 fi
 
 
@@ -2013,10 +2013,10 @@ AC_CHECK_ALIGNOF(double)
 MAX_ALIGNOF=$ac_cv_alignof_double
 
 if test $ac_cv_alignof_long -gt $MAX_ALIGNOF ; then
-  AC_MSG_ERROR([alignment of 'long' is greater than the alignment of 'double'])
+	AC_MSG_ERROR([alignment of 'long' is greater than the alignment of 'double'])
 fi
 if test $ac_cv_alignof_int64_t -gt $MAX_ALIGNOF ; then
-  AC_MSG_ERROR([alignment of 'int64_t' is greater than the alignment of 'double'])
+	AC_MSG_ERROR([alignment of 'int64_t' is greater than the alignment of 'double'])
 fi
 AC_DEFINE_UNQUOTED(MAXIMUM_ALIGNOF, $MAX_ALIGNOF, [Define as the maximum alignment requirement of any C data type.])
 
@@ -2036,74 +2036,83 @@ PGAC_HAVE_GCC__ATOMIC_INT64_CAS
 # Check for __get_cpuid() and __cpuid()
 AC_CACHE_CHECK([for __get_cpuid], [pgac_cv__get_cpuid],
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <cpuid.h>],
-  [[unsigned int exx[4] = {0, 0, 0, 0};
-  __get_cpuid(1, &exx[0], &exx[1], &exx[2], &exx[3]);
-  ]])],
-  [pgac_cv__get_cpuid="yes"],
-  [pgac_cv__get_cpuid="no"])])
+	[[unsigned int exx[4] = {0, 0, 0, 0};
+	__get_cpuid(1, &exx[0], &exx[1], &exx[2], &exx[3]);
+	]])],
+	[pgac_cv__get_cpuid="yes"],
+	[pgac_cv__get_cpuid="no"])])
 if test x"$pgac_cv__get_cpuid" = x"yes"; then
-  AC_DEFINE(HAVE__GET_CPUID, 1, [Define to 1 if you have __get_cpuid.])
+	AC_DEFINE(HAVE__GET_CPUID, 1, [Define to 1 if you have __get_cpuid.])
 else
-  # __cpuid()
-  AC_CACHE_CHECK([for __cpuid], [pgac_cv__cpuid],
-  [AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <intrin.h>],
-    [[unsigned int exx[4] = {0, 0, 0, 0};
-    __cpuid(exx, 1);
-    ]])],
-    [pgac_cv__cpuid="yes"],
-    [pgac_cv__cpuid="no"])])
-  if test x"$pgac_cv__cpuid" = x"yes"; then
-    AC_DEFINE(HAVE__CPUID, 1, [Define to 1 if you have __cpuid.])
-  fi
+	# __cpuid()
+	AC_CACHE_CHECK([for __cpuid], [pgac_cv__cpuid],
+	[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <intrin.h>],
+		[[unsigned int exx[4] = {0, 0, 0, 0};
+		__cpuid(exx, 1);
+		]])],
+		[pgac_cv__cpuid="yes"],
+		[pgac_cv__cpuid="no"])])
+	if test x"$pgac_cv__cpuid" = x"yes"; then
+		AC_DEFINE(HAVE__CPUID, 1, [Define to 1 if you have __cpuid.])
+	fi
 fi
 
 # Check for __get_cpuid_count() and __cpuidex() in a similar fashion.
 AC_CACHE_CHECK([for __get_cpuid_count], [pgac_cv__get_cpuid_count],
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <cpuid.h>],
-  [[unsigned int exx[4] = {0, 0, 0, 0};
-  __get_cpuid_count(7, 0, &exx[0], &exx[1], &exx[2], &exx[3]);
-  ]])],
-  [pgac_cv__get_cpuid_count="yes"],
-  [pgac_cv__get_cpuid_count="no"])])
+	[[unsigned int exx[4] = {0, 0, 0, 0};
+	__get_cpuid_count(7, 0, &exx[0], &exx[1], &exx[2], &exx[3]);
+	]])],
+	[pgac_cv__get_cpuid_count="yes"],
+	[pgac_cv__get_cpuid_count="no"])])
 if test x"$pgac_cv__get_cpuid_count" = x"yes"; then
-  AC_DEFINE(HAVE__GET_CPUID_COUNT, 1, [Define to 1 if you have __get_cpuid_count.])
+	AC_DEFINE(HAVE__GET_CPUID_COUNT, 1, [Define to 1 if you have __get_cpuid_count.])
 else
-  # __cpuidex()
-  AC_CACHE_CHECK([for __cpuidex], [pgac_cv__cpuidex],
-  [AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <intrin.h>],
-    [[unsigned int exx[4] = {0, 0, 0, 0};
-    __cpuidex(exx, 7, 0);
-    ]])],
-    [pgac_cv__cpuidex="yes"],
-    [pgac_cv__cpuidex="no"])])
-  if test x"$pgac_cv__cpuidex" = x"yes"; then
-    AC_DEFINE(HAVE__CPUIDEX, 1, [Define to 1 if you have __cpuidex.])
-  fi
+	# __cpuidex()
+	AC_CACHE_CHECK([for __cpuidex], [pgac_cv__cpuidex],
+	[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <intrin.h>],
+		[[unsigned int exx[4] = {0, 0, 0, 0};
+		__cpuidex(exx, 7, 0);
+		]])],
+		[pgac_cv__cpuidex="yes"],
+		[pgac_cv__cpuidex="no"])])
+	if test x"$pgac_cv__cpuidex" = x"yes"; then
+		AC_DEFINE(HAVE__CPUIDEX, 1, [Define to 1 if you have __cpuidex.])
+	fi
 fi
 
 # Check for XSAVE intrinsics
 #
 PGAC_XSAVE_INTRINSICS()
 if test x"$pgac_xsave_intrinsics" = x"yes"; then
-  AC_DEFINE(HAVE_XSAVE_INTRINSICS, 1, [Define to 1 if you have XSAVE intrinsics.])
+	AC_DEFINE(HAVE_XSAVE_INTRINSICS, 1, [Define to 1 if you have XSAVE intrinsics.])
 fi
 
 # Check for AVX-512 popcount intrinsics
 #
 if test x"$host_cpu" = x"x86_64"; then
-  PGAC_AVX512_POPCNT_INTRINSICS()
-  if test x"$pgac_avx512_popcnt_intrinsics" = x"yes"; then
-    AC_DEFINE(USE_AVX512_POPCNT_WITH_RUNTIME_CHECK, 1, [Define to 1 to use AVX-512 popcount instructions with a runtime check.])
-  fi
+	PGAC_AVX512_POPCNT_INTRINSICS()
+	if test x"$pgac_avx512_popcnt_intrinsics" = x"yes"; then
+		AC_DEFINE(USE_AVX512_POPCNT_WITH_RUNTIME_CHECK, 1, [Define to 1 to use AVX-512 popcount instructions with a runtime check.])
+	fi
 fi
 
 # Check for SVE popcount intrinsics
 #
 if test x"$host_cpu" = x"aarch64"; then
-  PGAC_SVE_POPCNT_INTRINSICS()
-  if test x"$pgac_sve_popcnt_intrinsics" = x"yes"; then
-    AC_DEFINE(USE_SVE_POPCNT_WITH_RUNTIME_CHECK, 1, [Define to 1 to use SVE popcount instructions with a runtime check.])
-  fi
+	PGAC_SVE_POPCNT_INTRINSICS()
+	if test x"$pgac_sve_popcnt_intrinsics" = x"yes"; then
+		AC_DEFINE(USE_SVE_POPCNT_WITH_RUNTIME_CHECK, 1, [Define to 1 to use SVE popcount instructions with a runtime check.])
+	fi
+fi
+
+# Check for SVE2 crc32 intrinsics
+#
+if test x"$host_cpu" = x"aarch64"; then
+	PGAC_SVE2_CRC32_INTRINSICS()
+	if test x"$pgac_sve2_crc32_intrinsics" = x"yes"; then
+		AC_DEFINE(USE_SVE2_CRC32_WITH_RUNTIME_CHECK, 1, [Define to 1 to use SVE2 CRC32 instructions with a runtime check.])
+	fi
 fi
 
 # Check for Intel SSE 4.2 intrinsics to do CRC calculations.
@@ -2126,10 +2135,10 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [
 # CFLAGS_CRC is set if the extra flag is required.
 PGAC_ARMV8_CRC32C_INTRINSICS([])
 if test x"$pgac_armv8_crc32c_intrinsics" != x"yes"; then
-  PGAC_ARMV8_CRC32C_INTRINSICS([-march=armv8-a+crc+simd])
-  if test x"$pgac_armv8_crc32c_intrinsics" != x"yes"; then
-    PGAC_ARMV8_CRC32C_INTRINSICS([-march=armv8-a+crc])
-  fi
+	PGAC_ARMV8_CRC32C_INTRINSICS([-march=armv8-a+crc+simd])
+	if test x"$pgac_armv8_crc32c_intrinsics" != x"yes"; then
+		PGAC_ARMV8_CRC32C_INTRINSICS([-march=armv8-a+crc])
+	fi
 fi
 
 # Check for LoongArch CRC intrinsics to do CRC calculations.
@@ -2169,128 +2178,128 @@ AC_SUBST(CFLAGS_CRC)
 # If we are targeting a LoongArch processor, CRC instructions are
 # always available (at least on 64 bit), so no runtime check is needed.
 if test x"$USE_SLICING_BY_8_CRC32C" = x"" && test x"$USE_SSE42_CRC32C" = x"" && test x"$USE_SSE42_CRC32C_WITH_RUNTIME_CHECK" = x"" && test x"$USE_ARMV8_CRC32C" = x"" && test x"$USE_ARMV8_CRC32C_WITH_RUNTIME_CHECK" = x"" && test x"$USE_LOONGARCH_CRC32C" = x""; then
-  # Use Intel SSE 4.2 if available.
-  if test x"$pgac_sse42_crc32_intrinsics" = x"yes" && test x"$SSE4_2_TARGETED" = x"1" ; then
-    USE_SSE42_CRC32C=1
-  else
-    # Intel SSE 4.2, with runtime check? The CPUID instruction is needed for
-    # the runtime check.
-    if test x"$pgac_sse42_crc32_intrinsics" = x"yes" && (test x"$pgac_cv__get_cpuid" = x"yes" || test x"$pgac_cv__cpuid" = x"yes"); then
-      USE_SSE42_CRC32C_WITH_RUNTIME_CHECK=1
-    else
-      # Use ARM CRC Extension if available.
-      if test x"$pgac_armv8_crc32c_intrinsics" = x"yes" && test x"$CFLAGS_CRC" = x""; then
-        USE_ARMV8_CRC32C=1
-      else
-        # ARM CRC Extension, with runtime check?
-        if test x"$pgac_armv8_crc32c_intrinsics" = x"yes"; then
-          USE_ARMV8_CRC32C_WITH_RUNTIME_CHECK=1
-        else
-          # LoongArch CRCC instructions.
-          if test x"$pgac_loongarch_crc32c_intrinsics" = x"yes"; then
-            USE_LOONGARCH_CRC32C=1
-          else
-            # fall back to slicing-by-8 algorithm, which doesn't require any
-            # special CPU support.
-            USE_SLICING_BY_8_CRC32C=1
-          fi
-        fi
-      fi
-    fi
-  fi
+	# Use Intel SSE 4.2 if available.
+	if test x"$pgac_sse42_crc32_intrinsics" = x"yes" && test x"$SSE4_2_TARGETED" = x"1" ; then
+		USE_SSE42_CRC32C=1
+	else
+		# Intel SSE 4.2, with runtime check? The CPUID instruction is needed for
+		# the runtime check.
+		if test x"$pgac_sse42_crc32_intrinsics" = x"yes" && (test x"$pgac_cv__get_cpuid" = x"yes" || test x"$pgac_cv__cpuid" = x"yes"); then
+			USE_SSE42_CRC32C_WITH_RUNTIME_CHECK=1
+		else
+			# Use ARM CRC Extension if available.
+			if test x"$pgac_armv8_crc32c_intrinsics" = x"yes" && test x"$CFLAGS_CRC" = x""; then
+				USE_ARMV8_CRC32C=1
+			else
+				# ARM CRC Extension, with runtime check?
+				if test x"$pgac_armv8_crc32c_intrinsics" = x"yes"; then
+					USE_ARMV8_CRC32C_WITH_RUNTIME_CHECK=1
+				else
+					# LoongArch CRCC instructions.
+					if test x"$pgac_loongarch_crc32c_intrinsics" = x"yes"; then
+						USE_LOONGARCH_CRC32C=1
+					else
+						# fall back to slicing-by-8 algorithm, which doesn't require any
+						# special CPU support.
+						USE_SLICING_BY_8_CRC32C=1
+					fi
+				fi
+			fi
+		fi
+	fi
 fi
 
 # Set PG_CRC32C_OBJS appropriately depending on the selected implementation.
 AC_MSG_CHECKING([which CRC-32C implementation to use])
 if test x"$USE_SSE42_CRC32C" = x"1"; then
-  AC_DEFINE(USE_SSE42_CRC32C, 1, [Define to 1 use Intel SSE 4.2 CRC instructions.])
-  PG_CRC32C_OBJS="pg_crc32c_sse42.o pg_crc32c_sse42_choose.o"
-  AC_MSG_RESULT(SSE 4.2)
+	AC_DEFINE(USE_SSE42_CRC32C, 1, [Define to 1 use Intel SSE 4.2 CRC instructions.])
+	PG_CRC32C_OBJS="pg_crc32c_sse42.o pg_crc32c_sse42_choose.o"
+	AC_MSG_RESULT(SSE 4.2)
 else
-  if test x"$USE_SSE42_CRC32C_WITH_RUNTIME_CHECK" = x"1"; then
-    AC_DEFINE(USE_SSE42_CRC32C_WITH_RUNTIME_CHECK, 1, [Define to 1 to use Intel SSE 4.2 CRC instructions with a runtime check.])
-    PG_CRC32C_OBJS="pg_crc32c_sse42.o pg_crc32c_sb8.o pg_crc32c_sse42_choose.o"
-    AC_MSG_RESULT(SSE 4.2 with runtime check)
-  else
-    if test x"$USE_ARMV8_CRC32C" = x"1"; then
-      AC_DEFINE(USE_ARMV8_CRC32C, 1, [Define to 1 to use ARMv8 CRC Extension.])
-      PG_CRC32C_OBJS="pg_crc32c_armv8.o"
-      AC_MSG_RESULT(ARMv8 CRC instructions)
-    else
-      if test x"$USE_ARMV8_CRC32C_WITH_RUNTIME_CHECK" = x"1"; then
-        AC_DEFINE(USE_ARMV8_CRC32C_WITH_RUNTIME_CHECK, 1, [Define to 1 to use ARMv8 CRC Extension with a runtime check.])
-        PG_CRC32C_OBJS="pg_crc32c_armv8.o pg_crc32c_sb8.o pg_crc32c_armv8_choose.o"
-        AC_MSG_RESULT(ARMv8 CRC instructions with runtime check)
-      else
-        if test x"$USE_LOONGARCH_CRC32C" = x"1"; then
-          AC_DEFINE(USE_LOONGARCH_CRC32C, 1, [Define to 1 to use LoongArch CRCC instructions.])
-          PG_CRC32C_OBJS="pg_crc32c_loongarch.o"
-          AC_MSG_RESULT(LoongArch CRCC instructions)
-        else
-          AC_DEFINE(USE_SLICING_BY_8_CRC32C, 1, [Define to 1 to use software CRC-32C implementation (slicing-by-8).])
-          PG_CRC32C_OBJS="pg_crc32c_sb8.o"
-          AC_MSG_RESULT(slicing-by-8)
-        fi
-      fi
-    fi
-  fi
+	if test x"$USE_SSE42_CRC32C_WITH_RUNTIME_CHECK" = x"1"; then
+		AC_DEFINE(USE_SSE42_CRC32C_WITH_RUNTIME_CHECK, 1, [Define to 1 to use Intel SSE 4.2 CRC instructions with a runtime check.])
+		PG_CRC32C_OBJS="pg_crc32c_sse42.o pg_crc32c_sb8.o pg_crc32c_sse42_choose.o"
+		AC_MSG_RESULT(SSE 4.2 with runtime check)
+	else
+		if test x"$USE_ARMV8_CRC32C" = x"1"; then
+			AC_DEFINE(USE_ARMV8_CRC32C, 1, [Define to 1 to use ARMv8 CRC Extension.])
+			PG_CRC32C_OBJS="pg_crc32c_armv8.o"
+			AC_MSG_RESULT(ARMv8 CRC instructions)
+		else
+			if test x"$USE_ARMV8_CRC32C_WITH_RUNTIME_CHECK" = x"1"; then
+				AC_DEFINE(USE_ARMV8_CRC32C_WITH_RUNTIME_CHECK, 1, [Define to 1 to use ARMv8 CRC Extension with a runtime check.])
+				PG_CRC32C_OBJS="pg_crc32c_armv8.o pg_crc32c_sb8.o pg_crc32c_armv8_choose.o"
+				AC_MSG_RESULT(ARMv8 CRC instructions with runtime check)
+			else
+				if test x"$USE_LOONGARCH_CRC32C" = x"1"; then
+					AC_DEFINE(USE_LOONGARCH_CRC32C, 1, [Define to 1 to use LoongArch CRCC instructions.])
+					PG_CRC32C_OBJS="pg_crc32c_loongarch.o"
+					AC_MSG_RESULT(LoongArch CRCC instructions)
+				else
+					AC_DEFINE(USE_SLICING_BY_8_CRC32C, 1, [Define to 1 to use software CRC-32C implementation (slicing-by-8).])
+					PG_CRC32C_OBJS="pg_crc32c_sb8.o"
+					AC_MSG_RESULT(slicing-by-8)
+				fi
+			fi
+		fi
+	fi
 fi
 AC_SUBST(PG_CRC32C_OBJS)
 
 # Check for carryless multiplication intrinsics to do vectorized CRC calculations.
 #
 if test x"$host_cpu" = x"x86_64"; then
-  PGAC_AVX512_PCLMUL_INTRINSICS()
+	PGAC_AVX512_PCLMUL_INTRINSICS()
 fi
 
 AC_MSG_CHECKING([for vectorized CRC-32C])
 if test x"$pgac_avx512_pclmul_intrinsics" = x"yes"; then
-  AC_DEFINE(USE_AVX512_CRC32C_WITH_RUNTIME_CHECK, 1, [Define to 1 to use AVX-512 CRC algorithms with a runtime check.])
-  AC_MSG_RESULT(AVX-512 with runtime check)
+	AC_DEFINE(USE_AVX512_CRC32C_WITH_RUNTIME_CHECK, 1, [Define to 1 to use AVX-512 CRC algorithms with a runtime check.])
+	AC_MSG_RESULT(AVX-512 with runtime check)
 else
-  AC_MSG_RESULT(none)
+	AC_MSG_RESULT(none)
 fi
 
 # Select semaphore implementation type.
 if test "$PORTNAME" != "win32"; then
-  if test x"$PREFERRED_SEMAPHORES" = x"NAMED_POSIX" ; then
-    # Need sem_open for this
-    AC_SEARCH_LIBS(sem_open, [rt pthread], [USE_NAMED_POSIX_SEMAPHORES=1])
-  fi
-  if test x"$PREFERRED_SEMAPHORES" = x"UNNAMED_POSIX" ; then
-    # Need sem_init for this
-    AC_SEARCH_LIBS(sem_init, [rt pthread], [USE_UNNAMED_POSIX_SEMAPHORES=1])
-  fi
-  AC_MSG_CHECKING([which semaphore API to use])
-  if test x"$USE_NAMED_POSIX_SEMAPHORES" = x"1" ; then
-    AC_DEFINE(USE_NAMED_POSIX_SEMAPHORES, 1, [Define to select named POSIX semaphores.])
-    SEMA_IMPLEMENTATION="src/backend/port/posix_sema.c"
-    sematype="named POSIX"
-  else
-    if test x"$USE_UNNAMED_POSIX_SEMAPHORES" = x"1" ; then
-      AC_DEFINE(USE_UNNAMED_POSIX_SEMAPHORES, 1, [Define to select unnamed POSIX semaphores.])
-      SEMA_IMPLEMENTATION="src/backend/port/posix_sema.c"
-      sematype="unnamed POSIX"
-    else
-      AC_DEFINE(USE_SYSV_SEMAPHORES, 1, [Define to select SysV-style semaphores.])
-      SEMA_IMPLEMENTATION="src/backend/port/sysv_sema.c"
-      sematype="System V"
-    fi
-  fi
-  AC_MSG_RESULT([$sematype])
+	if test x"$PREFERRED_SEMAPHORES" = x"NAMED_POSIX" ; then
+		# Need sem_open for this
+		AC_SEARCH_LIBS(sem_open, [rt pthread], [USE_NAMED_POSIX_SEMAPHORES=1])
+	fi
+	if test x"$PREFERRED_SEMAPHORES" = x"UNNAMED_POSIX" ; then
+		# Need sem_init for this
+		AC_SEARCH_LIBS(sem_init, [rt pthread], [USE_UNNAMED_POSIX_SEMAPHORES=1])
+	fi
+	AC_MSG_CHECKING([which semaphore API to use])
+	if test x"$USE_NAMED_POSIX_SEMAPHORES" = x"1" ; then
+		AC_DEFINE(USE_NAMED_POSIX_SEMAPHORES, 1, [Define to select named POSIX semaphores.])
+		SEMA_IMPLEMENTATION="src/backend/port/posix_sema.c"
+		sematype="named POSIX"
+	else
+		if test x"$USE_UNNAMED_POSIX_SEMAPHORES" = x"1" ; then
+			AC_DEFINE(USE_UNNAMED_POSIX_SEMAPHORES, 1, [Define to select unnamed POSIX semaphores.])
+			SEMA_IMPLEMENTATION="src/backend/port/posix_sema.c"
+			sematype="unnamed POSIX"
+		else
+			AC_DEFINE(USE_SYSV_SEMAPHORES, 1, [Define to select SysV-style semaphores.])
+			SEMA_IMPLEMENTATION="src/backend/port/sysv_sema.c"
+			sematype="System V"
+		fi
+	fi
+	AC_MSG_RESULT([$sematype])
 else
-  AC_DEFINE(USE_WIN32_SEMAPHORES, 1, [Define to select Win32-style semaphores.])
-  SEMA_IMPLEMENTATION="src/backend/port/win32_sema.c"
+	AC_DEFINE(USE_WIN32_SEMAPHORES, 1, [Define to select Win32-style semaphores.])
+	SEMA_IMPLEMENTATION="src/backend/port/win32_sema.c"
 fi
 
 
 # Select shared-memory implementation type.
 if test "$PORTNAME" != "win32"; then
-  AC_DEFINE(USE_SYSV_SHARED_MEMORY, 1, [Define to select SysV-style shared memory.])
-  SHMEM_IMPLEMENTATION="src/backend/port/sysv_shmem.c"
+	AC_DEFINE(USE_SYSV_SHARED_MEMORY, 1, [Define to select SysV-style shared memory.])
+	SHMEM_IMPLEMENTATION="src/backend/port/sysv_shmem.c"
 else
-  AC_DEFINE(USE_WIN32_SHARED_MEMORY, 1, [Define to select Win32-style shared memory.])
-  SHMEM_IMPLEMENTATION="src/backend/port/win32_shmem.c"
+	AC_DEFINE(USE_WIN32_SHARED_MEMORY, 1, [Define to select Win32-style shared memory.])
+	SHMEM_IMPLEMENTATION="src/backend/port/win32_shmem.c"
 fi
 
 # Select random number source. If a TLS library is used then it will be the
@@ -2298,84 +2307,84 @@ fi
 # will be used.
 AC_MSG_CHECKING([which random number source to use])
 if test x"$with_ssl" = x"openssl" ; then
-  AC_MSG_RESULT([OpenSSL])
+	AC_MSG_RESULT([OpenSSL])
 elif test x"$PORTNAME" = x"win32" ; then
-  AC_MSG_RESULT([Windows native])
+	AC_MSG_RESULT([Windows native])
 elif test x"$cross_compiling" = x"yes"; then
-  AC_MSG_RESULT([assuming /dev/urandom])
+	AC_MSG_RESULT([assuming /dev/urandom])
 else
-  AC_MSG_RESULT([/dev/urandom])
-  AC_CHECK_FILE([/dev/urandom], [], [])
+	AC_MSG_RESULT([/dev/urandom])
+	AC_CHECK_FILE([/dev/urandom], [], [])
 
-  if test x"$ac_cv_file__dev_urandom" = x"no" ; then
-    AC_MSG_ERROR([
+	if test x"$ac_cv_file__dev_urandom" = x"no" ; then
+		AC_MSG_ERROR([
 no source of strong random numbers was found
 PostgreSQL can use OpenSSL, native Windows API or /dev/urandom as a source of random numbers.])
-  fi
+	fi
 fi
 
 # If not set in template file, set bytes to use libc memset()
 if test x"$MEMSET_LOOP_LIMIT" = x"" ; then
-  MEMSET_LOOP_LIMIT=1024
+	MEMSET_LOOP_LIMIT=1024
 fi
 AC_DEFINE_UNQUOTED(MEMSET_LOOP_LIMIT, ${MEMSET_LOOP_LIMIT}, [Define bytes to use libc memset().])
 
 
 if test "$enable_nls" = yes ; then
-  PGAC_CHECK_GETTEXT
+	PGAC_CHECK_GETTEXT
 fi
 
 # Check for Tcl configuration script tclConfig.sh
 if test "$with_tcl" = yes; then
-    PGAC_PATH_TCLCONFIGSH([$with_tclconfig])
-    PGAC_EVAL_TCLCONFIGSH([$TCL_CONFIG_SH],
-                          [TCL_INCLUDE_SPEC,TCL_LIBS,TCL_LIB_SPEC,TCL_SHARED_BUILD])
-    if test "$TCL_SHARED_BUILD" != 1; then
-      AC_MSG_ERROR([cannot build PL/Tcl because Tcl is not a shared library
+		PGAC_PATH_TCLCONFIGSH([$with_tclconfig])
+		PGAC_EVAL_TCLCONFIGSH([$TCL_CONFIG_SH],
+													[TCL_INCLUDE_SPEC,TCL_LIBS,TCL_LIB_SPEC,TCL_SHARED_BUILD])
+		if test "$TCL_SHARED_BUILD" != 1; then
+			AC_MSG_ERROR([cannot build PL/Tcl because Tcl is not a shared library
 Use --without-tcl to disable building PL/Tcl.])
-    fi
-    # now that we have TCL_INCLUDE_SPEC, we can check for <tcl.h>
-    ac_save_CPPFLAGS=$CPPFLAGS
-    CPPFLAGS="$CPPFLAGS $TCL_INCLUDE_SPEC"
-    AC_CHECK_HEADER(tcl.h, [], [AC_MSG_ERROR([header file <tcl.h> is required for Tcl])])
-    CPPFLAGS=$ac_save_CPPFLAGS
+		fi
+		# now that we have TCL_INCLUDE_SPEC, we can check for <tcl.h>
+		ac_save_CPPFLAGS=$CPPFLAGS
+		CPPFLAGS="$CPPFLAGS $TCL_INCLUDE_SPEC"
+		AC_CHECK_HEADER(tcl.h, [], [AC_MSG_ERROR([header file <tcl.h> is required for Tcl])])
+		CPPFLAGS=$ac_save_CPPFLAGS
 fi
 
 # check for <perl.h>
 if test "$with_perl" = yes; then
-  ac_save_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="$CPPFLAGS $perl_includespec"
-  AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file <perl.h> is required for Perl])],
-                  [#include <EXTERN.h>])
-  # While we're at it, check that we can link to libperl.
-  # On most platforms, if perl.h is there then libperl.so will be too, but at
-  # this writing Debian packages them separately.  There is no known reason to
-  # waste cycles on separate probes for the Tcl or Python libraries, though.
-  # On some Red Hat platforms, the link attempt can fail if we don't use
-  # CFLAGS_SL while building the test program.
-  ac_save_CFLAGS=$CFLAGS
-  CFLAGS="$CFLAGS $CFLAGS_SL"
-  pgac_save_LIBS=$LIBS
-  LIBS="$perl_embed_ldflags"
-  AC_MSG_CHECKING([for libperl])
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([
+	ac_save_CPPFLAGS=$CPPFLAGS
+	CPPFLAGS="$CPPFLAGS $perl_includespec"
+	AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file <perl.h> is required for Perl])],
+									[#include <EXTERN.h>])
+	# While we're at it, check that we can link to libperl.
+	# On most platforms, if perl.h is there then libperl.so will be too, but at
+	# this writing Debian packages them separately.  There is no known reason to
+	# waste cycles on separate probes for the Tcl or Python libraries, though.
+	# On some Red Hat platforms, the link attempt can fail if we don't use
+	# CFLAGS_SL while building the test program.
+	ac_save_CFLAGS=$CFLAGS
+	CFLAGS="$CFLAGS $CFLAGS_SL"
+	pgac_save_LIBS=$LIBS
+	LIBS="$perl_embed_ldflags"
+	AC_MSG_CHECKING([for libperl])
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([
 #include <EXTERN.h>
 #include <perl.h>
 ],  [perl_alloc();])],
-    [AC_MSG_RESULT(yes)],
-    [AC_MSG_RESULT(no)
-     AC_MSG_ERROR([libperl library is required for Perl])])
-  LIBS=$pgac_save_LIBS
-  CFLAGS=$ac_save_CFLAGS
-  CPPFLAGS=$ac_save_CPPFLAGS
+		[AC_MSG_RESULT(yes)],
+		[AC_MSG_RESULT(no)
+		 AC_MSG_ERROR([libperl library is required for Perl])])
+	LIBS=$pgac_save_LIBS
+	CFLAGS=$ac_save_CFLAGS
+	CPPFLAGS=$ac_save_CPPFLAGS
 fi
 
 # check for <Python.h>
 if test "$with_python" = yes; then
-  ac_save_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="$CPPFLAGS $python_includespec"
-  AC_CHECK_HEADER(Python.h, [], [AC_MSG_ERROR([header file <Python.h> is required for Python])])
-  CPPFLAGS=$ac_save_CPPFLAGS
+	ac_save_CPPFLAGS=$CPPFLAGS
+	CPPFLAGS="$CPPFLAGS $python_includespec"
+	AC_CHECK_HEADER(Python.h, [], [AC_MSG_ERROR([header file <Python.h> is required for Python])])
+	CPPFLAGS=$ac_save_CPPFLAGS
 fi
 
 #
@@ -2390,26 +2399,26 @@ PGAC_PATH_PROGS(DBTOEPUB, dbtoepub)
 # Check for test tools
 #
 if test "$enable_tap_tests" = yes; then
-  # Make sure we know where prove is.
-  PGAC_PATH_PROGS(PROVE, prove)
-  if test -z "$PROVE"; then
-    AC_MSG_ERROR([prove not found])
-  fi
-  # Check for necessary Perl modules.  You might think we should use
-  # AX_PROG_PERL_MODULES here, but prove might be part of a different Perl
-  # installation than perl, eg on MSys, so we have to check using prove.
-  AC_MSG_CHECKING(for Perl modules required for TAP tests)
-  __CONFIG_HOST_OS__=$host_os; export __CONFIG_HOST_OS__
-  [modulestderr=`"$PROVE" "$srcdir/config/check_modules.pl" 2>&1 >/dev/null`]
-  if test $? -eq 0; then
-    # log the module version details, but don't show them interactively
-    echo "$modulestderr" >&AS_MESSAGE_LOG_FD
-    AC_MSG_RESULT(yes)
-  else
-    # on failure, though, show the results to the user
-    AC_MSG_RESULT([$modulestderr])
-    AC_MSG_ERROR([Additional Perl modules are required to run TAP tests])
-  fi
+	# Make sure we know where prove is.
+	PGAC_PATH_PROGS(PROVE, prove)
+	if test -z "$PROVE"; then
+		AC_MSG_ERROR([prove not found])
+	fi
+	# Check for necessary Perl modules.  You might think we should use
+	# AX_PROG_PERL_MODULES here, but prove might be part of a different Perl
+	# installation than perl, eg on MSys, so we have to check using prove.
+	AC_MSG_CHECKING(for Perl modules required for TAP tests)
+	__CONFIG_HOST_OS__=$host_os; export __CONFIG_HOST_OS__
+	[modulestderr=`"$PROVE" "$srcdir/config/check_modules.pl" 2>&1 >/dev/null`]
+	if test $? -eq 0; then
+		# log the module version details, but don't show them interactively
+		echo "$modulestderr" >&AS_MESSAGE_LOG_FD
+		AC_MSG_RESULT(yes)
+	else
+		# on failure, though, show the results to the user
+		AC_MSG_RESULT([$modulestderr])
+		AC_MSG_ERROR([Additional Perl modules are required to run TAP tests])
+	fi
 fi
 
 # If compiler will take -Wl,--as-needed (or various platform-specific
@@ -2419,17 +2428,17 @@ fi
 # libreadline; therefore we postpone testing it until we know what library
 # dependencies readline has.  The test code will try to link with $LIBS.
 if test "$with_readline" = yes; then
-  link_test_func=readline
+	link_test_func=readline
 else
-  link_test_func=exit
+	link_test_func=exit
 fi
 
 if test "$PORTNAME" = "darwin"; then
-  PGAC_PROG_CC_LDFLAGS_OPT([-Wl,-dead_strip_dylibs], $link_test_func)
+	PGAC_PROG_CC_LDFLAGS_OPT([-Wl,-dead_strip_dylibs], $link_test_func)
 elif test "$PORTNAME" = "openbsd"; then
-  PGAC_PROG_CC_LDFLAGS_OPT([-Wl,-Bdynamic], $link_test_func)
+	PGAC_PROG_CC_LDFLAGS_OPT([-Wl,-Bdynamic], $link_test_func)
 else
-  PGAC_PROG_CC_LDFLAGS_OPT([-Wl,--as-needed], $link_test_func)
+	PGAC_PROG_CC_LDFLAGS_OPT([-Wl,--as-needed], $link_test_func)
 fi
 
 # For linkers that understand --export-dynamic, add that to the LDFLAGS_EX_BE
@@ -2440,21 +2449,21 @@ fi
 # harmless.)
 PGAC_PROG_CC_LD_VARFLAGS_OPT(LDFLAGS_EX_BE, [-Wl,--export-dynamic], $link_test_func)
 if test x"$LDFLAGS_EX_BE" = x""; then
-  PGAC_PROG_CC_LD_VARFLAGS_OPT(LDFLAGS_EX_BE, [-Wl,-export_dynamic], $link_test_func)
+	PGAC_PROG_CC_LD_VARFLAGS_OPT(LDFLAGS_EX_BE, [-Wl,-export_dynamic], $link_test_func)
 fi
 AC_SUBST(LDFLAGS_EX_BE)
 
 # Create compiler version string
 if test x"$GCC" = x"yes" ; then
-  cc_string=`${CC} --version | sed q`
-  case $cc_string in [[A-Za-z]]*) ;; *) cc_string="GCC $cc_string";; esac
+	cc_string=`${CC} --version | sed q`
+	case $cc_string in [[A-Za-z]]*) ;; *) cc_string="GCC $cc_string";; esac
 else
-  cc_string=$CC
+	cc_string=$CC
 fi
 
 AC_DEFINE_UNQUOTED(PG_VERSION_STR,
-                   ["PostgreSQL $PG_VERSION on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"],
-                   [A string containing the version number, platform, and C compiler])
+									 ["PostgreSQL $PG_VERSION on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"],
+									 [A string containing the version number, platform, and C compiler])
 
 # 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
@@ -2469,8 +2478,8 @@ AC_SUBST(PG_VERSION_NUM)
 # we've finished all configure checks that depend on CPPFLAGS.
 # The same for LDFLAGS, too.
 if test x"$PG_SYSROOT" != x; then
-  CPPFLAGS=`echo "$CPPFLAGS" | sed -e "s| $PG_SYSROOT | \\\$(PG_SYSROOT) |"`
-  LDFLAGS=`echo "$LDFLAGS" | sed -e "s| $PG_SYSROOT | \\\$(PG_SYSROOT) |"`
+	CPPFLAGS=`echo "$CPPFLAGS" | sed -e "s| $PG_SYSROOT | \\\$(PG_SYSROOT) |"`
+	LDFLAGS=`echo "$LDFLAGS" | sed -e "s| $PG_SYSROOT | \\\$(PG_SYSROOT) |"`
 fi
 AC_SUBST(PG_SYSROOT)
 
@@ -2483,11 +2492,11 @@ AC_MSG_NOTICE([using CPPFLAGS=$CPPFLAGS])
 AC_MSG_NOTICE([using LDFLAGS=$LDFLAGS])
 # Currently only used when LLVM is used
 if test "$with_llvm" = yes ; then
-   AC_MSG_NOTICE([using CXX=$CXX])
-   AC_MSG_NOTICE([using CXXFLAGS=$CXXFLAGS])
-   AC_MSG_NOTICE([using CLANG=$CLANG])
-   AC_MSG_NOTICE([using BITCODE_CFLAGS=$BITCODE_CFLAGS])
-   AC_MSG_NOTICE([using BITCODE_CXXFLAGS=$BITCODE_CXXFLAGS])
+	 AC_MSG_NOTICE([using CXX=$CXX])
+	 AC_MSG_NOTICE([using CXXFLAGS=$CXXFLAGS])
+	 AC_MSG_NOTICE([using CLANG=$CLANG])
+	 AC_MSG_NOTICE([using BITCODE_CFLAGS=$BITCODE_CFLAGS])
+	 AC_MSG_NOTICE([using BITCODE_CXXFLAGS=$BITCODE_CXXFLAGS])
 fi
 
 # prepare build tree if outside source tree
@@ -2495,16 +2504,16 @@ fi
 # Note 2: /bin/pwd might be better than shell's built-in at getting
 #         a symlink-free name.
 if ( test "$srcdir" -ef . ) >/dev/null 2>&1 || test "`cd $srcdir && /bin/pwd`" = "`/bin/pwd`"; then
-  vpath_build=no
+	vpath_build=no
 else
-  vpath_build=yes
-  if test "$no_create" != yes; then
-    _AS_ECHO_N([preparing build tree... ])
-    pgac_abs_top_srcdir=`cd "$srcdir" && pwd`
-    $SHELL "$ac_aux_dir/prep_buildtree" "$pgac_abs_top_srcdir" "." \
-      || AC_MSG_ERROR(failed)
-    AC_MSG_RESULT(done)
-  fi
+	vpath_build=yes
+	if test "$no_create" != yes; then
+		_AS_ECHO_N([preparing build tree... ])
+		pgac_abs_top_srcdir=`cd "$srcdir" && pwd`
+		$SHELL "$ac_aux_dir/prep_buildtree" "$pgac_abs_top_srcdir" "." \
+			|| AC_MSG_ERROR(failed)
+		AC_MSG_RESULT(done)
+	fi
 fi
 AC_SUBST(vpath_build)
 
@@ -2512,10 +2521,10 @@ AC_SUBST(vpath_build)
 AC_CONFIG_FILES([GNUmakefile src/Makefile.global])
 
 AC_CONFIG_LINKS([
-  src/backend/port/pg_sema.c:${SEMA_IMPLEMENTATION}
-  src/backend/port/pg_shmem.c:${SHMEM_IMPLEMENTATION}
-  src/include/pg_config_os.h:src/include/port/${template}.h
-  src/Makefile.port:src/makefiles/Makefile.${template}
+	src/backend/port/pg_sema.c:${SEMA_IMPLEMENTATION}
+	src/backend/port/pg_shmem.c:${SHMEM_IMPLEMENTATION}
+	src/include/pg_config_os.h:src/include/port/${template}.h
+	src/Makefile.port:src/makefiles/Makefile.${template}
 ])
 
 if test "$PORTNAME" = "win32"; then
@@ -2537,12 +2546,12 @@ echo >src/include/stamp-h
 ])
 
 AC_CONFIG_HEADERS([src/interfaces/ecpg/include/ecpg_config.h],
-                  [echo >src/interfaces/ecpg/include/stamp-h])
+									[echo >src/interfaces/ecpg/include/stamp-h])
 
 AC_OUTPUT
 
 # Ensure that any meson build directories would reconfigure and see that
 # there's a conflicting in-tree build and can error out.
 if test "$vpath_build" = "no"; then
-  touch meson.build
+	touch meson.build
 fi
diff --git a/meson.build b/meson.build
index d7c5193d4ce..4972c7b26d4 100644
--- a/meson.build
+++ b/meson.build
@@ -7,24 +7,24 @@
 #  - https://mesonbuild.com/Reference-manual.html
 
 project('postgresql',
-  ['c'],
-  version: '19devel',
-  license: 'PostgreSQL',
-
-  # We want < 0.62 for python 3.6 compatibility on old platforms.
-  # RHEL 8 has 0.58.  < 0.57 would require various additional
-  # backward-compatibility conditionals.
-  # Meson 0.57.0 and 0.57.1 are buggy, therefore >=0.57.2.
-  meson_version: '>=0.57.2',
-  default_options: [
-    'warning_level=1', #-Wall equivalent
-    'b_pch=false',
-    'buildtype=debugoptimized', # -O2 + debug
-    # For compatibility with the autoconf build, set a default prefix. This
-    # works even on windows, where it's a drive-relative path (i.e. when on
-    # d:/somepath it'll install to d:/usr/local/pgsql)
-    'prefix=/usr/local/pgsql',
-  ]
+	['c'],
+	version: '19devel',
+	license: 'PostgreSQL',
+
+	# We want < 0.62 for python 3.6 compatibility on old platforms.
+	# RHEL 8 has 0.58.  < 0.57 would require various additional
+	# backward-compatibility conditionals.
+	# Meson 0.57.0 and 0.57.1 are buggy, therefore >=0.57.2.
+	meson_version: '>=0.57.2',
+	default_options: [
+		'warning_level=1', #-Wall equivalent
+		'b_pch=false',
+		'buildtype=debugoptimized', # -O2 + debug
+		# For compatibility with the autoconf build, set a default prefix. This
+		# works even on windows, where it's a drive-relative path (i.e. when on
+		# d:/somepath it'll install to d:/usr/local/pgsql)
+		'prefix=/usr/local/pgsql',
+	]
 )
 
 
@@ -73,8 +73,8 @@ configure. Alternatively use a separate check out for meson based builds.
 @0@
 ****'''
 if fs.exists(meson.current_source_dir() / 'src' / 'include' / 'pg_config.h')
-  errmsg_cleanup = 'To clean up, run make distclean in the source tree.'
-  error(errmsg_nonclean_base.format(errmsg_cleanup))
+	errmsg_cleanup = 'To clean up, run make distclean in the source tree.'
+	error(errmsg_nonclean_base.format(errmsg_cleanup))
 endif
 
 
@@ -124,13 +124,13 @@ cdata = configuration_data()
 pg_version = meson.project_version()
 
 if pg_version.endswith('devel')
-  pg_version_arr = [pg_version.split('devel')[0], '0']
+	pg_version_arr = [pg_version.split('devel')[0], '0']
 elif pg_version.contains('beta')
-  pg_version_arr = [pg_version.split('beta')[0], '0']
+	pg_version_arr = [pg_version.split('beta')[0], '0']
 elif pg_version.contains('rc')
-  pg_version_arr = [pg_version.split('rc')[0], '0']
+	pg_version_arr = [pg_version.split('rc')[0], '0']
 else
-  pg_version_arr = pg_version.split('.')
+	pg_version_arr = pg_version.split('.')
 endif
 
 pg_version_major = pg_version_arr[0].to_int()
@@ -184,12 +184,12 @@ sema_kind = 'sysv'
 # We implement support for some operating systems by pretending they're
 # another. Map here, before determining system properties below
 if host_system == 'dragonfly'
-  # apparently the most similar
-  host_system = 'netbsd'
+	# apparently the most similar
+	host_system = 'netbsd'
 elif host_system == 'android'
-  # while android isn't quite a normal linux, it seems close enough
-  # for our purposes so far
-  host_system = 'linux'
+	# while android isn't quite a normal linux, it seems close enough
+	# for our purposes so far
+	host_system = 'linux'
 endif
 
 # meson's system names don't quite map to our "traditional" names. In some
@@ -199,132 +199,132 @@ endif
 portname = host_system
 
 if host_system == 'cygwin'
-  sema_kind = 'unnamed_posix'
-  cppflags += '-D_GNU_SOURCE'
-  dlsuffix = '.dll'
-  mod_link_args_fmt = ['@0@']
-  mod_link_with_name = 'lib@0@.a'
-  mod_link_with_dir = 'libdir'
+	sema_kind = 'unnamed_posix'
+	cppflags += '-D_GNU_SOURCE'
+	dlsuffix = '.dll'
+	mod_link_args_fmt = ['@0@']
+	mod_link_with_name = 'lib@0@.a'
+	mod_link_with_dir = 'libdir'
 
 elif host_system == 'darwin'
-  dlsuffix = '.dylib'
-  library_path_var = 'DYLD_LIBRARY_PATH'
-
-  export_file_format = 'darwin'
-  export_fmt = '-Wl,-exported_symbols_list,@0@'
-
-  mod_link_args_fmt = ['-bundle_loader', '@0@']
-  mod_link_with_dir = 'bindir'
-  mod_link_with_name = '@0@'
-
-  sysroot_args = [files('src/tools/darwin_sysroot'), get_option('darwin_sysroot')]
-  pg_sysroot = run_command(sysroot_args, check:true).stdout().strip()
-  message('darwin sysroot: @0@'.format(pg_sysroot))
-  if pg_sysroot != ''
-    cflags += ['-isysroot', pg_sysroot]
-    ldflags += ['-isysroot', pg_sysroot]
-  endif
-
-  # meson defaults to -Wl,-undefined,dynamic_lookup for modules, which we
-  # don't want because a) it's different from what we do for autoconf, b) it
-  # causes warnings in macOS Ventura. But using -Wl,-undefined,error causes a
-  # warning starting in Sonoma. So only add -Wl,-undefined,error if it does
-  # not cause a warning.
-  if cc.has_multi_link_arguments('-Wl,-undefined,error', '-Werror')
-    ldflags_mod += '-Wl,-undefined,error'
-  endif
-
-  # Starting in Sonoma, the linker warns about the same library being
-  # linked twice.  Which can easily happen when multiple dependencies
-  # depend on the same library. Quiesce the ill considered warning.
-  ldflags += cc.get_supported_link_arguments('-Wl,-no_warn_duplicate_libraries')
+	dlsuffix = '.dylib'
+	library_path_var = 'DYLD_LIBRARY_PATH'
+
+	export_file_format = 'darwin'
+	export_fmt = '-Wl,-exported_symbols_list,@0@'
+
+	mod_link_args_fmt = ['-bundle_loader', '@0@']
+	mod_link_with_dir = 'bindir'
+	mod_link_with_name = '@0@'
+
+	sysroot_args = [files('src/tools/darwin_sysroot'), get_option('darwin_sysroot')]
+	pg_sysroot = run_command(sysroot_args, check:true).stdout().strip()
+	message('darwin sysroot: @0@'.format(pg_sysroot))
+	if pg_sysroot != ''
+		cflags += ['-isysroot', pg_sysroot]
+		ldflags += ['-isysroot', pg_sysroot]
+	endif
+
+	# meson defaults to -Wl,-undefined,dynamic_lookup for modules, which we
+	# don't want because a) it's different from what we do for autoconf, b) it
+	# causes warnings in macOS Ventura. But using -Wl,-undefined,error causes a
+	# warning starting in Sonoma. So only add -Wl,-undefined,error if it does
+	# not cause a warning.
+	if cc.has_multi_link_arguments('-Wl,-undefined,error', '-Werror')
+		ldflags_mod += '-Wl,-undefined,error'
+	endif
+
+	# Starting in Sonoma, the linker warns about the same library being
+	# linked twice.  Which can easily happen when multiple dependencies
+	# depend on the same library. Quiesce the ill considered warning.
+	ldflags += cc.get_supported_link_arguments('-Wl,-no_warn_duplicate_libraries')
 
 elif host_system == 'freebsd'
-  sema_kind = 'unnamed_posix'
+	sema_kind = 'unnamed_posix'
 
 elif host_system == 'linux'
-  sema_kind = 'unnamed_posix'
-  cppflags += '-D_GNU_SOURCE'
+	sema_kind = 'unnamed_posix'
+	cppflags += '-D_GNU_SOURCE'
 
 elif host_system == 'netbsd'
-  # We must resolve all dynamic linking in the core server at program start.
-  # Otherwise the postmaster can self-deadlock due to signals interrupting
-  # resolution of calls, since NetBSD's linker takes a lock while doing that
-  # and some postmaster signal handlers do things that will also acquire that
-  # lock.  As long as we need "-z now", might as well specify "-z relro" too.
-  # While there's not a hard reason to adopt these settings for our other
-  # executables, there's also little reason not to, so just add them to
-  # LDFLAGS.
-  ldflags += ['-Wl,-z,now', '-Wl,-z,relro']
+	# We must resolve all dynamic linking in the core server at program start.
+	# Otherwise the postmaster can self-deadlock due to signals interrupting
+	# resolution of calls, since NetBSD's linker takes a lock while doing that
+	# and some postmaster signal handlers do things that will also acquire that
+	# lock.  As long as we need "-z now", might as well specify "-z relro" too.
+	# While there's not a hard reason to adopt these settings for our other
+	# executables, there's also little reason not to, so just add them to
+	# LDFLAGS.
+	ldflags += ['-Wl,-z,now', '-Wl,-z,relro']
 
 elif host_system == 'openbsd'
-  # you're ok
+	# you're ok
 
 elif host_system == 'sunos'
-  portname = 'solaris'
-  export_fmt = '-Wl,-M@0@'
-  # We need these #defines to get POSIX-conforming versions
-  # of many interfaces (sigwait, getpwuid_r, shmdt, ...).
-  cppflags += [
-    '-D_POSIX_C_SOURCE=200112L',
-    '-D__EXTENSIONS__',
-    '-D_POSIX_PTHREAD_SEMANTICS',
-  ]
+	portname = 'solaris'
+	export_fmt = '-Wl,-M@0@'
+	# We need these #defines to get POSIX-conforming versions
+	# of many interfaces (sigwait, getpwuid_r, shmdt, ...).
+	cppflags += [
+		'-D_POSIX_C_SOURCE=200112L',
+		'-D__EXTENSIONS__',
+		'-D_POSIX_PTHREAD_SEMANTICS',
+	]
 
 elif host_system == 'windows'
-  portname = 'win32'
-  exesuffix = '.exe'
-  dlsuffix = '.dll'
-  library_path_var = ''
-  if cc.get_id() != 'msvc'
-    # define before including <time.h> for getting localtime_r() etc. on MinGW
-    cppflags += '-D_POSIX_C_SOURCE'
-  endif
-
-  export_file_format = 'win'
-  export_file_suffix = 'def'
-  if cc.get_id() == 'msvc'
-    export_fmt = '/DEF:@0@'
-    mod_link_with_name = '@0@.lib'
-  else
-    export_fmt = '@0@'
-    mod_link_with_name = 'lib@0@.a'
-  endif
-  mod_link_args_fmt = ['@0@']
-  mod_link_with_dir = 'libdir'
-
-  shmem_kind = 'win32'
-  sema_kind = 'win32'
-
-  cdata.set('WIN32_STACK_RLIMIT', 4194304)
-  if cc.get_id() == 'msvc'
-    ldflags += '/INCREMENTAL:NO'
-    ldflags += '/STACK:@0@'.format(cdata.get('WIN32_STACK_RLIMIT'))
-    # ldflags += '/nxcompat' # generated by msbuild, should have it for ninja?
-  else
-    ldflags += '-Wl,--stack,@0@'.format(cdata.get('WIN32_STACK_RLIMIT'))
-    # Need to allow multiple definitions, we e.g. want to override getopt.
-    ldflags += '-Wl,--allow-multiple-definition'
-    # Ensure we get MSVC-like linking behavior.
-    ldflags += '-Wl,--disable-auto-import'
-  endif
-
-  os_deps += cc.find_library('ws2_32', required: true)
-  secur32_dep = cc.find_library('secur32', required: true)
-  backend_deps += secur32_dep
-  libpq_deps += secur32_dep
-
-  postgres_inc_d += 'src/include/port/win32'
-  if cc.get_id() == 'msvc'
-    postgres_inc_d += 'src/include/port/win32_msvc'
-  endif
-
-  windows = import('windows')
+	portname = 'win32'
+	exesuffix = '.exe'
+	dlsuffix = '.dll'
+	library_path_var = ''
+	if cc.get_id() != 'msvc'
+		# define before including <time.h> for getting localtime_r() etc. on MinGW
+		cppflags += '-D_POSIX_C_SOURCE'
+	endif
+
+	export_file_format = 'win'
+	export_file_suffix = 'def'
+	if cc.get_id() == 'msvc'
+		export_fmt = '/DEF:@0@'
+		mod_link_with_name = '@0@.lib'
+	else
+		export_fmt = '@0@'
+		mod_link_with_name = 'lib@0@.a'
+	endif
+	mod_link_args_fmt = ['@0@']
+	mod_link_with_dir = 'libdir'
+
+	shmem_kind = 'win32'
+	sema_kind = 'win32'
+
+	cdata.set('WIN32_STACK_RLIMIT', 4194304)
+	if cc.get_id() == 'msvc'
+		ldflags += '/INCREMENTAL:NO'
+		ldflags += '/STACK:@0@'.format(cdata.get('WIN32_STACK_RLIMIT'))
+		# ldflags += '/nxcompat' # generated by msbuild, should have it for ninja?
+	else
+		ldflags += '-Wl,--stack,@0@'.format(cdata.get('WIN32_STACK_RLIMIT'))
+		# Need to allow multiple definitions, we e.g. want to override getopt.
+		ldflags += '-Wl,--allow-multiple-definition'
+		# Ensure we get MSVC-like linking behavior.
+		ldflags += '-Wl,--disable-auto-import'
+	endif
+
+	os_deps += cc.find_library('ws2_32', required: true)
+	secur32_dep = cc.find_library('secur32', required: true)
+	backend_deps += secur32_dep
+	libpq_deps += secur32_dep
+
+	postgres_inc_d += 'src/include/port/win32'
+	if cc.get_id() == 'msvc'
+		postgres_inc_d += 'src/include/port/win32_msvc'
+	endif
+
+	windows = import('windows')
 
 else
-  # XXX: Should we add an option to override the host_system as an escape
-  # hatch?
-  error('unknown host system: @0@'.format(host_system))
+	# XXX: Should we add an option to override the host_system as an escape
+	# hatch?
+	error('unknown host system: @0@'.format(host_system))
 endif
 
 
@@ -354,32 +354,32 @@ nm = find_program('nm', required: false, native: true)
 
 bison_flags = []
 if bison.found()
-  bison_version_c = run_command(bison, '--version', check: true)
-  # bison version string helpfully is something like
-  # >>bison (GNU bison) 3.8.1<<
-  bison_version = bison_version_c.stdout().split(' ')[3].split('\n')[0]
-  if bison_version.version_compare('>=3.0')
-    bison_flags += ['-Wno-deprecated']
-  endif
+	bison_version_c = run_command(bison, '--version', check: true)
+	# bison version string helpfully is something like
+	# >>bison (GNU bison) 3.8.1<<
+	bison_version = bison_version_c.stdout().split(' ')[3].split('\n')[0]
+	if bison_version.version_compare('>=3.0')
+		bison_flags += ['-Wno-deprecated']
+	endif
 endif
 bison_cmd = [bison, bison_flags, '-o', '@OUTPUT0@', '-d', '@INPUT@']
 bison_kw = {
-  'output': ['@BASENAME@.c', '@BASENAME@.h'],
-  'command': bison_cmd,
+	'output': ['@BASENAME@.c', '@BASENAME@.h'],
+	'command': bison_cmd,
 }
 
 flex_flags = []
 if flex.found()
-  flex_version_c = run_command(flex, '--version', check: true)
-  flex_version = flex_version_c.stdout().split(' ')[1].split('\n')[0]
+	flex_version_c = run_command(flex, '--version', check: true)
+	flex_version = flex_version_c.stdout().split(' ')[1].split('\n')[0]
 endif
 flex_wrapper = files('src/tools/pgflex')
 flex_cmd = [python, flex_wrapper,
-  '--builddir', '@BUILD_ROOT@',
-  '--srcdir', '@SOURCE_ROOT@',
-  '--privatedir', '@PRIVATE_DIR@',
-  '--flex', flex, '--perl', perl,
-  '-i', '@INPUT@', '-o', '@OUTPUT0@',
+	'--builddir', '@BUILD_ROOT@',
+	'--srcdir', '@SOURCE_ROOT@',
+	'--privatedir', '@PRIVATE_DIR@',
+	'--flex', flex, '--perl', perl,
+	'-i', '@INPUT@', '-o', '@OUTPUT0@',
 ]
 
 wget = find_program('wget', required: false, native: true)
@@ -398,17 +398,17 @@ install_files = files('src/tools/install_files')
 meson_binpath_r = run_command(python, 'src/tools/find_meson', check: true)
 
 if meson_binpath_r.stdout() == ''
-  error('huh, could not run find_meson.\nerrcode: @0@\nstdout: @1@\nstderr: @2@'.format(
-    meson_binpath_r.returncode(),
-    meson_binpath_r.stdout(),
-    meson_binpath_r.stderr()))
+	error('huh, could not run find_meson.\nerrcode: @0@\nstdout: @1@\nstderr: @2@'.format(
+		meson_binpath_r.returncode(),
+		meson_binpath_r.stdout(),
+		meson_binpath_r.stderr()))
 endif
 
 meson_binpath_s = meson_binpath_r.stdout().split('\n')
 meson_binpath_len = meson_binpath_s.length()
 
 if meson_binpath_len < 1
-  error('unexpected introspect line @0@'.format(meson_binpath_r.stdout()))
+	error('unexpected introspect line @0@'.format(meson_binpath_r.stdout()))
 endif
 
 i = 0
@@ -416,18 +416,18 @@ meson_impl = ''
 meson_binpath = ''
 meson_args = []
 foreach e : meson_binpath_s
-  if i == 0
-    meson_impl = e
-  elif i == 1
-    meson_binpath = e
-  else
-    meson_args += e
-  endif
-  i += 1
+	if i == 0
+		meson_impl = e
+	elif i == 1
+		meson_binpath = e
+	else
+		meson_args += e
+	endif
+	i += 1
 endforeach
 
 if meson_impl not in ['muon', 'meson']
-  error('unknown meson implementation "@0@"'.format(meson_impl))
+	error('unknown meson implementation "@0@"'.format(meson_impl))
 endif
 
 meson_bin = find_program(meson_binpath, native: true)
@@ -444,31 +444,31 @@ cdata.set('USE_INJECTION_POINTS', get_option('injection_points') ? 1 : false)
 blocksize = get_option('blocksize').to_int() * 1024
 
 if get_option('segsize_blocks') != 0
-  if get_option('segsize') != 1
-    warning('both segsize and segsize_blocks specified, segsize_blocks wins')
-  endif
+	if get_option('segsize') != 1
+		warning('both segsize and segsize_blocks specified, segsize_blocks wins')
+	endif
 
-  segsize = get_option('segsize_blocks')
+	segsize = get_option('segsize_blocks')
 else
-  segsize = (get_option('segsize') * 1024 * 1024 * 1024) / blocksize
+	segsize = (get_option('segsize') * 1024 * 1024 * 1024) / blocksize
 endif
 
 # If we don't have largefile support, can't handle segment size >= 2GB.
 if cc.sizeof('off_t', args: test_c_args) < 8
-  segsize_bytes = segsize * blocksize
-  if segsize_bytes >= (2 * 1024 * 1024 * 1024)
-    error('Large file support is not enabled. Segment size cannot be larger than 1GB.')
-  endif
+	segsize_bytes = segsize * blocksize
+	if segsize_bytes >= (2 * 1024 * 1024 * 1024)
+		error('Large file support is not enabled. Segment size cannot be larger than 1GB.')
+	endif
 endif
 
 cdata.set('BLCKSZ', blocksize, description:
 '''Size of a disk block --- this also limits the size of a tuple. You can set
-   it bigger if you need bigger tuples (although TOAST should reduce the need
-   to have large tuples, since fields can be spread across multiple tuples).
-   BLCKSZ must be a power of 2. The maximum possible value of BLCKSZ is
-   currently 2^15 (32768). This is determined by the 15-bit widths of the
-   lp_off and lp_len fields in ItemIdData (see include/storage/itemid.h).
-   Changing BLCKSZ requires an initdb.''')
+	 it bigger if you need bigger tuples (although TOAST should reduce the need
+	 to have large tuples, since fields can be spread across multiple tuples).
+	 BLCKSZ must be a power of 2. The maximum possible value of BLCKSZ is
+	 currently 2^15 (32768). This is determined by the 15-bit widths of the
+	 lp_off and lp_len fields in ItemIdData (see include/storage/itemid.h).
+	 Changing BLCKSZ requires an initdb.''')
 
 cdata.set('XLOG_BLCKSZ', get_option('wal_blocksize').to_int() * 1024)
 cdata.set('RELSEG_SIZE', segsize)
@@ -476,7 +476,7 @@ cdata.set('DEF_PGPORT', get_option('pgport'))
 cdata.set_quoted('DEF_PGPORT_STR', get_option('pgport').to_string())
 cdata.set_quoted('PG_KRB_SRVNAM', get_option('krb_srvnam'))
 if get_option('system_tzdata') != ''
-  cdata.set_quoted('SYSTEMTZDIR', get_option('system_tzdata'))
+	cdata.set_quoted('SYSTEMTZDIR', get_option('system_tzdata'))
 endif
 
 
@@ -499,19 +499,19 @@ dir_bin = get_option('bindir')
 
 dir_data = get_option('datadir')
 if not (dir_prefix_contains_pg or dir_data.contains('pgsql') or dir_data.contains('postgres'))
-  dir_data = dir_data / pkg
+	dir_data = dir_data / pkg
 endif
 
 dir_sysconf = get_option('sysconfdir')
 if not (dir_prefix_contains_pg or dir_sysconf.contains('pgsql') or dir_sysconf.contains('postgres'))
-  dir_sysconf = dir_sysconf / pkg
+	dir_sysconf = dir_sysconf / pkg
 endif
 
 dir_lib = get_option('libdir')
 
 dir_lib_pkg = dir_lib
 if not (dir_prefix_contains_pg or dir_lib_pkg.contains('pgsql') or dir_lib_pkg.contains('postgres'))
-  dir_lib_pkg = dir_lib_pkg / pkg
+	dir_lib_pkg = dir_lib_pkg / pkg
 endif
 
 dir_pgxs = dir_lib_pkg / 'pgxs'
@@ -521,8 +521,8 @@ dir_include = get_option('includedir')
 dir_include_pkg = dir_include
 dir_include_pkg_rel = ''
 if not (dir_prefix_contains_pg or dir_include_pkg.contains('pgsql') or dir_include_pkg.contains('postgres'))
-  dir_include_pkg = dir_include_pkg / pkg
-  dir_include_pkg_rel = pkg
+	dir_include_pkg = dir_include_pkg / pkg
+	dir_include_pkg_rel = pkg
 endif
 
 dir_man = get_option('mandir')
@@ -530,7 +530,7 @@ dir_man = get_option('mandir')
 # FIXME: These used to be separately configurable - worth adding?
 dir_doc = get_option('datadir') / 'doc'
 if not (dir_prefix_contains_pg or dir_doc.contains('pgsql') or dir_doc.contains('postgres'))
-  dir_doc = dir_doc / pkg
+	dir_doc = dir_doc / pkg
 endif
 dir_doc_html = dir_doc / 'html'
 
@@ -563,22 +563,22 @@ c11_test = '''
 '''
 
 if not cc.compiles(c11_test, name: 'C11')
-  c11_ok = false
-  if cc.get_id() == 'msvc'
-    c11_test_args = ['/std:c11']
-  else
-    c11_test_args = ['-std=gnu11', '-std=c11']
-  endif
-  foreach arg : c11_test_args
-    if cc.compiles(c11_test, name: 'C11 with @0@'.format(arg), args: [arg])
-      c11_ok = true
-      cflags += arg
-      break
-    endif
-  endforeach
-  if not c11_ok
-    error('C compiler does not support C11')
-  endif
+	c11_ok = false
+	if cc.get_id() == 'msvc'
+		c11_test_args = ['/std:c11']
+	else
+		c11_test_args = ['-std=gnu11', '-std=c11']
+	endif
+	foreach arg : c11_test_args
+		if cc.compiles(c11_test, name: 'C11 with @0@'.format(arg), args: [arg])
+			c11_ok = true
+			cflags += arg
+			break
+		endif
+	endforeach
+	if not c11_ok
+		error('C compiler does not support C11')
+	endif
 endif
 
 
@@ -595,10 +595,10 @@ test_c_args = cppflags + cflags
 bsd_authopt = get_option('bsd_auth')
 bsd_auth = not_found_dep
 if cc.check_header('bsd_auth.h', required: bsd_authopt,
-    args: test_c_args, prefix: '#include <sys/types.h>',
-    include_directories: postgres_inc)
-  cdata.set('USE_BSD_AUTH', 1)
-  bsd_auth = declare_dependency()
+		args: test_c_args, prefix: '#include <sys/types.h>',
+		include_directories: postgres_inc)
+	cdata.set('USE_BSD_AUTH', 1)
+	bsd_auth = declare_dependency()
 endif
 
 
@@ -613,11 +613,11 @@ endif
 bonjouropt = get_option('bonjour')
 bonjour = not_found_dep
 if cc.check_header('dns_sd.h', required: bonjouropt,
-    args: test_c_args, include_directories: postgres_inc) and \
-   cc.has_function('DNSServiceRegister',
-    args: test_c_args, include_directories: postgres_inc)
-  cdata.set('USE_BONJOUR', 1)
-  bonjour = declare_dependency()
+		args: test_c_args, include_directories: postgres_inc) and \
+	 cc.has_function('DNSServiceRegister',
+		args: test_c_args, include_directories: postgres_inc)
+	cdata.set('USE_BONJOUR', 1)
+	bonjour = declare_dependency()
 endif
 
 
@@ -629,11 +629,11 @@ endif
 docs_opt = get_option('docs')
 docs_dep = not_found_dep
 if not docs_opt.disabled()
-  if xmllint_bin.found() and xsltproc_bin.found()
-    docs_dep = declare_dependency()
-  elif docs_opt.enabled()
-    error('missing required tools (xmllint and xsltproc needed) for docs in HTML / man page format')
-  endif
+	if xmllint_bin.found() and xsltproc_bin.found()
+		docs_dep = declare_dependency()
+	elif docs_opt.enabled()
+		error('missing required tools (xmllint and xsltproc needed) for docs in HTML / man page format')
+	endif
 endif
 
 
@@ -645,12 +645,12 @@ endif
 docs_pdf_opt = get_option('docs_pdf')
 docs_pdf_dep = not_found_dep
 if not docs_pdf_opt.disabled()
-  fop = find_program(get_option('FOP'), native: true, required: docs_pdf_opt)
-  if xmllint_bin.found() and xsltproc_bin.found() and fop.found()
-    docs_pdf_dep = declare_dependency()
-  elif docs_pdf_opt.enabled()
-    error('missing required tools for docs in PDF format')
-  endif
+	fop = find_program(get_option('FOP'), native: true, required: docs_pdf_opt)
+	if xmllint_bin.found() and xsltproc_bin.found() and fop.found()
+		docs_pdf_dep = declare_dependency()
+	elif docs_pdf_opt.enabled()
+		error('missing required tools for docs in PDF format')
+	endif
 endif
 
 
@@ -663,84 +663,84 @@ gssapiopt = get_option('gssapi')
 krb_srvtab = ''
 have_gssapi = false
 if not gssapiopt.disabled()
-  gssapi = dependency('krb5-gssapi', required: false)
-  have_gssapi = gssapi.found()
-
-  if have_gssapi
-      gssapi_deps = [gssapi]
-  elif not have_gssapi
-    # Hardcoded lookup for gssapi. This is necessary as gssapi on windows does
-    # not install neither pkg-config nor cmake dependency information.
-    if host_system == 'windows'
-      is_64  = cc.sizeof('void *', args: test_c_args) == 8
-      if is_64
-        gssapi_search_libs = ['gssapi64', 'krb5_64', 'comerr64']
-      else
-        gssapi_search_libs = ['gssapi32', 'krb5_32', 'comerr32']
-      endif
-    else
-      gssapi_search_libs = ['gssapi_krb5']
-    endif
-
-    gssapi_deps = []
-    foreach libname : gssapi_search_libs
-      lib = cc.find_library(libname, dirs: test_lib_d, required: false)
-      if lib.found()
-        have_gssapi = true
-        gssapi_deps += lib
-      endif
-    endforeach
-
-    if have_gssapi
-      # Meson before 0.57.0 did not support using check_header() etc with
-      # declare_dependency(). Thus the tests below use the library looked up
-      # above.  Once we require a newer meson version, we can simplify.
-      gssapi = declare_dependency(dependencies: gssapi_deps)
-    endif
-  endif
-
-  if not have_gssapi
-  elif cc.check_header('gssapi/gssapi.h', dependencies: gssapi_deps, required: false,
-      args: test_c_args, include_directories: postgres_inc)
-    cdata.set('HAVE_GSSAPI_GSSAPI_H', 1)
-  elif cc.check_header('gssapi.h', dependencies: gssapi_deps, required: gssapiopt,
-      args: test_c_args, include_directories: postgres_inc)
-    cdata.set('HAVE_GSSAPI_H', 1)
-  else
-    have_gssapi = false
-  endif
-
-  if not have_gssapi
-  elif cc.check_header('gssapi/gssapi_ext.h', dependencies: gssapi_deps, required: false,
-      args: test_c_args, include_directories: postgres_inc)
-    cdata.set('HAVE_GSSAPI_GSSAPI_EXT_H', 1)
-  elif cc.check_header('gssapi_ext.h', dependencies: gssapi_deps, required: gssapiopt,
-      args: test_c_args, include_directories: postgres_inc)
-    cdata.set('HAVE_GSSAPI_EXT_H', 1)
-  else
-    have_gssapi = false
-  endif
-
-  if not have_gssapi
-  elif cc.has_function('gss_store_cred_into', dependencies: gssapi_deps,
-      args: test_c_args, include_directories: postgres_inc)
-    cdata.set('ENABLE_GSS', 1)
-
-    krb_srvtab = 'FILE:/@0@/krb5.keytab)'.format(get_option('sysconfdir'))
-    cdata.set_quoted('PG_KRB_SRVTAB', krb_srvtab)
-  elif gssapiopt.enabled()
-    error('''could not find function 'gss_store_cred_into' required for GSSAPI''')
-  else
-    have_gssapi = false
-  endif
-
-  if not have_gssapi and gssapiopt.enabled()
-    error('dependency lookup for gssapi failed')
-  endif
+	gssapi = dependency('krb5-gssapi', required: false)
+	have_gssapi = gssapi.found()
+
+	if have_gssapi
+			gssapi_deps = [gssapi]
+	elif not have_gssapi
+		# Hardcoded lookup for gssapi. This is necessary as gssapi on windows does
+		# not install neither pkg-config nor cmake dependency information.
+		if host_system == 'windows'
+			is_64  = cc.sizeof('void *', args: test_c_args) == 8
+			if is_64
+				gssapi_search_libs = ['gssapi64', 'krb5_64', 'comerr64']
+			else
+				gssapi_search_libs = ['gssapi32', 'krb5_32', 'comerr32']
+			endif
+		else
+			gssapi_search_libs = ['gssapi_krb5']
+		endif
+
+		gssapi_deps = []
+		foreach libname : gssapi_search_libs
+			lib = cc.find_library(libname, dirs: test_lib_d, required: false)
+			if lib.found()
+				have_gssapi = true
+				gssapi_deps += lib
+			endif
+		endforeach
+
+		if have_gssapi
+			# Meson before 0.57.0 did not support using check_header() etc with
+			# declare_dependency(). Thus the tests below use the library looked up
+			# above.  Once we require a newer meson version, we can simplify.
+			gssapi = declare_dependency(dependencies: gssapi_deps)
+		endif
+	endif
+
+	if not have_gssapi
+	elif cc.check_header('gssapi/gssapi.h', dependencies: gssapi_deps, required: false,
+			args: test_c_args, include_directories: postgres_inc)
+		cdata.set('HAVE_GSSAPI_GSSAPI_H', 1)
+	elif cc.check_header('gssapi.h', dependencies: gssapi_deps, required: gssapiopt,
+			args: test_c_args, include_directories: postgres_inc)
+		cdata.set('HAVE_GSSAPI_H', 1)
+	else
+		have_gssapi = false
+	endif
+
+	if not have_gssapi
+	elif cc.check_header('gssapi/gssapi_ext.h', dependencies: gssapi_deps, required: false,
+			args: test_c_args, include_directories: postgres_inc)
+		cdata.set('HAVE_GSSAPI_GSSAPI_EXT_H', 1)
+	elif cc.check_header('gssapi_ext.h', dependencies: gssapi_deps, required: gssapiopt,
+			args: test_c_args, include_directories: postgres_inc)
+		cdata.set('HAVE_GSSAPI_EXT_H', 1)
+	else
+		have_gssapi = false
+	endif
+
+	if not have_gssapi
+	elif cc.has_function('gss_store_cred_into', dependencies: gssapi_deps,
+			args: test_c_args, include_directories: postgres_inc)
+		cdata.set('ENABLE_GSS', 1)
+
+		krb_srvtab = 'FILE:/@0@/krb5.keytab)'.format(get_option('sysconfdir'))
+		cdata.set_quoted('PG_KRB_SRVTAB', krb_srvtab)
+	elif gssapiopt.enabled()
+		error('''could not find function 'gss_store_cred_into' required for GSSAPI''')
+	else
+		have_gssapi = false
+	endif
+
+	if not have_gssapi and gssapiopt.enabled()
+		error('dependency lookup for gssapi failed')
+	endif
 
 endif
 if not have_gssapi
-  gssapi = not_found_dep
+	gssapi = not_found_dep
 endif
 
 
@@ -751,81 +751,81 @@ endif
 
 ldapopt = get_option('ldap')
 if ldapopt.disabled()
-  ldap = not_found_dep
-  ldap_r = not_found_dep
+	ldap = not_found_dep
+	ldap_r = not_found_dep
 elif host_system == 'windows'
-  ldap = cc.find_library('wldap32', required: ldapopt)
-  ldap_r = ldap
+	ldap = cc.find_library('wldap32', required: ldapopt)
+	ldap_r = ldap
 else
-  # macos framework dependency is buggy for ldap (one can argue whether it's
-  # Apple's or meson's fault), leading to an endless recursion with ldap.h
-  # including itself. See https://github.com/mesonbuild/meson/issues/10002
-  # Luckily we only need pkg-config support, so the workaround isn't
-  # complicated.
-  ldap = dependency('ldap', method: 'pkg-config', required: false)
-  ldap_r = ldap
-
-  # Before 2.5 openldap didn't have a pkg-config file, and it might not be
-  # installed
-  if not ldap.found()
-    ldap = cc.find_library('ldap', required: ldapopt, dirs: test_lib_d,
-      has_headers: 'ldap.h', header_include_directories: postgres_inc)
-
-    # The separate ldap_r library only exists in OpenLDAP < 2.5, and if we
-    # have 2.5 or later, we shouldn't even probe for ldap_r (we might find a
-    # library from a separate OpenLDAP installation).  The most reliable
-    # way to check that is to check for a function introduced in 2.5.
-    if not ldap.found()
-      # don't have ldap, we shouldn't check for ldap_r
-    elif cc.has_function('ldap_verify_credentials',
-        dependencies: ldap, args: test_c_args)
-      ldap_r = ldap # ldap >= 2.5, no need for ldap_r
-    else
-
-      # Use ldap_r for FE if available, else assume ldap is thread-safe.
-      ldap_r = cc.find_library('ldap_r', required: false, dirs: test_lib_d,
-        has_headers: 'ldap.h', header_include_directories: postgres_inc)
-      if not ldap_r.found()
-        ldap_r = ldap
-      else
-        # On some platforms ldap_r fails to link without PTHREAD_LIBS.
-        ldap_r = declare_dependency(dependencies: [ldap_r, thread_dep])
-      endif
-
-      # PostgreSQL sometimes loads libldap_r and plain libldap into the same
-      # process.  Check for OpenLDAP versions known not to tolerate doing so;
-      # assume non-OpenLDAP implementations are safe.  The dblink test suite
-      # exercises the hazardous interaction directly.
-      compat_test_code = '''
+	# macos framework dependency is buggy for ldap (one can argue whether it's
+	# Apple's or meson's fault), leading to an endless recursion with ldap.h
+	# including itself. See https://github.com/mesonbuild/meson/issues/10002
+	# Luckily we only need pkg-config support, so the workaround isn't
+	# complicated.
+	ldap = dependency('ldap', method: 'pkg-config', required: false)
+	ldap_r = ldap
+
+	# Before 2.5 openldap didn't have a pkg-config file, and it might not be
+	# installed
+	if not ldap.found()
+		ldap = cc.find_library('ldap', required: ldapopt, dirs: test_lib_d,
+			has_headers: 'ldap.h', header_include_directories: postgres_inc)
+
+		# The separate ldap_r library only exists in OpenLDAP < 2.5, and if we
+		# have 2.5 or later, we shouldn't even probe for ldap_r (we might find a
+		# library from a separate OpenLDAP installation).  The most reliable
+		# way to check that is to check for a function introduced in 2.5.
+		if not ldap.found()
+			# don't have ldap, we shouldn't check for ldap_r
+		elif cc.has_function('ldap_verify_credentials',
+				dependencies: ldap, args: test_c_args)
+			ldap_r = ldap # ldap >= 2.5, no need for ldap_r
+		else
+
+			# Use ldap_r for FE if available, else assume ldap is thread-safe.
+			ldap_r = cc.find_library('ldap_r', required: false, dirs: test_lib_d,
+				has_headers: 'ldap.h', header_include_directories: postgres_inc)
+			if not ldap_r.found()
+				ldap_r = ldap
+			else
+				# On some platforms ldap_r fails to link without PTHREAD_LIBS.
+				ldap_r = declare_dependency(dependencies: [ldap_r, thread_dep])
+			endif
+
+			# PostgreSQL sometimes loads libldap_r and plain libldap into the same
+			# process.  Check for OpenLDAP versions known not to tolerate doing so;
+			# assume non-OpenLDAP implementations are safe.  The dblink test suite
+			# exercises the hazardous interaction directly.
+			compat_test_code = '''
 #include <ldap.h>
 #if !defined(LDAP_VENDOR_VERSION) || \
-     (defined(LDAP_API_FEATURE_X_OPENLDAP) && \
-      LDAP_VENDOR_VERSION >= 20424 && LDAP_VENDOR_VERSION <= 20431)
+		 (defined(LDAP_API_FEATURE_X_OPENLDAP) && \
+			LDAP_VENDOR_VERSION >= 20424 && LDAP_VENDOR_VERSION <= 20431)
 choke me
 #endif
 '''
-      if not cc.compiles(compat_test_code,
-          name: 'LDAP implementation compatible',
-          dependencies: ldap, args: test_c_args)
-        warning('''
+			if not cc.compiles(compat_test_code,
+					name: 'LDAP implementation compatible',
+					dependencies: ldap, args: test_c_args)
+				warning('''
 *** With OpenLDAP versions 2.4.24 through 2.4.31, inclusive, each backend
 *** process that loads libpq (via WAL receiver, dblink, or postgres_fdw) and
 *** also uses LDAP will crash on exit.''')
-      endif
-    endif
-  endif
+			endif
+		endif
+	endif
 
-  if ldap.found() and cc.has_function('ldap_initialize',
-      dependencies: ldap, args: test_c_args)
-    cdata.set('HAVE_LDAP_INITIALIZE', 1)
-  endif
+	if ldap.found() and cc.has_function('ldap_initialize',
+			dependencies: ldap, args: test_c_args)
+		cdata.set('HAVE_LDAP_INITIALIZE', 1)
+	endif
 endif
 
 if ldap.found()
-  assert(ldap_r.found())
-  cdata.set('USE_LDAP', 1)
+	assert(ldap_r.found())
+	cdata.set('USE_LDAP', 1)
 else
-  assert(not ldap_r.found())
+	assert(not ldap_r.found())
 endif
 
 
@@ -837,24 +837,24 @@ endif
 llvmopt = get_option('llvm')
 llvm = not_found_dep
 if add_languages('cpp', required: llvmopt, native: false)
-  llvm = dependency('llvm', version: '>=14', method: 'config-tool', required: llvmopt)
+	llvm = dependency('llvm', version: '>=14', method: 'config-tool', required: llvmopt)
 
-  if llvm.found()
+	if llvm.found()
 
-    cdata.set('USE_LLVM', 1)
+		cdata.set('USE_LLVM', 1)
 
-    cpp = meson.get_compiler('cpp')
+		cpp = meson.get_compiler('cpp')
 
-    llvm_binpath = llvm.get_variable(configtool: 'bindir')
+		llvm_binpath = llvm.get_variable(configtool: 'bindir')
 
-    ccache = find_program('ccache', native: true, required: false)
+		ccache = find_program('ccache', native: true, required: false)
 
-    # Some distros put LLVM and clang in different paths, so fallback to
-    # find via PATH, too.
-    clang = find_program(llvm_binpath / 'clang', 'clang', required: true)
-  endif
+		# Some distros put LLVM and clang in different paths, so fallback to
+		# find via PATH, too.
+		clang = find_program(llvm_binpath / 'clang', 'clang', required: true)
+	endif
 elif llvmopt.auto()
-  message('llvm requires a C++ compiler')
+	message('llvm requires a C++ compiler')
 endif
 
 
@@ -865,30 +865,30 @@ endif
 
 icuopt = get_option('icu')
 if not icuopt.disabled()
-  icu = dependency('icu-uc', required: false)
-  if icu.found()
-    icu_i18n = dependency('icu-i18n', required: true)
-  endif
-
-  # Unfortunately the dependency is named differently with cmake
-  if not icu.found() # combine with above once meson 0.60.0 is required
-    icu = dependency('ICU', required: icuopt,
-                     components: ['uc'], modules: ['ICU::uc'], method: 'cmake')
-    if icu.found()
-      icu_i18n = dependency('ICU', required: true,
-                            components: ['i18n'], modules: ['ICU::i18n'])
-    endif
-  endif
-
-  if icu.found()
-    cdata.set('USE_ICU', 1)
-  else
-    icu_i18n = not_found_dep
-  endif
+	icu = dependency('icu-uc', required: false)
+	if icu.found()
+		icu_i18n = dependency('icu-i18n', required: true)
+	endif
+
+	# Unfortunately the dependency is named differently with cmake
+	if not icu.found() # combine with above once meson 0.60.0 is required
+		icu = dependency('ICU', required: icuopt,
+										 components: ['uc'], modules: ['ICU::uc'], method: 'cmake')
+		if icu.found()
+			icu_i18n = dependency('ICU', required: true,
+														components: ['i18n'], modules: ['ICU::i18n'])
+		endif
+	endif
+
+	if icu.found()
+		cdata.set('USE_ICU', 1)
+	else
+		icu_i18n = not_found_dep
+	endif
 
 else
-  icu = not_found_dep
-  icu_i18n = not_found_dep
+	icu = not_found_dep
+	icu_i18n = not_found_dep
 endif
 
 
@@ -901,99 +901,99 @@ libcurlopt = get_option('libcurl')
 oauth_flow_supported = false
 
 if not libcurlopt.disabled()
-  # Check for libcurl 7.61.0 or higher (corresponding to RHEL8 and the ability
-  # to explicitly set TLS 1.3 ciphersuites).
-  libcurl = dependency('libcurl', version: '>= 7.61.0', required: libcurlopt)
-  if libcurl.found()
-    # Check to see whether the current platform supports thread-safe Curl
-    # initialization.
-    libcurl_threadsafe_init = false
-
-    if not meson.is_cross_build()
-      r = cc.run('''
-        #include <curl/curl.h>
-
-        int main(void)
-        {
-            curl_version_info_data *info;
-
-            if (curl_global_init(CURL_GLOBAL_ALL))
-                return -1;
-
-            info = curl_version_info(CURLVERSION_NOW);
-        #ifdef CURL_VERSION_THREADSAFE
-            if (info->features & CURL_VERSION_THREADSAFE)
-                return 0;
-        #endif
-
-            return 1;
-        }''',
-        name: 'test for curl_global_init thread safety',
-        dependencies: libcurl,
-      )
-
-      assert(r.compiled())
-      if r.returncode() == 0
-        libcurl_threadsafe_init = true
-        message('curl_global_init is thread-safe')
-      elif r.returncode() == 1
-        message('curl_global_init is not thread-safe')
-      else
-        message('curl_global_init failed; assuming not thread-safe')
-      endif
-    endif
-
-    if libcurl_threadsafe_init
-      cdata.set('HAVE_THREADSAFE_CURL_GLOBAL_INIT', 1)
-    endif
-
-    # Fail if a thread-friendly DNS resolver isn't built.
-    if not meson.is_cross_build()
-      r = cc.run('''
-        #include <curl/curl.h>
-
-        int main(void)
-        {
-            curl_version_info_data *info;
-
-            if (curl_global_init(CURL_GLOBAL_ALL))
-                return -1;
-
-            info = curl_version_info(CURLVERSION_NOW);
-            return (info->features & CURL_VERSION_ASYNCHDNS) ? 0 : 1;
-        }''',
-        name: 'test for curl support for asynchronous DNS',
-        dependencies: libcurl,
-      )
-
-      assert(r.compiled())
-      if r.returncode() != 0
-        error('''
+	# Check for libcurl 7.61.0 or higher (corresponding to RHEL8 and the ability
+	# to explicitly set TLS 1.3 ciphersuites).
+	libcurl = dependency('libcurl', version: '>= 7.61.0', required: libcurlopt)
+	if libcurl.found()
+		# Check to see whether the current platform supports thread-safe Curl
+		# initialization.
+		libcurl_threadsafe_init = false
+
+		if not meson.is_cross_build()
+			r = cc.run('''
+				#include <curl/curl.h>
+
+				int main(void)
+				{
+						curl_version_info_data *info;
+
+						if (curl_global_init(CURL_GLOBAL_ALL))
+								return -1;
+
+						info = curl_version_info(CURLVERSION_NOW);
+				#ifdef CURL_VERSION_THREADSAFE
+						if (info->features & CURL_VERSION_THREADSAFE)
+								return 0;
+				#endif
+
+						return 1;
+				}''',
+				name: 'test for curl_global_init thread safety',
+				dependencies: libcurl,
+			)
+
+			assert(r.compiled())
+			if r.returncode() == 0
+				libcurl_threadsafe_init = true
+				message('curl_global_init is thread-safe')
+			elif r.returncode() == 1
+				message('curl_global_init is not thread-safe')
+			else
+				message('curl_global_init failed; assuming not thread-safe')
+			endif
+		endif
+
+		if libcurl_threadsafe_init
+			cdata.set('HAVE_THREADSAFE_CURL_GLOBAL_INIT', 1)
+		endif
+
+		# Fail if a thread-friendly DNS resolver isn't built.
+		if not meson.is_cross_build()
+			r = cc.run('''
+				#include <curl/curl.h>
+
+				int main(void)
+				{
+						curl_version_info_data *info;
+
+						if (curl_global_init(CURL_GLOBAL_ALL))
+								return -1;
+
+						info = curl_version_info(CURLVERSION_NOW);
+						return (info->features & CURL_VERSION_ASYNCHDNS) ? 0 : 1;
+				}''',
+				name: 'test for curl support for asynchronous DNS',
+				dependencies: libcurl,
+			)
+
+			assert(r.compiled())
+			if r.returncode() != 0
+				error('''
 *** The installed version of libcurl does not support asynchronous DNS
 *** lookups. Rebuild libcurl with the AsynchDNS feature enabled in order
 *** to use it with libpq.''')
-      endif
-    endif
-  endif
-
-  # Check that the current platform supports our builtin flow. This requires
-  # libcurl and one of either epoll or kqueue.
-  oauth_flow_supported = (
-    libcurl.found()
-    and (cc.has_header('sys/event.h',
-                       args: test_c_args, include_directories: postgres_inc)
-         or cc.has_header('sys/epoll.h',
-                          args: test_c_args, include_directories: postgres_inc))
-  )
-
-  if oauth_flow_supported
-    cdata.set('USE_LIBCURL', 1)
-  elif libcurlopt.enabled()
-    error('client-side OAuth is not supported on this platform')
-  endif
+			endif
+		endif
+	endif
+
+	# Check that the current platform supports our builtin flow. This requires
+	# libcurl and one of either epoll or kqueue.
+	oauth_flow_supported = (
+		libcurl.found()
+		and (cc.has_header('sys/event.h',
+											 args: test_c_args, include_directories: postgres_inc)
+				 or cc.has_header('sys/epoll.h',
+													args: test_c_args, include_directories: postgres_inc))
+	)
+
+	if oauth_flow_supported
+		cdata.set('USE_LIBCURL', 1)
+	elif libcurlopt.enabled()
+		error('client-side OAuth is not supported on this platform')
+	endif
 
 else
-  libcurl = not_found_dep
+	libcurl = not_found_dep
 endif
 
 
@@ -1003,19 +1003,19 @@ endif
 
 libnumaopt = get_option('libnuma')
 if not libnumaopt.disabled()
-  # via pkg-config
-  libnuma = dependency('numa', required: false)
-  if not libnuma.found()
-    libnuma = cc.find_library('numa', required: libnumaopt)
-  endif
-  if not cc.has_header('numa.h', dependencies: libnuma, required: libnumaopt)
-    libnuma = not_found_dep
-  endif
-  if libnuma.found()
-    cdata.set('USE_LIBNUMA', 1)
-  endif
+	# via pkg-config
+	libnuma = dependency('numa', required: false)
+	if not libnuma.found()
+		libnuma = cc.find_library('numa', required: libnumaopt)
+	endif
+	if not cc.has_header('numa.h', dependencies: libnuma, required: libnumaopt)
+		libnuma = not_found_dep
+	endif
+	if libnuma.found()
+		cdata.set('USE_LIBNUMA', 1)
+	endif
 else
-  libnuma = not_found_dep
+	libnuma = not_found_dep
 endif
 
 
@@ -1026,12 +1026,12 @@ endif
 liburingopt = get_option('liburing')
 liburing = dependency('liburing', required: liburingopt)
 if liburing.found()
-  cdata.set('USE_LIBURING', 1)
+	cdata.set('USE_LIBURING', 1)
 
-  if cc.has_function('io_uring_queue_init_mem',
-      dependencies: liburing, args: test_c_args)
-    cdata.set('HAVE_LIBURING_QUEUE_INIT_MEM', 1)
-  endif
+	if cc.has_function('io_uring_queue_init_mem',
+			dependencies: liburing, args: test_c_args)
+		cdata.set('HAVE_LIBURING_QUEUE_INIT_MEM', 1)
+	endif
 
 endif
 
@@ -1043,18 +1043,18 @@ endif
 
 libxmlopt = get_option('libxml')
 if not libxmlopt.disabled()
-  libxml = dependency('libxml-2.0', required: false, version: '>= 2.6.23')
-  # Unfortunately the dependency is named differently with cmake
-  if not libxml.found() # combine with above once meson 0.60.0 is required
-    libxml = dependency('LibXml2', required: libxmlopt, version: '>= 2.6.23',
-      method: 'cmake')
-  endif
-
-  if libxml.found()
-    cdata.set('USE_LIBXML', 1)
-  endif
+	libxml = dependency('libxml-2.0', required: false, version: '>= 2.6.23')
+	# Unfortunately the dependency is named differently with cmake
+	if not libxml.found() # combine with above once meson 0.60.0 is required
+		libxml = dependency('LibXml2', required: libxmlopt, version: '>= 2.6.23',
+			method: 'cmake')
+	endif
+
+	if libxml.found()
+		cdata.set('USE_LIBXML', 1)
+	endif
 else
-  libxml = not_found_dep
+	libxml = not_found_dep
 endif
 
 
@@ -1065,17 +1065,17 @@ endif
 
 libxsltopt = get_option('libxslt')
 if not libxsltopt.disabled()
-  libxslt = dependency('libxslt', required: false)
-  # Unfortunately the dependency is named differently with cmake
-  if not libxslt.found() # combine with above once meson 0.60.0 is required
-    libxslt = dependency('LibXslt', required: libxsltopt, method: 'cmake')
-  endif
-
-  if libxslt.found()
-    cdata.set('USE_LIBXSLT', 1)
-  endif
+	libxslt = dependency('libxslt', required: false)
+	# Unfortunately the dependency is named differently with cmake
+	if not libxslt.found() # combine with above once meson 0.60.0 is required
+		libxslt = dependency('LibXslt', required: libxsltopt, method: 'cmake')
+	endif
+
+	if libxslt.found()
+		cdata.set('USE_LIBXSLT', 1)
+	endif
 else
-  libxslt = not_found_dep
+	libxslt = not_found_dep
 endif
 
 
@@ -1086,21 +1086,21 @@ endif
 
 lz4opt = get_option('lz4')
 if not lz4opt.disabled()
-  lz4 = dependency('liblz4', required: false)
-  # Unfortunately the dependency is named differently with cmake
-  if not lz4.found() # combine with above once meson 0.60.0 is required
-    lz4 = dependency('lz4', required: lz4opt,
-                     method: 'cmake', modules: ['LZ4::lz4_shared'],
-                    )
-  endif
-
-  if lz4.found()
-    cdata.set('USE_LZ4', 1)
-    cdata.set('HAVE_LIBLZ4', 1)
-  endif
+	lz4 = dependency('liblz4', required: false)
+	# Unfortunately the dependency is named differently with cmake
+	if not lz4.found() # combine with above once meson 0.60.0 is required
+		lz4 = dependency('lz4', required: lz4opt,
+										 method: 'cmake', modules: ['LZ4::lz4_shared'],
+										)
+	endif
+
+	if lz4.found()
+		cdata.set('USE_LZ4', 1)
+		cdata.set('HAVE_LIBLZ4', 1)
+	endif
 
 else
-  lz4 = not_found_dep
+	lz4 = not_found_dep
 endif
 
 
@@ -1119,18 +1119,18 @@ tcl_version = get_option('tcl_version')
 tcl_dep = not_found_dep
 if not tclopt.disabled()
 
-  # via pkg-config
-  tcl_dep = dependency(tcl_version, required: false)
+	# via pkg-config
+	tcl_dep = dependency(tcl_version, required: false)
 
-  if not tcl_dep.found()
-    tcl_dep = cc.find_library(tcl_version,
-      required: tclopt,
-      dirs: test_lib_d)
-  endif
+	if not tcl_dep.found()
+		tcl_dep = cc.find_library(tcl_version,
+			required: tclopt,
+			dirs: test_lib_d)
+	endif
 
-  if not cc.has_header('tcl.h', dependencies: tcl_dep, required: tclopt)
-    tcl_dep = not_found_dep
-  endif
+	if not cc.has_header('tcl.h', dependencies: tcl_dep, required: tclopt)
+		tcl_dep = not_found_dep
+	endif
 endif
 
 
@@ -1141,34 +1141,34 @@ endif
 
 pamopt = get_option('pam')
 if not pamopt.disabled()
-  pam = dependency('pam', required: false)
-
-  if not pam.found()
-    pam = cc.find_library('pam', required: pamopt, dirs: test_lib_d)
-  endif
-
-  if pam.found()
-    pam_header_found = false
-
-    # header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM.
-    if cc.check_header('security/pam_appl.h', dependencies: pam, required: false,
-        args: test_c_args, include_directories: postgres_inc)
-      cdata.set('HAVE_SECURITY_PAM_APPL_H', 1)
-      pam_header_found = true
-    elif cc.check_header('pam/pam_appl.h', dependencies: pam, required: pamopt,
-        args: test_c_args, include_directories: postgres_inc)
-      cdata.set('HAVE_PAM_PAM_APPL_H', 1)
-      pam_header_found = true
-    endif
-
-    if pam_header_found
-      cdata.set('USE_PAM', 1)
-    else
-      pam = not_found_dep
-    endif
-  endif
+	pam = dependency('pam', required: false)
+
+	if not pam.found()
+		pam = cc.find_library('pam', required: pamopt, dirs: test_lib_d)
+	endif
+
+	if pam.found()
+		pam_header_found = false
+
+		# header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM.
+		if cc.check_header('security/pam_appl.h', dependencies: pam, required: false,
+				args: test_c_args, include_directories: postgres_inc)
+			cdata.set('HAVE_SECURITY_PAM_APPL_H', 1)
+			pam_header_found = true
+		elif cc.check_header('pam/pam_appl.h', dependencies: pam, required: pamopt,
+				args: test_c_args, include_directories: postgres_inc)
+			cdata.set('HAVE_PAM_PAM_APPL_H', 1)
+			pam_header_found = true
+		endif
+
+		if pam_header_found
+			cdata.set('USE_PAM', 1)
+		else
+			pam = not_found_dep
+		endif
+	endif
 else
-  pam = not_found_dep
+	pam = not_found_dep
 endif
 
 
@@ -1181,88 +1181,88 @@ perlopt = get_option('plperl')
 perl_dep = not_found_dep
 perlversion = ''
 if not perlopt.disabled()
-  perl_may_work = true
-
-  # First verify that perl has the necessary dependencies installed
-  perl_mods = run_command(
-    [perl,
-     '-MConfig', '-MOpcode', '-MExtUtils::Embed', '-MExtUtils::ParseXS',
-     '-e', ''],
-    check: false)
-  if perl_mods.returncode() != 0
-    perl_may_work = false
-    perl_msg = 'perl installation does not have the required modules'
-  endif
-
-  # Then inquire perl about its configuration
-  if perl_may_work
-    perl_conf_cmd = [perl, '-MConfig', '-e', 'print $Config{$ARGV[0]}']
-    perlversion = run_command(perl_conf_cmd, 'version', check: true).stdout()
-    archlibexp = run_command(perl_conf_cmd, 'archlibexp', check: true).stdout()
-    privlibexp = run_command(perl_conf_cmd, 'privlibexp', check: true).stdout()
-    useshrplib = run_command(perl_conf_cmd, 'useshrplib', check: true).stdout()
-
-    perl_inc_dir = '@0@/CORE'.format(archlibexp)
-
-    if perlversion.version_compare('< 5.14')
-      perl_may_work = false
-      perl_msg = 'Perl version 5.14 or later is required, but this is @0@'.format(perlversion)
-    elif useshrplib != 'true'
-      perl_may_work = false
-      perl_msg = 'need a shared perl'
-    endif
-  endif
-
-  if perl_may_work
-    # On most platforms, archlibexp is also where the Perl include files live ...
-    perl_ccflags = ['-I@0@'.format(perl_inc_dir)]
-    # ... but on newer macOS versions, we must use -iwithsysroot to look
-    # under sysroot
-    if not fs.is_file('@0@/perl.h'.format(perl_inc_dir)) and \
-       fs.is_file('@0@@1@/perl.h'.format(pg_sysroot, perl_inc_dir))
-      perl_ccflags = ['-iwithsysroot', perl_inc_dir]
-    endif
-
-    # check compiler finds header
-    if not cc.has_header('perl.h', required: false,
-        args: test_c_args + perl_ccflags, include_directories: postgres_inc)
-      perl_may_work = false
-      perl_msg = 'missing perl.h'
-    endif
-  endif
-
-  if perl_may_work
-    perl_ccflags_r = run_command(perl_conf_cmd, 'ccflags', check: true).stdout()
-
-    # See comments for PGAC_CHECK_PERL_EMBED_CCFLAGS in perl.m4
-    foreach flag : perl_ccflags_r.split(' ')
-      if flag.startswith('-D') and \
-          (not flag.startswith('-D_') or flag == '_USE_32BIT_TIME_T')
-        perl_ccflags += flag
-      endif
-    endforeach
-
-    if host_system == 'windows'
-      perl_ccflags += ['-DPLPERL_HAVE_UID_GID']
-
-      if cc.get_id() == 'msvc'
-        # prevent binary mismatch between MSVC built plperl and Strawberry or
-        # msys ucrt perl libraries
-        perl_v = run_command(perl, '-V', check: false).stdout()
-        if not perl_v.contains('USE_THREAD_SAFE_LOCALE')
-          perl_ccflags += ['-DNO_THREAD_SAFE_LOCALE']
-        endif
-      endif
-    endif
-
-    message('CCFLAGS recommended by perl: @0@'.format(perl_ccflags_r))
-    message('CCFLAGS for embedding perl: @0@'.format(' '.join(perl_ccflags)))
-
-    # We are after Embed's ldopts, but without the subset mentioned in
-    # Config's ccdlflags and ldflags.  (Those are the choices of those who
-    # built the Perl installation, which are not necessarily appropriate
-    # for building PostgreSQL.)
-    perl_ldopts = run_command(perl, '-e', '''
+	perl_may_work = true
+
+	# First verify that perl has the necessary dependencies installed
+	perl_mods = run_command(
+		[perl,
+		 '-MConfig', '-MOpcode', '-MExtUtils::Embed', '-MExtUtils::ParseXS',
+		 '-e', ''],
+		check: false)
+	if perl_mods.returncode() != 0
+		perl_may_work = false
+		perl_msg = 'perl installation does not have the required modules'
+	endif
+
+	# Then inquire perl about its configuration
+	if perl_may_work
+		perl_conf_cmd = [perl, '-MConfig', '-e', 'print $Config{$ARGV[0]}']
+		perlversion = run_command(perl_conf_cmd, 'version', check: true).stdout()
+		archlibexp = run_command(perl_conf_cmd, 'archlibexp', check: true).stdout()
+		privlibexp = run_command(perl_conf_cmd, 'privlibexp', check: true).stdout()
+		useshrplib = run_command(perl_conf_cmd, 'useshrplib', check: true).stdout()
+
+		perl_inc_dir = '@0@/CORE'.format(archlibexp)
+
+		if perlversion.version_compare('< 5.14')
+			perl_may_work = false
+			perl_msg = 'Perl version 5.14 or later is required, but this is @0@'.format(perlversion)
+		elif useshrplib != 'true'
+			perl_may_work = false
+			perl_msg = 'need a shared perl'
+		endif
+	endif
+
+	if perl_may_work
+		# On most platforms, archlibexp is also where the Perl include files live ...
+		perl_ccflags = ['-I@0@'.format(perl_inc_dir)]
+		# ... but on newer macOS versions, we must use -iwithsysroot to look
+		# under sysroot
+		if not fs.is_file('@0@/perl.h'.format(perl_inc_dir)) and \
+			 fs.is_file('@0@@1@/perl.h'.format(pg_sysroot, perl_inc_dir))
+			perl_ccflags = ['-iwithsysroot', perl_inc_dir]
+		endif
+
+		# check compiler finds header
+		if not cc.has_header('perl.h', required: false,
+				args: test_c_args + perl_ccflags, include_directories: postgres_inc)
+			perl_may_work = false
+			perl_msg = 'missing perl.h'
+		endif
+	endif
+
+	if perl_may_work
+		perl_ccflags_r = run_command(perl_conf_cmd, 'ccflags', check: true).stdout()
+
+		# See comments for PGAC_CHECK_PERL_EMBED_CCFLAGS in perl.m4
+		foreach flag : perl_ccflags_r.split(' ')
+			if flag.startswith('-D') and \
+					(not flag.startswith('-D_') or flag == '_USE_32BIT_TIME_T')
+				perl_ccflags += flag
+			endif
+		endforeach
+
+		if host_system == 'windows'
+			perl_ccflags += ['-DPLPERL_HAVE_UID_GID']
+
+			if cc.get_id() == 'msvc'
+				# prevent binary mismatch between MSVC built plperl and Strawberry or
+				# msys ucrt perl libraries
+				perl_v = run_command(perl, '-V', check: false).stdout()
+				if not perl_v.contains('USE_THREAD_SAFE_LOCALE')
+					perl_ccflags += ['-DNO_THREAD_SAFE_LOCALE']
+				endif
+			endif
+		endif
+
+		message('CCFLAGS recommended by perl: @0@'.format(perl_ccflags_r))
+		message('CCFLAGS for embedding perl: @0@'.format(' '.join(perl_ccflags)))
+
+		# We are after Embed's ldopts, but without the subset mentioned in
+		# Config's ccdlflags and ldflags.  (Those are the choices of those who
+		# built the Perl installation, which are not necessarily appropriate
+		# for building PostgreSQL.)
+		perl_ldopts = run_command(perl, '-e', '''
 use ExtUtils::Embed;
 use Text::ParseWords;
 # tell perl to suppress including these in ldopts
@@ -1273,20 +1273,20 @@ use Text::ParseWords;
 (my $opts = ldopts(undef)) =~ s!\\!\\\\!g;
 print "$_\n" foreach shellwords($opts);
 ''',
-     check: true).stdout().strip().split('\n')
+		 check: true).stdout().strip().split('\n')
 
-    message('LDFLAGS for embedding perl: "@0@"'.format(' '.join(perl_ldopts)))
+		message('LDFLAGS for embedding perl: "@0@"'.format(' '.join(perl_ldopts)))
 
-    perl_dep_int = declare_dependency(
-      compile_args: perl_ccflags,
-      link_args: perl_ldopts,
-      version: perlversion,
-    )
+		perl_dep_int = declare_dependency(
+			compile_args: perl_ccflags,
+			link_args: perl_ldopts,
+			version: perlversion,
+		)
 
-    # While we're at it, check that we can link to libperl.
-    # On most platforms, if perl.h is there then libperl.so will be too, but
-    # at this writing Debian packages them separately.
-    perl_link_test = '''
+		# While we're at it, check that we can link to libperl.
+		# On most platforms, if perl.h is there then libperl.so will be too, but
+		# at this writing Debian packages them separately.
+		perl_link_test = '''
 /* see plperl.h */
 #ifdef _MSC_VER
 #define __inline__ inline
@@ -1297,24 +1297,24 @@ int main(void)
 {
 perl_alloc();
 }'''
-    if not cc.links(perl_link_test, name: 'libperl',
-          args: test_c_args + perl_ccflags + perl_ldopts,
-          include_directories: postgres_inc)
-      perl_may_work = false
-      perl_msg = 'missing libperl'
-    endif
+		if not cc.links(perl_link_test, name: 'libperl',
+					args: test_c_args + perl_ccflags + perl_ldopts,
+					include_directories: postgres_inc)
+			perl_may_work = false
+			perl_msg = 'missing libperl'
+		endif
 
-  endif # perl_may_work
+	endif # perl_may_work
 
-  if perl_may_work
-    perl_dep = perl_dep_int
-  else
-    if perlopt.enabled()
-      error('dependency plperl failed: @0@'.format(perl_msg))
-    else
-      message('disabling optional dependency plperl: @0@'.format(perl_msg))
-    endif
-  endif
+	if perl_may_work
+		perl_dep = perl_dep_int
+	else
+		if perlopt.enabled()
+			error('dependency plperl failed: @0@'.format(perl_msg))
+		else
+			message('disabling optional dependency plperl: @0@'.format(perl_msg))
+		endif
+	endif
 endif
 
 
@@ -1326,15 +1326,15 @@ endif
 pyopt = get_option('plpython')
 python3_dep = not_found_dep
 if not pyopt.disabled()
-  pm = import('python')
-  python3_inst = pm.find_installation(python.full_path(), required: pyopt)
-  if python3_inst.found()
-    python3_dep = python3_inst.dependency(embed: true, required: pyopt)
-    # Remove this check after we depend on Meson >= 1.1.0
-    if not cc.check_header('Python.h', dependencies: python3_dep, required: pyopt, include_directories: postgres_inc)
-      python3_dep = not_found_dep
-    endif
-  endif
+	pm = import('python')
+	python3_inst = pm.find_installation(python.full_path(), required: pyopt)
+	if python3_inst.found()
+		python3_dep = python3_inst.dependency(embed: true, required: pyopt)
+		# Remove this check after we depend on Meson >= 1.1.0
+		if not cc.check_header('Python.h', dependencies: python3_dep, required: pyopt, include_directories: postgres_inc)
+			python3_dep = not_found_dep
+		endif
+	endif
 endif
 
 
@@ -1344,129 +1344,129 @@ endif
 ###############################################################
 
 if not get_option('readline').disabled()
-  libedit_preferred = get_option('libedit_preferred')
-  # Set the order of readline dependencies.
-  # cc.find_library breaks and throws on the first dependency which
-  # is marked as required=true and can't be found. Thus, we only mark
-  # the last dependency to look up as required, to not throw too early.
-  check_readline_deps = [
-    {
-      'name': libedit_preferred ? 'libedit' : 'readline',
-      'required': false
-    },
-    {
-      'name': libedit_preferred ? 'readline' : 'libedit',
-      'required': get_option('readline')
-    }
-  ]
-
-  foreach readline_dep : check_readline_deps
-    readline = dependency(readline_dep['name'], required: false)
-    if not readline.found()
-      readline = cc.find_library(readline_dep['name'],
-        required: readline_dep['required'],
-        dirs: test_lib_d)
-    endif
-    if readline.found()
-      break
-    endif
-  endforeach
-
-  if readline.found()
-    cdata.set('HAVE_LIBREADLINE', 1)
-
-    editline_prefix = {
-      'header_prefix': 'editline/',
-      'flag_prefix': 'EDITLINE_',
-    }
-    readline_prefix = {
-      'header_prefix': 'readline/',
-      'flag_prefix': 'READLINE_',
-    }
-    default_prefix = {
-      'header_prefix': '',
-      'flag_prefix': '',
-    }
-
-    # Set the order of prefixes
-    prefixes = libedit_preferred ? \
-      [editline_prefix, default_prefix, readline_prefix] : \
-      [readline_prefix, default_prefix, editline_prefix]
-
-    at_least_one_header_found = false
-    foreach header : ['history', 'readline']
-      is_found = false
-      foreach prefix : prefixes
-        header_file = '@0@@1@.h'.format(prefix['header_prefix'], header)
-        # Check history.h and readline.h
-        if not is_found and cc.has_header(header_file,
-            args: test_c_args, include_directories: postgres_inc,
-            dependencies: [readline], required: false)
-          if header == 'readline'
-            readline_h = header_file
-          endif
-          cdata.set('HAVE_@0@@1@_H'.format(prefix['flag_prefix'], header).to_upper(), 1)
-          is_found = true
-          at_least_one_header_found = true
-        endif
-      endforeach
-    endforeach
-
-    if not at_least_one_header_found
-      error('''readline header not found
+	libedit_preferred = get_option('libedit_preferred')
+	# Set the order of readline dependencies.
+	# cc.find_library breaks and throws on the first dependency which
+	# is marked as required=true and can't be found. Thus, we only mark
+	# the last dependency to look up as required, to not throw too early.
+	check_readline_deps = [
+		{
+			'name': libedit_preferred ? 'libedit' : 'readline',
+			'required': false
+		},
+		{
+			'name': libedit_preferred ? 'readline' : 'libedit',
+			'required': get_option('readline')
+		}
+	]
+
+	foreach readline_dep : check_readline_deps
+		readline = dependency(readline_dep['name'], required: false)
+		if not readline.found()
+			readline = cc.find_library(readline_dep['name'],
+				required: readline_dep['required'],
+				dirs: test_lib_d)
+		endif
+		if readline.found()
+			break
+		endif
+	endforeach
+
+	if readline.found()
+		cdata.set('HAVE_LIBREADLINE', 1)
+
+		editline_prefix = {
+			'header_prefix': 'editline/',
+			'flag_prefix': 'EDITLINE_',
+		}
+		readline_prefix = {
+			'header_prefix': 'readline/',
+			'flag_prefix': 'READLINE_',
+		}
+		default_prefix = {
+			'header_prefix': '',
+			'flag_prefix': '',
+		}
+
+		# Set the order of prefixes
+		prefixes = libedit_preferred ? \
+			[editline_prefix, default_prefix, readline_prefix] : \
+			[readline_prefix, default_prefix, editline_prefix]
+
+		at_least_one_header_found = false
+		foreach header : ['history', 'readline']
+			is_found = false
+			foreach prefix : prefixes
+				header_file = '@0@@1@.h'.format(prefix['header_prefix'], header)
+				# Check history.h and readline.h
+				if not is_found and cc.has_header(header_file,
+						args: test_c_args, include_directories: postgres_inc,
+						dependencies: [readline], required: false)
+					if header == 'readline'
+						readline_h = header_file
+					endif
+					cdata.set('HAVE_@0@@1@_H'.format(prefix['flag_prefix'], header).to_upper(), 1)
+					is_found = true
+					at_least_one_header_found = true
+				endif
+			endforeach
+		endforeach
+
+		if not at_least_one_header_found
+			error('''readline header not found
 If you have @0@ already installed, see meson-logs/meson-log.txt for details on the
 failure. It is possible the compiler isn't looking in the proper directory.
 Use -Dreadline=disabled to disable readline support.'''.format(readline_dep))
-    endif
-
-    check_funcs = [
-      'append_history',
-      'history_truncate_file',
-      'rl_completion_matches',
-      'rl_filename_completion_function',
-      'rl_reset_screen_size',
-      'rl_variable_bind',
-    ]
-
-    foreach func : check_funcs
-      found = cc.has_function(func, dependencies: [readline],
-        args: test_c_args, include_directories: postgres_inc)
-      cdata.set('HAVE_' + func.to_upper(), found ? 1 : false)
-    endforeach
-
-    check_vars = [
-      'rl_completion_suppress_quote',
-      'rl_filename_quote_characters',
-      'rl_filename_quoting_function',
-    ]
-
-    foreach var : check_vars
-      cdata.set('HAVE_' + var.to_upper(),
-        cc.has_header_symbol(readline_h, var,
-          args: test_c_args, include_directories: postgres_inc,
-          prefix: '#include <stdio.h>',
-          dependencies: [readline]) ? 1 : false)
-    endforeach
-
-    # If found via cc.find_library() ensure headers are found when using the
-    # dependency. On meson < 0.57 one cannot do compiler checks using the
-    # dependency returned by declare_dependency(), so we can't do this above.
-    if readline.type_name() == 'library'
-      readline = declare_dependency(dependencies: readline,
-        include_directories: postgres_inc)
-    endif
-
-    # On windows with mingw readline requires auto-import to successfully
-    # link, as the headers don't use declspec(dllimport)
-    if host_system == 'windows' and cc.get_id() != 'msvc'
-      readline = declare_dependency(dependencies: readline,
-        link_args: '-Wl,--enable-auto-import')
-    endif
-  endif
-
-  # XXX: Figure out whether to implement mingw warning equivalent
+		endif
+
+		check_funcs = [
+			'append_history',
+			'history_truncate_file',
+			'rl_completion_matches',
+			'rl_filename_completion_function',
+			'rl_reset_screen_size',
+			'rl_variable_bind',
+		]
+
+		foreach func : check_funcs
+			found = cc.has_function(func, dependencies: [readline],
+				args: test_c_args, include_directories: postgres_inc)
+			cdata.set('HAVE_' + func.to_upper(), found ? 1 : false)
+		endforeach
+
+		check_vars = [
+			'rl_completion_suppress_quote',
+			'rl_filename_quote_characters',
+			'rl_filename_quoting_function',
+		]
+
+		foreach var : check_vars
+			cdata.set('HAVE_' + var.to_upper(),
+				cc.has_header_symbol(readline_h, var,
+					args: test_c_args, include_directories: postgres_inc,
+					prefix: '#include <stdio.h>',
+					dependencies: [readline]) ? 1 : false)
+		endforeach
+
+		# If found via cc.find_library() ensure headers are found when using the
+		# dependency. On meson < 0.57 one cannot do compiler checks using the
+		# dependency returned by declare_dependency(), so we can't do this above.
+		if readline.type_name() == 'library'
+			readline = declare_dependency(dependencies: readline,
+				include_directories: postgres_inc)
+		endif
+
+		# On windows with mingw readline requires auto-import to successfully
+		# link, as the headers don't use declspec(dllimport)
+		if host_system == 'windows' and cc.get_id() != 'msvc'
+			readline = declare_dependency(dependencies: readline,
+				link_args: '-Wl,--enable-auto-import')
+		endif
+	endif
+
+	# XXX: Figure out whether to implement mingw warning equivalent
 else
-  readline = not_found_dep
+	readline = not_found_dep
 endif
 
 
@@ -1478,11 +1478,11 @@ endif
 selinux = not_found_dep
 selinuxopt = get_option('selinux')
 if meson.version().version_compare('>=0.59')
-  selinuxopt = selinuxopt.disable_auto_if(host_system != 'linux')
+	selinuxopt = selinuxopt.disable_auto_if(host_system != 'linux')
 endif
 selinux = dependency('libselinux', required: selinuxopt, version: '>= 2.1.10')
 cdata.set('HAVE_LIBSELINUX',
-  selinux.found() ? 1 : false)
+	selinux.found() ? 1 : false)
 
 
 
@@ -1493,7 +1493,7 @@ cdata.set('HAVE_LIBSELINUX',
 systemd = not_found_dep
 systemdopt = get_option('systemd')
 if meson.version().version_compare('>=0.59')
-  systemdopt = systemdopt.disable_auto_if(host_system != 'linux')
+	systemdopt = systemdopt.disable_auto_if(host_system != 'linux')
 endif
 systemd = dependency('libsystemd', required: systemdopt)
 cdata.set('USE_SYSTEMD', systemd.found() ? 1 : false)
@@ -1509,90 +1509,90 @@ ssl_library = 'none'
 sslopt = get_option('ssl')
 
 if sslopt == 'auto' and auto_features.disabled()
-  sslopt = 'none'
+	sslopt = 'none'
 endif
 
 if sslopt in ['auto', 'openssl']
-  openssl_required = (sslopt == 'openssl')
-
-  # Try to find openssl via pkg-config et al, if that doesn't work
-  # (e.g. because it's provided as part of the OS, like on FreeBSD), look for
-  # the library names that we know about.
-
-  # via pkg-config et al
-  ssl = dependency('openssl', required: false)
-  # only meson >= 0.57 supports declare_dependency() in cc.has_function(), so
-  # we pass cc.find_library() results if necessary
-  ssl_int = []
-
-  # via library + headers
-  if not ssl.found()
-    ssl_lib = cc.find_library('ssl',
-      dirs: test_lib_d,
-      header_include_directories: postgres_inc,
-      has_headers: ['openssl/ssl.h', 'openssl/err.h'],
-      required: openssl_required)
-    crypto_lib = cc.find_library('crypto',
-      dirs: test_lib_d,
-      required: openssl_required)
-    if ssl_lib.found() and crypto_lib.found()
-      ssl_int = [ssl_lib, crypto_lib]
-      ssl = declare_dependency(dependencies: ssl_int, include_directories: postgres_inc)
-    endif
-  elif cc.has_header('openssl/ssl.h', args: test_c_args, dependencies: ssl, required: openssl_required) and \
-       cc.has_header('openssl/err.h', args: test_c_args, dependencies: ssl, required: openssl_required)
-    ssl_int = [ssl]
-  else
-    ssl = not_found_dep
-  endif
-
-  if ssl.found()
-    check_funcs = [
-      ['CRYPTO_new_ex_data', {'required': true}],
-      ['SSL_new', {'required': true}],
-
-      # Functions introduced in OpenSSL 1.1.1.
-      ['SSL_CTX_set_ciphersuites', {'required': true}],
-
-      # Function introduced in OpenSSL 1.0.2, not in LibreSSL.
-      ['SSL_CTX_set_cert_cb'],
-
-      # Function introduced in OpenSSL 1.1.1, not in LibreSSL.
-      ['X509_get_signature_info'],
-      ['SSL_CTX_set_num_tickets'],
-      ['SSL_CTX_set_keylog_callback'],
-    ]
-
-    are_openssl_funcs_complete = true
-    foreach c : check_funcs
-      func = c.get(0)
-      val = cc.has_function(func, args: test_c_args, dependencies: ssl_int)
-      required = c.get(1, {}).get('required', false)
-      if required and not val
-        are_openssl_funcs_complete = false
-        if openssl_required
-          error('openssl function @0@ is required'.format(func))
-        endif
-        break
-      elif not required
-        cdata.set('HAVE_' + func.to_upper(), val ? 1 : false)
-      endif
-    endforeach
-
-    if are_openssl_funcs_complete
-      cdata.set('USE_OPENSSL', 1,
-                description: 'Define to 1 to build with OpenSSL support. (-Dssl=openssl)')
-      cdata.set('OPENSSL_API_COMPAT', '0x10101000L',
-                description: 'Define to the OpenSSL API version in use. This avoids deprecation warnings from newer OpenSSL versions.')
-      ssl_library = 'openssl'
-    else
-      ssl = not_found_dep
-    endif
-  endif
+	openssl_required = (sslopt == 'openssl')
+
+	# Try to find openssl via pkg-config et al, if that doesn't work
+	# (e.g. because it's provided as part of the OS, like on FreeBSD), look for
+	# the library names that we know about.
+
+	# via pkg-config et al
+	ssl = dependency('openssl', required: false)
+	# only meson >= 0.57 supports declare_dependency() in cc.has_function(), so
+	# we pass cc.find_library() results if necessary
+	ssl_int = []
+
+	# via library + headers
+	if not ssl.found()
+		ssl_lib = cc.find_library('ssl',
+			dirs: test_lib_d,
+			header_include_directories: postgres_inc,
+			has_headers: ['openssl/ssl.h', 'openssl/err.h'],
+			required: openssl_required)
+		crypto_lib = cc.find_library('crypto',
+			dirs: test_lib_d,
+			required: openssl_required)
+		if ssl_lib.found() and crypto_lib.found()
+			ssl_int = [ssl_lib, crypto_lib]
+			ssl = declare_dependency(dependencies: ssl_int, include_directories: postgres_inc)
+		endif
+	elif cc.has_header('openssl/ssl.h', args: test_c_args, dependencies: ssl, required: openssl_required) and \
+			 cc.has_header('openssl/err.h', args: test_c_args, dependencies: ssl, required: openssl_required)
+		ssl_int = [ssl]
+	else
+		ssl = not_found_dep
+	endif
+
+	if ssl.found()
+		check_funcs = [
+			['CRYPTO_new_ex_data', {'required': true}],
+			['SSL_new', {'required': true}],
+
+			# Functions introduced in OpenSSL 1.1.1.
+			['SSL_CTX_set_ciphersuites', {'required': true}],
+
+			# Function introduced in OpenSSL 1.0.2, not in LibreSSL.
+			['SSL_CTX_set_cert_cb'],
+
+			# Function introduced in OpenSSL 1.1.1, not in LibreSSL.
+			['X509_get_signature_info'],
+			['SSL_CTX_set_num_tickets'],
+			['SSL_CTX_set_keylog_callback'],
+		]
+
+		are_openssl_funcs_complete = true
+		foreach c : check_funcs
+			func = c.get(0)
+			val = cc.has_function(func, args: test_c_args, dependencies: ssl_int)
+			required = c.get(1, {}).get('required', false)
+			if required and not val
+				are_openssl_funcs_complete = false
+				if openssl_required
+					error('openssl function @0@ is required'.format(func))
+				endif
+				break
+			elif not required
+				cdata.set('HAVE_' + func.to_upper(), val ? 1 : false)
+			endif
+		endforeach
+
+		if are_openssl_funcs_complete
+			cdata.set('USE_OPENSSL', 1,
+								description: 'Define to 1 to build with OpenSSL support. (-Dssl=openssl)')
+			cdata.set('OPENSSL_API_COMPAT', '0x10101000L',
+								description: 'Define to the OpenSSL API version in use. This avoids deprecation warnings from newer OpenSSL versions.')
+			ssl_library = 'openssl'
+		else
+			ssl = not_found_dep
+		endif
+	endif
 endif
 
 if sslopt == 'auto' and auto_features.enabled() and not ssl.found()
-  error('no SSL library found')
+	error('no SSL library found')
 endif
 
 
@@ -1603,56 +1603,56 @@ endif
 
 uuidopt = get_option('uuid')
 if uuidopt != 'none'
-  uuidname = uuidopt.to_upper()
-  if uuidopt == 'e2fs'
-    uuid = dependency('uuid', required: true)
-    uuidfunc = 'uuid_generate'
-    uuidheader = 'uuid/uuid.h'
-  elif uuidopt == 'bsd'
-    # libc should have uuid function
-    uuid = declare_dependency()
-    uuidfunc = 'uuid_to_string'
-    uuidheader = 'uuid.h'
-  elif uuidopt == 'ossp'
-    # In upstream, the package and library is called just 'uuid', but many
-    # distros change it to 'ossp-uuid'.
-    uuid = dependency('ossp-uuid', required: false)
-    if not uuid.found()
-      uuid = dependency('uuid', required: false)
-    endif
-    uuidfunc = 'uuid_export'
-    uuidheader = 'uuid.h'
-
-    # Hardcoded lookup for ossp-uuid. This is necessary as ossp-uuid on
-    # windows installs neither a pkg-config nor a cmake dependency
-    # information. Nor is there another supported uuid implementation
-    # available on windows.
-    if not uuid.found()
-      uuid = cc.find_library('ossp-uuid',
-        required: false, dirs: test_lib_d,
-        has_headers: uuidheader, header_include_directories: postgres_inc)
-    endif
-    if not uuid.found()
-      uuid = cc.find_library('uuid',
-        required: true, dirs: test_lib_d,
-        has_headers: uuidheader, header_include_directories: postgres_inc)
-    endif
-  else
-    error('unknown uuid build option value: @0@'.format(uuidopt))
-  endif
-
-  if not cc.has_header_symbol(uuidheader, uuidfunc,
-                              args: test_c_args,
-                              include_directories: postgres_inc,
-                              dependencies: uuid)
-    error('uuid library @0@ missing required function @1@'.format(uuidopt, uuidfunc))
-  endif
-  cdata.set('HAVE_@0@'.format(uuidheader.underscorify().to_upper()), 1)
-
-  cdata.set('HAVE_UUID_@0@'.format(uuidname), 1,
-           description: 'Define to 1 if you have @0@ UUID support.'.format(uuidname))
+	uuidname = uuidopt.to_upper()
+	if uuidopt == 'e2fs'
+		uuid = dependency('uuid', required: true)
+		uuidfunc = 'uuid_generate'
+		uuidheader = 'uuid/uuid.h'
+	elif uuidopt == 'bsd'
+		# libc should have uuid function
+		uuid = declare_dependency()
+		uuidfunc = 'uuid_to_string'
+		uuidheader = 'uuid.h'
+	elif uuidopt == 'ossp'
+		# In upstream, the package and library is called just 'uuid', but many
+		# distros change it to 'ossp-uuid'.
+		uuid = dependency('ossp-uuid', required: false)
+		if not uuid.found()
+			uuid = dependency('uuid', required: false)
+		endif
+		uuidfunc = 'uuid_export'
+		uuidheader = 'uuid.h'
+
+		# Hardcoded lookup for ossp-uuid. This is necessary as ossp-uuid on
+		# windows installs neither a pkg-config nor a cmake dependency
+		# information. Nor is there another supported uuid implementation
+		# available on windows.
+		if not uuid.found()
+			uuid = cc.find_library('ossp-uuid',
+				required: false, dirs: test_lib_d,
+				has_headers: uuidheader, header_include_directories: postgres_inc)
+		endif
+		if not uuid.found()
+			uuid = cc.find_library('uuid',
+				required: true, dirs: test_lib_d,
+				has_headers: uuidheader, header_include_directories: postgres_inc)
+		endif
+	else
+		error('unknown uuid build option value: @0@'.format(uuidopt))
+	endif
+
+	if not cc.has_header_symbol(uuidheader, uuidfunc,
+															args: test_c_args,
+															include_directories: postgres_inc,
+															dependencies: uuid)
+		error('uuid library @0@ missing required function @1@'.format(uuidopt, uuidfunc))
+	endif
+	cdata.set('HAVE_@0@'.format(uuidheader.underscorify().to_upper()), 1)
+
+	cdata.set('HAVE_UUID_@0@'.format(uuidname), 1,
+					 description: 'Define to 1 if you have @0@ UUID support.'.format(uuidname))
 else
-  uuid = not_found_dep
+	uuid = not_found_dep
 endif
 
 
@@ -1664,25 +1664,25 @@ endif
 zlibopt = get_option('zlib')
 zlib = not_found_dep
 if not zlibopt.disabled()
-  zlib_t = dependency('zlib', required: zlibopt)
+	zlib_t = dependency('zlib', required: zlibopt)
 
-  if zlib_t.type_name() == 'internal'
-    # if fallback was used, we don't need to test if headers are present (they
-    # aren't built yet, so we can't test)
-    zlib = zlib_t
-  elif not zlib_t.found()
-    warning('did not find zlib')
-  elif not cc.has_header('zlib.h',
-      args: test_c_args, include_directories: postgres_inc,
-      dependencies: [zlib_t], required: zlibopt)
-    warning('zlib header not found')
-  else
-    zlib = zlib_t
-  endif
+	if zlib_t.type_name() == 'internal'
+		# if fallback was used, we don't need to test if headers are present (they
+		# aren't built yet, so we can't test)
+		zlib = zlib_t
+	elif not zlib_t.found()
+		warning('did not find zlib')
+	elif not cc.has_header('zlib.h',
+			args: test_c_args, include_directories: postgres_inc,
+			dependencies: [zlib_t], required: zlibopt)
+		warning('zlib header not found')
+	else
+		zlib = zlib_t
+	endif
 
-  if zlib.found()
-    cdata.set('HAVE_LIBZ', 1)
-  endif
+	if zlib.found()
+		cdata.set('HAVE_LIBZ', 1)
+	endif
 endif
 
 
@@ -1695,18 +1695,18 @@ endif
 tap_tests_enabled = false
 tapopt = get_option('tap_tests')
 if not tapopt.disabled()
-  # Checking for perl modules for tap tests
-  perl_ipc_run_check = run_command(perl, 'config/check_modules.pl', check: false)
-  if perl_ipc_run_check.returncode() != 0
-    message(perl_ipc_run_check.stderr().strip())
-    if tapopt.enabled()
-      error('Additional Perl modules are required to run TAP tests.')
-    else
-      warning('Additional Perl modules are required to run TAP tests.')
-    endif
-  else
-    tap_tests_enabled = true
-  endif
+	# Checking for perl modules for tap tests
+	perl_ipc_run_check = run_command(perl, 'config/check_modules.pl', check: false)
+	if perl_ipc_run_check.returncode() != 0
+		message(perl_ipc_run_check.stderr().strip())
+		if tapopt.enabled()
+			error('Additional Perl modules are required to run TAP tests.')
+		else
+			warning('Additional Perl modules are required to run TAP tests.')
+		endif
+	else
+		tap_tests_enabled = true
+	endif
 endif
 
 
@@ -1717,20 +1717,20 @@ endif
 
 zstdopt = get_option('zstd')
 if not zstdopt.disabled()
-  zstd = dependency('libzstd', required: false, version: '>=1.4.0')
-  # Unfortunately the dependency is named differently with cmake
-  if not zstd.found() # combine with above once meson 0.60.0 is required
-    zstd = dependency('zstd', required: zstdopt, version: '>=1.4.0',
-                      method: 'cmake', modules: ['zstd::libzstd_shared'])
-  endif
-
-  if zstd.found()
-    cdata.set('USE_ZSTD', 1)
-    cdata.set('HAVE_LIBZSTD', 1)
-  endif
+	zstd = dependency('libzstd', required: false, version: '>=1.4.0')
+	# Unfortunately the dependency is named differently with cmake
+	if not zstd.found() # combine with above once meson 0.60.0 is required
+		zstd = dependency('zstd', required: zstdopt, version: '>=1.4.0',
+											method: 'cmake', modules: ['zstd::libzstd_shared'])
+	endif
+
+	if zstd.found()
+		cdata.set('USE_ZSTD', 1)
+		cdata.set('HAVE_LIBZSTD', 1)
+	endif
 
 else
-  zstd = not_found_dep
+	zstd = not_found_dep
 endif
 
 
@@ -1740,15 +1740,15 @@ endif
 ###############################################################
 
 if host_machine.endian() == 'big'
-  cdata.set('WORDS_BIGENDIAN', 1)
+	cdata.set('WORDS_BIGENDIAN', 1)
 endif
 
 # Determine memory alignment requirements for the basic C data types.
 
 alignof_types = ['short', 'int', 'long', 'double']
 foreach t : alignof_types
-  align = cc.alignment(t, args: test_c_args)
-  cdata.set('ALIGNOF_@0@'.format(t.to_upper()), align)
+	align = cc.alignment(t, args: test_c_args)
+	cdata.set('ALIGNOF_@0@'.format(t.to_upper()), align)
 endforeach
 
 # Compute maximum alignment of any basic type.
@@ -1768,7 +1768,7 @@ endforeach
 # would be too much of a penalty for disk and memory space.
 alignof_double = cdata.get('ALIGNOF_DOUBLE')
 if cc.alignment('int64_t', args: test_c_args, prefix: '#include <stdint.h>') > alignof_double
-  error('alignment of int64_t is greater than the alignment of double')
+	error('alignment of int64_t is greater than the alignment of double')
 endif
 cdata.set('MAXIMUM_ALIGNOF', alignof_double)
 
@@ -1777,7 +1777,7 @@ cdata.set('SIZEOF_LONG_LONG', cc.sizeof('long long', args: test_c_args))
 cdata.set('SIZEOF_VOID_P', cc.sizeof('void *', args: test_c_args))
 cdata.set('SIZEOF_SIZE_T', cc.sizeof('size_t', args: test_c_args))
 cdata.set('SIZEOF_INTMAX_T', cc.sizeof('intmax_t', args: test_c_args,
-                                       prefix: '#include <stdint.h>'))
+																			 prefix: '#include <stdint.h>'))
 
 
 # Check if __int128 is a working 128 bit integer type, and if so
@@ -1789,75 +1789,75 @@ cdata.set('SIZEOF_INTMAX_T', cc.sizeof('intmax_t', args: test_c_args,
 # For the moment we only test for support for 128bit math; support for
 # 128bit literals and snprintf is not required.
 if cc.links('''
-  /*
-   * We don't actually run this test, just link it to verify that any support
-   * functions needed for __int128 are present.
-   *
-   * These are globals to discourage the compiler from folding all the
-   * arithmetic tests down to compile-time constants.  We do not have
-   * convenient support for 128bit literals at this point...
-   */
-  __int128 a = 48828125;
-  __int128 b = 97656250;
-
-  int main(void)
-  {
-      __int128 c,d;
-      a = (a << 12) + 1; /* 200000000001 */
-      b = (b << 12) + 5; /* 400000000005 */
-      /* try the most relevant arithmetic ops */
-      c = a * b;
-      d = (c + b) / b;
-      /* must use the results, else compiler may optimize arithmetic away */
-      return d != a+1;
-  }''',
-  name: '__int128',
-  args: test_c_args)
-
-  buggy_int128 = false
-
-  # Use of non-default alignment with __int128 tickles bugs in some compilers.
-  # If not cross-compiling, we can test for bugs and disable use of __int128
-  # with buggy compilers.  If cross-compiling, hope for the best.
-  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83925
-  if not meson.is_cross_build()
-    r = cc.run('''
-    /* This must match the corresponding code in c.h: */
-    #if defined(__GNUC__)
-    #define pg_attribute_aligned(a) __attribute__((aligned(a)))
-    #elif defined(_MSC_VER)
-    #define pg_attribute_aligned(a) __declspec(align(a))
-    #endif
-    typedef __int128 int128a
-    #if defined(pg_attribute_aligned)
-    pg_attribute_aligned(8)
-    #endif
-    ;
-
-    int128a holder;
-    void pass_by_val(void *buffer, int128a par) { holder = par; }
-
-    int main(void)
-    {
-        long int i64 = 97656225L << 12;
-        int128a q;
-        pass_by_val(main, (int128a) i64);
-        q = (int128a) i64;
-        return q != holder;
-    }''',
-    name: '__int128 alignment bug',
-    args: test_c_args)
-    assert(r.compiled())
-    if r.returncode() != 0
-      buggy_int128 = true
-      message('__int128 support present but buggy and thus disabled')
-    endif
-  endif
-
-  if not buggy_int128
-    cdata.set('PG_INT128_TYPE', '__int128')
-    cdata.set('ALIGNOF_PG_INT128_TYPE', cc.alignment('__int128', args: test_c_args))
-  endif
+	/*
+	 * We don't actually run this test, just link it to verify that any support
+	 * functions needed for __int128 are present.
+	 *
+	 * These are globals to discourage the compiler from folding all the
+	 * arithmetic tests down to compile-time constants.  We do not have
+	 * convenient support for 128bit literals at this point...
+	 */
+	__int128 a = 48828125;
+	__int128 b = 97656250;
+
+	int main(void)
+	{
+			__int128 c,d;
+			a = (a << 12) + 1; /* 200000000001 */
+			b = (b << 12) + 5; /* 400000000005 */
+			/* try the most relevant arithmetic ops */
+			c = a * b;
+			d = (c + b) / b;
+			/* must use the results, else compiler may optimize arithmetic away */
+			return d != a+1;
+	}''',
+	name: '__int128',
+	args: test_c_args)
+
+	buggy_int128 = false
+
+	# Use of non-default alignment with __int128 tickles bugs in some compilers.
+	# If not cross-compiling, we can test for bugs and disable use of __int128
+	# with buggy compilers.  If cross-compiling, hope for the best.
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83925
+	if not meson.is_cross_build()
+		r = cc.run('''
+		/* This must match the corresponding code in c.h: */
+		#if defined(__GNUC__)
+		#define pg_attribute_aligned(a) __attribute__((aligned(a)))
+		#elif defined(_MSC_VER)
+		#define pg_attribute_aligned(a) __declspec(align(a))
+		#endif
+		typedef __int128 int128a
+		#if defined(pg_attribute_aligned)
+		pg_attribute_aligned(8)
+		#endif
+		;
+
+		int128a holder;
+		void pass_by_val(void *buffer, int128a par) { holder = par; }
+
+		int main(void)
+		{
+				long int i64 = 97656225L << 12;
+				int128a q;
+				pass_by_val(main, (int128a) i64);
+				q = (int128a) i64;
+				return q != holder;
+		}''',
+		name: '__int128 alignment bug',
+		args: test_c_args)
+		assert(r.compiled())
+		if r.returncode() != 0
+			buggy_int128 = true
+			message('__int128 support present but buggy and thus disabled')
+		endif
+	endif
+
+	if not buggy_int128
+		cdata.set('PG_INT128_TYPE', '__int128')
+		cdata.set('ALIGNOF_PG_INT128_TYPE', cc.alignment('__int128', args: test_c_args))
+	endif
 endif
 
 
@@ -1867,29 +1867,29 @@ endif
 # Checking whether computed gotos are supported syntax-wise ought to
 # be enough, as the syntax is otherwise illegal.
 if cc.compiles('''
-    static inline int foo(void)
-    {
-      void *labeladdrs[] = {&&my_label};
-      goto *labeladdrs[0];
-      my_label:
-      return 1;
-    }''',
-    name: 'computed goto',
-    args: test_c_args)
-  cdata.set('HAVE_COMPUTED_GOTO', 1)
+		static inline int foo(void)
+		{
+			void *labeladdrs[] = {&&my_label};
+			goto *labeladdrs[0];
+			my_label:
+			return 1;
+		}''',
+		name: 'computed goto',
+		args: test_c_args)
+	cdata.set('HAVE_COMPUTED_GOTO', 1)
 endif
 
 
 # Check if the C compiler supports GCC-style statement expressions.
 if cc.compiles('''
-    int main(int arg, char **argv)
-    {
-        ({ _Static_assert(1, "foo"); });
-    }
-    ''',
-    name: 'statement expressions',
-    args: test_c_args)
-  cdata.set('HAVE_STATEMENT_EXPRESSIONS', 1)
+		int main(int arg, char **argv)
+		{
+				({ _Static_assert(1, "foo"); });
+		}
+		''',
+		name: 'statement expressions',
+		args: test_c_args)
+	cdata.set('HAVE_STATEMENT_EXPRESSIONS', 1)
 endif
 
 
@@ -1902,64 +1902,64 @@ testsrc = '''
 extern void emit_log(int ignore, const char *fmt,...) __attribute__((format(@0@, 2,3)));
 static void call_log(void)
 {
-    emit_log(0, "error: %s: %m", "foo");
+		emit_log(0, "error: %s: %m", "foo");
 }
 '''
 attrib_error_args = cc.get_supported_arguments('-Werror=format', '-Werror=ignored-attributes')
 foreach a : printf_attributes
-  if cc.compiles(testsrc.format(a),
-      args: test_c_args + attrib_error_args, name: 'format ' + a)
-    cdata.set('PG_C_PRINTF_ATTRIBUTE', a)
-    break
-  endif
+	if cc.compiles(testsrc.format(a),
+			args: test_c_args + attrib_error_args, name: 'format ' + a)
+		cdata.set('PG_C_PRINTF_ATTRIBUTE', a)
+		break
+	endif
 endforeach
 
 # We need to repeat the test for C++ because gcc and clang prefer different
 # format archetypes.
 if llvm.found()
-  attrib_error_args = cpp.get_supported_arguments('-Werror=format', '-Werror=ignored-attributes')
-  foreach a : printf_attributes
-    if cpp.compiles(testsrc.format(a),
-        args: attrib_error_args, name: 'cppformat ' + a)
-      cdata.set('PG_CXX_PRINTF_ATTRIBUTE', a)
-      break
-    endif
-  endforeach
+	attrib_error_args = cpp.get_supported_arguments('-Werror=format', '-Werror=ignored-attributes')
+	foreach a : printf_attributes
+		if cpp.compiles(testsrc.format(a),
+				args: attrib_error_args, name: 'cppformat ' + a)
+			cdata.set('PG_CXX_PRINTF_ATTRIBUTE', a)
+			break
+		endif
+	endforeach
 endif
 
 
 if cc.has_function_attribute('visibility:default') and \
-    cc.has_function_attribute('visibility:hidden')
-  cdata.set('HAVE_VISIBILITY_ATTRIBUTE', 1)
+		cc.has_function_attribute('visibility:hidden')
+	cdata.set('HAVE_VISIBILITY_ATTRIBUTE', 1)
 
-  # Only newer versions of meson know not to apply gnu_symbol_visibility =
-  # inlineshidden to C code as well... And either way, we want to put these
-  # flags into exported files (pgxs, .pc files).
-  cflags_mod += '-fvisibility=hidden'
-  cxxflags_mod += ['-fvisibility=hidden', '-fvisibility-inlines-hidden']
-  ldflags_mod += '-fvisibility=hidden'
+	# Only newer versions of meson know not to apply gnu_symbol_visibility =
+	# inlineshidden to C code as well... And either way, we want to put these
+	# flags into exported files (pgxs, .pc files).
+	cflags_mod += '-fvisibility=hidden'
+	cxxflags_mod += ['-fvisibility=hidden', '-fvisibility-inlines-hidden']
+	ldflags_mod += '-fvisibility=hidden'
 endif
 
 
 # Check if various builtins exist. Some builtins are tested separately,
 # because we want to test something more complicated than the generic case.
 builtins = [
-  'bswap16',
-  'bswap32',
-  'bswap64',
-  'clz',
-  'ctz',
-  'constant_p',
-  'frame_address',
-  'popcount',
-  'unreachable',
+	'bswap16',
+	'bswap32',
+	'bswap64',
+	'clz',
+	'ctz',
+	'constant_p',
+	'frame_address',
+	'popcount',
+	'unreachable',
 ]
 
 foreach builtin : builtins
-  fname = '__builtin_@0@'.format(builtin)
-  if cc.has_function(fname, args: test_c_args)
-    cdata.set('HAVE@0@'.format(fname.to_upper()), 1)
-  endif
+	fname = '__builtin_@0@'.format(builtin)
+	if cc.has_function(fname, args: test_c_args)
+		cdata.set('HAVE@0@'.format(fname.to_upper()), 1)
+	endif
 endforeach
 
 
@@ -1969,12 +1969,12 @@ endforeach
 # We check usage with __typeof__, though it's unlikely any compiler would
 # have the former and not the latter.
 if cc.compiles('''
-    static int x;
-    static int y[__builtin_types_compatible_p(__typeof__(x), int)];
-    ''',
-    name: '__builtin_types_compatible_p',
-    args: test_c_args)
-  cdata.set('HAVE__BUILTIN_TYPES_COMPATIBLE_P', 1)
+		static int x;
+		static int y[__builtin_types_compatible_p(__typeof__(x), int)];
+		''',
+		name: '__builtin_types_compatible_p',
+		args: test_c_args)
+	cdata.set('HAVE__BUILTIN_TYPES_COMPATIBLE_P', 1)
 endif
 
 
@@ -1987,65 +1987,65 @@ endif
 # compile, and store the results in global variables so the compiler doesn't
 # optimize away the call.
 if cc.links('''
-    #include <stdint.h>
-    int64_t a = 1;
-    int64_t b = 1;
-    int64_t result;
+		#include <stdint.h>
+		int64_t a = 1;
+		int64_t b = 1;
+		int64_t result;
 
-    int main(void)
-    {
-        return __builtin_mul_overflow(a, b, &result);
-    }''',
-    name: '__builtin_mul_overflow',
-    args: test_c_args)
-  cdata.set('HAVE__BUILTIN_OP_OVERFLOW', 1)
+		int main(void)
+		{
+				return __builtin_mul_overflow(a, b, &result);
+		}''',
+		name: '__builtin_mul_overflow',
+		args: test_c_args)
+	cdata.set('HAVE__BUILTIN_OP_OVERFLOW', 1)
 endif
 
 # Check for __get_cpuid() and __cpuid().
 if cc.links('''
-    #include <cpuid.h>
-    int main(int arg, char **argv)
-    {
-        unsigned int exx[4] = {0, 0, 0, 0};
-        __get_cpuid(1, &exx[0], &exx[1], &exx[2], &exx[3]);
-    }
-    ''', name: '__get_cpuid',
-    args: test_c_args)
-  cdata.set('HAVE__GET_CPUID', 1)
+		#include <cpuid.h>
+		int main(int arg, char **argv)
+		{
+				unsigned int exx[4] = {0, 0, 0, 0};
+				__get_cpuid(1, &exx[0], &exx[1], &exx[2], &exx[3]);
+		}
+		''', name: '__get_cpuid',
+		args: test_c_args)
+	cdata.set('HAVE__GET_CPUID', 1)
 elif cc.links('''
-    #include <intrin.h>
-    int main(int arg, char **argv)
-    {
-        unsigned int exx[4] = {0, 0, 0, 0};
-        __cpuid(exx, 1);
-    }
-    ''', name: '__cpuid',
-    args: test_c_args)
-  cdata.set('HAVE__CPUID', 1)
+		#include <intrin.h>
+		int main(int arg, char **argv)
+		{
+				unsigned int exx[4] = {0, 0, 0, 0};
+				__cpuid(exx, 1);
+		}
+		''', name: '__cpuid',
+		args: test_c_args)
+	cdata.set('HAVE__CPUID', 1)
 endif
 
 
 # Check for __get_cpuid_count() and __cpuidex() in a similar fashion.
 if cc.links('''
-    #include <cpuid.h>
-    int main(int arg, char **argv)
-    {
-        unsigned int exx[4] = {0, 0, 0, 0};
-        __get_cpuid_count(7, 0, &exx[0], &exx[1], &exx[2], &exx[3]);
-    }
-    ''', name: '__get_cpuid_count',
-    args: test_c_args)
-  cdata.set('HAVE__GET_CPUID_COUNT', 1)
+		#include <cpuid.h>
+		int main(int arg, char **argv)
+		{
+				unsigned int exx[4] = {0, 0, 0, 0};
+				__get_cpuid_count(7, 0, &exx[0], &exx[1], &exx[2], &exx[3]);
+		}
+		''', name: '__get_cpuid_count',
+		args: test_c_args)
+	cdata.set('HAVE__GET_CPUID_COUNT', 1)
 elif cc.links('''
-    #include <intrin.h>
-    int main(int arg, char **argv)
-    {
-        unsigned int exx[4] = {0, 0, 0, 0};
-        __cpuidex(exx, 7, 0);
-    }
-    ''', name: '__cpuidex',
-    args: test_c_args)
-  cdata.set('HAVE__CPUIDEX', 1)
+		#include <intrin.h>
+		int main(int arg, char **argv)
+		{
+				unsigned int exx[4] = {0, 0, 0, 0};
+				__cpuidex(exx, 7, 0);
+		}
+		''', name: '__cpuidex',
+		args: test_c_args)
+	cdata.set('HAVE__CPUIDEX', 1)
 endif
 
 
@@ -2059,13 +2059,13 @@ endif
 # -fexcess-precision=standard, that way a potentially fixed compiler will work
 # automatically.
 if '-fexcess-precision=standard' not in cflags
-  if not cc.compiles('''
+	if not cc.compiles('''
 #if defined(__clang__) && defined(__i386__) && !defined(__SSE2_MATH__)
 choke me
 #endif''',
-      name: '', args: test_c_args)
-    error('Compiling PostgreSQL with clang, on 32bit x86, requires SSE2 support. Use -msse2 or use gcc.')
-  endif
+			name: '', args: test_c_args)
+		error('Compiling PostgreSQL with clang, on 32bit x86, requires SSE2 support. Use -msse2 or use gcc.')
+	endif
 endif
 
 
@@ -2075,48 +2075,48 @@ endif
 ###############################################################
 
 common_functional_flags = [
-  # Disable strict-aliasing rules; needed for gcc 3.3+
-  '-fno-strict-aliasing',
-  # Disable optimizations that assume no overflow; needed for gcc 4.3+
-  '-fwrapv',
-  '-fexcess-precision=standard',
+	# Disable strict-aliasing rules; needed for gcc 3.3+
+	'-fno-strict-aliasing',
+	# Disable optimizations that assume no overflow; needed for gcc 4.3+
+	'-fwrapv',
+	'-fexcess-precision=standard',
 ]
 
 cflags += cc.get_supported_arguments(common_functional_flags)
 if llvm.found()
-  cxxflags += cpp.get_supported_arguments(common_functional_flags)
+	cxxflags += cpp.get_supported_arguments(common_functional_flags)
 endif
 
 vectorize_cflags = cc.get_supported_arguments(['-ftree-vectorize'])
 unroll_loops_cflags = cc.get_supported_arguments(['-funroll-loops'])
 
 common_warning_flags = [
-  '-Wmissing-prototypes',
-  '-Wpointer-arith',
-  # Really don't want VLAs to be used in our dialect of C
-  '-Werror=vla',
-  # On macOS, complain about usage of symbols newer than the deployment target
-  '-Werror=unguarded-availability-new',
-  '-Wendif-labels',
-  '-Wmissing-format-attribute',
-  '-Wimplicit-fallthrough=3',
-  '-Wcast-function-type',
-  '-Wshadow=compatible-local',
-  # This was included in -Wall/-Wformat in older GCC versions
-  '-Wformat-security',
+	'-Wmissing-prototypes',
+	'-Wpointer-arith',
+	# Really don't want VLAs to be used in our dialect of C
+	'-Werror=vla',
+	# On macOS, complain about usage of symbols newer than the deployment target
+	'-Werror=unguarded-availability-new',
+	'-Wendif-labels',
+	'-Wmissing-format-attribute',
+	'-Wimplicit-fallthrough=3',
+	'-Wcast-function-type',
+	'-Wshadow=compatible-local',
+	# This was included in -Wall/-Wformat in older GCC versions
+	'-Wformat-security',
 ]
 
 cflags_warn += cc.get_supported_arguments(common_warning_flags)
 if llvm.found()
-  cxxflags_warn += cpp.get_supported_arguments(common_warning_flags)
+	cxxflags_warn += cpp.get_supported_arguments(common_warning_flags)
 endif
 
 # A few places with imported code get a pass on -Wdeclaration-after-statement, remember
 # the result for them
 cflags_no_decl_after_statement = []
 if cc.has_argument('-Wdeclaration-after-statement')
-  cflags_warn += '-Wdeclaration-after-statement'
-  cflags_no_decl_after_statement += '-Wno-declaration-after-statement'
+	cflags_warn += '-Wdeclaration-after-statement'
+	cflags_no_decl_after_statement += '-Wno-declaration-after-statement'
 endif
 
 # Some code is not clean for -Wmissing-variable-declarations, so we
@@ -2125,8 +2125,8 @@ endif
 # C++.
 cflags_no_missing_var_decls = []
 if cc.has_argument('-Wmissing-variable-declarations')
-  cflags_warn += '-Wmissing-variable-declarations'
-  cflags_no_missing_var_decls += '-Wno-missing-variable-declarations'
+	cflags_warn += '-Wmissing-variable-declarations'
+	cflags_no_missing_var_decls += '-Wno-missing-variable-declarations'
 endif
 
 
@@ -2136,69 +2136,69 @@ endif
 # add the negative form.
 
 negative_warning_flags = [
-  # Suppress clang's unhelpful unused-command-line-argument warnings.
-  'unused-command-line-argument',
+	# Suppress clang's unhelpful unused-command-line-argument warnings.
+	'unused-command-line-argument',
 
-  # Remove clang 12+'s compound-token-split-by-macro, as this causes a lot
-  # of warnings when building plperl because of usages in the Perl headers.
-  'compound-token-split-by-macro',
+	# Remove clang 12+'s compound-token-split-by-macro, as this causes a lot
+	# of warnings when building plperl because of usages in the Perl headers.
+	'compound-token-split-by-macro',
 
-  # Similarly disable useless truncation warnings from gcc 8+
-  'format-truncation',
-  'stringop-truncation',
+	# Similarly disable useless truncation warnings from gcc 8+
+	'format-truncation',
+	'stringop-truncation',
 
-  # Suppress clang 16's strict warnings about function casts
-  'cast-function-type-strict',
+	# Suppress clang 16's strict warnings about function casts
+	'cast-function-type-strict',
 
-  # To make warning_level=2 / -Wextra work, we'd need at least the following
-  # 'clobbered',
-  # 'missing-field-initializers',
-  # 'sign-compare',
-  # 'unused-parameter',
+	# To make warning_level=2 / -Wextra work, we'd need at least the following
+	# 'clobbered',
+	# 'missing-field-initializers',
+	# 'sign-compare',
+	# 'unused-parameter',
 ]
 
 foreach w : negative_warning_flags
-  if cc.has_argument('-W' + w)
-    cflags_warn += '-Wno-' + w
-  endif
-  if llvm.found() and cpp.has_argument('-W' + w)
-    cxxflags_warn += '-Wno-' + w
-  endif
+	if cc.has_argument('-W' + w)
+		cflags_warn += '-Wno-' + w
+	endif
+	if llvm.found() and cpp.has_argument('-W' + w)
+		cxxflags_warn += '-Wno-' + w
+	endif
 endforeach
 
 
 if cc.get_id() == 'msvc'
-  cflags_warn += [
-    # Warnings to disable:
-    # from /W1:
-    '/wd4090', # different 'modifier' qualifiers
-    # from /W2:
-    '/wd4244', # conversion from 'type1' to 'type2', possible loss of data
-    # from /W3:
-    '/wd4018', # signed/unsigned mismatch
-    '/wd4101', # unreferenced local variable [like -Wunused-variable, but there is no "unused" attribute, so too noisy]
-    '/wd4267', # conversion from 'size_t' to 'type', possible loss of data
-
-    # Additional warnings to enable:
-    '/w24062', # enumerator 'identifier' in switch of enum 'enumeration' is not handled [like -Wswitch]
-    '/w24102', # unreferenced label [like -Wunused-label]
-    '/w24777', # 'function' : format string 'string' requires an argument of type 'type1', but variadic argument number has type 'type2' [like -Wformat]
-  ]
-
-  cppflags += [
-    '/DWIN32',
-    '/DWINDOWS',
-    '/D__WINDOWS__',
-    '/D__WIN32__',
-    '/D_CRT_SECURE_NO_DEPRECATE',
-    '/D_CRT_NONSTDC_NO_DEPRECATE',
-  ]
-
-  # We never need export libraries. As link.exe reports their creation, they
-  # are unnecessarily noisy. Similarly, we don't need import library for
-  # modules, we only import them dynamically, and they're also noisy.
-  ldflags += '/NOEXP'
-  ldflags_mod += '/NOIMPLIB'
+	cflags_warn += [
+		# Warnings to disable:
+		# from /W1:
+		'/wd4090', # different 'modifier' qualifiers
+		# from /W2:
+		'/wd4244', # conversion from 'type1' to 'type2', possible loss of data
+		# from /W3:
+		'/wd4018', # signed/unsigned mismatch
+		'/wd4101', # unreferenced local variable [like -Wunused-variable, but there is no "unused" attribute, so too noisy]
+		'/wd4267', # conversion from 'size_t' to 'type', possible loss of data
+
+		# Additional warnings to enable:
+		'/w24062', # enumerator 'identifier' in switch of enum 'enumeration' is not handled [like -Wswitch]
+		'/w24102', # unreferenced label [like -Wunused-label]
+		'/w24777', # 'function' : format string 'string' requires an argument of type 'type1', but variadic argument number has type 'type2' [like -Wformat]
+	]
+
+	cppflags += [
+		'/DWIN32',
+		'/DWINDOWS',
+		'/D__WINDOWS__',
+		'/D__WIN32__',
+		'/D_CRT_SECURE_NO_DEPRECATE',
+		'/D_CRT_NONSTDC_NO_DEPRECATE',
+	]
+
+	# We never need export libraries. As link.exe reports their creation, they
+	# are unnecessarily noisy. Similarly, we don't need import library for
+	# modules, we only import them dynamically, and they're also noisy.
+	ldflags += '/NOEXP'
+	ldflags_mod += '/NOIMPLIB'
 endif
 
 
@@ -2212,25 +2212,25 @@ endif
 common_builtin_flags = ['-Wall']
 
 if get_option('debug')
-  common_builtin_flags += ['-g']
+	common_builtin_flags += ['-g']
 endif
 
 optimization = get_option('optimization')
 if optimization == '0'
-  common_builtin_flags += ['-O0']
+	common_builtin_flags += ['-O0']
 elif optimization == '1'
-  common_builtin_flags += ['-O1']
+	common_builtin_flags += ['-O1']
 elif optimization == '2'
-  common_builtin_flags += ['-O2']
+	common_builtin_flags += ['-O2']
 elif optimization == '3'
-  common_builtin_flags += ['-O3']
+	common_builtin_flags += ['-O3']
 elif optimization == 's'
-  common_builtin_flags += ['-Os']
+	common_builtin_flags += ['-Os']
 endif
 
 cflags_builtin = cc.get_supported_arguments(common_builtin_flags)
 if llvm.found()
-  cxxflags_builtin = cpp.get_supported_arguments(common_builtin_flags)
+	cxxflags_builtin = cpp.get_supported_arguments(common_builtin_flags)
 endif
 
 
@@ -2240,60 +2240,60 @@ endif
 ###############################################################
 
 atomic_checks = [
-  {'name': 'HAVE_GCC__SYNC_CHAR_TAS',
-   'desc': '__sync_lock_test_and_set(char)',
-   'test': '''
+	{'name': 'HAVE_GCC__SYNC_CHAR_TAS',
+	 'desc': '__sync_lock_test_and_set(char)',
+	 'test': '''
 char lock = 0;
 __sync_lock_test_and_set(&lock, 1);
 __sync_lock_release(&lock);'''},
 
-  {'name': 'HAVE_GCC__SYNC_INT32_TAS',
-   'desc': '__sync_lock_test_and_set(int32)',
-   'test': '''
+	{'name': 'HAVE_GCC__SYNC_INT32_TAS',
+	 'desc': '__sync_lock_test_and_set(int32)',
+	 'test': '''
 int lock = 0;
 __sync_lock_test_and_set(&lock, 1);
 __sync_lock_release(&lock);'''},
 
-  {'name': 'HAVE_GCC__SYNC_INT32_CAS',
-   'desc': '__sync_val_compare_and_swap(int32)',
-   'test': '''
+	{'name': 'HAVE_GCC__SYNC_INT32_CAS',
+	 'desc': '__sync_val_compare_and_swap(int32)',
+	 'test': '''
 int val = 0;
 __sync_val_compare_and_swap(&val, 0, 37);'''},
 
-  {'name': 'HAVE_GCC__SYNC_INT64_CAS',
-   'desc': '__sync_val_compare_and_swap(int64)',
-   'test': '''
+	{'name': 'HAVE_GCC__SYNC_INT64_CAS',
+	 'desc': '__sync_val_compare_and_swap(int64)',
+	 'test': '''
 int64_t val = 0;
 __sync_val_compare_and_swap(&val, 0, 37);'''},
 
-  {'name': 'HAVE_GCC__ATOMIC_INT32_CAS',
-   'desc': ' __atomic_compare_exchange_n(int32)',
-   'test': '''
+	{'name': 'HAVE_GCC__ATOMIC_INT32_CAS',
+	 'desc': ' __atomic_compare_exchange_n(int32)',
+	 'test': '''
 int val = 0;
 int expect = 0;
 __atomic_compare_exchange_n(&val, &expect, 37, 0, __ATOMIC_SEQ_CST, __ATOMIC_RELAXED);'''},
 
-  {'name': 'HAVE_GCC__ATOMIC_INT64_CAS',
-   'desc': ' __atomic_compare_exchange_n(int64)',
-   'test': '''
+	{'name': 'HAVE_GCC__ATOMIC_INT64_CAS',
+	 'desc': ' __atomic_compare_exchange_n(int64)',
+	 'test': '''
 int64_t val = 0;
 int64_t expect = 0;
 __atomic_compare_exchange_n(&val, &expect, 37, 0, __ATOMIC_SEQ_CST, __ATOMIC_RELAXED);'''},
 ]
 
 foreach check : atomic_checks
-  test = '''
+	test = '''
 #include <stdint.h>
 int main(void)
 {
 @0@
 }'''.format(check['test'])
 
-  cdata.set(check['name'],
-    cc.links(test,
-      name: check['desc'],
-      args: test_c_args) ? 1 : false
-  )
+	cdata.set(check['name'],
+		cc.links(test,
+			name: check['desc'],
+			args: test_c_args) ? 1 : false
+	)
 endforeach
 
 
@@ -2303,7 +2303,7 @@ endforeach
 
 if host_cpu == 'x86' or host_cpu == 'x86_64'
 
-  prog = '''
+	prog = '''
 #include <immintrin.h>
 
 #if defined(__has_attribute) && __has_attribute (target)
@@ -2311,13 +2311,13 @@ __attribute__((target("xsave")))
 #endif
 int main(void)
 {
-    return _xgetbv(0) & 0xe0;
+		return _xgetbv(0) & 0xe0;
 }
 '''
 
-  if cc.links(prog, name: 'XSAVE intrinsics', args: test_c_args)
-    cdata.set('HAVE_XSAVE_INTRINSICS', 1)
-  endif
+	if cc.links(prog, name: 'XSAVE intrinsics', args: test_c_args)
+		cdata.set('HAVE_XSAVE_INTRINSICS', 1)
+	endif
 
 endif
 
@@ -2328,7 +2328,7 @@ endif
 
 if host_cpu == 'x86_64'
 
-  prog = '''
+	prog = '''
 #include <immintrin.h>
 #include <stdint.h>
 char buf[sizeof(__m512i)];
@@ -2338,20 +2338,20 @@ __attribute__((target("avx512vpopcntdq,avx512bw")))
 #endif
 int main(void)
 {
-    int64_t popcnt = 0;
-    __m512i accum = _mm512_setzero_si512();
-    __m512i val = _mm512_maskz_loadu_epi8((__mmask64) 0xf0f0f0f0f0f0f0f0, (const __m512i *) buf);
-    __m512i cnt = _mm512_popcnt_epi64(val);
-    accum = _mm512_add_epi64(accum, cnt);
-    popcnt = _mm512_reduce_add_epi64(accum);
-    /* return computed value, to prevent the above being optimized away */
-    return popcnt == 0;
+		int64_t popcnt = 0;
+		__m512i accum = _mm512_setzero_si512();
+		__m512i val = _mm512_maskz_loadu_epi8((__mmask64) 0xf0f0f0f0f0f0f0f0, (const __m512i *) buf);
+		__m512i cnt = _mm512_popcnt_epi64(val);
+		accum = _mm512_add_epi64(accum, cnt);
+		popcnt = _mm512_reduce_add_epi64(accum);
+		/* return computed value, to prevent the above being optimized away */
+		return popcnt == 0;
 }
 '''
 
-  if cc.links(prog, name: 'AVX-512 popcount', args: test_c_args)
-    cdata.set('USE_AVX512_POPCNT_WITH_RUNTIME_CHECK', 1)
-  endif
+	if cc.links(prog, name: 'AVX-512 popcount', args: test_c_args)
+		cdata.set('USE_AVX512_POPCNT_WITH_RUNTIME_CHECK', 1)
+	endif
 
 endif
 
@@ -2362,7 +2362,7 @@ endif
 
 if host_cpu == 'aarch64'
 
-  prog = '''
+	prog = '''
 #include <arm_sve.h>
 
 char buf[128];
@@ -2397,9 +2397,9 @@ int main(void)
 }
 '''
 
-  if cc.links(prog, name: 'SVE popcount', args: test_c_args)
-    cdata.set('USE_SVE_POPCNT_WITH_RUNTIME_CHECK', 1)
-  endif
+	if cc.links(prog, name: 'SVE popcount', args: test_c_args)
+		cdata.set('USE_SVE_POPCNT_WITH_RUNTIME_CHECK', 1)
+	endif
 
 endif
 
@@ -2433,13 +2433,13 @@ have_optimized_crc = false
 cflags_crc = []
 if host_cpu == 'x86' or host_cpu == 'x86_64'
 
-  if cc.get_id() == 'msvc'
-    cdata.set('USE_SSE42_CRC32C', false)
-    cdata.set('USE_SSE42_CRC32C_WITH_RUNTIME_CHECK', 1)
-    have_optimized_crc = true
-  else
+	if cc.get_id() == 'msvc'
+		cdata.set('USE_SSE42_CRC32C', false)
+		cdata.set('USE_SSE42_CRC32C_WITH_RUNTIME_CHECK', 1)
+		have_optimized_crc = true
+	else
 
-    prog = '''
+		prog = '''
 #include <nmmintrin.h>
 unsigned int crc;
 
@@ -2448,32 +2448,32 @@ __attribute__((target("sse4.2")))
 #endif
 int main(void)
 {
-    crc = _mm_crc32_u8(crc, 0);
-    crc = _mm_crc32_u32(crc, 0);
-    /* return computed value, to prevent the above being optimized away */
-    return crc == 0;
+		crc = _mm_crc32_u8(crc, 0);
+		crc = _mm_crc32_u32(crc, 0);
+		/* return computed value, to prevent the above being optimized away */
+		return crc == 0;
 }
 '''
 
-    if not cc.links(prog, name: 'SSE 4.2 CRC32C',
-          args: test_c_args)
-      # Do not use Intel SSE 4.2
-    elif (cc.get_define('__SSE4_2__') != '')
-      # Use Intel SSE 4.2 unconditionally.
-      cdata.set('USE_SSE42_CRC32C', 1)
-      have_optimized_crc = true
-    else
-      # Use Intel SSE 4.2, with runtime check. The CPUID instruction is needed for
-      # the runtime check.
-      cdata.set('USE_SSE42_CRC32C', false)
-      cdata.set('USE_SSE42_CRC32C_WITH_RUNTIME_CHECK', 1)
-      have_optimized_crc = true
-    endif
-
-    # Check if the compiler supports AVX-512 carryless multiplication
-    # and three-way exclusive-or instructions used for computing CRC.
-    # AVX-512F is assumed to be supported if the above are.
-    prog = '''
+		if not cc.links(prog, name: 'SSE 4.2 CRC32C',
+					args: test_c_args)
+			# Do not use Intel SSE 4.2
+		elif (cc.get_define('__SSE4_2__') != '')
+			# Use Intel SSE 4.2 unconditionally.
+			cdata.set('USE_SSE42_CRC32C', 1)
+			have_optimized_crc = true
+		else
+			# Use Intel SSE 4.2, with runtime check. The CPUID instruction is needed for
+			# the runtime check.
+			cdata.set('USE_SSE42_CRC32C', false)
+			cdata.set('USE_SSE42_CRC32C_WITH_RUNTIME_CHECK', 1)
+			have_optimized_crc = true
+		endif
+
+		# Check if the compiler supports AVX-512 carryless multiplication
+		# and three-way exclusive-or instructions used for computing CRC.
+		# AVX-512F is assumed to be supported if the above are.
+		prog = '''
 #include <immintrin.h>
 __m512i x;
 __m512i y;
@@ -2483,99 +2483,137 @@ __attribute__((target("vpclmulqdq,avx512vl")))
 #endif
 int main(void)
 {
-     __m128i z;
-
-    x = _mm512_xor_si512(_mm512_zextsi128_si512(_mm_cvtsi32_si128(0)), x);
-    y = _mm512_clmulepi64_epi128(x, y, 0);
-    z = _mm_ternarylogic_epi64(
-            _mm512_castsi512_si128(y),
-            _mm512_extracti32x4_epi32(y, 1),
-            _mm512_extracti32x4_epi32(y, 2),
-            0x96);
-    /* return computed value, to prevent the above being optimized away */
-    return _mm_crc32_u64(0, _mm_extract_epi64(z, 0));
+		 __m128i z;
+
+		x = _mm512_xor_si512(_mm512_zextsi128_si512(_mm_cvtsi32_si128(0)), x);
+		y = _mm512_clmulepi64_epi128(x, y, 0);
+		z = _mm_ternarylogic_epi64(
+						_mm512_castsi512_si128(y),
+						_mm512_extracti32x4_epi32(y, 1),
+						_mm512_extracti32x4_epi32(y, 2),
+						0x96);
+		/* return computed value, to prevent the above being optimized away */
+		return _mm_crc32_u64(0, _mm_extract_epi64(z, 0));
 }
 '''
 
-    if cc.links(prog,
-        name: 'AVX-512 CRC32C',
-        args: test_c_args)
-      cdata.set('USE_AVX512_CRC32C_WITH_RUNTIME_CHECK', 1)
-    endif
+		if cc.links(prog,
+				name: 'AVX-512 CRC32C',
+				args: test_c_args)
+			cdata.set('USE_AVX512_CRC32C_WITH_RUNTIME_CHECK', 1)
+		endif
 
-  endif
+	endif
 
 elif host_cpu == 'arm' or host_cpu == 'aarch64'
 
-  prog = '''
+	prog = '''
 #include <arm_acle.h>
 unsigned int crc;
 
 int main(void)
 {
-    crc = __crc32cb(crc, 0);
-    crc = __crc32ch(crc, 0);
-    crc = __crc32cw(crc, 0);
-    crc = __crc32cd(crc, 0);
+		crc = __crc32cb(crc, 0);
+		crc = __crc32ch(crc, 0);
+		crc = __crc32cw(crc, 0);
+		crc = __crc32cd(crc, 0);
 
-    /* return computed value, to prevent the above being optimized away */
-    return crc == 0;
+		/* return computed value, to prevent the above being optimized away */
+		return crc == 0;
 }
 '''
 
-  if cc.links(prog, name: '__crc32cb, __crc32ch, __crc32cw, and __crc32cd without -march=armv8-a+crc',
-      args: test_c_args)
-    # Use ARM CRC Extension unconditionally
-    cdata.set('USE_ARMV8_CRC32C', 1)
-    have_optimized_crc = true
-  elif cc.links(prog, name: '__crc32cb, __crc32ch, __crc32cw, and __crc32cd with -march=armv8-a+crc+simd',
-      args: test_c_args + ['-march=armv8-a+crc+simd'])
-    # Use ARM CRC Extension, with runtime check
-    cflags_crc += '-march=armv8-a+crc+simd'
-    cdata.set('USE_ARMV8_CRC32C', false)
-    cdata.set('USE_ARMV8_CRC32C_WITH_RUNTIME_CHECK', 1)
-    have_optimized_crc = true
-  elif cc.links(prog, name: '__crc32cb, __crc32ch, __crc32cw, and __crc32cd with -march=armv8-a+crc',
-      args: test_c_args + ['-march=armv8-a+crc'])
-    # Use ARM CRC Extension, with runtime check
-    cflags_crc += '-march=armv8-a+crc'
-    cdata.set('USE_ARMV8_CRC32C', false)
-    cdata.set('USE_ARMV8_CRC32C_WITH_RUNTIME_CHECK', 1)
-    have_optimized_crc = true
-  endif
+	if cc.links(prog, name: '__crc32cb, __crc32ch, __crc32cw, and __crc32cd without -march=armv8-a+crc',
+			args: test_c_args)
+		# Use ARM CRC Extension unconditionally
+		cdata.set('USE_ARMV8_CRC32C', 1)
+		have_optimized_crc = true
+	elif cc.links(prog, name: '__crc32cb, __crc32ch, __crc32cw, and __crc32cd with -march=armv8-a+crc+simd',
+			args: test_c_args + ['-march=armv8-a+crc+simd'])
+		# Use ARM CRC Extension, with runtime check
+		cflags_crc += '-march=armv8-a+crc+simd'
+		cdata.set('USE_ARMV8_CRC32C', false)
+		cdata.set('USE_ARMV8_CRC32C_WITH_RUNTIME_CHECK', 1)
+		have_optimized_crc = true
+	elif cc.links(prog, name: '__crc32cb, __crc32ch, __crc32cw, and __crc32cd with -march=armv8-a+crc',
+			args: test_c_args + ['-march=armv8-a+crc'])
+		# Use ARM CRC Extension, with runtime check
+		cflags_crc += '-march=armv8-a+crc'
+		cdata.set('USE_ARMV8_CRC32C', false)
+		cdata.set('USE_ARMV8_CRC32C_WITH_RUNTIME_CHECK', 1)
+		have_optimized_crc = true
+	endif
 
 elif host_cpu == 'loongarch64'
 
-  prog = '''
+	prog = '''
 unsigned int crc;
 
 int main(void)
 {
-    crc = __builtin_loongarch_crcc_w_b_w(0, crc);
-    crc = __builtin_loongarch_crcc_w_h_w(0, crc);
-    crc = __builtin_loongarch_crcc_w_w_w(0, crc);
-    crc = __builtin_loongarch_crcc_w_d_w(0, crc);
+		crc = __builtin_loongarch_crcc_w_b_w(0, crc);
+		crc = __builtin_loongarch_crcc_w_h_w(0, crc);
+		crc = __builtin_loongarch_crcc_w_w_w(0, crc);
+		crc = __builtin_loongarch_crcc_w_d_w(0, crc);
 
-    /* return computed value, to prevent the above being optimized away */
-    return crc == 0;
+		/* return computed value, to prevent the above being optimized away */
+		return crc == 0;
 }
 '''
 
-  if cc.links(prog, name: '__builtin_loongarch_crcc_w_b_w, __builtin_loongarch_crcc_w_h_w, __builtin_loongarch_crcc_w_w_w, and __builtin_loongarch_crcc_w_d_w',
-      args: test_c_args)
-    # Use LoongArch CRC instruction unconditionally
-    cdata.set('USE_LOONGARCH_CRC32C', 1)
-    have_optimized_crc = true
-  endif
+	if cc.links(prog, name: '__builtin_loongarch_crcc_w_b_w, __builtin_loongarch_crcc_w_h_w, __builtin_loongarch_crcc_w_w_w, and __builtin_loongarch_crcc_w_d_w',
+			args: test_c_args)
+		# Use LoongArch CRC instruction unconditionally
+		cdata.set('USE_LOONGARCH_CRC32C', 1)
+		have_optimized_crc = true
+	endif
 
 endif
 
 if not have_optimized_crc
-  # fall back to slicing-by-8 algorithm, which doesn't require any special CPU
-  # support.
-  cdata.set('USE_SLICING_BY_8_CRC32C', 1)
+	# fall back to slicing-by-8 algorithm, which doesn't require any special CPU
+	# support.
+	cdata.set('USE_SLICING_BY_8_CRC32C', 1)
 endif
 
+###############################################################
+# Check for the availability of ARM SVE2 CRC32C intrinsics.
+###############################################################
+
+if host_cpu == 'aarch64'
+
+	prog = '''
+#include <arm_sve.h>
+#include <stdint.h>
+
+#if defined(__has_attribute) && __has_attribute(target)
+__attribute__((target("arch=armv9-a+sve2-aes")))
+#endif
+static int crc32c_sve2_test(void)
+{
+	svbool_t pg = svptrue_b64();
+	const uint64_t data[2] = { 0x1234567890abcdef, 0xfedcba0987654321 };
+	svuint64_t x1 = svld1_u64(pg, data);
+	svuint64_t x2 = svld1_u64(pg, data + 1);
+
+	// test key CRC folding ops
+	svuint64_t m1 = svpmullb_pair_u64(x1, x2);
+	svuint64_t m2 = svpmullt_pair_u64(x1, x2);
+	svuint64_t res = sveor3_u64(m1, m2, x2);
+	return (int)svaddv_u64(pg, res) & 1;
+}
+
+int main(void)
+{
+	return crc32c_sve2_test();
+}
+'''
+
+	if cc.links(prog, name: 'SVE2 CRC32C', args: test_c_args)
+		cdata.set('USE_SVE2_CRC32C_WITH_RUNTIME_CHECK', 1)
+	endif
+
+endif
 
 
 ###############################################################
@@ -2584,37 +2622,37 @@ endif
 
 if host_cpu == 'x86_64'
 
-  if cc.compiles('''
-      void main(void)
-      {
-          long long x = 1; long long r;
-          __asm__ __volatile__ (" popcntq %1,%0\n" : "=q"(r) : "rm"(x));
-      }''',
-      name: '@0@: popcntq instruction'.format(host_cpu),
-      args: test_c_args)
-    cdata.set('HAVE_X86_64_POPCNTQ', 1)
-  endif
+	if cc.compiles('''
+			void main(void)
+			{
+					long long x = 1; long long r;
+					__asm__ __volatile__ (" popcntq %1,%0\n" : "=q"(r) : "rm"(x));
+			}''',
+			name: '@0@: popcntq instruction'.format(host_cpu),
+			args: test_c_args)
+		cdata.set('HAVE_X86_64_POPCNTQ', 1)
+	endif
 
 elif host_cpu == 'ppc' or host_cpu == 'ppc64'
-  # Check if compiler accepts "i"(x) when __builtin_constant_p(x).
-  if cdata.has('HAVE__BUILTIN_CONSTANT_P')
-    if cc.compiles('''
-      static inline int
-      addi(int ra, int si)
-      {
-          int res = 0;
-          if (__builtin_constant_p(si))
-              __asm__ __volatile__(
-                  " addi %0,%1,%2\n" : "=r"(res) : "b"(ra), "i"(si));
-          return res;
-      }
-      int test_adds(int x) { return addi(3, x) + addi(x, 5); }
-      ''',
-      name: '@0@: "i"(x) when __builtin_constant_p(x)'.format(host_cpu),
-      args: test_c_args)
-      cdata.set('HAVE_I_CONSTRAINT__BUILTIN_CONSTANT_P', 1)
-    endif
-  endif
+	# Check if compiler accepts "i"(x) when __builtin_constant_p(x).
+	if cdata.has('HAVE__BUILTIN_CONSTANT_P')
+		if cc.compiles('''
+			static inline int
+			addi(int ra, int si)
+			{
+					int res = 0;
+					if (__builtin_constant_p(si))
+							__asm__ __volatile__(
+									" addi %0,%1,%2\n" : "=r"(res) : "b"(ra), "i"(si));
+					return res;
+			}
+			int test_adds(int x) { return addi(3, x) + addi(x, 5); }
+			''',
+			name: '@0@: "i"(x) when __builtin_constant_p(x)'.format(host_cpu),
+			args: test_c_args)
+			cdata.set('HAVE_I_CONSTRAINT__BUILTIN_CONSTANT_P', 1)
+		endif
+	endif
 endif
 
 
@@ -2626,145 +2664,145 @@ endif
 # XXX: Might be worth conditioning some checks on the OS, to avoid doing
 # unnecessary checks over and over, particularly on windows.
 header_checks = [
-  'atomic.h',
-  'copyfile.h',
-  'crtdefs.h',
-  'execinfo.h',
-  'getopt.h',
-  'ifaddrs.h',
-  'mbarrier.h',
-  'strings.h',
-  'sys/epoll.h',
-  'sys/event.h',
-  'sys/personality.h',
-  'sys/prctl.h',
-  'sys/procctl.h',
-  'sys/signalfd.h',
-  'sys/ucred.h',
-  'termios.h',
-  'uchar.h',
-  'ucred.h',
-  'xlocale.h',
+	'atomic.h',
+	'copyfile.h',
+	'crtdefs.h',
+	'execinfo.h',
+	'getopt.h',
+	'ifaddrs.h',
+	'mbarrier.h',
+	'strings.h',
+	'sys/epoll.h',
+	'sys/event.h',
+	'sys/personality.h',
+	'sys/prctl.h',
+	'sys/procctl.h',
+	'sys/signalfd.h',
+	'sys/ucred.h',
+	'termios.h',
+	'uchar.h',
+	'ucred.h',
+	'xlocale.h',
 ]
 
 foreach header : header_checks
-  varname = 'HAVE_' + header.underscorify().to_upper()
+	varname = 'HAVE_' + header.underscorify().to_upper()
 
-  # Emulate autoconf behaviour of not-found->undef, found->1
-  found = cc.has_header(header,
-    include_directories: postgres_inc, args: test_c_args)
-  cdata.set(varname, found ? 1 : false,
-            description: 'Define to 1 if you have the <@0@> header file.'.format(header))
+	# Emulate autoconf behaviour of not-found->undef, found->1
+	found = cc.has_header(header,
+		include_directories: postgres_inc, args: test_c_args)
+	cdata.set(varname, found ? 1 : false,
+						description: 'Define to 1 if you have the <@0@> header file.'.format(header))
 endforeach
 
 
 decl_checks = [
-  ['F_FULLFSYNC', 'fcntl.h'],
-  ['fdatasync', 'unistd.h'],
-  ['posix_fadvise', 'fcntl.h'],
-  ['strlcat', 'string.h'],
-  ['strlcpy', 'string.h'],
-  ['strnlen', 'string.h'],
-  ['strsep',  'string.h'],
-  ['timingsafe_bcmp',  'string.h'],
+	['F_FULLFSYNC', 'fcntl.h'],
+	['fdatasync', 'unistd.h'],
+	['posix_fadvise', 'fcntl.h'],
+	['strlcat', 'string.h'],
+	['strlcpy', 'string.h'],
+	['strnlen', 'string.h'],
+	['strsep',  'string.h'],
+	['timingsafe_bcmp',  'string.h'],
 ]
 
 # Need to check for function declarations for these functions, because
 # checking for library symbols wouldn't handle deployment target
 # restrictions on macOS
 decl_checks += [
-  ['preadv', 'sys/uio.h'],
-  ['pwritev', 'sys/uio.h'],
-  ['strchrnul', 'string.h'],
-  ['memset_s', 'string.h', '#define __STDC_WANT_LIB_EXT1__ 1'],
+	['preadv', 'sys/uio.h'],
+	['pwritev', 'sys/uio.h'],
+	['strchrnul', 'string.h'],
+	['memset_s', 'string.h', '#define __STDC_WANT_LIB_EXT1__ 1'],
 ]
 
 # Check presence of some optional LLVM functions.
 if llvm.found()
-  decl_checks += [
-    ['LLVMCreateGDBRegistrationListener', 'llvm-c/ExecutionEngine.h'],
-    ['LLVMCreatePerfJITEventListener', 'llvm-c/ExecutionEngine.h'],
-  ]
+	decl_checks += [
+		['LLVMCreateGDBRegistrationListener', 'llvm-c/ExecutionEngine.h'],
+		['LLVMCreatePerfJITEventListener', 'llvm-c/ExecutionEngine.h'],
+	]
 endif
 
 foreach c : decl_checks
-  func = c.get(0)
-  header = c.get(1)
-  prologue = c.get(2, '')
-  args = c.get(3, {})
-  varname = 'HAVE_DECL_' + func.underscorify().to_upper()
+	func = c.get(0)
+	header = c.get(1)
+	prologue = c.get(2, '')
+	args = c.get(3, {})
+	varname = 'HAVE_DECL_' + func.underscorify().to_upper()
 
-  found = cc.compiles('''
+	found = cc.compiles('''
 @0@
 #include <@1@>
 
 int main()
 {
 #ifndef @2@
-    (void) @2@;
+		(void) @2@;
 #endif
 
 return 0;
 }
 '''.format(prologue, header, func),
-    name: 'test whether @0@ is declared'.format(func),
-    # need to add cflags_warn to get at least
-    # -Werror=unguarded-availability-new if applicable
-    args: test_c_args + cflags_warn,
-    include_directories: postgres_inc,
-    kwargs: args)
-  cdata.set10(varname, found, description:
+		name: 'test whether @0@ is declared'.format(func),
+		# need to add cflags_warn to get at least
+		# -Werror=unguarded-availability-new if applicable
+		args: test_c_args + cflags_warn,
+		include_directories: postgres_inc,
+		kwargs: args)
+	cdata.set10(varname, found, description:
 '''Define to 1 if you have the declaration of `@0@', and to 0 if you
-   don't.'''.format(func))
+	 don't.'''.format(func))
 endforeach
 
 
 if cc.has_type('struct option',
-    args: test_c_args, include_directories: postgres_inc,
-    prefix: '@0@'.format(cdata.get('HAVE_GETOPT_H')) == '1' ? '#include <getopt.h>' : '')
-  cdata.set('HAVE_STRUCT_OPTION', 1)
+		args: test_c_args, include_directories: postgres_inc,
+		prefix: '@0@'.format(cdata.get('HAVE_GETOPT_H')) == '1' ? '#include <getopt.h>' : '')
+	cdata.set('HAVE_STRUCT_OPTION', 1)
 endif
 
 
 foreach c : ['opterr', 'optreset']
-  varname = 'HAVE_INT_' + c.underscorify().to_upper()
+	varname = 'HAVE_INT_' + c.underscorify().to_upper()
 
-  if cc.links('''
+	if cc.links('''
 #include <unistd.h>
 int main(void)
 {
-    extern int @0@;
-    @0@ = 1;
+		extern int @0@;
+		@0@ = 1;
 }
 '''.format(c), name: c, args: test_c_args)
-    cdata.set(varname, 1)
-  else
-    cdata.set(varname, false)
-  endif
+		cdata.set(varname, 1)
+	else
+		cdata.set(varname, false)
+	endif
 endforeach
 
 if cc.has_type('socklen_t',
-    args: test_c_args, include_directories: postgres_inc,
-    prefix: '''
+		args: test_c_args, include_directories: postgres_inc,
+		prefix: '''
 #include <sys/socket.h>''')
-  cdata.set('HAVE_SOCKLEN_T', 1)
+	cdata.set('HAVE_SOCKLEN_T', 1)
 endif
 
 if cc.has_member('struct sockaddr', 'sa_len',
-    args: test_c_args, include_directories: postgres_inc,
-    prefix: '''
+		args: test_c_args, include_directories: postgres_inc,
+		prefix: '''
 #include <sys/types.h>
 #include <sys/socket.h>''')
-  cdata.set('HAVE_STRUCT_SOCKADDR_SA_LEN', 1)
+	cdata.set('HAVE_STRUCT_SOCKADDR_SA_LEN', 1)
 endif
 
 if cc.has_member('struct tm', 'tm_zone',
-    args: test_c_args, include_directories: postgres_inc,
-    prefix: '''
+		args: test_c_args, include_directories: postgres_inc,
+		prefix: '''
 #include <sys/types.h>
 #include <time.h>
 ''')
-  cdata.set('HAVE_STRUCT_TM_TM_ZONE', 1)
+	cdata.set('HAVE_STRUCT_TM_TM_ZONE', 1)
 endif
 
 if cc.compiles('''
@@ -2772,64 +2810,64 @@ if cc.compiles('''
 extern int foo(void);
 int foo(void)
 {
-    return timezone / 60;
+		return timezone / 60;
 }
 ''',
-    name: 'global variable `timezone\' exists',
-    args: test_c_args, include_directories: postgres_inc)
-  cdata.set('HAVE_INT_TIMEZONE', 1)
+		name: 'global variable `timezone\' exists',
+		args: test_c_args, include_directories: postgres_inc)
+	cdata.set('HAVE_INT_TIMEZONE', 1)
 else
-  cdata.set('HAVE_INT_TIMEZONE', false)
+	cdata.set('HAVE_INT_TIMEZONE', false)
 endif
 
 if cc.has_type('union semun',
-    args: test_c_args,
-    include_directories: postgres_inc,
-    prefix: '''
+		args: test_c_args,
+		include_directories: postgres_inc,
+		prefix: '''
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/sem.h>
 ''')
-  cdata.set('HAVE_UNION_SEMUN', 1)
+	cdata.set('HAVE_UNION_SEMUN', 1)
 endif
 
 if cc.compiles('''
 #include <string.h>
 int main(void)
 {
-  char buf[100];
-  switch (strerror_r(1, buf, sizeof(buf)))
-  { case 0: break; default: break; }
+	char buf[100];
+	switch (strerror_r(1, buf, sizeof(buf)))
+	{ case 0: break; default: break; }
 }''',
-    name: 'strerror_r',
-    args: test_c_args, include_directories: postgres_inc)
-  cdata.set('STRERROR_R_INT', 1)
+		name: 'strerror_r',
+		args: test_c_args, include_directories: postgres_inc)
+	cdata.set('STRERROR_R_INT', 1)
 else
-  cdata.set('STRERROR_R_INT', false)
+	cdata.set('STRERROR_R_INT', false)
 endif
 
 # Check if the C compiler understands typeof or a variant.  Define
 # HAVE_TYPEOF if so, and define 'typeof' to the actual key word.
 foreach kw : ['typeof', '__typeof__']
-  if cc.compiles('''
+	if cc.compiles('''
 int main(void)
 {
-    int x = 0;
-    @0@(x) y;
-    y = x;
-    return y;
+		int x = 0;
+		@0@(x) y;
+		y = x;
+		return y;
 }
 '''.format(kw),
-    name: kw,
-    args: test_c_args, include_directories: postgres_inc)
+		name: kw,
+		args: test_c_args, include_directories: postgres_inc)
 
-    cdata.set('HAVE_TYPEOF', 1)
-    if kw != 'typeof'
-      cdata.set('typeof', kw)
-    endif
+		cdata.set('HAVE_TYPEOF', 1)
+		if kw != 'typeof'
+			cdata.set('typeof', kw)
+		endif
 
-    break
-  endif
+		break
+	endif
 endforeach
 
 
@@ -2869,115 +2907,115 @@ always_replace_getopt_long = host_system in ['windows', 'cygwin'] or not cdata.h
 execinfo_dep = cc.find_library('execinfo', required: false)
 
 if host_system == 'cygwin'
-  cygipc_dep = cc.find_library('cygipc', required: false)
+	cygipc_dep = cc.find_library('cygipc', required: false)
 else
-  cygipc_dep = not_found_dep
+	cygipc_dep = not_found_dep
 endif
 
 if host_system == 'sunos'
-  socket_dep = cc.find_library('socket', required: false)
+	socket_dep = cc.find_library('socket', required: false)
 else
-  socket_dep = not_found_dep
+	socket_dep = not_found_dep
 endif
 
 # XXX: Might be worth conditioning some checks on the OS, to avoid doing
 # unnecessary checks over and over, particularly on windows.
 func_checks = [
-  ['backtrace_symbols', {'dependencies': [execinfo_dep]}],
-  ['clock_gettime', {'dependencies': [rt_dep], 'define': false}],
-  ['copyfile'],
-  ['copy_file_range'],
-  # gcc/clang's sanitizer helper library provides dlopen but not dlsym, thus
-  # when enabling asan the dlopen check doesn't notice that -ldl is actually
-  # required. Just checking for dlsym() ought to suffice.
-  ['dlsym', {'dependencies': [dl_dep], 'define': false}],
-  ['elf_aux_info'],
-  ['explicit_bzero'],
-  ['getauxval'],
-  ['getifaddrs'],
-  ['getopt', {'dependencies': [getopt_dep, gnugetopt_dep], 'skip': always_replace_getopt}],
-  ['getopt_long', {'dependencies': [getopt_dep, gnugetopt_dep], 'skip': always_replace_getopt_long}],
-  ['getpeereid'],
-  ['getpeerucred'],
-  ['inet_aton'],
-  ['inet_pton'],
-  ['kqueue'],
-  ['localeconv_l'],
-  ['mbstowcs_l'],
-  ['mkdtemp'],
-  ['posix_fadvise'],
-  ['posix_fallocate'],
-  ['ppoll'],
-  ['pthread_barrier_wait', {'dependencies': [thread_dep]}],
-  ['pthread_is_threaded_np', {'dependencies': [thread_dep]}],
-  ['sem_init', {'dependencies': [rt_dep, thread_dep], 'skip': sema_kind != 'unnamed_posix', 'define': false}],
-  ['setproctitle', {'dependencies': [util_dep]}],
-  ['setproctitle_fast'],
-  ['shm_open', {'dependencies': [rt_dep], 'define': false}],
-  ['shm_unlink', {'dependencies': [rt_dep], 'define': false}],
-  ['shmget', {'dependencies': [cygipc_dep], 'define': false}],
-  ['socket', {'dependencies': [socket_dep], 'define': false}],
-  ['strerror_r', {'dependencies': [thread_dep]}],
-  ['strlcat'],
-  ['strlcpy'],
-  ['strnlen'],
-  ['strsep'],
-  ['strsignal'],
-  ['sync_file_range'],
-  ['syncfs'],
-  ['timingsafe_bcmp'],
-  ['uselocale'],
-  ['wcstombs_l'],
+	['backtrace_symbols', {'dependencies': [execinfo_dep]}],
+	['clock_gettime', {'dependencies': [rt_dep], 'define': false}],
+	['copyfile'],
+	['copy_file_range'],
+	# gcc/clang's sanitizer helper library provides dlopen but not dlsym, thus
+	# when enabling asan the dlopen check doesn't notice that -ldl is actually
+	# required. Just checking for dlsym() ought to suffice.
+	['dlsym', {'dependencies': [dl_dep], 'define': false}],
+	['elf_aux_info'],
+	['explicit_bzero'],
+	['getauxval'],
+	['getifaddrs'],
+	['getopt', {'dependencies': [getopt_dep, gnugetopt_dep], 'skip': always_replace_getopt}],
+	['getopt_long', {'dependencies': [getopt_dep, gnugetopt_dep], 'skip': always_replace_getopt_long}],
+	['getpeereid'],
+	['getpeerucred'],
+	['inet_aton'],
+	['inet_pton'],
+	['kqueue'],
+	['localeconv_l'],
+	['mbstowcs_l'],
+	['mkdtemp'],
+	['posix_fadvise'],
+	['posix_fallocate'],
+	['ppoll'],
+	['pthread_barrier_wait', {'dependencies': [thread_dep]}],
+	['pthread_is_threaded_np', {'dependencies': [thread_dep]}],
+	['sem_init', {'dependencies': [rt_dep, thread_dep], 'skip': sema_kind != 'unnamed_posix', 'define': false}],
+	['setproctitle', {'dependencies': [util_dep]}],
+	['setproctitle_fast'],
+	['shm_open', {'dependencies': [rt_dep], 'define': false}],
+	['shm_unlink', {'dependencies': [rt_dep], 'define': false}],
+	['shmget', {'dependencies': [cygipc_dep], 'define': false}],
+	['socket', {'dependencies': [socket_dep], 'define': false}],
+	['strerror_r', {'dependencies': [thread_dep]}],
+	['strlcat'],
+	['strlcpy'],
+	['strnlen'],
+	['strsep'],
+	['strsignal'],
+	['sync_file_range'],
+	['syncfs'],
+	['timingsafe_bcmp'],
+	['uselocale'],
+	['wcstombs_l'],
 ]
 
 func_check_results = {}
 foreach c : func_checks
-  func = c.get(0)
-  kwargs = c.get(1, {})
-  deps = kwargs.get('dependencies', [])
-
-  if kwargs.get('skip', false)
-    continue
-  endif
-
-  found = cc.has_function(func, args: test_c_args)
-
-  if not found
-    foreach dep : deps
-      if not dep.found()
-        continue
-      endif
-      found = cc.has_function(func, args: test_c_args,
-                              dependencies: [dep])
-      if found
-        os_deps += dep
-        break
-      endif
-    endforeach
-  endif
-
-  func_check_results += {func: found}
-
-  if kwargs.get('define', true)
-    # Emulate autoconf behaviour of not-found->undef, found->1
-    cdata.set('HAVE_' + func.underscorify().to_upper(),
-              found  ? 1 : false,
-              description: 'Define to 1 if you have the `@0@\' function.'.format(func))
-  endif
+	func = c.get(0)
+	kwargs = c.get(1, {})
+	deps = kwargs.get('dependencies', [])
+
+	if kwargs.get('skip', false)
+		continue
+	endif
+
+	found = cc.has_function(func, args: test_c_args)
+
+	if not found
+		foreach dep : deps
+			if not dep.found()
+				continue
+			endif
+			found = cc.has_function(func, args: test_c_args,
+															dependencies: [dep])
+			if found
+				os_deps += dep
+				break
+			endif
+		endforeach
+	endif
+
+	func_check_results += {func: found}
+
+	if kwargs.get('define', true)
+		# Emulate autoconf behaviour of not-found->undef, found->1
+		cdata.set('HAVE_' + func.underscorify().to_upper(),
+							found  ? 1 : false,
+							description: 'Define to 1 if you have the `@0@\' function.'.format(func))
+	endif
 endforeach
 
 
 if cc.has_function('syslog', args: test_c_args) and \
-    cc.check_header('syslog.h', args: test_c_args)
-  cdata.set('HAVE_SYSLOG', 1)
+		cc.check_header('syslog.h', args: test_c_args)
+	cdata.set('HAVE_SYSLOG', 1)
 endif
 
 
 # if prerequisites for unnamed posix semas aren't fulfilled, fall back to sysv
 # semaphores
 if sema_kind == 'unnamed_posix' and \
-   not func_check_results.get('sem_init', false)
-  sema_kind = 'sysv'
+	 not func_check_results.get('sem_init', false)
+	sema_kind = 'sysv'
 endif
 
 cdata.set('USE_@0@_SHARED_MEMORY'.format(shmem_kind.to_upper()), 1)
@@ -2989,10 +3027,10 @@ cdata.set_quoted('DLSUFFIX', dlsuffix)
 
 # built later than the rest of the version metadata, we need SIZEOF_VOID_P
 cdata.set_quoted('PG_VERSION_STR',
-  'PostgreSQL @0@ on @1@-@2@, compiled by @3@-@4@, @5@-bit'.format(
-    pg_version, host_machine.cpu_family(), host_system,
-    cc.get_id(), cc.version(), cdata.get('SIZEOF_VOID_P') * 8,
-  )
+	'PostgreSQL @0@ on @1@-@2@, compiled by @3@-@4@, @5@-bit'.format(
+		pg_version, host_machine.cpu_family(), host_system,
+		cc.get_id(), cc.version(), cdata.get('SIZEOF_VOID_P') * 8,
+	)
 )
 
 
@@ -3004,31 +3042,31 @@ nlsopt = get_option('nls')
 libintl = not_found_dep
 
 if not nlsopt.disabled()
-  # otherwise there'd be lots of
-  # "Gettext not found, all translation (po) targets will be ignored."
-  # warnings if not found.
-  msgfmt = find_program('msgfmt', required: nlsopt, native: true)
+	# otherwise there'd be lots of
+	# "Gettext not found, all translation (po) targets will be ignored."
+	# warnings if not found.
+	msgfmt = find_program('msgfmt', required: nlsopt, native: true)
 
-  # meson 0.59 has this wrapped in dependency('intl')
-  if (msgfmt.found() and
-      cc.check_header('libintl.h', required: nlsopt,
-        args: test_c_args, include_directories: postgres_inc))
+	# meson 0.59 has this wrapped in dependency('intl')
+	if (msgfmt.found() and
+			cc.check_header('libintl.h', required: nlsopt,
+				args: test_c_args, include_directories: postgres_inc))
 
-    # in libc
-    if cc.has_function('ngettext')
-      libintl = declare_dependency()
-    else
-      libintl = cc.find_library('intl',
-        has_headers: ['libintl.h'], required: nlsopt,
-        header_include_directories: postgres_inc,
-        dirs: test_lib_d)
-    endif
-  endif
+		# in libc
+		if cc.has_function('ngettext')
+			libintl = declare_dependency()
+		else
+			libintl = cc.find_library('intl',
+				has_headers: ['libintl.h'], required: nlsopt,
+				header_include_directories: postgres_inc,
+				dirs: test_lib_d)
+		endif
+	endif
 
-  if libintl.found()
-    i18n = import('i18n')
-    cdata.set('ENABLE_NLS', 1)
-  endif
+	if libintl.found()
+		i18n = import('i18n')
+		cdata.set('ENABLE_NLS', 1)
+	endif
 endif
 
 
@@ -3077,72 +3115,72 @@ mod_install_rpaths = []
 # libraries are needed, absolute LC_ID_DYLIB ensures libraries can be found in
 # their final destination.
 if host_system != 'darwin'
-  # Add absolute path to libdir to rpath. This ensures installed binaries /
-  # libraries find our libraries (mainly libpq).
-  bin_install_rpaths += dir_prefix / dir_lib
-  lib_install_rpaths += dir_prefix / dir_lib
-  mod_install_rpaths += dir_prefix / dir_lib
+	# Add absolute path to libdir to rpath. This ensures installed binaries /
+	# libraries find our libraries (mainly libpq).
+	bin_install_rpaths += dir_prefix / dir_lib
+	lib_install_rpaths += dir_prefix / dir_lib
+	mod_install_rpaths += dir_prefix / dir_lib
 
-  # Add extra_lib_dirs to rpath. This ensures we find libraries we depend on.
-  #
-  # Not needed on darwin even if we use relative rpaths for our own libraries,
-  # as the install_name of libraries in extra_lib_dirs will point to their
-  # location anyway.
-  bin_install_rpaths += postgres_lib_d
-  lib_install_rpaths += postgres_lib_d
-  mod_install_rpaths += postgres_lib_d
+	# Add extra_lib_dirs to rpath. This ensures we find libraries we depend on.
+	#
+	# Not needed on darwin even if we use relative rpaths for our own libraries,
+	# as the install_name of libraries in extra_lib_dirs will point to their
+	# location anyway.
+	bin_install_rpaths += postgres_lib_d
+	lib_install_rpaths += postgres_lib_d
+	mod_install_rpaths += postgres_lib_d
 endif
 
 
 # Define arguments for default targets
 
 default_target_args = {
-  'implicit_include_directories': false,
-  'install': true,
+	'implicit_include_directories': false,
+	'install': true,
 }
 
 default_lib_args = default_target_args + {
-  'name_prefix': '',
+	'name_prefix': '',
 }
 
 internal_lib_args = default_lib_args + {
-  'build_by_default': false,
-  'install': false,
+	'build_by_default': false,
+	'install': false,
 }
 
 default_mod_args = default_lib_args + {
-  'name_prefix': '',
-  'install_dir': dir_lib_pkg,
+	'name_prefix': '',
+	'install_dir': dir_lib_pkg,
 }
 
 default_bin_args = default_target_args + {
-  'install_dir': dir_bin,
+	'install_dir': dir_bin,
 }
 
 if get_option('rpath')
-  default_lib_args += {
-    'install_rpath': ':'.join(lib_install_rpaths),
-  }
+	default_lib_args += {
+		'install_rpath': ':'.join(lib_install_rpaths),
+	}
 
-  default_mod_args += {
-    'install_rpath': ':'.join(mod_install_rpaths),
-  }
+	default_mod_args += {
+		'install_rpath': ':'.join(mod_install_rpaths),
+	}
 
-  default_bin_args += {
-    'install_rpath': ':'.join(bin_install_rpaths),
-  }
+	default_bin_args += {
+		'install_rpath': ':'.join(bin_install_rpaths),
+	}
 endif
 
 
 # Helper for exporting a limited number of symbols
 gen_export_kwargs = {
-  'input': 'exports.txt',
-  'output': '@BASENAME@.'+export_file_suffix,
-  'command': [perl, files('src/tools/gen_export.pl'),
-   '--format', export_file_format,
-   '--input', '@INPUT0@', '--output', '@OUTPUT0@'],
-  'build_by_default': false,
-  'install': false,
+	'input': 'exports.txt',
+	'output': '@BASENAME@.'+export_file_suffix,
+	'command': [perl, files('src/tools/gen_export.pl'),
+	 '--format', export_file_format,
+	 '--input', '@INPUT0@', '--output', '@OUTPUT0@'],
+	'build_by_default': false,
+	'install': false,
 }
 
 # command to create stamp files on all OSs
@@ -3157,9 +3195,9 @@ catalog_pm = files('src/backend/catalog/Catalog.pm')
 perfect_hash_pm = files('src/tools/PerfectHash.pm')
 gen_kwlist_deps = [perfect_hash_pm]
 gen_kwlist_cmd = [
-  perl, '-I', '@SOURCE_ROOT@/src/tools',
-  files('src/tools/gen_keywordlist.pl'),
-  '--output', '@OUTDIR@', '@INPUT@']
+	perl, '-I', '@SOURCE_ROOT@/src/tools',
+	files('src/tools/gen_keywordlist.pl'),
+	'--output', '@OUTDIR@', '@INPUT@']
 
 
 
@@ -3168,56 +3206,56 @@ gen_kwlist_cmd = [
 ###
 
 if host_system == 'windows'
-  pg_ico = meson.project_source_root() / 'src' / 'port' / 'win32.ico'
-  win32ver_rc = files('src/port/win32ver.rc')
-  rcgen = find_program('src/tools/rcgen', native: true)
-
-  rcgen_base_args = [
-    '--srcdir', '@SOURCE_DIR@',
-    '--builddir', meson.project_build_root(),
-    '--rcout', '@OUTPUT0@',
-    '--out', '@OUTPUT1@',
-    '--input', '@INPUT@',
-    '@EXTRA_ARGS@',
-  ]
-
-  if cc.get_argument_syntax() == 'msvc'
-    rc = find_program('rc', required: true)
-    rcgen_base_args += ['--rc', rc.full_path()]
-    rcgen_outputs = ['@BASENAME@.rc', '@BASENAME@.res']
-  else
-    windres = find_program('windres', required: true)
-    rcgen_base_args += ['--windres', windres.full_path()]
-    rcgen_outputs = ['@BASENAME@.rc', '@BASENAME@.obj']
-  endif
-
-  # msbuild backend doesn't support this atm
-  if meson.backend() == 'ninja'
-    rcgen_base_args += ['--depfile', '@DEPFILE@']
-  endif
-
-  rcgen_bin_args = rcgen_base_args + [
-    '--VFT_TYPE', 'VFT_APP',
-    '--FILEENDING', 'exe',
-    '--ICO', pg_ico
-  ]
-
-  rcgen_lib_args = rcgen_base_args + [
-    '--VFT_TYPE', 'VFT_DLL',
-    '--FILEENDING', 'dll',
-  ]
-
-  rc_bin_gen = generator(rcgen,
-    depfile: '@BASENAME@.d',
-    arguments: rcgen_bin_args,
-    output: rcgen_outputs,
-  )
-
-  rc_lib_gen = generator(rcgen,
-    depfile: '@BASENAME@.d',
-    arguments: rcgen_lib_args,
-    output: rcgen_outputs,
-  )
+	pg_ico = meson.project_source_root() / 'src' / 'port' / 'win32.ico'
+	win32ver_rc = files('src/port/win32ver.rc')
+	rcgen = find_program('src/tools/rcgen', native: true)
+
+	rcgen_base_args = [
+		'--srcdir', '@SOURCE_DIR@',
+		'--builddir', meson.project_build_root(),
+		'--rcout', '@OUTPUT0@',
+		'--out', '@OUTPUT1@',
+		'--input', '@INPUT@',
+		'@EXTRA_ARGS@',
+	]
+
+	if cc.get_argument_syntax() == 'msvc'
+		rc = find_program('rc', required: true)
+		rcgen_base_args += ['--rc', rc.full_path()]
+		rcgen_outputs = ['@BASENAME@.rc', '@BASENAME@.res']
+	else
+		windres = find_program('windres', required: true)
+		rcgen_base_args += ['--windres', windres.full_path()]
+		rcgen_outputs = ['@BASENAME@.rc', '@BASENAME@.obj']
+	endif
+
+	# msbuild backend doesn't support this atm
+	if meson.backend() == 'ninja'
+		rcgen_base_args += ['--depfile', '@DEPFILE@']
+	endif
+
+	rcgen_bin_args = rcgen_base_args + [
+		'--VFT_TYPE', 'VFT_APP',
+		'--FILEENDING', 'exe',
+		'--ICO', pg_ico
+	]
+
+	rcgen_lib_args = rcgen_base_args + [
+		'--VFT_TYPE', 'VFT_DLL',
+		'--FILEENDING', 'dll',
+	]
+
+	rc_bin_gen = generator(rcgen,
+		depfile: '@BASENAME@.d',
+		arguments: rcgen_bin_args,
+		output: rcgen_outputs,
+	)
+
+	rc_lib_gen = generator(rcgen,
+		depfile: '@BASENAME@.d',
+		arguments: rcgen_lib_args,
+		output: rcgen_outputs,
+	)
 endif
 
 
@@ -3247,80 +3285,80 @@ subdir('config')
 # Then through src/port and src/common, as most other things depend on them
 
 frontend_port_code = declare_dependency(
-  compile_args: ['-DFRONTEND'],
-  include_directories: [postgres_inc],
-  dependencies: os_deps,
+	compile_args: ['-DFRONTEND'],
+	include_directories: [postgres_inc],
+	dependencies: os_deps,
 )
 
 backend_port_code = declare_dependency(
-  compile_args: ['-DBUILDING_DLL'],
-  include_directories: [postgres_inc],
-  sources: [errcodes], # errcodes.h is needed due to use of ereport
-  dependencies: os_deps,
+	compile_args: ['-DBUILDING_DLL'],
+	include_directories: [postgres_inc],
+	sources: [errcodes], # errcodes.h is needed due to use of ereport
+	dependencies: os_deps,
 )
 
 subdir('src/port')
 
 frontend_common_code = declare_dependency(
-  compile_args: ['-DFRONTEND'],
-  include_directories: [postgres_inc],
-  sources: generated_headers_stamp,
-  dependencies: [os_deps, zlib, zstd, lz4],
+	compile_args: ['-DFRONTEND'],
+	include_directories: [postgres_inc],
+	sources: generated_headers_stamp,
+	dependencies: [os_deps, zlib, zstd, lz4],
 )
 
 backend_common_code = declare_dependency(
-  compile_args: ['-DBUILDING_DLL'],
-  include_directories: [postgres_inc],
-  sources: generated_headers_stamp,
-  dependencies: [os_deps, zlib, zstd],
+	compile_args: ['-DBUILDING_DLL'],
+	include_directories: [postgres_inc],
+	sources: generated_headers_stamp,
+	dependencies: [os_deps, zlib, zstd],
 )
 
 subdir('src/common')
 
 # all shared libraries should depend on shlib_code
 shlib_code = declare_dependency(
-  link_args: ldflags_sl,
+	link_args: ldflags_sl,
 )
 
 # all static libraries not part of the backend should depend on this
 frontend_stlib_code = declare_dependency(
-  include_directories: [postgres_inc],
-  link_with: [common_static, pgport_static],
-  sources: generated_headers_stamp,
-  dependencies: [os_deps, libintl],
+	include_directories: [postgres_inc],
+	link_with: [common_static, pgport_static],
+	sources: generated_headers_stamp,
+	dependencies: [os_deps, libintl],
 )
 
 # all shared libraries not part of the backend should depend on this
 frontend_shlib_code = declare_dependency(
-  include_directories: [postgres_inc],
-  link_with: [common_shlib, pgport_shlib],
-  sources: generated_headers_stamp,
-  dependencies: [shlib_code, os_deps, libintl],
+	include_directories: [postgres_inc],
+	link_with: [common_shlib, pgport_shlib],
+	sources: generated_headers_stamp,
+	dependencies: [shlib_code, os_deps, libintl],
 )
 
 # For frontend code that doesn't use fe_utils - this mainly exists for libpq's
 # tests, which are defined before fe_utils is defined, as fe_utils depends on
 # libpq.
 frontend_no_fe_utils_code = declare_dependency(
-  include_directories: [postgres_inc],
-  link_with: [common_static, pgport_static],
-  sources: generated_headers_stamp,
-  dependencies: [os_deps, libintl],
+	include_directories: [postgres_inc],
+	link_with: [common_static, pgport_static],
+	sources: generated_headers_stamp,
+	dependencies: [os_deps, libintl],
 )
 
 # Dependencies both for static and shared libpq
 libpq_deps += [
-  thread_dep,
+	thread_dep,
 
-  gssapi,
-  ldap_r,
-  libintl,
-  ssl,
+	gssapi,
+	ldap_r,
+	libintl,
+	ssl,
 ]
 
 libpq_oauth_deps += [
-  thread_dep,
-  libcurl,
+	thread_dep,
+	libcurl,
 ]
 
 subdir('src/interfaces/libpq')
@@ -3330,40 +3368,40 @@ subdir('src/interfaces/libpq-oauth')
 
 # for frontend binaries
 frontend_code = declare_dependency(
-  include_directories: [postgres_inc],
-  link_with: [fe_utils, common_static, pgport_static],
-  sources: generated_headers_stamp,
-  dependencies: [os_deps, libintl],
+	include_directories: [postgres_inc],
+	link_with: [fe_utils, common_static, pgport_static],
+	sources: generated_headers_stamp,
+	dependencies: [os_deps, libintl],
 )
 
 backend_both_deps += [
-  thread_dep,
-  bsd_auth,
-  gssapi,
-  icu,
-  icu_i18n,
-  ldap,
-  libintl,
-  libnuma,
-  liburing,
-  libxml,
-  lz4,
-  pam,
-  ssl,
-  systemd,
-  zlib,
-  zstd,
+	thread_dep,
+	bsd_auth,
+	gssapi,
+	icu,
+	icu_i18n,
+	ldap,
+	libintl,
+	libnuma,
+	liburing,
+	libxml,
+	lz4,
+	pam,
+	ssl,
+	systemd,
+	zlib,
+	zstd,
 ]
 
 backend_mod_deps = backend_both_deps + os_deps
 
 backend_code = declare_dependency(
-  compile_args: ['-DBUILDING_DLL'],
-  include_directories: [postgres_inc],
-  link_args: ldflags_be,
-  link_with: [],
-  sources: generated_backend_headers_stamp,
-  dependencies: os_deps + backend_both_deps + backend_deps,
+	compile_args: ['-DBUILDING_DLL'],
+	include_directories: [postgres_inc],
+	link_args: ldflags_be,
+	link_with: [],
+	sources: generated_backend_headers_stamp,
+	dependencies: os_deps + backend_both_deps + backend_deps,
 )
 
 # install these files only during test, not main install
@@ -3410,44 +3448,44 @@ potentially_conflicting_files = []
 
 # convert all sources of potentially conflicting files into uniform shape
 foreach t : potentially_conflicting_files_t
-  potentially_conflicting_files += t.full_path()
+	potentially_conflicting_files += t.full_path()
 endforeach
 foreach t1 : configure_files
-  if meson.version().version_compare('>=0.59')
-    t = fs.parent(t1) / fs.name(t1)
-  else
-    t = '@0@'.format(t1)
-  endif
-  potentially_conflicting_files += meson.current_build_dir() / t
+	if meson.version().version_compare('>=0.59')
+		t = fs.parent(t1) / fs.name(t1)
+	else
+		t = '@0@'.format(t1)
+	endif
+	potentially_conflicting_files += meson.current_build_dir() / t
 endforeach
 foreach sub, fnames : generated_sources_ac
-  sub = meson.project_build_root() / sub
-  foreach fname : fnames
-    potentially_conflicting_files += sub / fname
-  endforeach
+	sub = meson.project_build_root() / sub
+	foreach fname : fnames
+		potentially_conflicting_files += sub / fname
+	endforeach
 endforeach
 
 # find and report conflicting files
 foreach build_path : potentially_conflicting_files
-  build_path = host_system == 'windows' ? fs.as_posix(build_path) : build_path
-  # str.replace is in 0.56
-  src_path = meson.current_source_dir() / build_path.split(meson.current_build_dir() / '')[1]
-  if fs.exists(src_path) or fs.is_symlink(src_path)
-    conflicting_files += src_path
-  endif
+	build_path = host_system == 'windows' ? fs.as_posix(build_path) : build_path
+	# str.replace is in 0.56
+	src_path = meson.current_source_dir() / build_path.split(meson.current_build_dir() / '')[1]
+	if fs.exists(src_path) or fs.is_symlink(src_path)
+		conflicting_files += src_path
+	endif
 endforeach
 # XXX: Perhaps we should generate a file that would clean these up? The list
 # can be long.
 if conflicting_files.length() > 0
-  errmsg_cleanup = '''
+	errmsg_cleanup = '''
 Conflicting files in source directory:
-  @0@
+	@0@
 
 The conflicting files need to be removed, either by removing the files listed
 above, or by running configure and then make maintainer-clean.
 '''
-  errmsg_cleanup = errmsg_cleanup.format(' '.join(conflicting_files))
-  error(errmsg_nonclean_base.format(errmsg_cleanup))
+	errmsg_cleanup = errmsg_cleanup.format(' '.join(conflicting_files))
+	error(errmsg_nonclean_base.format(errmsg_cleanup))
 endif
 
 
@@ -3466,59 +3504,59 @@ endif
 # generation happens during install, so that's not a real issue.
 nls_mo_targets = []
 if libintl.found() and meson.version().version_compare('>=0.60')
-  # use range() to avoid the flattening of the list that foreach() would do
-  foreach off : range(0, nls_targets.length())
-    # i18n.gettext() list containing 1) list of built .mo files 2) maintainer
-    # -pot target 3) maintainer -pot target
-    nls_mo_targets += nls_targets[off][0]
-  endforeach
-  alias_target('nls', nls_mo_targets)
+	# use range() to avoid the flattening of the list that foreach() would do
+	foreach off : range(0, nls_targets.length())
+		# i18n.gettext() list containing 1) list of built .mo files 2) maintainer
+		# -pot target 3) maintainer -pot target
+		nls_mo_targets += nls_targets[off][0]
+	endforeach
+	alias_target('nls', nls_mo_targets)
 endif
 
 
 # all targets that 'meson install' needs
 installed_targets = [
-  backend_targets,
-  bin_targets,
-  libpq_st,
-  pl_targets,
-  contrib_targets,
-  nls_mo_targets,
-  ecpg_targets,
+	backend_targets,
+	bin_targets,
+	libpq_st,
+	pl_targets,
+	contrib_targets,
+	nls_mo_targets,
+	ecpg_targets,
 ]
 
 if oauth_flow_supported
-  installed_targets += [
-    libpq_oauth_so,
-    libpq_oauth_st,
-  ]
+	installed_targets += [
+		libpq_oauth_so,
+		libpq_oauth_st,
+	]
 endif
 
 # all targets that require building code
 all_built = [
-  installed_targets,
-  testprep_targets,
+	installed_targets,
+	testprep_targets,
 ]
 
 # Meson's default install target is quite verbose. Provide one that is quiet.
 install_quiet = custom_target('install-quiet',
-  output: 'install-quiet',
-  build_always_stale: true,
-  build_by_default: false,
-  command: [meson_bin, meson_args, 'install', '--quiet', '--no-rebuild'],
-  depends: installed_targets,
+	output: 'install-quiet',
+	build_always_stale: true,
+	build_by_default: false,
+	command: [meson_bin, meson_args, 'install', '--quiet', '--no-rebuild'],
+	depends: installed_targets,
 )
 
 # Target to install files used for tests, which aren't installed by default
 install_test_files_args = [
-  install_files,
-  '--prefix', dir_prefix,
-  '--install', contrib_data_dir, test_install_data,
-  '--install', dir_lib_pkg, test_install_libs,
+	install_files,
+	'--prefix', dir_prefix,
+	'--install', contrib_data_dir, test_install_data,
+	'--install', dir_lib_pkg, test_install_libs,
 ]
 run_target('install-test-files',
-  command: [python] + install_test_files_args,
-  depends: testprep_targets,
+	command: [python] + install_test_files_args,
+	depends: testprep_targets,
 )
 
 
@@ -3532,44 +3570,44 @@ test_install_destdir = meson.project_build_root() / 'tmp_install/'
 
 # DESTDIR + prefix appropriately munged
 if build_system != 'windows'
-  # On unixoid systems this is trivial, we just prepend the destdir
-  assert(dir_prefix.startswith('/')) # enforced by meson
-  temp_install_bindir = '@0@@1@'.format(test_install_destdir, dir_prefix / dir_bin)
-  temp_install_libdir = '@0@@1@'.format(test_install_destdir, dir_prefix / dir_lib)
+	# On unixoid systems this is trivial, we just prepend the destdir
+	assert(dir_prefix.startswith('/')) # enforced by meson
+	temp_install_bindir = '@0@@1@'.format(test_install_destdir, dir_prefix / dir_bin)
+	temp_install_libdir = '@0@@1@'.format(test_install_destdir, dir_prefix / dir_lib)
 else
-  # drives, drive-relative paths, etc make this complicated on windows, call
-  # into a copy of meson's logic for it
-  command = [
-    python, '-c',
-    'import sys; from pathlib import PurePath; d1=sys.argv[1]; d2=sys.argv[2]; print(str(PurePath(d1, *PurePath(d2).parts[1:])))',
-    test_install_destdir]
-  temp_install_bindir = run_command(command, dir_prefix / dir_bin, check: true).stdout().strip()
-  temp_install_libdir = run_command(command, dir_prefix / dir_lib, check: true).stdout().strip()
+	# drives, drive-relative paths, etc make this complicated on windows, call
+	# into a copy of meson's logic for it
+	command = [
+		python, '-c',
+		'import sys; from pathlib import PurePath; d1=sys.argv[1]; d2=sys.argv[2]; print(str(PurePath(d1, *PurePath(d2).parts[1:])))',
+		test_install_destdir]
+	temp_install_bindir = run_command(command, dir_prefix / dir_bin, check: true).stdout().strip()
+	temp_install_libdir = run_command(command, dir_prefix / dir_lib, check: true).stdout().strip()
 endif
 
 meson_install_args = meson_args + ['install'] + {
-    'meson': ['--quiet', '--only-changed', '--no-rebuild'],
-    'muon': []
+		'meson': ['--quiet', '--only-changed', '--no-rebuild'],
+		'muon': []
 }[meson_impl]
 
 # setup tests should be run first,
 # so define priority for these
 setup_tests_priority = 100
 test('tmp_install',
-    meson_bin, args: meson_install_args ,
-    env: {'DESTDIR':test_install_destdir},
-    priority: setup_tests_priority,
-    timeout: 300,
-    is_parallel: false,
-    depends: installed_targets,
-    suite: ['setup'])
+		meson_bin, args: meson_install_args ,
+		env: {'DESTDIR':test_install_destdir},
+		priority: setup_tests_priority,
+		timeout: 300,
+		is_parallel: false,
+		depends: installed_targets,
+		suite: ['setup'])
 
 test('install_test_files',
-    python,
-    args: install_test_files_args + ['--destdir', test_install_destdir],
-    priority: setup_tests_priority,
-    is_parallel: false,
-    suite: ['setup'])
+		python,
+		args: install_test_files_args + ['--destdir', test_install_destdir],
+		priority: setup_tests_priority,
+		is_parallel: false,
+		suite: ['setup'])
 
 test_result_dir = meson.project_build_root() / 'testrun'
 
@@ -3593,7 +3631,7 @@ test_env.set('top_builddir', meson.project_build_root())
 # that works (everything but windows, basically). On windows everything
 # library-like gets installed into bindir, solving that issue.
 if library_path_var != ''
-  test_env.prepend(library_path_var, temp_install_libdir)
+	test_env.prepend(library_path_var, temp_install_libdir)
 endif
 
 
@@ -3603,9 +3641,9 @@ endif
 # Use python to remove the old cached initdb, as we cannot rely on a working
 # 'rm' binary on windows.
 test('initdb_cache',
-     python,
-     args: [
-       '-c', '''
+		 python,
+		 args: [
+			 '-c', '''
 import shutil
 import sys
 import subprocess
@@ -3614,16 +3652,16 @@ shutil.rmtree(sys.argv[1], ignore_errors=True)
 sp = subprocess.run(sys.argv[2:] + [sys.argv[1]])
 sys.exit(sp.returncode)
 ''',
-       test_initdb_template,
-       temp_install_bindir / 'initdb',
-       '--auth', 'trust', '--no-sync', '--no-instructions', '--lc-messages=C',
-       '--no-clean'
-     ],
-     priority: setup_tests_priority - 1,
-     timeout: 300,
-     is_parallel: false,
-     env: test_env,
-     suite: ['setup'])
+			 test_initdb_template,
+			 temp_install_bindir / 'initdb',
+			 '--auth', 'trust', '--no-sync', '--no-instructions', '--lc-messages=C',
+			 '--no-clean'
+		 ],
+		 priority: setup_tests_priority - 1,
+		 timeout: 300,
+		 is_parallel: false,
+		 env: test_env,
+		 suite: ['setup'])
 
 
 
@@ -3642,186 +3680,186 @@ install_suites = []
 testwrap = files('src/tools/testwrap')
 
 foreach test_dir : tests
-  testwrap_base = [
-    testwrap,
-    '--basedir', meson.project_build_root(),
-    '--srcdir', test_dir['sd'],
-    # Some test suites are not run by default but can be run if selected by the
-    # user via variable PG_TEST_EXTRA. Pass configuration time value of
-    # PG_TEST_EXTRA as an argument to testwrap so that it can be overridden by
-    # run time value, if any.
-    '--pg-test-extra', get_option('PG_TEST_EXTRA'),
-  ]
-
-  foreach kind, v : test_dir
-    if kind in ['sd', 'bd', 'name']
-      continue
-    endif
-
-    t = test_dir[kind]
-
-    if kind in ['regress', 'isolation', 'ecpg']
-      if kind == 'regress'
-        runner = pg_regress
-        fallback_dbname = 'regression_@0@'
-      elif kind == 'isolation'
-        runner = pg_isolation_regress
-        fallback_dbname = 'isolation_regression_@0@'
-      elif kind == 'ecpg'
-        runner = pg_regress_ecpg
-        fallback_dbname = 'ecpg_regression_@0@'
-      endif
-
-      test_group = test_dir['name']
-      test_group_running = test_dir['name'] + '-running'
-
-      test_output = test_result_dir / test_group / kind
-      test_output_running = test_result_dir / test_group_running/ kind
-
-      # Unless specified by the test, choose a non-conflicting database name,
-      # to avoid conflicts when running against existing server.
-      dbname = t.get('dbname',
-        fallback_dbname.format(test_dir['name']))
-
-      test_command_base = [
-        runner.full_path(),
-        '--inputdir', t.get('inputdir', test_dir['sd']),
-        '--expecteddir', t.get('expecteddir', test_dir['sd']),
-        '--bindir', '',
-        '--dlpath', test_dir['bd'],
-        '--max-concurrent-tests=20',
-        '--dbname', dbname,
-      ] + t.get('regress_args', [])
-
-      test_schedule = t.get('schedule', [])
-
-      test_selection = []
-      if kind == 'isolation'
-        test_selection += t.get('specs', [])
-      else
-        test_selection += t.get('sql', [])
-      endif
-
-      env = test_env
-      env.prepend('PATH', temp_install_bindir, test_dir['bd'])
-
-      test_kwargs = {
-        'protocol': 'tap',
-        'priority': 10,
-        'timeout': 1000,
-        'depends': test_deps + t.get('deps', []),
-        'env': env,
-      } + t.get('test_kwargs', {})
-
-      test(test_group / kind,
-        python,
-        args: [
-          testwrap_base,
-          '--testgroup', test_group,
-          '--testname', kind,
-          '--schedule', test_schedule,
-          '--tests', test_selection,
-          '--',
-          test_command_base,
-          '--outputdir', test_output,
-          '--temp-instance', test_output / 'tmp_check',
-          '--port', testport.to_string(),
-        ],
-        suite: test_group,
-        kwargs: test_kwargs,
-      )
-      install_suites += test_group
-
-      # some tests can't support running against running DB
-      if t.get('runningcheck', true)
-        test(test_group_running / kind,
-          python,
-          args: [
-            testwrap_base,
-            '--testgroup', test_group_running,
-            '--testname', kind,
-            '--schedule', test_schedule,
-            '--tests', test_selection,
-            '--',
-            test_command_base,
-            '--outputdir', test_output_running,
-          ],
-          is_parallel: t.get('runningcheck-parallel', true),
-          suite: test_group_running,
-          kwargs: test_kwargs,
-        )
-        running_suites += test_group_running
-      endif
-
-      testport += 1
-    elif kind == 'tap'
-      testwrap_tap = testwrap_base
-      if not tap_tests_enabled
-        testwrap_tap += ['--skip', 'TAP tests not enabled']
-      endif
-
-      test_command = [
-        perl.full_path(),
-        '-I', meson.project_source_root() / 'src/test/perl',
-        '-I', test_dir['sd'],
-      ]
-
-      # Add temporary install, the build directory for non-installed binaries and
-      # also test/ for non-installed test binaries built separately.
-      env = test_env
-      env.prepend('PATH', temp_install_bindir, test_dir['bd'], test_dir['bd'] / 'test')
-      temp_install_datadir = '@0@@1@'.format(test_install_destdir, dir_prefix / dir_data)
-      env.set('share_contrib_dir', temp_install_datadir / 'contrib')
-
-      foreach name, value : t.get('env', {})
-        env.set(name, value)
-      endforeach
-
-      test_group = test_dir['name']
-      test_kwargs = {
-        'protocol': 'tap',
-        'suite': test_group,
-        'timeout': 1000,
-        'depends': test_deps + t.get('deps', []),
-        'env': env,
-      } + t.get('test_kwargs', {})
-
-      foreach onetap : t['tests']
-        # Make tap test names prettier, remove t/ and .pl
-        onetap_p = onetap
-        if onetap_p.startswith('t/')
-          onetap_p = onetap.split('t/')[1]
-        endif
-        if onetap_p.endswith('.pl')
-          onetap_p = fs.stem(onetap_p)
-        endif
-
-        test(test_dir['name'] / onetap_p,
-          python,
-          kwargs: test_kwargs,
-          args: testwrap_tap + [
-            '--testgroup', test_dir['name'],
-            '--testname', onetap_p,
-            '--', test_command,
-            test_dir['sd'] / onetap,
-          ],
-        )
-      endforeach
-      install_suites += test_group
-    else
-      error('unknown kind @0@ of test in @1@'.format(kind, test_dir['sd']))
-    endif
-
-  endforeach # kinds of tests
+	testwrap_base = [
+		testwrap,
+		'--basedir', meson.project_build_root(),
+		'--srcdir', test_dir['sd'],
+		# Some test suites are not run by default but can be run if selected by the
+		# user via variable PG_TEST_EXTRA. Pass configuration time value of
+		# PG_TEST_EXTRA as an argument to testwrap so that it can be overridden by
+		# run time value, if any.
+		'--pg-test-extra', get_option('PG_TEST_EXTRA'),
+	]
+
+	foreach kind, v : test_dir
+		if kind in ['sd', 'bd', 'name']
+			continue
+		endif
+
+		t = test_dir[kind]
+
+		if kind in ['regress', 'isolation', 'ecpg']
+			if kind == 'regress'
+				runner = pg_regress
+				fallback_dbname = 'regression_@0@'
+			elif kind == 'isolation'
+				runner = pg_isolation_regress
+				fallback_dbname = 'isolation_regression_@0@'
+			elif kind == 'ecpg'
+				runner = pg_regress_ecpg
+				fallback_dbname = 'ecpg_regression_@0@'
+			endif
+
+			test_group = test_dir['name']
+			test_group_running = test_dir['name'] + '-running'
+
+			test_output = test_result_dir / test_group / kind
+			test_output_running = test_result_dir / test_group_running/ kind
+
+			# Unless specified by the test, choose a non-conflicting database name,
+			# to avoid conflicts when running against existing server.
+			dbname = t.get('dbname',
+				fallback_dbname.format(test_dir['name']))
+
+			test_command_base = [
+				runner.full_path(),
+				'--inputdir', t.get('inputdir', test_dir['sd']),
+				'--expecteddir', t.get('expecteddir', test_dir['sd']),
+				'--bindir', '',
+				'--dlpath', test_dir['bd'],
+				'--max-concurrent-tests=20',
+				'--dbname', dbname,
+			] + t.get('regress_args', [])
+
+			test_schedule = t.get('schedule', [])
+
+			test_selection = []
+			if kind == 'isolation'
+				test_selection += t.get('specs', [])
+			else
+				test_selection += t.get('sql', [])
+			endif
+
+			env = test_env
+			env.prepend('PATH', temp_install_bindir, test_dir['bd'])
+
+			test_kwargs = {
+				'protocol': 'tap',
+				'priority': 10,
+				'timeout': 1000,
+				'depends': test_deps + t.get('deps', []),
+				'env': env,
+			} + t.get('test_kwargs', {})
+
+			test(test_group / kind,
+				python,
+				args: [
+					testwrap_base,
+					'--testgroup', test_group,
+					'--testname', kind,
+					'--schedule', test_schedule,
+					'--tests', test_selection,
+					'--',
+					test_command_base,
+					'--outputdir', test_output,
+					'--temp-instance', test_output / 'tmp_check',
+					'--port', testport.to_string(),
+				],
+				suite: test_group,
+				kwargs: test_kwargs,
+			)
+			install_suites += test_group
+
+			# some tests can't support running against running DB
+			if t.get('runningcheck', true)
+				test(test_group_running / kind,
+					python,
+					args: [
+						testwrap_base,
+						'--testgroup', test_group_running,
+						'--testname', kind,
+						'--schedule', test_schedule,
+						'--tests', test_selection,
+						'--',
+						test_command_base,
+						'--outputdir', test_output_running,
+					],
+					is_parallel: t.get('runningcheck-parallel', true),
+					suite: test_group_running,
+					kwargs: test_kwargs,
+				)
+				running_suites += test_group_running
+			endif
+
+			testport += 1
+		elif kind == 'tap'
+			testwrap_tap = testwrap_base
+			if not tap_tests_enabled
+				testwrap_tap += ['--skip', 'TAP tests not enabled']
+			endif
+
+			test_command = [
+				perl.full_path(),
+				'-I', meson.project_source_root() / 'src/test/perl',
+				'-I', test_dir['sd'],
+			]
+
+			# Add temporary install, the build directory for non-installed binaries and
+			# also test/ for non-installed test binaries built separately.
+			env = test_env
+			env.prepend('PATH', temp_install_bindir, test_dir['bd'], test_dir['bd'] / 'test')
+			temp_install_datadir = '@0@@1@'.format(test_install_destdir, dir_prefix / dir_data)
+			env.set('share_contrib_dir', temp_install_datadir / 'contrib')
+
+			foreach name, value : t.get('env', {})
+				env.set(name, value)
+			endforeach
+
+			test_group = test_dir['name']
+			test_kwargs = {
+				'protocol': 'tap',
+				'suite': test_group,
+				'timeout': 1000,
+				'depends': test_deps + t.get('deps', []),
+				'env': env,
+			} + t.get('test_kwargs', {})
+
+			foreach onetap : t['tests']
+				# Make tap test names prettier, remove t/ and .pl
+				onetap_p = onetap
+				if onetap_p.startswith('t/')
+					onetap_p = onetap.split('t/')[1]
+				endif
+				if onetap_p.endswith('.pl')
+					onetap_p = fs.stem(onetap_p)
+				endif
+
+				test(test_dir['name'] / onetap_p,
+					python,
+					kwargs: test_kwargs,
+					args: testwrap_tap + [
+						'--testgroup', test_dir['name'],
+						'--testname', onetap_p,
+						'--', test_command,
+						test_dir['sd'] / onetap,
+					],
+				)
+			endforeach
+			install_suites += test_group
+		else
+			error('unknown kind @0@ of test in @1@'.format(kind, test_dir['sd']))
+		endif
+
+	endforeach # kinds of tests
 
 endforeach # directories with tests
 
 # repeat condition so meson realizes version dependency
 add_test_setup('tmp_install',
-  is_default: true,
-  exclude_suites: running_suites)
+	is_default: true,
+	exclude_suites: running_suites)
 add_test_setup('running',
-  exclude_suites: ['setup'] + install_suites)
+	exclude_suites: ['setup'] + install_suites)
 
 
 
@@ -3839,10 +3877,10 @@ alias_target('world', all_built, docs)
 alias_target('install-world', install_quiet, installdocs)
 
 run_target('help',
-  command: [
-    perl, '-ne', 'next if /^#/; print',
-    files('doc/src/sgml/targets-meson.txt'),
-  ]
+	command: [
+		perl, '-ne', 'next if /^#/; print',
+		files('doc/src/sgml/targets-meson.txt'),
+	]
 )
 
 
@@ -3871,36 +3909,36 @@ pg_git_revision = get_option('PG_GIT_REVISION')
 # on, Unix machines.
 
 tar_gz = custom_target('tar.gz',
-  build_always_stale: true,
-  command: [git, '-C', '@SOURCE_ROOT@',
-            '-c', 'core.autocrlf=false',
-            'archive',
-            '--format', 'tar.gz',
-            '-9',
-            '--prefix', distdir + '/',
-            '-o', join_paths(meson.project_build_root(), '@OUTPUT@'),
-            pg_git_revision],
-  output: distdir + '.tar.gz',
+	build_always_stale: true,
+	command: [git, '-C', '@SOURCE_ROOT@',
+						'-c', 'core.autocrlf=false',
+						'archive',
+						'--format', 'tar.gz',
+						'-9',
+						'--prefix', distdir + '/',
+						'-o', join_paths(meson.project_build_root(), '@OUTPUT@'),
+						pg_git_revision],
+	output: distdir + '.tar.gz',
 )
 
 if bzip2.found()
-  tar_bz2 = custom_target('tar.bz2',
-    build_always_stale: true,
-    command: [git, '-C', '@SOURCE_ROOT@',
-              '-c', 'core.autocrlf=false',
-              '-c', 'tar.tar.bz2.command="@0@" -c'.format(bzip2.full_path()),
-              'archive',
-              '--format', 'tar.bz2',
-              '--prefix', distdir + '/',
-              '-o', join_paths(meson.project_build_root(), '@OUTPUT@'),
-              pg_git_revision],
-    output: distdir + '.tar.bz2',
-  )
+	tar_bz2 = custom_target('tar.bz2',
+		build_always_stale: true,
+		command: [git, '-C', '@SOURCE_ROOT@',
+							'-c', 'core.autocrlf=false',
+							'-c', 'tar.tar.bz2.command="@0@" -c'.format(bzip2.full_path()),
+							'archive',
+							'--format', 'tar.bz2',
+							'--prefix', distdir + '/',
+							'-o', join_paths(meson.project_build_root(), '@OUTPUT@'),
+							pg_git_revision],
+		output: distdir + '.tar.bz2',
+	)
 else
-  tar_bz2 = custom_target('tar.bz2',
-    command: [perl, '-e', 'exit 1'],
-    output: distdir + '.tar.bz2',
-  )
+	tar_bz2 = custom_target('tar.bz2',
+		command: [perl, '-e', 'exit 1'],
+		output: distdir + '.tar.bz2',
+	)
 endif
 
 alias_target('pgdist', [tar_gz, tar_bz2])
@@ -3909,7 +3947,7 @@ alias_target('pgdist', [tar_gz, tar_bz2])
 # But not if we are in a subproject, in case the parent project wants to
 # create a dist using the standard Meson command.
 if not meson.is_subproject()
-  meson.add_dist_script(perl, '-e', 'exit 1')
+	meson.add_dist_script(perl, '-e', 'exit 1')
 endif
 
 
@@ -3919,101 +3957,101 @@ endif
 ###############################################################
 
 summary(
-  {
-    'data block size': '@0@ kB'.format(cdata.get('BLCKSZ') / 1024),
-    'WAL block size': '@0@ kB'.format(cdata.get('XLOG_BLCKSZ') / 1024),
-    'segment size': get_option('segsize_blocks') != 0 ?
-      '@0@ blocks'.format(cdata.get('RELSEG_SIZE')) :
-      '@0@ GB'.format(get_option('segsize')),
-  },
-  section: 'Data layout',
+	{
+		'data block size': '@0@ kB'.format(cdata.get('BLCKSZ') / 1024),
+		'WAL block size': '@0@ kB'.format(cdata.get('XLOG_BLCKSZ') / 1024),
+		'segment size': get_option('segsize_blocks') != 0 ?
+			'@0@ blocks'.format(cdata.get('RELSEG_SIZE')) :
+			'@0@ GB'.format(get_option('segsize')),
+	},
+	section: 'Data layout',
 )
 
 summary(
-  {
-    'host system': '@0@ @1@'.format(host_system, host_cpu),
-    'build system': '@0@ @1@'.format(build_machine.system(),
-                                     build_machine.cpu_family()),
-  },
-  section: 'System',
+	{
+		'host system': '@0@ @1@'.format(host_system, host_cpu),
+		'build system': '@0@ @1@'.format(build_machine.system(),
+																		 build_machine.cpu_family()),
+	},
+	section: 'System',
 )
 
 summary(
-  {
-    'linker': '@0@'.format(cc.get_linker_id()),
-    'C compiler': '@0@ @1@'.format(cc.get_id(), cc.version()),
-  },
-  section: 'Compiler',
+	{
+		'linker': '@0@'.format(cc.get_linker_id()),
+		'C compiler': '@0@ @1@'.format(cc.get_id(), cc.version()),
+	},
+	section: 'Compiler',
 )
 
 summary(
-  {
-    'CPP FLAGS': ' '.join(cppflags),
-    'C FLAGS, functional': ' '.join(cflags),
-    'C FLAGS, warnings': ' '.join(cflags_warn),
-    'C FLAGS, modules': ' '.join(cflags_mod),
-    'C FLAGS, user specified': ' '.join(get_option('c_args')),
-    'LD FLAGS': ' '.join(ldflags + get_option('c_link_args')),
-  },
-  section: 'Compiler Flags',
+	{
+		'CPP FLAGS': ' '.join(cppflags),
+		'C FLAGS, functional': ' '.join(cflags),
+		'C FLAGS, warnings': ' '.join(cflags_warn),
+		'C FLAGS, modules': ' '.join(cflags_mod),
+		'C FLAGS, user specified': ' '.join(get_option('c_args')),
+		'LD FLAGS': ' '.join(ldflags + get_option('c_link_args')),
+	},
+	section: 'Compiler Flags',
 )
 
 if llvm.found()
-  summary(
-    {
-      'C++ compiler': '@0@ @1@'.format(cpp.get_id(), cpp.version()),
-    },
-    section: 'Compiler',
-  )
-
-  summary(
-    {
-      'C++ FLAGS, functional': ' '.join(cxxflags),
-      'C++ FLAGS, warnings': ' '.join(cxxflags_warn),
-      'C++ FLAGS, user specified': ' '.join(get_option('cpp_args')),
-    },
-    section: 'Compiler Flags',
-  )
+	summary(
+		{
+			'C++ compiler': '@0@ @1@'.format(cpp.get_id(), cpp.version()),
+		},
+		section: 'Compiler',
+	)
+
+	summary(
+		{
+			'C++ FLAGS, functional': ' '.join(cxxflags),
+			'C++ FLAGS, warnings': ' '.join(cxxflags_warn),
+			'C++ FLAGS, user specified': ' '.join(get_option('cpp_args')),
+		},
+		section: 'Compiler Flags',
+	)
 endif
 
 summary(
-  {
-    'bison': '@0@ @1@'.format(bison.full_path(), bison_version),
-    'dtrace': dtrace,
-    'flex': '@0@ @1@'.format(flex.full_path(), flex_version),
-  },
-  section: 'Programs',
+	{
+		'bison': '@0@ @1@'.format(bison.full_path(), bison_version),
+		'dtrace': dtrace,
+		'flex': '@0@ @1@'.format(flex.full_path(), flex_version),
+	},
+	section: 'Programs',
 )
 
 summary(
-  {
-    'bonjour': bonjour,
-    'bsd_auth': bsd_auth,
-    'docs': docs_dep,
-    'docs_pdf': docs_pdf_dep,
-    'gss': gssapi,
-    'icu': icu,
-    'ldap': ldap,
-    'libcurl': libcurl,
-    'libnuma': libnuma,
-    'liburing': liburing,
-    'libxml': libxml,
-    'libxslt': libxslt,
-    'llvm': llvm,
-    'lz4': lz4,
-    'nls': libintl,
-    'openssl': ssl,
-    'pam': pam,
-    'plperl': [perl_dep, perlversion],
-    'plpython': python3_dep,
-    'pltcl': tcl_dep,
-    'readline': readline,
-    'selinux': selinux,
-    'systemd': systemd,
-    'uuid': uuid,
-    'zlib': zlib,
-    'zstd': zstd,
-  },
-  section: 'External libraries',
-  list_sep: ' ',
+	{
+		'bonjour': bonjour,
+		'bsd_auth': bsd_auth,
+		'docs': docs_dep,
+		'docs_pdf': docs_pdf_dep,
+		'gss': gssapi,
+		'icu': icu,
+		'ldap': ldap,
+		'libcurl': libcurl,
+		'libnuma': libnuma,
+		'liburing': liburing,
+		'libxml': libxml,
+		'libxslt': libxslt,
+		'llvm': llvm,
+		'lz4': lz4,
+		'nls': libintl,
+		'openssl': ssl,
+		'pam': pam,
+		'plperl': [perl_dep, perlversion],
+		'plpython': python3_dep,
+		'pltcl': tcl_dep,
+		'readline': readline,
+		'selinux': selinux,
+		'systemd': systemd,
+		'uuid': uuid,
+		'zlib': zlib,
+		'zstd': zstd,
+	},
+	section: 'External libraries',
+	list_sep: ' ',
 )
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index 92fcc5f3063..9d404144800 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -22,21 +22,21 @@
 #undef ALIGNOF_SHORT
 
 /* Size of a disk block --- this also limits the size of a tuple. You can set
-   it bigger if you need bigger tuples (although TOAST should reduce the need
-   to have large tuples, since fields can be spread across multiple tuples).
-   BLCKSZ must be a power of 2. The maximum possible value of BLCKSZ is
-   currently 2^15 (32768). This is determined by the 15-bit widths of the
-   lp_off and lp_len fields in ItemIdData (see include/storage/itemid.h).
-   Changing BLCKSZ requires an initdb. */
+	it bigger if you need bigger tuples (although TOAST should reduce the need
+	to have large tuples, since fields can be spread across multiple tuples).
+	BLCKSZ must be a power of 2. The maximum possible value of BLCKSZ is
+	currently 2^15 (32768). This is determined by the 15-bit widths of the
+	lp_off and lp_len fields in ItemIdData (see include/storage/itemid.h).
+	Changing BLCKSZ requires an initdb. */
 #undef BLCKSZ
 
 /* Saved arguments from configure */
 #undef CONFIGURE_ARGS
 
 /* Define to the default TCP port number on which the server listens and to
-   which clients will try to connect. This can be overridden at run-time, but
-   it's convenient if your clients have the right default compiled in.
-   (--with-pgport=PORTNUM) */
+	which clients will try to connect. This can be overridden at run-time, but
+	it's convenient if your clients have the right default compiled in.
+	(--with-pgport=PORTNUM) */
 #undef DEF_PGPORT
 
 /* Define to the default TCP port number as a string constant. */
@@ -76,59 +76,59 @@
 #undef HAVE_CRTDEFS_H
 
 /* Define to 1 if you have the declaration of `fdatasync', and to 0 if you
-   don't. */
+	don't. */
 #undef HAVE_DECL_FDATASYNC
 
 /* Define to 1 if you have the declaration of `F_FULLFSYNC', and to 0 if you
-   don't. */
+	don't. */
 #undef HAVE_DECL_F_FULLFSYNC
 
 /* Define to 1 if you have the declaration of
-   `LLVMCreateGDBRegistrationListener', and to 0 if you don't. */
+	`LLVMCreateGDBRegistrationListener', and to 0 if you don't. */
 #undef HAVE_DECL_LLVMCREATEGDBREGISTRATIONLISTENER
 
 /* Define to 1 if you have the declaration of
-   `LLVMCreatePerfJITEventListener', and to 0 if you don't. */
+	`LLVMCreatePerfJITEventListener', and to 0 if you don't. */
 #undef HAVE_DECL_LLVMCREATEPERFJITEVENTLISTENER
 
 /* Define to 1 if you have the declaration of `memset_s', and to 0 if you
-   don't. */
+	don't. */
 #undef HAVE_DECL_MEMSET_S
 
 /* Define to 1 if you have the declaration of `posix_fadvise', and to 0 if you
-   don't. */
+	don't. */
 #undef HAVE_DECL_POSIX_FADVISE
 
 /* Define to 1 if you have the declaration of `preadv', and to 0 if you don't.
-   */
+	*/
 #undef HAVE_DECL_PREADV
 
 /* Define to 1 if you have the declaration of `pwritev', and to 0 if you
-   don't. */
+	don't. */
 #undef HAVE_DECL_PWRITEV
 
 /* Define to 1 if you have the declaration of `strchrnul', and to 0 if you
-   don't. */
+	don't. */
 #undef HAVE_DECL_STRCHRNUL
 
 /* Define to 1 if you have the declaration of `strlcat', and to 0 if you
-   don't. */
+	don't. */
 #undef HAVE_DECL_STRLCAT
 
 /* Define to 1 if you have the declaration of `strlcpy', and to 0 if you
-   don't. */
+	don't. */
 #undef HAVE_DECL_STRLCPY
 
 /* Define to 1 if you have the declaration of `strnlen', and to 0 if you
-   don't. */
+	don't. */
 #undef HAVE_DECL_STRNLEN
 
 /* Define to 1 if you have the declaration of `strsep', and to 0 if you don't.
-   */
+	*/
 #undef HAVE_DECL_STRSEP
 
 /* Define to 1 if you have the declaration of `timingsafe_bcmp', and to 0 if
-   you don't. */
+	you don't. */
 #undef HAVE_DECL_TIMINGSAFE_BCMP
 
 /* Define to 1 if you have the <editline/history.h> header file. */
@@ -153,7 +153,7 @@
 #undef HAVE_GCC__ATOMIC_INT32_CAS
 
 /* Define to 1 if you have __atomic_compare_exchange_n(int64 *, int64 *,
-   int64). */
+	int64). */
 #undef HAVE_GCC__ATOMIC_INT64_CAS
 
 /* Define to 1 if you have __sync_lock_test_and_set(char *) and friends. */
@@ -166,7 +166,7 @@
 #undef HAVE_GCC__SYNC_INT32_TAS
 
 /* Define to 1 if you have __sync_val_compare_and_swap(int64_t *, int64_t,
-   int64_t). */
+	int64_t). */
 #undef HAVE_GCC__SYNC_INT64_CAS
 
 /* Define to 1 if you have the `getauxval' function. */
@@ -341,18 +341,18 @@
 #undef HAVE_RL_COMPLETION_MATCHES
 
 /* Define to 1 if you have the global variable 'rl_completion_suppress_quote'.
-   */
+	*/
 #undef HAVE_RL_COMPLETION_SUPPRESS_QUOTE
 
 /* Define to 1 if you have the `rl_filename_completion_function' function. */
 #undef HAVE_RL_FILENAME_COMPLETION_FUNCTION
 
 /* Define to 1 if you have the global variable 'rl_filename_quote_characters'.
-   */
+	*/
 #undef HAVE_RL_FILENAME_QUOTE_CHARACTERS
 
 /* Define to 1 if you have the global variable 'rl_filename_quoting_function'.
-   */
+	*/
 #undef HAVE_RL_FILENAME_QUOTING_FUNCTION
 
 /* Define to 1 if you have the `rl_reset_screen_size' function. */
@@ -575,7 +575,7 @@
 #undef MEMSET_LOOP_LIMIT
 
 /* Define to the OpenSSL API version in use. This avoids deprecation warnings
-   from newer OpenSSL versions. */
+	from newer OpenSSL versions. */
 #undef OPENSSL_API_COMPAT
 
 /* Define to the address where bug reports for this package should be sent. */
@@ -597,18 +597,18 @@
 #undef PACKAGE_VERSION
 
 /* Define to best C++ printf format archetype, usually gnu_printf if
-   available. */
+	available. */
 #undef PG_CXX_PRINTF_ATTRIBUTE
 
 /* Define to best C printf format archetype, usually gnu_printf if available.
-   */
+	*/
 #undef PG_C_PRINTF_ATTRIBUTE
 
 /* Define to the name of a signed 128-bit integer type. */
 #undef PG_INT128_TYPE
 
 /* Define to the name of the default PostgreSQL service principal in Kerberos
-   (GSSAPI). (--with-krb-srvnam=NAME) */
+	(GSSAPI). (--with-krb-srvnam=NAME) */
 #undef PG_KRB_SRVNAM
 
 /* PostgreSQL major version as a string */
@@ -630,24 +630,24 @@
 #undef PG_VERSION_STR
 
 /* Define to 1 to allow profiling output to be saved separately for each
-   process. */
+	process. */
 #undef PROFILE_PID_DIR
 
 /* Define to necessary symbol if this constant uses a non-standard name on
-   your system. */
+	your system. */
 #undef PTHREAD_CREATE_JOINABLE
 
 /* RELSEG_SIZE is the maximum number of blocks allowed in one disk file. Thus,
-   the maximum size of a single file is RELSEG_SIZE * BLCKSZ; relations bigger
-   than that are divided into multiple files. RELSEG_SIZE * BLCKSZ must be
-   less than your OS' limit on file size. This is often 2 GB or 4GB in a
-   32-bit operating system, unless you have large file support enabled. By
-   default, we make the limit 1 GB to avoid any possible integer-overflow
-   problems within the OS. A limit smaller than necessary only means we divide
-   a large relation into more chunks than necessary, so it seems best to err
-   in the direction of a small limit. A power-of-2 value is recommended to
-   save a few cycles in md.c, but is not absolutely required. Changing
-   RELSEG_SIZE requires an initdb. */
+	the maximum size of a single file is RELSEG_SIZE * BLCKSZ; relations bigger
+	than that are divided into multiple files. RELSEG_SIZE * BLCKSZ must be
+	less than your OS' limit on file size. This is often 2 GB or 4GB in a
+	32-bit operating system, unless you have large file support enabled. By
+	default, we make the limit 1 GB to avoid any possible integer-overflow
+	problems within the OS. A limit smaller than necessary only means we divide
+	a large relation into more chunks than necessary, so it seems best to err
+	in the direction of a small limit. A power-of-2 value is recommended to
+	save a few cycles in md.c, but is not absolutely required. Changing
+	RELSEG_SIZE requires an initdb. */
 #undef RELSEG_SIZE
 
 /* The size of `intmax_t', as computed by sizeof. */
@@ -717,7 +717,7 @@
 #undef USE_LIBXML
 
 /* Define to 1 to use XSLT support when building contrib/xml2.
-   (--with-libxslt) */
+	(--with-libxslt) */
 #undef USE_LIBXSLT
 
 /* Define to 1 to build with LLVM based JIT support. (--with-llvm) */
@@ -750,6 +750,9 @@
 /* Define to 1 to use SVE popcount instructions with a runtime check. */
 #undef USE_SVE_POPCNT_WITH_RUNTIME_CHECK
 
+/* Define to 1 to use SVE2 CRC instructions with a runtime check. */
+#undef USE_SVE2_CRC32C_WITH_RUNTIME_CHECK
+
 /* Define to build with systemd support. (--with-systemd) */
 #undef USE_SYSTEMD
 
@@ -772,7 +775,7 @@
 #undef USE_ZSTD
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
+	significant byte first (like Motorola and SPARC, unlike Intel). */
 #if defined AC_APPLE_UNIVERSAL_BUILD
 # if defined __BIG_ENDIAN__
 #  define WORDS_BIGENDIAN 1
@@ -784,10 +787,10 @@
 #endif
 
 /* Size of a WAL file block. This need have no particular relation to BLCKSZ.
-   XLOG_BLCKSZ must be a power of 2, and if your system supports O_DIRECT I/O,
-   XLOG_BLCKSZ must be a multiple of the alignment requirement for direct-I/O
-   buffers, else direct I/O may fail. Changing XLOG_BLCKSZ requires an initdb.
-   */
+	XLOG_BLCKSZ must be a power of 2, and if your system supports O_DIRECT I/O,
+	XLOG_BLCKSZ must be a multiple of the alignment requirement for direct-I/O
+	buffers, else direct I/O may fail. Changing XLOG_BLCKSZ requires an initdb.
+	*/
 #undef XLOG_BLCKSZ
 
 
@@ -802,20 +805,20 @@
 #undef _LARGE_FILES
 
 /* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
+	calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus
 #undef inline
 #endif
 
 /* Define to the equivalent of the C99 'restrict' keyword, or to
-   nothing if this is not supported.  Do not define if restrict is
-   supported directly.  */
+	nothing if this is not supported.  Do not define if restrict is
+	supported directly.  */
 #undef restrict
 /* Work around a bug in Sun C++: it does not support _Restrict or
-   __restrict__, even though the corresponding Sun C compiler ends up with
-   "#define restrict _Restrict" or "#define restrict __restrict__" in the
-   previous line.  Perhaps some future version of Sun C++ will work with
-   restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
+	__restrict__, even though the corresponding Sun C compiler ends up with
+	"#define restrict _Restrict" or "#define restrict __restrict__" in the
+	previous line.  Perhaps some future version of Sun C++ will work with
+	restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
 #if defined __SUNPRO_CC && !defined __RESTRICT
 # define _Restrict
 # define __restrict__
diff --git a/src/include/port/pg_crc32c.h b/src/include/port/pg_crc32c.h
index ae008118ea8..91ecf3950d4 100644
--- a/src/include/port/pg_crc32c.h
+++ b/src/include/port/pg_crc32c.h
@@ -118,6 +118,9 @@ extern pg_crc32c pg_comp_crc32c_avx512(pg_crc32c crc, const void *data, size_t l
 #define FIN_CRC32C(crc) ((crc) ^= 0xFFFFFFFF)
 
 extern pg_crc32c pg_comp_crc32c_armv8(pg_crc32c crc, const void *data, size_t len);
+#ifdef USE_SVE2_CRC32C_WITH_RUNTIME_CHECK
+extern pg_crc32c pg_comp_crc32c_sve2(pg_crc32c crc, const void *data, size_t len);
+#endif
 
 #elif defined(USE_LOONGARCH_CRC32C)
 /* Use LoongArch CRCC instructions. */
@@ -139,8 +142,11 @@ extern pg_crc32c pg_comp_crc32c_loongarch(pg_crc32c crc, const void *data, size_
 #define FIN_CRC32C(crc) ((crc) ^= 0xFFFFFFFF)
 
 extern pg_crc32c pg_comp_crc32c_sb8(pg_crc32c crc, const void *data, size_t len);
-extern pg_crc32c (*pg_comp_crc32c) (pg_crc32c crc, const void *data, size_t len);
+extern PGDLLIMPORT pg_crc32c (*pg_comp_crc32c) (pg_crc32c crc, const void *data, size_t len);
 extern pg_crc32c pg_comp_crc32c_armv8(pg_crc32c crc, const void *data, size_t len);
+#ifdef USE_SVE2_CRC32C_WITH_RUNTIME_CHECK
+extern pg_crc32c pg_comp_crc32c_sve2(pg_crc32c crc, const void *data, size_t len);
+#endif
 
 #else
 /*
diff --git a/src/port/pg_crc32c_armv8.c b/src/port/pg_crc32c_armv8.c
index 5ba070bb99d..2b5a5c1f10f 100644
--- a/src/port/pg_crc32c_armv8.c
+++ b/src/port/pg_crc32c_armv8.c
@@ -73,3 +73,191 @@ pg_comp_crc32c_armv8(pg_crc32c crc, const void *data, size_t len)
 
 	return crc;
 }
+
+#ifdef USE_SVE2_CRC32C_WITH_RUNTIME_CHECK
+#include <arm_sve.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+static const uint64_t k_8way_fold[2] __attribute__((aligned(16))) = {
+	0x000000006992cea2ULL,		/* x^1055 mod P(x) */
+	0x000000000d3b6092ULL		/* x^991 mod P(x) */
+};
+
+static const uint64_t k1k2_merge1[2] __attribute__((aligned(16))) = {
+	0x00000000f20c0dfeULL,		/* x^159 */
+	0x00000000493c7d27ULL		/* x^95 */
+};
+
+static const uint64_t k1k2_merge2[2] __attribute__((aligned(16))) = {
+	0x000000003da6d0cbULL,		/* x^287 */
+	0x00000000ba4fc28eULL		/* x^223 */
+};
+
+static const uint64_t k3k4_merge3[2] __attribute__((aligned(16))) = {
+	0x00000000740eef02ULL,		/* x^543 */
+	0x000000009e4addf8ULL		/* x^479 */
+};
+
+pg_attribute_target("arch=armv9-a+sve2-aes")
+static inline svuint64_t
+sve_load_crc(uint32_t crc)
+{
+	uint64_t	buf[4] = {(uint64_t) crc, 0};
+
+	return svld1_u64(svptrue_b64(), buf);
+}
+
+pg_attribute_target("arch=armv9-a+sve2-aes")
+pg_crc32c
+pg_comp_crc32c_sve2(pg_crc32c crc_in, const void *data, size_t length)
+{
+	const uint8_t *input = (const uint8_t *) data;
+	pg_crc32c	crc = crc_in;
+	svbool_t	pg = svptrue_b64();
+	size_t		vl_bytes = (size_t) svcntb();
+	svuint64_t	vK_fold = svld1_u64(pg, k_8way_fold);
+	svuint64_t	vK_merge1 = svld1_u64(pg, k1k2_merge1);
+	svuint64_t	vK_merge2 = svld1_u64(pg, k1k2_merge2);
+	svuint64_t	vK_merge3 = svld1_u64(pg, k3k4_merge3);
+
+	if (length < 8 * vl_bytes)
+		return pg_comp_crc32c_armv8(crc, input, length);
+
+	/* Initialize 8 accumulators */
+	svuint64_t	acc0 = svld1_u64(pg, (const uint64_t *) input);
+
+	acc0 = sveor_u64_z(pg, acc0, sve_load_crc(crc));
+
+	svuint64_t	acc1 = svld1_u64(pg, (const uint64_t *) (input + 1 * vl_bytes));
+	svuint64_t	acc2 = svld1_u64(pg, (const uint64_t *) (input + 2 * vl_bytes));
+	svuint64_t	acc3 = svld1_u64(pg, (const uint64_t *) (input + 3 * vl_bytes));
+	svuint64_t	acc4 = svld1_u64(pg, (const uint64_t *) (input + 4 * vl_bytes));
+	svuint64_t	acc5 = svld1_u64(pg, (const uint64_t *) (input + 5 * vl_bytes));
+	svuint64_t	acc6 = svld1_u64(pg, (const uint64_t *) (input + 6 * vl_bytes));
+	svuint64_t	acc7 = svld1_u64(pg, (const uint64_t *) (input + 7 * vl_bytes));
+
+	input += 8 * vl_bytes;
+	length -= 8 * vl_bytes;
+
+	/* Main loop */
+	while (length >= 8 * vl_bytes)
+	{
+		svuint64_t	block0 = svld1_u64(pg, (const uint64_t *) (input + 0 * vl_bytes));
+		svuint64_t	block1 = svld1_u64(pg, (const uint64_t *) (input + 1 * vl_bytes));
+		svuint64_t	block2 = svld1_u64(pg, (const uint64_t *) (input + 2 * vl_bytes));
+		svuint64_t	block3 = svld1_u64(pg, (const uint64_t *) (input + 3 * vl_bytes));
+		svuint64_t	block4 = svld1_u64(pg, (const uint64_t *) (input + 4 * vl_bytes));
+		svuint64_t	block5 = svld1_u64(pg, (const uint64_t *) (input + 5 * vl_bytes));
+		svuint64_t	block6 = svld1_u64(pg, (const uint64_t *) (input + 6 * vl_bytes));
+		svuint64_t	block7 = svld1_u64(pg, (const uint64_t *) (input + 7 * vl_bytes));
+
+		svuint64_t	t0_0 = svpmullb_pair_u64(acc0, vK_fold);
+		svuint64_t	t0_1 = svpmullb_pair_u64(acc1, vK_fold);
+		svuint64_t	t0_2 = svpmullb_pair_u64(acc2, vK_fold);
+		svuint64_t	t0_3 = svpmullb_pair_u64(acc3, vK_fold);
+		svuint64_t	t0_4 = svpmullb_pair_u64(acc4, vK_fold);
+		svuint64_t	t0_5 = svpmullb_pair_u64(acc5, vK_fold);
+		svuint64_t	t0_6 = svpmullb_pair_u64(acc6, vK_fold);
+		svuint64_t	t0_7 = svpmullb_pair_u64(acc7, vK_fold);
+
+		svuint64_t	t1_0 = svpmullt_pair_u64(acc0, vK_fold);
+		svuint64_t	t1_1 = svpmullt_pair_u64(acc1, vK_fold);
+		svuint64_t	t1_2 = svpmullt_pair_u64(acc2, vK_fold);
+		svuint64_t	t1_3 = svpmullt_pair_u64(acc3, vK_fold);
+		svuint64_t	t1_4 = svpmullt_pair_u64(acc4, vK_fold);
+		svuint64_t	t1_5 = svpmullt_pair_u64(acc5, vK_fold);
+		svuint64_t	t1_6 = svpmullt_pair_u64(acc6, vK_fold);
+		svuint64_t	t1_7 = svpmullt_pair_u64(acc7, vK_fold);
+
+		acc0 = sveor3_u64(t0_0, t1_0, block0);
+		acc1 = sveor3_u64(t0_1, t1_1, block1);
+		acc2 = sveor3_u64(t0_2, t1_2, block2);
+		acc3 = sveor3_u64(t0_3, t1_3, block3);
+		acc4 = sveor3_u64(t0_4, t1_4, block4);
+		acc5 = sveor3_u64(t0_5, t1_5, block5);
+		acc6 = sveor3_u64(t0_6, t1_6, block6);
+		acc7 = sveor3_u64(t0_7, t1_7, block7);
+
+		input += 8 * vl_bytes;
+		length -= 8 * vl_bytes;
+	}
+
+	/* Stage 1: Fold 128 bits */
+	{
+		svuint64_t	t0,
+					t1;
+
+		t0 = svpmullb_pair_u64(acc0, vK_merge1);
+		t1 = svpmullt_pair_u64(acc0, vK_merge1);
+		acc0 = sveor3_u64(t0, t1, acc1);
+
+		t0 = svpmullb_pair_u64(acc2, vK_merge1);
+		t1 = svpmullt_pair_u64(acc2, vK_merge1);
+		acc2 = sveor3_u64(t0, t1, acc3);
+
+		t0 = svpmullb_pair_u64(acc4, vK_merge1);
+		t1 = svpmullt_pair_u64(acc4, vK_merge1);
+		acc4 = sveor3_u64(t0, t1, acc5);
+
+		t0 = svpmullb_pair_u64(acc6, vK_merge1);
+		t1 = svpmullt_pair_u64(acc6, vK_merge1);
+		acc6 = sveor3_u64(t0, t1, acc7);
+	}
+
+	/* Stage 2: Fold 256 bits */
+	{
+		svuint64_t	t0,
+					t1;
+
+		t0 = svpmullb_pair_u64(acc0, vK_merge2);
+		t1 = svpmullt_pair_u64(acc0, vK_merge2);
+		acc0 = sveor3_u64(t0, t1, acc2);
+
+		t0 = svpmullb_pair_u64(acc4, vK_merge2);
+		t1 = svpmullt_pair_u64(acc4, vK_merge2);
+		acc4 = sveor3_u64(t0, t1, acc6);
+	}
+
+	/* Stage 3: Fold 512 bits */
+	{
+		svuint64_t	t0,
+					t1;
+
+		t0 = svpmullb_pair_u64(acc0, vK_merge3);
+		t1 = svpmullt_pair_u64(acc0, vK_merge3);
+		acc0 = sveor3_u64(t0, t1, acc4);
+	}
+
+	/* Remainder loop */
+	while (length >= vl_bytes)
+	{
+		svuint64_t	block = svld1_u64(pg, (const uint64_t *) input);
+
+		svuint64_t	t0 = svpmullb_pair_u64(acc0, vK_merge1);
+		svuint64_t	t1 = svpmullt_pair_u64(acc0, vK_merge1);
+
+		acc0 = sveor3_u64(t0, t1, block);
+
+		input += vl_bytes;
+		length -= vl_bytes;
+	}
+
+	/* Final reduction */
+	{
+		uint64_t	temp[2];
+
+		svst1_u64(pg, temp, acc0);
+
+		crc = 0;
+		crc = __crc32cd(crc, temp[0]);
+		crc = __crc32cd(crc, temp[1]);
+	}
+
+	if (length > 0)
+		crc = pg_comp_crc32c_armv8(crc, input, length);
+
+	return crc;
+}
+#endif
\ No newline at end of file
diff --git a/src/port/pg_crc32c_armv8_choose.c b/src/port/pg_crc32c_armv8_choose.c
index c0001cfe2dc..86aa9072f9a 100644
--- a/src/port/pg_crc32c_armv8_choose.c
+++ b/src/port/pg_crc32c_armv8_choose.c
@@ -26,8 +26,7 @@
 
 #if defined(HAVE_ELF_AUX_INFO) || defined(HAVE_GETAUXVAL)
 #include <sys/auxv.h>
-/* Ancient glibc releases don't include the HWCAPxxx macros in sys/auxv.h */
-#if defined(__linux__) && (defined(__aarch64__) ? !defined(HWCAP_CRC32) : !defined(HWCAP2_CRC32))
+#if defined(__linux__) && !defined(__aarch64__) && !defined(HWCAP2_CRC32)
 #include <asm/hwcap.h>
 #endif
 #endif
@@ -36,11 +35,45 @@
 #include <sys/sysctl.h>
 #if defined(__aarch64__)
 #include <aarch64/armreg.h>
+#include <arm_sve.h>
 #endif
 #endif
 
+#include <sys/prctl.h>
+
 #include "port/pg_crc32c.h"
 
+#ifndef PR_SVE_GET_VL
+#define PR_SVE_GET_VL 51
+#endif
+
+static bool
+pg_crc32c_sve2_available(void)
+{
+#if defined(__aarch64__)
+#ifdef HAVE_ELF_AUX_INFO
+	unsigned long hwcap, hwcap2;
+
+	/* Check for CRC32 and SVE2 on BSD systems */
+	if (elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap)) != 0)
+		return false;
+	if (elf_aux_info(AT_HWCAP2, &hwcap2, sizeof(hwcap2)) != 0)
+		return false;
+	return (hwcap & HWCAP_CRC32) && (hwcap2 & HWCAP2_SVE2);
+#elif defined(HAVE_GETAUXVAL)
+	/* Check for CRC32 and SVE2 on Linux systems */
+	unsigned long hwcap = getauxval(AT_HWCAP);
+	unsigned long hwcap2 = getauxval(AT_HWCAP2);
+
+	return (hwcap & HWCAP_CRC32) && (hwcap2 & HWCAP2_SVE2);
+#else
+	return false;
+#endif
+#else
+	return false;
+#endif
+}
+
 static bool
 pg_crc32c_armv8_available(void)
 {
@@ -74,14 +107,17 @@ pg_crc32c_armv8_available(void)
 
 	size_t		len;
 	uint64		sysctlbuf[SYSCTL_CPU_ID_MAXSIZE];
+
 #if defined(__aarch64__)
 	/* We assume cpu0 is representative of all the machine's CPUs. */
 	const char *path = "machdep.cpu0.cpu_id";
 	size_t		expected_len = sizeof(struct aarch64_sysctl_cpu_id);
+
 #define ISAR0 ((struct aarch64_sysctl_cpu_id *) sysctlbuf)->ac_aa64isar0
 #else
 	const char *path = "machdep.id_isar";
 	size_t		expected_len = 6 * sizeof(int);
+
 #define ISAR0 ((int *) sysctlbuf)[5]
 #endif
 	uint64		fld;
@@ -115,7 +151,11 @@ pg_crc32c_armv8_available(void)
 static pg_crc32c
 pg_comp_crc32c_choose(pg_crc32c crc, const void *data, size_t len)
 {
-	if (pg_crc32c_armv8_available())
+	int vl = prctl(PR_SVE_GET_VL);
+
+	if (pg_crc32c_sve2_available() && vl > 0 && (vl & 0xFFFF) == 16) /* 16 bytes = 128 bits */
+		pg_comp_crc32c = pg_comp_crc32c_sve2;
+	else if (pg_crc32c_armv8_available())
 		pg_comp_crc32c = pg_comp_crc32c_armv8;
 	else
 		pg_comp_crc32c = pg_comp_crc32c_sb8;
@@ -123,4 +163,4 @@ pg_comp_crc32c_choose(pg_crc32c crc, const void *data, size_t len)
 	return pg_comp_crc32c(crc, data, len);
 }
 
-pg_crc32c	(*pg_comp_crc32c) (pg_crc32c crc, const void *data, size_t len) = pg_comp_crc32c_choose;
+pg_crc32c	(*pg_comp_crc32c) (pg_crc32c crc, const void *data, size_t len) = pg_comp_crc32c_choose;
\ No newline at end of file
-- 
2.34.1

