@@ -4169,31 +4169,30 @@ fi
4169
4169
4170
4170
# Check for use of the system libmpdec library
4171
4171
AC_MSG_CHECKING ( [ for --with-system-libmpdec] )
4172
+ AC_DEFUN ( [ USE_BUNDLED_LIBMPDEC] ,
4173
+ [ LIBMPDEC_CFLAGS="-I\$(srcdir)/Modules/_decimal/libmpdec"
4174
+ LIBMPDEC_LIBS="-lm \$(LIBMPDEC_A)"
4175
+ LIBMPDEC_INTERNAL="\$(LIBMPDEC_HEADERS) \$(LIBMPDEC_A)"
4176
+ have_mpdec=yes
4177
+ with_system_libmpdec=no] )
4172
4178
AC_ARG_WITH (
4173
4179
[ system_libmpdec] ,
4174
4180
[ AS_HELP_STRING (
4175
4181
[ --with-system-libmpdec] ,
4176
4182
[ build _decimal module using an installed mpdecimal library, see Doc/library/decimal.rst (default is yes)]
4177
4183
) ] ,
4178
- [ ] ,
4184
+ [ AS_IF ( [ test "x$with_system_libmpdec" = xno] ,
4185
+ [ USE_BUNDLED_LIBMPDEC()] ) ] ,
4179
4186
[ with_system_libmpdec="yes"] )
4180
4187
AC_MSG_RESULT ( [ $with_system_libmpdec] )
4181
4188
4182
- AC_DEFUN ( [ USE_BUNDLED_LIBMPDEC] ,
4183
- [ LIBMPDEC_CFLAGS="-I\$(srcdir)/Modules/_decimal/libmpdec"
4184
- LIBMPDEC_LIBS="-lm \$(LIBMPDEC_A)"
4185
- LIBMPDEC_INTERNAL="\$(LIBMPDEC_HEADERS) \$(LIBMPDEC_A)"
4186
- have_mpdec=yes
4187
- with_system_libmpdec=no] )
4188
-
4189
4189
AS_VAR_IF (
4190
4190
[ with_system_libmpdec] , [ yes] ,
4191
4191
[ PKG_CHECK_MODULES(
4192
4192
[ LIBMPDEC] , [ libmpdec >= 2.5.0] , [ ] ,
4193
4193
[ LIBMPDEC_CFLAGS=${LIBMPDEC_CFLAGS-""}
4194
4194
LIBMPDEC_LIBS=${LIBMPDEC_LIBS-"-lmpdec -lm"}
4195
- LIBMPDEC_INTERNAL=] )] ,
4196
- [ USE_BUNDLED_LIBMPDEC()] )
4195
+ LIBMPDEC_INTERNAL=] )] )
4197
4196
4198
4197
AS_VAR_IF ( [ with_system_libmpdec] , [ yes] ,
4199
4198
[ WITH_SAVE_ENV([
@@ -4209,16 +4208,7 @@ AS_VAR_IF([with_system_libmpdec], [yes],
4209
4208
] , [ const char *x = mpd_version();] ) ] ,
4210
4209
[ have_mpdec=yes] ,
4211
4210
[ have_mpdec=no] )
4212
- ] )] ,
4213
- [ AC_MSG_WARN ( [ m4_normalize ( [
4214
- the bundled copy of libmpdecimal is scheduled for removal in Python 3.15;
4215
- consider using a system installed mpdecimal library.] ) ] ) ] )
4216
-
4217
- AS_IF ( [ test "$with_system_libmpdec" = "yes" && test "$have_mpdec" = "no"] ,
4218
- [ AC_MSG_WARN ( [ m4_normalize ( [
4219
- no system libmpdecimal found; falling back to bundled libmpdecimal
4220
- (deprecated and scheduled for removal in Python 3.15)] ) ] )
4221
- USE_BUNDLED_LIBMPDEC()] )
4211
+ ] )] )
4222
4212
4223
4213
# Disable forced inlining in debug builds, see GH-94847
4224
4214
AS_VAR_IF (
@@ -8136,6 +8126,16 @@ PY_STDLIB_MOD([_curses_panel],
8136
8126
PY_STDLIB_MOD([ _decimal] ,
8137
8127
[ ] , [ test "$have_mpdec" = "yes"] ,
8138
8128
[ $LIBMPDEC_CFLAGS] , [ $LIBMPDEC_LIBS] )
8129
+
8130
+ AS_VAR_IF ( [ with_system_libmpdec] , [ no] ,
8131
+ [ AC_MSG_WARN ( [ m4_normalize ( [
8132
+ the bundled copy of libmpdecimal is scheduled for removal in Python 3.16;
8133
+ consider using a system installed mpdecimal library.] ) ] ) ] )
8134
+ AS_IF ( [ test "$with_system_libmpdec" = "yes" && test "$have_mpdec" = "no"] ,
8135
+ [ AC_MSG_WARN ( [ m4_normalize ( [
8136
+ no system libmpdecimal found; falling back to pure-Python version
8137
+ for the decimal module] ) ] ) ] )
8138
+
8139
8139
PY_STDLIB_MOD([ _dbm] ,
8140
8140
[ test -n "$with_dbmliborder"] , [ test "$have_dbm" != "no"] ,
8141
8141
[ $DBM_CFLAGS] , [ $DBM_LIBS] )
0 commit comments