diff -r 424a0fb2c64f -r 7241d072ace4 test/configure2
--- a/test/configure2	Sun Dec 15 15:00:13 2024 +0100
+++ b/test/configure2	Sun Jan 12 11:26:16 2025 +0100
@@ -770,18 +770,18 @@
 fi
 if [ "$BUILD_TYPE" = "debug" ]; then
     if [ -n "$lang_c" ]; then
-        echo 'DAV_CFLAGS += ${DEBUG_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo 'DAV_CFLAGS += ${DEBUG_CFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
     if [ -n "$lang_cpp" ]; then
-        echo 'DAV_CXXFLAGS += ${DEBUG_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo 'DAV_CXXFLAGS += ${DEBUG_CXXFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
 fi
 if [ "$BUILD_TYPE" = "release" ]; then
     if [ -n "$lang_c" ]; then
-        echo 'DAV_CFLAGS += ${RELEASE_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo 'DAV_CFLAGS += ${RELEASE_CFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
     if [ -n "$lang_cpp" ]; then
-        echo 'DAV_CXXFLAGS += ${RELEASE_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo 'DAV_CXXFLAGS += ${RELEASE_CXXFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
 fi
 if [ -n "${TEMP_LDFLAGS}" ]; then
@@ -811,18 +811,18 @@
 fi
 if [ "$BUILD_TYPE" = "debug" ]; then
     if [ -n "$lang_c" ]; then
-        echo 'CFLAGS += ${DEBUG_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo 'CFLAGS += ${DEBUG_CFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
     if [ -n "$lang_cpp" ]; then
-        echo 'CXXFLAGS += ${DEBUG_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo 'CXXFLAGS += ${DEBUG_CXXFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
 fi
 if [ "$BUILD_TYPE" = "release" ]; then
     if [ -n "$lang_c" ]; then
-        echo 'CFLAGS += ${RELEASE_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo 'CFLAGS += ${RELEASE_CFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
     if [ -n "$lang_cpp" ]; then
-        echo 'CXXFLAGS += ${RELEASE_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo 'CXXFLAGS += ${RELEASE_CXXFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
 fi
 if [ -n "${TEMP_LDFLAGS}" ]; then