Author: mikej Date: Sun Mar 11 10:14:32 2007 New Revision: 4549 Modified: freeswitch/trunk/libs/js/nsprpub/configure.in Log: merge a stray change from my branch that fixes configure run failure Modified: freeswitch/trunk/libs/js/nsprpub/configure.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/configure.in (original) +++ freeswitch/trunk/libs/js/nsprpub/configure.in Sun Mar 11 10:14:32 2007 @@ -2167,8 +2167,7 @@ ;; *) 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 @@ _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 @@ *-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