From 29bdf53d3b8b71410e2fdee87dd8d8eecf439ece Mon Sep 17 00:00:00 2001
From: Richard Kreckel <kreckel@ginac.de>
Date: Sat, 12 Aug 2023 18:17:41 +0200
Subject: [PATCH] Finalize 1.8.7 release.

---
 Makefile.am                 |  2 +-
 NEWS                        |  2 +-
 ginac/version.h             |  4 ++--
 m4/ax_cxx_compile_stdcxx.m4 | 15 ++++++++++++---
 m4/lib-link.m4              |  2 +-
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 950d12d5..8d66956d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ CMAKE_FILES = CMakeLists.txt \
 	      cmake/modules/FindGiNaC.cmake \
 	      cmake/modules/FindLibDL.cmake
 
-BUILD_HELPERS = scripts/yaptu.py scripts/fixupind.py
+BUILD_HELPERS = scripts/yaptu.py
 
 # All the rest of the distributed files
 EXTRA_DIST = ginac.pc GiNaC.spec $(BUILD_HELPERS) $(CMAKE_FILES)
diff --git a/NEWS b/NEWS
index 546b0ff3..828b0130 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 This file records noteworthy changes.
 
-1.8.7 (dd mm yyyy)
+1.8.7 (12 August 2023)
 * Fix series expansion of polynomial(x)^n for small and large n.
 * Fix bugs in internal parser from strings.
 * Make ginsh evaluate line-by-line in non-interactive mode.
diff --git a/ginac/version.h b/ginac/version.h
index 9b3301fd..c101910f 100644
--- a/ginac/version.h
+++ b/ginac/version.h
@@ -30,7 +30,7 @@
 #define GINACLIB_MINOR_VERSION 8
 
 /* Micro version of GiNaC */
-#define GINACLIB_MICRO_VERSION 6
+#define GINACLIB_MICRO_VERSION 7
 
 // GiNaC library version information. It has very little to do with GiNaC
 // version number. In particular, library version is OS dependent. 
@@ -56,7 +56,7 @@
 //  * change matrix inverse to use default argument (twice)
 //  * check for interfaces marked as deprecated
 #define GINAC_LT_CURRENT  12
-#define GINAC_LT_REVISION 5
+#define GINAC_LT_REVISION 6
 #define GINAC_LT_AGE      1
 
 /*
diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4
index a3d964c6..8edf5152 100644
--- a/m4/ax_cxx_compile_stdcxx.m4
+++ b/m4/ax_cxx_compile_stdcxx.m4
@@ -43,7 +43,7 @@
 #   and this notice are preserved.  This file is offered as-is, without any
 #   warranty.
 
-#serial 15
+#serial 18
 
 dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
 dnl  (serial version number 13).
@@ -104,9 +104,18 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
     dnl HP's aCC needs +std=c++11 according to:
     dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
     dnl Cray's crayCC needs "-h std=c++11"
+    dnl MSVC needs -std:c++NN for C++17 and later (default is C++14)
     for alternative in ${ax_cxx_compile_alternatives}; do
-      for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
-        cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
+      for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}" MSVC; do
+        if test x"$switch" = xMSVC; then
+          dnl AS_TR_SH maps both `:` and `=` to `_` so -std:c++17 would collide
+          dnl with -std=c++17.  We suffix the cache variable name with _MSVC to
+          dnl avoid this.
+          switch=-std:c++${alternative}
+          cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_${switch}_MSVC])
+        else
+          cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
+        fi
         AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
                        $cachevar,
           [ac_save_CXX="$CXX"
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index 653e34f8..5f8afae6 100644
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -224,7 +224,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
     additional_libdir3=
   fi
   dnl Search the library and its dependencies in $additional_libdir and
-  dnl $LDFLAGS. Using breadth-first-seach.
+  dnl $LDFLAGS. Use breadth-first search.
   LIB[]NAME=
   LTLIB[]NAME=
   INC[]NAME=
-- 
2.49.0