diff --git a/configure.ac b/configure.ac
index 3cbaddf26b..f8c008458f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -713,6 +713,11 @@ if test "x$GCC" = "xyes"; then
 	fi
 fi
 
+AC_ARG_ENABLE([thread-safety],
+	[AC_HELP_STRING([--enable-thread-safety], [enforce thread-safety otherwise fail the build [default=yes]])],
+	[], [enable_thread_safety=yes])
+AM_CONDITIONAL([ENFORCE_THREAD_SAFETY], [test "x$enable_thread_safety" = "xyes"])
+
 # Files requiring some variable expansion
 AC_CONFIG_FILES([
 	Makefile
@@ -975,6 +980,9 @@ Debugging:
 
 Paths:
  - Logs in configpath: $enable_configpath_log
+
+Thread-safety:
+ - enforce: $enable_thread_safety
 EOF
 
 if test "x$ac_cv_func_pthread_atfork" = "xno" ; then