# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1713003261 -7200
# Node ID 35901ae8a563d62ce54db2f7d85914a92939f812
# Parent  c714266d9f0dea194b4c48c1b3551243abf1692f# Parent  0d1a3c2ad9c62c324996f0d09e1aaaffe2b7ba39
maint: Merge stable to default.

diff -r c714266d9f0d -r 35901ae8a563 configure.ac
--- a/configure.ac	Fri Apr 12 18:53:59 2024 -0400
+++ b/configure.ac	Sat Apr 13 12:14:21 2024 +0200
@@ -346,6 +346,8 @@
 
 if test $ENABLE_STD_PMR_POLYMORPHIC_ALLOCATOR = yes; then
   OCTAVE_CHECK_STD_PMR_POLYMORPHIC_ALLOCATOR
+else
+  HAVE_STD_PMR_POLYMORPHIC_ALLOCATOR="no"
 fi
 
 ### Determine which C compiler to use (we expect to find gcc or clang).
@@ -3362,7 +3364,7 @@
   Use library visibility flags:         $ENABLE_LIB_VISIBILITY_FLAGS
   64-bit array dims and indexing:       $ENABLE_64
   64-bit BLAS array dims and indexing:  $HAVE_64_BIT_BLAS
-  Use std::pmr::polymorphic_allocator:  $ENABLE_STD_PMR_POLYMORPHIC_ALLOCATOR
+  Use std::pmr::polymorphic_allocator:  $HAVE_STD_PMR_POLYMORPHIC_ALLOCATOR
   OpenMP SMP multithreading:            $ENABLE_OPENMP
   Include support for GNU readline:     $USE_READLINE
   Use push parser in command line REPL: $ENABLE_COMMAND_LINE_PUSH_PARSER
diff -r c714266d9f0d -r 35901ae8a563 m4/acinclude.m4
--- a/m4/acinclude.m4	Fri Apr 12 18:53:59 2024 -0400
+++ b/m4/acinclude.m4	Sat Apr 13 12:14:21 2024 +0200
@@ -236,6 +236,9 @@
   if test $octave_cv_std_pmr_polymorphic_allocator = yes; then
     AC_DEFINE(OCTAVE_HAVE_STD_PMR_POLYMORPHIC_ALLOCATOR, 1,
       [Define to 1 if std::pmr::polymorphic_allocator is available.])
+    HAVE_STD_PMR_POLYMORPHIC_ALLOCATOR="yes"
+  else
+    HAVE_STD_PMR_POLYMORPHIC_ALLOCATOR="no"
   fi
 ])
 dnl