]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
merge a stray change from my branch that fixes configure run failure
authorMichael Jerris <mike@jerris.com>
Sun, 11 Mar 2007 14:14:32 +0000 (14:14 +0000)
committerMichael Jerris <mike@jerris.com>
Sun, 11 Mar 2007 14:14:32 +0000 (14:14 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4549 d0543943-73ff-0310-b7d9-9358b9ac24b2

libs/js/nsprpub/configure.in

index e8f48f0d3c009bce6cecc3c2bf683dbf18bc8f99..62b31d6b32ed8cdffb7afcb23e35be0564106260 100644 (file)
@@ -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