Add a documentat on how to revert a faulty merge

diff --git a/config.mak.in b/config.mak.in
index 17e9861c0634133ec5e07af99191cff99f8a40ad..14dfb21fa59efb7482ea0727845c8198cc996271 100644 (file)
--- a/config.mak.in
+++ b/config.mak.in
@@ -41,6 +41,7 @@ NO_C99_FORMAT=@NO_C99_FORMAT@
 NO_STRCASESTR=@NO_STRCASESTR@
 NO_MEMMEM=@NO_MEMMEM@
 NO_STRLCPY=@NO_STRLCPY@
+NO_UINTMAX_T=@NO_UINTMAX_T@
 NO_STRTOUMAX=@NO_STRTOUMAX@
 NO_SETENV=@NO_SETENV@
 NO_UNSETENV=@NO_UNSETENV@
@@ -50,3 +51,5 @@ OLD_ICONV=@OLD_ICONV@
 NO_DEFLATE_BOUND=@NO_DEFLATE_BOUND@
 FREAD_READS_DIRECTORIES=@FREAD_READS_DIRECTORIES@
 SNPRINTF_RETURNS_BOGUS=@SNPRINTF_RETURNS_BOGUS@
+NO_PTHREADS=@NO_PTHREADS@
+PTHREAD_LIBS=@PTHREAD_LIBS@