Skip to content

Commit d07a592

Browse files
committed
Disable mdblocales by default in configure
Changed the default value of `--with-mdblocales` from 'yes' to 'no' in configure.ac. This prevents enabling custom locales by default, which require additional packages and may cause compatibility issues across different system environments (e.g., Rocky Linux 8 vs 9 with different libc versions). Users who need mdblocales can explicitly enable it with `--with-mdblocales` option. Regenerated configure file using autoconf 2.69 on Rocky Linux 8.
1 parent a6a7579 commit d07a592

File tree

2 files changed

+53
-52
lines changed

2 files changed

+53
-52
lines changed

configure

Lines changed: 52 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1697,7 +1697,7 @@ Optional Packages:
16971697
--without-libcurl do not use libcurl
16981698
--with-apr-config=PATH path to apr-1-config utility
16991699
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
1700-
--without-mdblocales build without MDB locales
1700+
--with-mdblocales build with MDB locales
17011701
--with-ssl=LIB use LIB for SSL/TLS support (openssl)
17021702
--with-openssl obsolete spelling of --with-ssl=openssl
17031703

@@ -2914,6 +2914,7 @@ PG_PACKAGE_VERSION=14.4
29142914

29152915

29162916

2917+
29172918
ac_aux_dir=
29182919
for ac_dir in config "$srcdir"/config; do
29192920
if test -f "$ac_dir/install-sh"; then
@@ -12906,56 +12907,6 @@ $as_echo "${python_libspec} ${python_additional_libs}" >&6; }
1290612907

1290712908

1290812909

12909-
fi
12910-
12911-
if test "$with_mdblocales" = yes; then
12912-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mdb_setlocale in -lmdblocales" >&5
12913-
$as_echo_n "checking for mdb_setlocale in -lmdblocales... " >&6; }
12914-
if ${ac_cv_lib_mdblocales_mdb_setlocale+:} false; then :
12915-
$as_echo_n "(cached) " >&6
12916-
else
12917-
ac_check_lib_save_LIBS=$LIBS
12918-
LIBS="-lmdblocales $LIBS"
12919-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12920-
/* end confdefs.h. */
12921-
12922-
/* Override any GCC internal prototype to avoid an error.
12923-
Use char because int might match the return type of a GCC
12924-
builtin and then its argument prototype would still apply. */
12925-
#ifdef __cplusplus
12926-
extern "C"
12927-
#endif
12928-
char mdb_setlocale ();
12929-
int
12930-
main ()
12931-
{
12932-
return mdb_setlocale ();
12933-
;
12934-
return 0;
12935-
}
12936-
_ACEOF
12937-
if ac_fn_c_try_link "$LINENO"; then :
12938-
ac_cv_lib_mdblocales_mdb_setlocale=yes
12939-
else
12940-
ac_cv_lib_mdblocales_mdb_setlocale=no
12941-
fi
12942-
rm -f core conftest.err conftest.$ac_objext \
12943-
conftest$ac_exeext conftest.$ac_ext
12944-
LIBS=$ac_check_lib_save_LIBS
12945-
fi
12946-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mdblocales_mdb_setlocale" >&5
12947-
$as_echo "$ac_cv_lib_mdblocales_mdb_setlocale" >&6; }
12948-
if test "x$ac_cv_lib_mdblocales_mdb_setlocale" = xyes; then :
12949-
cat >>confdefs.h <<_ACEOF
12950-
#define HAVE_LIBMDBLOCALES 1
12951-
_ACEOF
12952-
12953-
LIBS="-lmdblocales $LIBS"
12954-
12955-
else
12956-
as_fn_error $? "mdblocales library not found" "$LINENO" 5
12957-
fi
12958-
1295912910
fi
1296012911

1296112912
if test x"$cross_compiling" = x"yes" && test -z "$with_system_tzdata"; then
@@ -14880,6 +14831,56 @@ fi
1488014831

1488114832
fi
1488214833

14834+
if test "$with_mdblocales" = yes; then
14835+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mdb_setlocale in -lmdblocales" >&5
14836+
$as_echo_n "checking for mdb_setlocale in -lmdblocales... " >&6; }
14837+
if ${ac_cv_lib_mdblocales_mdb_setlocale+:} false; then :
14838+
$as_echo_n "(cached) " >&6
14839+
else
14840+
ac_check_lib_save_LIBS=$LIBS
14841+
LIBS="-lmdblocales $LIBS"
14842+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14843+
/* end confdefs.h. */
14844+
14845+
/* Override any GCC internal prototype to avoid an error.
14846+
Use char because int might match the return type of a GCC
14847+
builtin and then its argument prototype would still apply. */
14848+
#ifdef __cplusplus
14849+
extern "C"
14850+
#endif
14851+
char mdb_setlocale ();
14852+
int
14853+
main ()
14854+
{
14855+
return mdb_setlocale ();
14856+
;
14857+
return 0;
14858+
}
14859+
_ACEOF
14860+
if ac_fn_c_try_link "$LINENO"; then :
14861+
ac_cv_lib_mdblocales_mdb_setlocale=yes
14862+
else
14863+
ac_cv_lib_mdblocales_mdb_setlocale=no
14864+
fi
14865+
rm -f core conftest.err conftest.$ac_objext \
14866+
conftest$ac_exeext conftest.$ac_ext
14867+
LIBS=$ac_check_lib_save_LIBS
14868+
fi
14869+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mdblocales_mdb_setlocale" >&5
14870+
$as_echo "$ac_cv_lib_mdblocales_mdb_setlocale" >&6; }
14871+
if test "x$ac_cv_lib_mdblocales_mdb_setlocale" = xyes; then :
14872+
cat >>confdefs.h <<_ACEOF
14873+
#define HAVE_LIBMDBLOCALES 1
14874+
_ACEOF
14875+
14876+
LIBS="-lmdblocales $LIBS"
14877+
14878+
else
14879+
as_fn_error $? "mdblocales library not found" "$LINENO" 5
14880+
fi
14881+
14882+
fi
14883+
1488314884
if test "$enable_external_fts" = yes; then
1488414885
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jansson_version_str in -ljansson" >&5
1488514886
$as_echo_n "checking for jansson_version_str in -ljansson... " >&6; }

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1484,7 +1484,7 @@ AC_SUBST(install_bin)
14841484
# MDB locales
14851485
#
14861486

1487-
PGAC_ARG_BOOL(with, mdblocales, yes, [build without MDB locales],
1487+
PGAC_ARG_BOOL(with, mdblocales, no, [build with MDB locales],
14881488
[AC_DEFINE([USE_MDBLOCALES], 1, [Define to 1 to build with MDB locales. (--with-mdblocales)])])
14891489
AC_SUBST(USE_MDBLOCALES)
14901490

0 commit comments

Comments
 (0)