From 6541e99c82469ef12f7d551891cbfacab50dcff3 Mon Sep 17 00:00:00 2001
From: Dianjin Wang <wangdianjin@gmail.com>
Date: Tue, 31 Mar 2026 15:57:07 +0800
Subject: [PATCH] Update configure with the latest configure.ac

Some changes to configure.ac have been made by the following PRs:
- https://github.com/apache/cloudberry/pull/1598
- https://github.com/apache/cloudberry/pull/1363

We need to regenerate the `configure` file by the command `autoconf`,
not simply editing the configure directly. This commit is to generate
the latest configure based the latest configure.ac.

OS: Rocky Linux 8
Autoconf: 2.69 (default version in Rocky Linux 8)
---
 configure | 114 ++++++++++++++++++++++++++----------------------------
 1 file changed, 55 insertions(+), 59 deletions(-)

diff --git a/configure b/configure
index c9ce3d46302..4a25bf3c06e 100755
--- a/configure
+++ b/configure
@@ -2912,6 +2912,7 @@ PG_PACKAGE_VERSION=14.4
 
 
 
+
 ac_aux_dir=
 for ac_dir in config "$srcdir"/config; do
   if test -f "$ac_dir/install-sh"; then
@@ -12235,7 +12236,9 @@ $as_echo "#define USE_MDBLOCALES 1" >>confdefs.h
   esac
 
 else
-  with_mdblocales=no
+  with_mdblocales=yes
+
+$as_echo "#define USE_MDBLOCALES 1" >>confdefs.h
 
 fi
 
@@ -12878,56 +12881,6 @@ $as_echo "${python_libspec} ${python_additional_libs}" >&6; }
 
 
 
-fi
-
-if test "$with_mdblocales" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mdb_setlocale in -lmdblocales" >&5
-$as_echo_n "checking for mdb_setlocale in -lmdblocales... " >&6; }
-if ${ac_cv_lib_mdblocales_mdb_setlocale+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmdblocales  $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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char mdb_setlocale ();
-int
-main ()
-{
-return mdb_setlocale ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_mdblocales_mdb_setlocale=yes
-else
-  ac_cv_lib_mdblocales_mdb_setlocale=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mdblocales_mdb_setlocale" >&5
-$as_echo "$ac_cv_lib_mdblocales_mdb_setlocale" >&6; }
-if test "x$ac_cv_lib_mdblocales_mdb_setlocale" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBMDBLOCALES 1
-_ACEOF
-
-  LIBS="-lmdblocales $LIBS"
-
-else
-  as_fn_error $? "mdblocales library not found" "$LINENO" 5
-fi
-
 fi
 
 if test x"$cross_compiling" = x"yes" && test -z "$with_system_tzdata"; then
@@ -14852,6 +14805,56 @@ fi
 
 fi
 
+if test "$with_mdblocales" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mdb_setlocale in -lmdblocales" >&5
+$as_echo_n "checking for mdb_setlocale in -lmdblocales... " >&6; }
+if ${ac_cv_lib_mdblocales_mdb_setlocale+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmdblocales  $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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char mdb_setlocale ();
+int
+main ()
+{
+return mdb_setlocale ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_mdblocales_mdb_setlocale=yes
+else
+  ac_cv_lib_mdblocales_mdb_setlocale=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mdblocales_mdb_setlocale" >&5
+$as_echo "$ac_cv_lib_mdblocales_mdb_setlocale" >&6; }
+if test "x$ac_cv_lib_mdblocales_mdb_setlocale" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBMDBLOCALES 1
+_ACEOF
+
+  LIBS="-lmdblocales $LIBS"
+
+else
+  as_fn_error $? "mdblocales library not found" "$LINENO" 5
+fi
+
+fi
+
 if test "$enable_external_fts" = yes; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jansson_version_str in -ljansson" >&5
 $as_echo_n "checking for jansson_version_str in -ljansson... " >&6; }
@@ -24833,11 +24836,4 @@ fi
 # The configure args contain '-Wl,-rpath,\$$ORIGIN`, when it falls
 # as a C literal string, it's invalid, so converting `\` to `\\`
 # to be correct for C program.
-case $build_os in
-darwin*)
-  sed -i '' '/define CONFIGURE_ARGS/s,\([^\\]\)\\\$\$,\1\\\\$$,g' src/include/pg_config.h
-  ;;
-*)
-  sed -i '/define CONFIGURE_ARGS/s,\([^\\]\)\\\$\$,\1\\\\$$,g' src/include/pg_config.h
-  ;;
-esac
+sed -i '/define CONFIGURE_ARGS/s,\([^\\]\)\\\$\$,\1\\\\$$,g' src/include/pg_config.h