summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorunknown <tim@white.box>2001-07-17 17:25:27 -0400
committerunknown <tim@white.box>2001-07-17 17:25:27 -0400
commit03509e63992a931c55b9ac6cb3e15c09ccd14857 (patch)
tree8b79be758414a9b215a355b255b1dacc91d3314e /configure.in
parentea82b7c68779a105d686570b6f1849c4c9ad41b7 (diff)
parentf63d29f515332ebd4454f1cfc200a03ea7722e82 (diff)
downloadmariadb-git-03509e63992a931c55b9ac6cb3e15c09ccd14857.tar.gz
Merge
configure.in: SCCS merged
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.in b/configure.in
index aa84f152095..17098e85157 100644
--- a/configure.in
+++ b/configure.in
@@ -1131,10 +1131,10 @@ if test "$ac_cv_lib_pthread_strtok_r" = "no"
then
my_save_LIBS="$LIBS"
AC_CHECK_LIB(c_r,strtok_r)
- if test "$with_osf32_threads" = "yes" -o "$target_os" = "FreeBSD" -o "$target_os" = "freebsd"
- then
- LIBS="$my_save_LIBS"
- fi
+ case "$with_osf32_threads---$target_os" in
+ # Don't keep -lc_r in LIBS; -pthread handles it magically
+ yes---* | *---freebsd* ) LIBS="$my_save_LIBS" ;;
+ esac
AC_CHECK_FUNCS(strtok_r pthread_init)
else
AC_CHECK_FUNCS(strtok_r)