diff options
author | wtc%google.com <devnull@localhost> | 2008-12-05 00:46:50 +0000 |
---|---|---|
committer | wtc%google.com <devnull@localhost> | 2008-12-05 00:46:50 +0000 |
commit | bfea4fc4b80b72194c374e218b839c6c68d6bbd9 (patch) | |
tree | cf0285369ba4fc8c8ac1c748294ad55660d1fac7 | |
parent | 38a5150419e5305fc3d67aa79bc87498b7e86453 (diff) | |
download | nspr-hg-bfea4fc4b80b72194c374e218b839c6c68d6bbd9.tar.gz |
Bug 467951: Build NSPR on NetBSD with pthreads by default. The patch is
contributed by Kaspar Brand <mozbugzilla@velox.ch>. r=wtc.
-rwxr-xr-x | configure | 48 | ||||
-rw-r--r-- | configure.in | 4 |
2 files changed, 28 insertions, 24 deletions
@@ -4294,7 +4294,9 @@ EOF #define HAVE_BSD_FLOCK 1 EOF - USE_NSPR_THREADS=1 + if test -z "$USE_NSPR_THREADS"; then + USE_PTHREADS=1 + fi MDCPUCFG_H=_netbsd.cfg PR_MD_CSRCS=netbsd.c @@ -4501,17 +4503,17 @@ EOF _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Olimit 4000" ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6 -echo "configure:4505: checking for machine/builtins.h" >&5 +echo "configure:4507: checking for machine/builtins.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4510 "configure" +#line 4512 "configure" #include "confdefs.h" #include <machine/builtins.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4515: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5041,7 +5043,7 @@ case $target in ;; *) echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:5045: checking for dlopen in -ldl" >&5 +echo "configure:5047: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5049,7 +5051,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 5053 "configure" +#line 5055 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5060,7 +5062,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:5064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5077,17 +5079,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:5081: checking for dlfcn.h" >&5 +echo "configure:5083: checking for dlfcn.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5086 "configure" +#line 5088 "configure" #include "confdefs.h" #include <dlfcn.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5120,13 +5122,13 @@ esac if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:5124: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:5126: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext <<EOF -#line 5130 "configure" +#line 5132 "configure" #include "confdefs.h" #include <sgtty.h> Autoconf TIOCGETP @@ -5144,7 +5146,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF -#line 5148 "configure" +#line 5150 "configure" #include "confdefs.h" #include <termio.h> Autoconf TCGETA @@ -5168,12 +5170,12 @@ fi for ac_func in lchown strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5172: checking for $ac_func" >&5 +echo "configure:5174: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5177 "configure" +#line 5179 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5196,7 +5198,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5237,7 +5239,7 @@ hpux*) if test -z "$GNU_CC"; then echo $ac_n "checking for +Olit support""... $ac_c" 1>&6 -echo "configure:5241: checking for +Olit support" >&5 +echo "configure:5243: checking for +Olit support" >&5 if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5276,7 +5278,7 @@ darwin*) *) echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:5280: checking for pthread_create in -lpthreads" >&5 +echo "configure:5282: checking for pthread_create in -lpthreads" >&5 echo " #include <pthread.h> void *foo(void *v) { return v; } @@ -5298,7 +5300,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:5302: checking for pthread_create in -lpthread" >&5 +echo "configure:5304: checking for pthread_create in -lpthread" >&5 echo " #include <pthread.h> void *foo(void *v) { return v; } @@ -5320,7 +5322,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:5324: checking for pthread_create in -lc_r" >&5 +echo "configure:5326: checking for pthread_create in -lc_r" >&5 echo " #include <pthread.h> void *foo(void *v) { return v; } @@ -5342,7 +5344,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -echo "configure:5346: checking for pthread_create in -lc" >&5 +echo "configure:5348: checking for pthread_create in -lc" >&5 echo " #include <pthread.h> void *foo(void *v) { return v; } @@ -5474,7 +5476,7 @@ if test -n "$USE_PTHREADS"; then rm -f conftest* ac_cv_have_dash_pthread=no echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 -echo "configure:5478: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:5480: checking whether ${CC-cc} accepts -pthread" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then @@ -5497,7 +5499,7 @@ echo "configure:5478: checking whether ${CC-cc} accepts -pthread" >&5 ac_cv_have_dash_pthreads=no if test "$ac_cv_have_dash_pthread" = "no"; then echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 -echo "configure:5501: checking whether ${CC-cc} accepts -pthreads" >&5 +echo "configure:5503: checking whether ${CC-cc} accepts -pthreads" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then diff --git a/configure.in b/configure.in index 73562d3b..e0dc3568 100644 --- a/configure.in +++ b/configure.in @@ -1729,7 +1729,9 @@ mips-nec-sysv*) AC_DEFINE(XP_UNIX) AC_DEFINE(NETBSD) AC_DEFINE(HAVE_BSD_FLOCK) - USE_NSPR_THREADS=1 + if test -z "$USE_NSPR_THREADS"; then + USE_PTHREADS=1 + fi MDCPUCFG_H=_netbsd.cfg PR_MD_CSRCS=netbsd.c |