consistent naming of CHECK_* preprocessor defines

FlexibleSUSY · Oct 23, 2014 · 72768f0 · 72768f0
1 parent 87a761d
commit 72768f0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/config/Makefile.in b/config/Makefile.in
@@ -21,7 +21,7 @@ ENABLE_THREADS     := @ENABLE_THREADS@
 # C/C++ preprocessor defines
 ENABLE_COLOR_PRINTOUT := @ENABLE_COLOR_PRINTOUT@
 ENABLE_DEBUG          := @ENABLE_DEBUG@
-ENABLE_EIGENVALUE_ERROR_CHECK := @ENABLE_EIGENVALUE_ERROR@
+ENABLE_CHECK_EIGENVALUE_ERROR := @ENABLE_CHECK_EIGENVALUE_ERROR@
 ENABLE_SILENT         := @ENABLE_SILENT@
 ENABLE_VERBOSE        := @ENABLE_VERBOSE@
 
@@ -232,7 +232,7 @@ showbuild:
 	@echo "ENABLE_COLOR_PRINTOUT = $(ENABLE_COLOR_PRINTOUT)"
 	@echo "ENABLE_COMPILE     = $(ENABLE_COMPILE)"
 	@echo "ENABLE_DEBUG       = $(ENABLE_DEBUG)"
-	@echo "ENABLE_EIGENVALUE_ERROR_CHECK = $(ENABLE_EIGENVALUE_ERROR_CHECK)"
+	@echo "ENABLE_CHECK_EIGENVALUE_ERROR = $(ENABLE_CHECK_EIGENVALUE_ERROR)"
 	@echo "ENABLE_FFLITE      = $(ENABLE_FFLITE)"
 	@echo "ENABLE_LOOPTOOLS   = $(ENABLE_LOOPTOOLS)"
 	@echo "ENABLE_META        = $(ENABLE_META)"

diff --git a/config/config.h.in b/config/config.h.in
@@ -42,7 +42,7 @@
 @DEFINE_ENABLE_COLOR_PRINTOUT@
 
 /* Enable eigenvalues error check */
-@DEFINE_ENABLE_EIGENVALUE_ERROR@
+@DEFINE_ENABLE_CHECK_EIGENVALUE_ERROR@
 
 /* Enable debug mode */
 @DEFINE_ENABLE_DEBUG@

diff --git a/configure b/configure
@@ -127,7 +127,7 @@ enable_verbose="no"
 # corresponding preprocessor define statements
 DEFINE_ENABLE_COLOR_PRINTOUT="#undef ENABLE_COLOR_PRINTOUT"
 DEFINE_ENABLE_DEBUG="#undef ENABLE_DEBUG"
-DEFINE_ENABLE_EIGENVALUE_ERROR="#undef CHECK_EIGENVALUE_ERROR"
+DEFINE_ENABLE_CHECK_EIGENVALUE_ERROR="#undef CHECK_EIGENVALUE_ERROR"
 DEFINE_ENABLE_FFLITE="#undef ENABLE_FFLITE"
 DEFINE_ENABLE_LOOPTOOLS="#undef ENABLE_LOOPTOOLS"
 DEFINE_ENABLE_RANDOM="#undef ENABLE_RANDOM"
@@ -1850,13 +1850,13 @@ enable_defines() {
     fi
 
     if test "x$enable_eigenvalue_error" = "xyes" ; then
-        DEFINE_ENABLE_EIGENVALUE_ERROR="#define CHECK_EIGENVALUE_ERROR 1"
+        DEFINE_ENABLE_CHECK_EIGENVALUE_ERROR="#define CHECK_EIGENVALUE_ERROR 1"
         message "Enabling eigenvalue error check"
-        logmsg "   ${DEFINE_ENABLE_EIGENVALUE_ERROR}"
+        logmsg "   ${DEFINE_ENABLE_CHECK_EIGENVALUE_ERROR}"
     else
-        DEFINE_ENABLE_EIGENVALUE_ERROR="#undef CHECK_EIGENVALUE_ERROR"
+        DEFINE_ENABLE_CHECK_EIGENVALUE_ERROR="#undef CHECK_EIGENVALUE_ERROR"
         logmsg "Disabling eigenvalue error check"
-        logmsg "   ${DEFINE_ENABLE_EIGENVALUE_ERROR}"
+        logmsg "   ${DEFINE_ENABLE_CHECK_EIGENVALUE_ERROR}"
     fi
 
     if test "$enable_fflite" = "yes" -a "$enable_looptools" = "yes"; then
@@ -1969,7 +1969,7 @@ replace_markers() {
 	-e "s|@ENABLE_THREADS@|$enable_threads|"  \
 	-e "s|@ENABLE_COLOR_PRINTOUT@|$enable_colors|" \
 	-e "s|@ENABLE_DEBUG@|$enable_debug|"      \
-	-e "s|@ENABLE_EIGENVALUE_ERROR@|$enable_eigenvalue_error|" \
+	-e "s|@ENABLE_CHECK_EIGENVALUE_ERROR@|$enable_eigenvalue_error|" \
 	-e "s|@ENABLE_SILENT@|$enable_silent|"    \
 	-e "s|@ENABLE_VERBOSE@|$enable_verbose|"  \
 	-e "s|@LOOPTOOLSLIBS@|$LOOPTOOLSLIBS|"    \
@@ -2259,7 +2259,7 @@ sed -e "s|@FLEXIBLESUSY_VERSION@|$FLEXIBLESUSY_VERSION|" \
     -e "s|@DATE@|$DATE|"                             \
     -e "s|@DEFINE_ENABLE_COLOR_PRINTOUT@|$DEFINE_ENABLE_COLOR_PRINTOUT|" \
     -e "s|@DEFINE_ENABLE_DEBUG@|$DEFINE_ENABLE_DEBUG|"         \
-    -e "s|@DEFINE_ENABLE_EIGENVALUE_ERROR@|$DEFINE_ENABLE_EIGENVALUE_ERROR|" \
+    -e "s|@DEFINE_ENABLE_CHECK_EIGENVALUE_ERROR@|$DEFINE_ENABLE_CHECK_EIGENVALUE_ERROR|" \
     -e "s|@DEFINE_ENABLE_FFLITE@|$DEFINE_ENABLE_FFLITE|" \
     -e "s|@DEFINE_ENABLE_LOOPTOOLS@|$DEFINE_ENABLE_LOOPTOOLS|" \
     -e "s|@DEFINE_ENABLE_RANDOM@|$DEFINE_ENABLE_RANDOM|"       \