# HG changeset patch
# User Mike Becker <universe@uap-core.de>
# Date 1748201728 -7200
# Node ID 1d2ac6c76bfdc1ca1dc8b98d79ae5935fbfa63ba
# Parent  b001b56522fa79d5d8e2cdd47be2a043615bd323
revert last commit, because it reverted bug fix #570

diff -r b001b56522fa -r 1d2ac6c76bfd test/configure
--- a/test/configure	Sat May 24 07:09:22 2025 +0200
+++ b/test/configure	Sun May 25 21:35:28 2025 +0200
@@ -542,12 +542,12 @@
 
 # build type
 if [ "$BUILD_TYPE" = "debug" ]; then
-    TEMP_CFLAGS="\${DEBUG_CC_FLAGS} $TEMP_CFLAGS"
-    TEMP_CXXFLAGS="\${DEBUG_CXX_FLAGS} $TEMP_CXXFLAGS"
+    TEMP_CFLAGS="\${DEBUG_CFLAGS} $TEMP_CFLAGS"
+    TEMP_CXXFLAGS="\${DEBUG_CXXFLAGS} $TEMP_CXXFLAGS"
 fi
 if [ "$BUILD_TYPE" = "release" ]; then
-    TEMP_CFLAGS="\${RELEASE_CC_FLAGS} $TEMP_CFLAGS"
-    TEMP_CXXFLAGS="\${RELEASE_CXX_FLAGS} $TEMP_CXXFLAGS"
+    TEMP_CFLAGS="\${RELEASE_CFLAGS} $TEMP_CFLAGS"
+    TEMP_CXXFLAGS="\${RELEASE_CXXFLAGS} $TEMP_CXXFLAGS"
 fi
 
 # add general dependency flags to flags.mk
diff -r b001b56522fa -r 1d2ac6c76bfd test/configure2
--- a/test/configure2	Sat May 24 07:09:22 2025 +0200
+++ b/test/configure2	Sun May 25 21:35:28 2025 +0200
@@ -563,12 +563,12 @@
 
 # build type
 if [ "$BUILD_TYPE" = "debug" ]; then
-    TEMP_CFLAGS="\${DEBUG_CC_FLAGS} $TEMP_CFLAGS"
-    TEMP_CXXFLAGS="\${DEBUG_CXX_FLAGS} $TEMP_CXXFLAGS"
+    TEMP_CFLAGS="\${DEBUG_CFLAGS} $TEMP_CFLAGS"
+    TEMP_CXXFLAGS="\${DEBUG_CXXFLAGS} $TEMP_CXXFLAGS"
 fi
 if [ "$BUILD_TYPE" = "release" ]; then
-    TEMP_CFLAGS="\${RELEASE_CC_FLAGS} $TEMP_CFLAGS"
-    TEMP_CXXFLAGS="\${RELEASE_CXX_FLAGS} $TEMP_CXXFLAGS"
+    TEMP_CFLAGS="\${RELEASE_CFLAGS} $TEMP_CFLAGS"
+    TEMP_CXXFLAGS="\${RELEASE_CXXFLAGS} $TEMP_CXXFLAGS"
 fi
 
 # add general dependency flags to flags.mk
diff -r b001b56522fa -r 1d2ac6c76bfd test/make/configure.vm
--- a/test/make/configure.vm	Sat May 24 07:09:22 2025 +0200
+++ b/test/make/configure.vm	Sun May 25 21:35:28 2025 +0200
@@ -503,12 +503,12 @@
 
 # build type
 if [ "$BUILD_TYPE" = "debug" ]; then
-    TEMP_CFLAGS="\${DEBUG_CC_FLAGS} $TEMP_CFLAGS"
-    TEMP_CXXFLAGS="\${DEBUG_CXX_FLAGS} $TEMP_CXXFLAGS"
+    TEMP_CFLAGS="\${DEBUG_CFLAGS} $TEMP_CFLAGS"
+    TEMP_CXXFLAGS="\${DEBUG_CXXFLAGS} $TEMP_CXXFLAGS"
 fi
 if [ "$BUILD_TYPE" = "release" ]; then
-    TEMP_CFLAGS="\${RELEASE_CC_FLAGS} $TEMP_CFLAGS"
-    TEMP_CXXFLAGS="\${RELEASE_CXX_FLAGS} $TEMP_CXXFLAGS"
+    TEMP_CFLAGS="\${RELEASE_CFLAGS} $TEMP_CFLAGS"
+    TEMP_CXXFLAGS="\${RELEASE_CXXFLAGS} $TEMP_CXXFLAGS"
 fi
 
 # add general dependency flags to flags.mk