diff options
| author |  Benjamin Barenblat <bbaren@mit.edu> | 2015-10-24 11:06:31 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@mit.edu> | 2015-10-24 11:06:31 -0400 |
| commit | 7d861ea0debf944cb8e3e38d73a8c0197de574b3 (patch) | |
| tree | ed87d21ffe040bf296d2230c7490abda8e34752c /configure.ac | |
| parent | 598756dc69f89cf2dd2b889cad63a7a690ae7ed7 (diff) | |
| parent | cb0109804fdad0dd423bb344446344cdc08c0886 (diff) | |
Merge branch 'upstream' into dfsg_clean20151018+dfsg
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index b199cd29..ee76f9ee 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([urweb], [20150819]) +AC_INIT([urweb], [20151018]) WORKING_VERSION=0 AC_USE_SYSTEM_EXTENSIONS @@ -112,6 +112,22 @@ if test [$CLANG = "yes"]; then PTHREAD_LIBS="" fi +# Check if pthread_t is a scalar or pointer type so we can use the correct +# OpenSSL functions on it. +AC_MSG_CHECKING([if pthread_t is a pointer type]) +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include <pthread.h> + ]], + [[ +pthread_t a; +*a; + ]])], + AC_DEFINE([PTHREAD_T_IS_POINTER], [1], [Define if pthread_t is a pointer.]) + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no)) + AC_SUBST(CC) AC_SUBST(BIN) AC_SUBST(LIB) |