From: Roland Schulz Date: Mon, 26 Nov 2012 20:04:19 +0000 (-0500) Subject: Merge release-4-5-patches into release-4-6 X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=4924e82d78ae312d659255557618208a749a4863;p=alexxy%2Fgromacs.git Merge release-4-5-patches into release-4-6 Conflicts (both trivial): CMakeLists.txt src/config.h.cmakein Change-Id: I363ce1c09c68c2be5aa926e893011d43c8ed3337 --- 4924e82d78ae312d659255557618208a749a4863 diff --cc CMakeLists.txt index ce83358689,ce84f6a5e3..7fb19a985f --- a/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 b532adf06a,91873e6dcc..40bb5d7a2c --- a/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 header file. */ #cmakedefine HAVE_STRING_H