提交 1edd6bf7 authored 作者: Michael Jerris's avatar Michael Jerris

merge a stray change from my branch that fixes configure run failure

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4549 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 ee3fc89f
...@@ -2167,8 +2167,7 @@ case $target in ...@@ -2167,8 +2167,7 @@ case $target in
;; ;;
*) *)
AC_CHECK_LIB(dl, dlopen, AC_CHECK_LIB(dl, dlopen,
AC_CHECK_HEADER(dlfcn.h, [AC_CHECK_HEADER(dlfcn.h, OS_LIBS="-ldl $OS_LIBS")])
OS_LIBS="-ldl $OS_LIBS"))
;; ;;
esac esac
...@@ -2297,10 +2296,10 @@ darwin*) ...@@ -2297,10 +2296,10 @@ darwin*)
_HAVE_PTHREADS=1 _HAVE_PTHREADS=1
;; ;;
*) *)
MOZ_CHECK_PTHREADS(pthreads,
_HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads",
MOZ_CHECK_PTHREADS(pthread, MOZ_CHECK_PTHREADS(pthread,
_HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread", _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread",
MOZ_CHECK_PTHREADS(pthreads,
_HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads",
MOZ_CHECK_PTHREADS(c_r, MOZ_CHECK_PTHREADS(c_r,
_HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r", _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r",
MOZ_CHECK_PTHREADS(c, MOZ_CHECK_PTHREADS(c,
...@@ -2452,12 +2451,6 @@ if test -n "$USE_PTHREADS"; then ...@@ -2452,12 +2451,6 @@ if test -n "$USE_PTHREADS"; then
*-freebsd*) *-freebsd*)
AC_DEFINE(_REENTRANT) AC_DEFINE(_REENTRANT)
AC_DEFINE(_THREAD_SAFE) AC_DEFINE(_THREAD_SAFE)
dnl -pthread links in -lc_r, so don't specify it explicitly.
if test "$ac_cv_have_dash_pthread" = "yes"; then
_PTHREAD_LDFLAGS="-pthread"
else
_PTHREAD_LDFLAGS="-lc_r"
fi
;; ;;
*-netbsd*) *-netbsd*)
if test "$ac_cv_have_dash_pthread" = "yes"; then if test "$ac_cv_have_dash_pthread" = "yes"; then
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论