From 1edd6bf776c6fcbad3ddb9c2331ccbcfc7000674 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Sun, 11 Mar 2007 14:14:32 +0000 Subject: [PATCH] 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 --- libs/js/nsprpub/configure.in | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/libs/js/nsprpub/configure.in b/libs/js/nsprpub/configure.in index e8f48f0d3c..62b31d6b32 100644 --- a/libs/js/nsprpub/configure.in +++ b/libs/js/nsprpub/configure.in @@ -2167,8 +2167,7 @@ case $target in ;; *) AC_CHECK_LIB(dl, dlopen, - AC_CHECK_HEADER(dlfcn.h, - OS_LIBS="-ldl $OS_LIBS")) + [AC_CHECK_HEADER(dlfcn.h, OS_LIBS="-ldl $OS_LIBS")]) ;; esac @@ -2297,10 +2296,10 @@ darwin*) _HAVE_PTHREADS=1 ;; *) - MOZ_CHECK_PTHREADS(pthreads, - _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads", - MOZ_CHECK_PTHREADS(pthread, - _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread", + MOZ_CHECK_PTHREADS(pthread, + _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread", + MOZ_CHECK_PTHREADS(pthreads, + _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads", MOZ_CHECK_PTHREADS(c_r, _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r", MOZ_CHECK_PTHREADS(c, @@ -2452,12 +2451,6 @@ if test -n "$USE_PTHREADS"; then *-freebsd*) AC_DEFINE(_REENTRANT) 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*) if test "$ac_cv_have_dash_pthread" = "yes"; then