mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-26 22:32:46 +00:00
Automated update
This commit is contained in:
briano%netscape.com
parent
4e2f68cde3
commit
16465b529b
86
configure
vendored
86
configure
vendored
@ -7895,6 +7895,49 @@ 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:7902: 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
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lc_r $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7910 "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
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char pthread_attr_init();
|
||||
|
||||
int main() {
|
||||
pthread_attr_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7921: \"$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
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
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
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
fi
|
||||
case "$target" in
|
||||
*-*-solaris*)
|
||||
cat >> confdefs.h <<\EOF
|
||||
@ -7946,13 +7989,13 @@ else
|
||||
fi
|
||||
|
||||
echo $ac_n "checking "for PR_GetCurrentThread in -lnspr3"""... $ac_c" 1>&6
|
||||
echo "configure:7950: checking "for PR_GetCurrentThread in -lnspr3"" >&5
|
||||
echo "configure:7993: 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 7956 "configure"
|
||||
#line 7999 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <nspr.h>
|
||||
@ -7962,7 +8005,7 @@ else
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:7966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:8009: \"$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
|
||||
@ -7983,7 +8026,7 @@ LIBS=$_SAVE_LIBS
|
||||
case "$target" in
|
||||
*-*-solaris*)
|
||||
echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
|
||||
echo "configure:7987: checking for pthread_attr_init in -lpthread" >&5
|
||||
echo "configure:8030: 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
|
||||
@ -7991,7 +8034,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpthread $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7995 "configure"
|
||||
#line 8038 "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
|
||||
@ -8002,7 +8045,7 @@ int main() {
|
||||
pthread_attr_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8049: \"$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
|
||||
@ -8024,7 +8067,7 @@ fi
|
||||
;;
|
||||
*-*-linux*)
|
||||
echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
|
||||
echo "configure:8028: checking for pthread_attr_init in -lpthread" >&5
|
||||
echo "configure:8071: 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
|
||||
@ -8032,7 +8075,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpthread $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8036 "configure"
|
||||
#line 8079 "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
|
||||
@ -8043,7 +8086,7 @@ int main() {
|
||||
pthread_attr_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8090: \"$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
|
||||
@ -8066,13 +8109,13 @@ fi
|
||||
esac
|
||||
|
||||
echo $ac_n "checking "for PR_GetCurrentThread in -lnspr3 with thread lib"""... $ac_c" 1>&6
|
||||
echo "configure:8070: checking "for PR_GetCurrentThread in -lnspr3 with thread lib"" >&5
|
||||
echo "configure:8113: 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 8076 "configure"
|
||||
#line 8119 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <nspr.h>
|
||||
@ -8082,7 +8125,7 @@ else
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:8086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:8129: \"$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
|
||||
@ -8100,7 +8143,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for PL_CreateOptState in -lplc3""... $ac_c" 1>&6
|
||||
echo "configure:8104: checking for PL_CreateOptState in -lplc3" >&5
|
||||
echo "configure:8147: 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
|
||||
@ -8108,7 +8151,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lplc3 $NSPR_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8112 "configure"
|
||||
#line 8155 "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
|
||||
@ -8119,7 +8162,7 @@ int main() {
|
||||
PL_CreateOptState()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8166: \"$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
|
||||
@ -8141,7 +8184,7 @@ MISSING_NSPR="$MISSING_NSPR -lplc3"
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for PL_GetEvent in -lplds3""... $ac_c" 1>&6
|
||||
echo "configure:8145: checking for PL_GetEvent in -lplds3" >&5
|
||||
echo "configure:8188: 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
|
||||
@ -8149,7 +8192,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lplds3 $NSPR_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8153 "configure"
|
||||
#line 8196 "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
|
||||
@ -8160,7 +8203,7 @@ int main() {
|
||||
PL_GetEvent()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8207: \"$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
|
||||
@ -8186,7 +8229,8 @@ CFLAGS=$_SAVE_CFLAGS
|
||||
LDFLAGS=$_SAVE_LDFLAGS
|
||||
LIBS=$_SAVE_LIBS
|
||||
if test "${NSPR_DIR}" -a -d "${NSPR_DIR}"; then
|
||||
NSPR_CFLAGS="-I${NSPR_DIR}/include"
|
||||
NSPR_INCLUDE_DIR="${NSPR_DIR}/include"
|
||||
NSPR_CFLAGS="-I${NSPR_INCLUDE_DIR}"
|
||||
if test "$NSPR_LIBDIR"x != x; then
|
||||
NSPR_LIBS="-L${NSPR_LIBDIR} ${NSPR_LIBS}"
|
||||
else
|
||||
@ -8226,7 +8270,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:8230: checking for $ac_word" >&5
|
||||
echo "configure:8274: 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
|
||||
@ -8280,6 +8324,7 @@ fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
cat >> confdefs.h <<EOF
|
||||
@ -8673,6 +8718,7 @@ s%@ZLIB_CFLAGS@%$ZLIB_CFLAGS%g
|
||||
s%@ZLIB_LIBS@%$ZLIB_LIBS%g
|
||||
s%@PNG_CFLAGS@%$PNG_CFLAGS%g
|
||||
s%@PNG_LIBS@%$PNG_LIBS%g
|
||||
s%@NSPR_INCLUDE_DIR@%$NSPR_INCLUDE_DIR%g
|
||||
s%@NSPR_CFLAGS@%$NSPR_CFLAGS%g
|
||||
s%@NSPR_LIBS@%$NSPR_LIBS%g
|
||||
s%@WRAP_MALLOC_CFLAGS@%$WRAP_MALLOC_CFLAGS%g
|
||||
|
||||
Loading…
Reference in New Issue
Block a user