diff --git a/configure.ac b/configure.ac
index 9777efefa..64cb274fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -429,7 +429,9 @@ AM_COND_IF([OPTIMIZE],
 	optimize="no"
 	CXXFLAGS+=" -g"
 	CXXFLAGS+=" -ggdb"
+	CXXFLAGS+=" -gdwarf-4"
 	CXXFLAGS+=" -fvar-tracking"
+	CXXFLAGS+=" -fvar-tracking-assignments"
 ])
 
 dnl