mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-16 06:45:42 +00:00
Automated update
This commit is contained in:
briano%netscape.com
parent
2c1a52ac46
commit
995f9e53e2
145
configure
vendored
145
configure
vendored
@ -8403,12 +8403,13 @@ fi
|
||||
|
||||
fi
|
||||
|
||||
# Check whether --with-pthreads or --without-pthreads was given.
|
||||
if test "${with_pthreads+set}" = set; then
|
||||
withval="$with_pthreads"
|
||||
if test "$withval" = "yes"; then
|
||||
echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
|
||||
echo "configure:8412: checking for pthread_attr_init in -lpthread" >&5
|
||||
|
||||
|
||||
USE_PTHREADS=
|
||||
PTHREAD_LDFLAGS=""
|
||||
|
||||
echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
|
||||
echo "configure:8413: checking for pthread_attr_init in -lpthread" >&5
|
||||
ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -8416,7 +8417,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpthread $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8420 "configure"
|
||||
#line 8421 "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
|
||||
@ -8427,7 +8428,7 @@ int main() {
|
||||
pthread_attr_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -8442,15 +8443,17 @@ LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
NSPR_LIBS="-lpthread $NSPR_LIBS" USE_PTHREADS=1
|
||||
USE_PTHREADS=1 PTHREAD_LDFLAGS="-lpthread"
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
if test "x$ac_cv_lib_pthread_pthread_attr_init" = "xno" -a \
|
||||
"x$ac_cv_lib_c_r_gethostbyname_r" = "xno"; then
|
||||
echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6
|
||||
echo "configure:8454: checking for pthread_attr_init in -lc_r" >&5
|
||||
|
||||
if test "x$ac_cv_lib_pthread_pthread_attr_init" = "xno" -a \
|
||||
"x$ac_cv_lib_c_r_gethostbyname_r" = "xno"
|
||||
then
|
||||
echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6
|
||||
echo "configure:8457: checking for pthread_attr_init in -lc_r" >&5
|
||||
ac_lib_var=`echo c_r'_'pthread_attr_init | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -8458,7 +8461,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lc_r $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8462 "configure"
|
||||
#line 8465 "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
|
||||
@ -8469,7 +8472,7 @@ int main() {
|
||||
pthread_attr_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -8484,37 +8487,63 @@ LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
NSPR_LIBS="-lc_r $NSPR_LIBS" USE_PTHREADS=1
|
||||
PTHREAD_LDFLAGS="-lc_r"
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
fi
|
||||
case "$target" in
|
||||
*-*-solaris*)
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define _REENTRANT 1
|
||||
EOF
|
||||
;;
|
||||
*-*-linux*)
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define _REENTRANT 1
|
||||
EOF
|
||||
;;
|
||||
alpha*-*-osf*)
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define _REENTRANT 1
|
||||
EOF
|
||||
|
||||
if test ! "$GNU_CC"; then
|
||||
CFLAGS="$CFLAGS -pthread"
|
||||
CXXFLAGS="$CXXFLAGS -pthread"
|
||||
fi ;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
# Check whether --with-pthreads or --without-pthreads was given.
|
||||
if test "${with_pthreads+set}" = set; then
|
||||
withval="$with_pthreads"
|
||||
if test "$withval" = "yes"
|
||||
then
|
||||
if test "$USE_PTHREADS"x = x
|
||||
then
|
||||
{ echo "configure: error: --with-pthreads specified for a system with pthread support " 1>&2; exit 1; };
|
||||
fi
|
||||
else
|
||||
USE_PTHREADS=
|
||||
PTHREAD_LDFLAGS=""
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
if test "$USE_PTHREADS"x = x
|
||||
then
|
||||
case "$target" in
|
||||
*-*-solaris*)
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define _REENTRANT 1
|
||||
EOF
|
||||
|
||||
;;
|
||||
|
||||
*-*-linux*)
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define _REENTRANT 1
|
||||
EOF
|
||||
|
||||
;;
|
||||
|
||||
alpha*-*-osf*)
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define _REENTRANT 1
|
||||
EOF
|
||||
|
||||
|
||||
if test ! "$GNU_CC"; then
|
||||
CFLAGS="$CFLAGS -pthread"
|
||||
CXXFLAGS="$CXXFLAGS -pthread"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
NSPR_LIBS="$NSPR_LIBS $PTHREAD_LDFLAGS"
|
||||
|
||||
# Check whether --with-nspr or --without-nspr was given.
|
||||
if test "${with_nspr+set}" = set; then
|
||||
withval="$with_nspr"
|
||||
@ -8540,13 +8569,13 @@ else
|
||||
fi
|
||||
|
||||
echo $ac_n "checking "for PR_GetCurrentThread in -lnspr3"""... $ac_c" 1>&6
|
||||
echo "configure:8544: checking "for PR_GetCurrentThread in -lnspr3"" >&5
|
||||
echo "configure:8573: checking "for PR_GetCurrentThread in -lnspr3"" >&5
|
||||
LIBS="-lnspr3 $NSPR_LIBS $LIBS"
|
||||
if test "$cross_compiling" = yes; then
|
||||
_NSPR_NEEDS_THREAD_LIB=1 result="no"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8550 "configure"
|
||||
#line 8579 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <nspr.h>
|
||||
@ -8556,7 +8585,7 @@ else
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:8560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:8589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
NSPR_LIBS="-lnspr3 $NSPR_LIBS" result="yes"
|
||||
else
|
||||
@ -8577,7 +8606,7 @@ LIBS=$_SAVE_LIBS
|
||||
case "$target" in
|
||||
*-*-solaris*)
|
||||
echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
|
||||
echo "configure:8581: checking for pthread_attr_init in -lpthread" >&5
|
||||
echo "configure:8610: checking for pthread_attr_init in -lpthread" >&5
|
||||
ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -8585,7 +8614,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpthread $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8589 "configure"
|
||||
#line 8618 "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
|
||||
@ -8596,7 +8625,7 @@ int main() {
|
||||
pthread_attr_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -8618,7 +8647,7 @@ fi
|
||||
;;
|
||||
*-*-linux*)
|
||||
echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
|
||||
echo "configure:8622: checking for pthread_attr_init in -lpthread" >&5
|
||||
echo "configure:8651: checking for pthread_attr_init in -lpthread" >&5
|
||||
ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -8626,7 +8655,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpthread $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8630 "configure"
|
||||
#line 8659 "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
|
||||
@ -8637,7 +8666,7 @@ int main() {
|
||||
pthread_attr_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -8660,13 +8689,13 @@ fi
|
||||
esac
|
||||
|
||||
echo $ac_n "checking "for PR_GetCurrentThread in -lnspr3 with thread lib"""... $ac_c" 1>&6
|
||||
echo "configure:8664: checking "for PR_GetCurrentThread in -lnspr3 with thread lib"" >&5
|
||||
echo "configure:8693: checking "for PR_GetCurrentThread in -lnspr3 with thread lib"" >&5
|
||||
LIBS="-lnspr3 $NSPR_LIBS $LIBS"
|
||||
if test "$cross_compiling" = yes; then
|
||||
MISSING_NSPR="$MISSING_NSPR -lnspr3" result="no"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8670 "configure"
|
||||
#line 8699 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <nspr.h>
|
||||
@ -8676,7 +8705,7 @@ else
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:8680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:8709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
NSPR_LIBS="-lnspr3 $NSPR_LIBS" result="yes"
|
||||
else
|
||||
@ -8694,7 +8723,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for PL_CreateOptState in -lplc3""... $ac_c" 1>&6
|
||||
echo "configure:8698: checking for PL_CreateOptState in -lplc3" >&5
|
||||
echo "configure:8727: checking for PL_CreateOptState in -lplc3" >&5
|
||||
ac_lib_var=`echo plc3'_'PL_CreateOptState | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -8702,7 +8731,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lplc3 $NSPR_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8706 "configure"
|
||||
#line 8735 "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
|
||||
@ -8713,7 +8742,7 @@ int main() {
|
||||
PL_CreateOptState()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -8735,7 +8764,7 @@ MISSING_NSPR="$MISSING_NSPR -lplc3"
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for PL_GetEvent in -lplds3""... $ac_c" 1>&6
|
||||
echo "configure:8739: checking for PL_GetEvent in -lplds3" >&5
|
||||
echo "configure:8768: checking for PL_GetEvent in -lplds3" >&5
|
||||
ac_lib_var=`echo plds3'_'PL_GetEvent | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -8743,7 +8772,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lplds3 $NSPR_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8747 "configure"
|
||||
#line 8776 "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
|
||||
@ -8754,7 +8783,7 @@ int main() {
|
||||
PL_GetEvent()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -8821,7 +8850,7 @@ then
|
||||
# Extract the first word of "makedepend", so it can be a program name with args.
|
||||
set dummy makedepend; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:8825: checking for $ac_word" >&5
|
||||
echo "configure:8854: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_SYSTEM_MAKEDEPEND'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
Loading…
Reference in New Issue
Block a user