Merge release-4-5-patches into release-4-6

Conflicts (both trivial):
	CMakeLists.txt
	src/config.h.cmakein

Change-Id: I363ce1c09c68c2be5aa926e893011d43c8ed3337

diff --cc CMakeLists.txt
index ce8335868921e2e72e00a26bcada535488585264,ce84f6a5e3b23d7dcb20f0fd0d37a74c162b1094..7fb19a985f65c8992c130094d932113b95d61fd4
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -405,14 -347,6 +405,13 @@@ check_function_exists(fsyn
  check_function_exists(_fileno           HAVE__FILENO)
  check_function_exists(fileno            HAVE_FILENO)
  check_function_exists(_commit           HAVE__COMMIT)
- check_function_exists(lstat             HAVE_LSTAT)
 +check_function_exists(sigaction         HAVE_SIGACTION)
 +check_function_exists(sysconf           HAVE_SYSCONF)
 +check_function_exists(sched_setaffinity HAVE_SCHED_SETAFFINITY)
 +check_function_exists(sched_getaffinity HAVE_SCHED_GETAFFINITY)
 +check_function_exists(rsqrt             HAVE_RSQRT)
 +check_function_exists(rsqrtf            HAVE_RSQRTF)
 +check_function_exists(sqrtf             HAVE_SQRTF)
  
  include(CheckLibraryExists)
  check_library_exists(m sqrt "" HAVE_LIBM)

diff --cc src/config.h.cmakein
index b532adf06a5a63967942c9221623bd5b8d5ea8af,91873e6dccb8a7f521cc7fd1183b112f3ad9ae79..40bb5d7a2cb83dc49b0dc7a22554b755c2c0057c
--- 1/src/config.h.cmakein
--- 2/src/config.h.cmakein
+++ b/src/config.h.cmakein
@@@ -266,21 -290,6 +266,18 @@@
  /* Define to 1 if you have the _fileno() function. */
  #cmakedefine HAVE__FILENO
  
- /* Define to 1 if you have the lstat() function. */
- #cmakedefine HAVE_LSTAT
- 
 +/* Define to 1 if you have the sigaction() function. */
 +#cmakedefine HAVE_SIGACTION
 +
 +/* Define to 1 if you have the rsqrt() function. */
 +#cmakedefine HAVE_RSQRT
 +
 +/* Define to 1 if you have the rsqrtf() function. */
 +#cmakedefine HAVE_RSQRTF
 +
 +/* Define to 1 if you have the sqrtf() function. */
 +#cmakedefine HAVE_SQRTF
 +
  /* Define to 1 if you have the <string.h> header file. */
  #cmakedefine HAVE_STRING_H
  

diff --cc src/gmxlib/futil.c
Simple merge

diff --cc src/tools/gmx_cluster.c
Simple merge

diff --cc src/tools/gmx_hbond.c
Simple merge