зеркало из https://github.com/mozilla/pjs.git
Automated update
This commit is contained in:
briano%netscape.com
Родитель
31f0396d2d
Коммит
11ff00023b
|
|
@ -8544,6 +8544,7 @@ 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"
|
||||
|
|
@ -8569,13 +8570,13 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking "for PR_GetCurrentThread in -lnspr3"""... $ac_c" 1>&6
|
||||
echo "configure:8573: checking "for PR_GetCurrentThread in -lnspr3"" >&5
|
||||
echo "configure:8574: 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 8579 "configure"
|
||||
#line 8580 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <nspr.h>
|
||||
|
|
@ -8585,7 +8586,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:8589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:8590: \"$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
|
||||
|
|
@ -8606,7 +8607,7 @@ LIBS=$_SAVE_LIBS
|
|||
case "$target" in
|
||||
*-*-solaris*)
|
||||
echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
|
||||
echo "configure:8610: checking for pthread_attr_init in -lpthread" >&5
|
||||
echo "configure:8611: 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
|
||||
|
|
@ -8614,7 +8615,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpthread $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8618 "configure"
|
||||
#line 8619 "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
|
||||
|
|
@ -8625,7 +8626,7 @@ int main() {
|
|||
pthread_attr_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8630: \"$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
|
||||
|
|
@ -8647,7 +8648,7 @@ fi
|
|||
;;
|
||||
*-*-linux*)
|
||||
echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
|
||||
echo "configure:8651: checking for pthread_attr_init in -lpthread" >&5
|
||||
echo "configure:8652: 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
|
||||
|
|
@ -8655,7 +8656,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpthread $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8659 "configure"
|
||||
#line 8660 "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
|
||||
|
|
@ -8666,7 +8667,7 @@ int main() {
|
|||
pthread_attr_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8671: \"$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
|
||||
|
|
@ -8689,13 +8690,13 @@ fi
|
|||
esac
|
||||
|
||||
echo $ac_n "checking "for PR_GetCurrentThread in -lnspr3 with thread lib"""... $ac_c" 1>&6
|
||||
echo "configure:8693: checking "for PR_GetCurrentThread in -lnspr3 with thread lib"" >&5
|
||||
echo "configure:8694: 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 8699 "configure"
|
||||
#line 8700 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <nspr.h>
|
||||
|
|
@ -8705,7 +8706,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:8709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:8710: \"$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
|
||||
|
|
@ -8723,7 +8724,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for PL_CreateOptState in -lplc3""... $ac_c" 1>&6
|
||||
echo "configure:8727: checking for PL_CreateOptState in -lplc3" >&5
|
||||
echo "configure:8728: 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
|
||||
|
|
@ -8731,7 +8732,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lplc3 $NSPR_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8735 "configure"
|
||||
#line 8736 "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
|
||||
|
|
@ -8742,7 +8743,7 @@ int main() {
|
|||
PL_CreateOptState()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8747: \"$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
|
||||
|
|
@ -8764,7 +8765,7 @@ MISSING_NSPR="$MISSING_NSPR -lplc3"
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for PL_GetEvent in -lplds3""... $ac_c" 1>&6
|
||||
echo "configure:8768: checking for PL_GetEvent in -lplds3" >&5
|
||||
echo "configure:8769: 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
|
||||
|
|
@ -8772,7 +8773,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lplds3 $NSPR_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8776 "configure"
|
||||
#line 8777 "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
|
||||
|
|
@ -8783,7 +8784,7 @@ int main() {
|
|||
PL_GetEvent()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8788: \"$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
|
||||
|
|
@ -8818,6 +8819,22 @@ if test "${NSPR_DIR}" -a -d "${NSPR_DIR}"; then
|
|||
fi
|
||||
fi
|
||||
|
||||
if test "$MISSING_NSPR"; then
|
||||
|
||||
|
||||
echo
|
||||
echo "*** NSPR was not detected in your system. This is not a problem."
|
||||
echo "*** I will use the one in the current source tree instead. "
|
||||
echo
|
||||
sleep 3
|
||||
|
||||
NSPR_INCLUDE_DIR=
|
||||
NSPR_CFLAGS=
|
||||
NSPR_LIBS="-lplds3 -lplc3 -lnspr3 $PTHREAD_LDFLAGS"
|
||||
else
|
||||
MOZ_NATIVE_NSPR=1
|
||||
fi
|
||||
|
||||
LDFLAGS=`echo \
|
||||
$_WARNINGS_CFLAGS \
|
||||
$LDFLAGS \
|
||||
|
|
@ -8850,7 +8867,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:8854: checking for $ac_word" >&5
|
||||
echo "configure:8871: 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
|
||||
|
|
@ -8937,12 +8954,6 @@ if test "$MISSING_MOTIF"; then
|
|||
fi
|
||||
fi # $no_x
|
||||
|
||||
if test "$MISSING_NSPR"; then
|
||||
{ echo "configure: error: Could not find the following nspr libraries or could not run sample program: $MISSING_NSPR" 1>&2; exit 1; };
|
||||
else
|
||||
MOZ_NATIVE_NSPR=1
|
||||
fi
|
||||
|
||||
# netlib stuff
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define MODULAR_NETLIB 1
|
||||
|
|
@ -9054,7 +9065,7 @@ MOZ_RPM_VERSION="5.0"
|
|||
|
||||
|
||||
|
||||
MOZ_NSPRENV_USE_PTHREADS=1
|
||||
MOZ_NSPRENV_USE_PTHREADS=$USE_PTHREADS
|
||||
|
||||
if test "$MOZ_DEBUG"
|
||||
then
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче