summaryrefslogtreecommitdiff
path: root/m4/pthread.m4
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2015-07-04 17:13:50 +0300
committerIgor Pashev <pashev.igor@gmail.com>2015-07-04 17:13:50 +0300
commit71cd8e3a743046573744123777061b64881bf372 (patch)
tree82522befe647f4fff186a5630cad0cad33f8ef53 /m4/pthread.m4
parentc18578632fd3c9e513e613a86ba2b7c4ebee6c45 (diff)
downloadcoreutils-upstream.tar.gz
Imported Upstream version 8.24upstream/8.24upstream
Diffstat (limited to 'm4/pthread.m4')
-rw-r--r--m4/pthread.m48
1 files changed, 4 insertions, 4 deletions
diff --git a/m4/pthread.m4 b/m4/pthread.m4
index 1ed0dd33..b8e2c4c5 100644
--- a/m4/pthread.m4
+++ b/m4/pthread.m4
@@ -1,5 +1,5 @@
-# pthread.m4 serial 8
-dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# pthread.m4 serial 10
+dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -16,7 +16,7 @@ AC_DEFUN([gl_PTHREAD_CHECK],
[AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[#include <pthread.h>
- #ifdef strtok_r
+ #if defined strtok_r || defined localtime_r
#error
break me
#endif
@@ -63,7 +63,7 @@ AC_DEFUN([gl_PTHREAD_CHECK],
[gl_cv_lib_pthread],
[gl_saved_libs=$LIBS
gl_cv_lib_pthread=
- for gl_lib_prefix in '' '-lpthread'; do
+ for gl_lib_prefix in '' '-pthread' '-lpthread'; do
LIBS="$gl_lib_prefix $gl_saved_libs"
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(