зеркало из https://github.com/mozilla/gecko-dev.git
Automated update
This commit is contained in:
Родитель
6a6b2674ee
Коммит
872fb5ea79
|
@ -6166,7 +6166,7 @@ LIBS="$ac_save_LIBS"
|
|||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
TK_MOTIF_LIBS="-lXpm $TK_MOTIF_LIBS"
|
||||
TK_LIBS="-lXpm $TK_LIBS"
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
MISSING_MOTIF="-lXpm $MISSING_MOTIF"
|
||||
|
@ -6209,14 +6209,14 @@ LIBS="$ac_save_LIBS"
|
|||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
TK_MOTIF_LIBS="-lXp $TK_MOTIF_LIBS"
|
||||
TK_LIBS="-lXp $TK_LIBS"
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
MISSING_MOTIF="-lXp $MISSING_MOTIF"
|
||||
fi
|
||||
|
||||
fi
|
||||
TK_MOTIF_LIBS="$XLDFLAGS $TK_MOTIF_LIBS"
|
||||
TK_LIBS="$XLDFLAGS $TK_LIBS"
|
||||
LDFLAGS="$_SAVE_LDFLAGS"
|
||||
fi
|
||||
|
||||
|
@ -6258,7 +6258,7 @@ 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="-lXm $MOTIF_DYNAMIC_PATHS $TK_MOTIF_LIBS $XLIBS $LIBS"
|
||||
LIBS="-lXm $MOTIF_DYNAMIC_PATHS $TK_LIBS $XLIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6264 "configure"
|
||||
#include "confdefs.h"
|
||||
|
@ -6286,7 +6286,7 @@ LIBS="$ac_save_LIBS"
|
|||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
TK_MOTIF_LIBS="$MOTIF_DYNAMIC_PATHS $MOTIF_DYNAMIC_FLAGS $TK_MOTIF_LIBS"
|
||||
TK_LIBS="$MOTIF_DYNAMIC_PATHS $MOTIF_DYNAMIC_FLAGS $TK_LIBS"
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
MISSING_MOTIF="$MOTIF_DYNAMIC_FLAGS $MISSING_MOTIF"
|
||||
|
@ -6301,7 +6301,7 @@ 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="-lXm $TK_MOTIF_LIBS $XLIBS $LIBS"
|
||||
LIBS="-lXm $TK_LIBS $XLIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6307 "configure"
|
||||
#include "confdefs.h"
|
||||
|
@ -6329,7 +6329,7 @@ LIBS="$ac_save_LIBS"
|
|||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
TK_MOTIF_LIBS="$MOTIF_STATIC_FLAGS $TK_MOTIF_LIBS"
|
||||
TK_LIBS="$MOTIF_STATIC_FLAGS $TK_LIBS"
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
MISSING_MOTIF="$MOTIF_STATIC_FLAGS $MISSING_MOTIF"
|
||||
|
@ -6337,7 +6337,7 @@ fi
|
|||
|
||||
fi
|
||||
|
||||
TK_MOTIF_CFLAGS="$MOTIF_INCLUDES"
|
||||
TK_CFLAGS="$MOTIF_INCLUDES"
|
||||
fi
|
||||
|
||||
res=`echo :$MOZ_TOOLKIT | grep -c "gtk"`
|
||||
|
@ -6606,7 +6606,7 @@ fi
|
|||
|
||||
|
||||
if test "$sysstaticgtk" != "yes" ; then
|
||||
TK_GTK_LIBS=$GTK_LIBS
|
||||
TK_LIBS=$GTK_LIBS
|
||||
else
|
||||
|
||||
|
||||
|
@ -6627,13 +6627,13 @@ fi
|
|||
|
||||
|
||||
|
||||
TK_GTK_LIBS="$GTK_STATIC_LOC/lib${GTK_STATIC}.a"
|
||||
TK_GTK_LIBS="$TK_GTK_LIBS $GTK_STATIC_LOC/lib${GDK_STATIC}.a"
|
||||
TK_GTK_LIBS="$TK_GTK_LIBS $GLIB_STATIC_LOC/lib${GMODULE_STATIC}.a"
|
||||
TK_GTK_LIBS="$TK_GTK_LIBS $GLIB_STATIC_LOC/lib${GLIB_STATIC}.a"
|
||||
TK_GTK_LIBS="$TK_GTK_LIBS $GTK_LIBS_LOC $GTK_OTHER_LIBS"
|
||||
TK_LIBS="$GTK_STATIC_LOC/lib${GTK_STATIC}.a"
|
||||
TK_LIBS="$TK_LIBS $GTK_STATIC_LOC/lib${GDK_STATIC}.a"
|
||||
TK_LIBS="$TK_LIBS $GLIB_STATIC_LOC/lib${GMODULE_STATIC}.a"
|
||||
TK_LIBS="$TK_LIBS $GLIB_STATIC_LOC/lib${GLIB_STATIC}.a"
|
||||
TK_LIBS="$TK_LIBS $GTK_LIBS_LOC $GTK_OTHER_LIBS"
|
||||
fi
|
||||
TK_GTK_CFLAGS=$GTK_CFLAGS
|
||||
TK_CFLAGS=$GTK_CFLAGS
|
||||
fi
|
||||
|
||||
fi # $no_x
|
||||
|
@ -6642,8 +6642,6 @@ fi # $no_x
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
XCFLAGS="$X_CFLAGS"
|
||||
|
||||
|
||||
|
@ -6666,7 +6664,7 @@ if test "$JPEG_DIR" = no; then
|
|||
SYSTEM_JPEG=
|
||||
else
|
||||
echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6
|
||||
echo "configure:6670: checking for jpeg_destroy_compress in -ljpeg" >&5
|
||||
echo "configure:6668: checking for jpeg_destroy_compress in -ljpeg" >&5
|
||||
ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
@ -6674,7 +6672,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ljpeg $JPEG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6678 "configure"
|
||||
#line 6676 "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
|
||||
|
@ -6685,7 +6683,7 @@ int main() {
|
|||
jpeg_destroy_compress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:6687: \"$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
|
||||
|
@ -6714,7 +6712,7 @@ if test "$SYSTEM_JPEG" = 1 ; then
|
|||
SYSTEM_JPEG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6718 "configure"
|
||||
#line 6716 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
|
@ -6728,7 +6726,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:6732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:6730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_JPEG=1
|
||||
else
|
||||
|
@ -6766,16 +6764,16 @@ if test "$ZLIB_DIR" = no; then
|
|||
SYSTEM_ZLIB=
|
||||
else
|
||||
echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
|
||||
echo "configure:6770: checking "for zlib.h"" >&5
|
||||
echo "configure:6768: checking "for zlib.h"" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6772 "configure"
|
||||
#line 6770 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "zlib.h"
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:6777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
result="yes" SYSTEM_ZLIB=1
|
||||
else
|
||||
|
@ -6789,7 +6787,7 @@ rm -f conftest*
|
|||
fi
|
||||
if test "$SYSTEM_ZLIB" = 1 ; then
|
||||
echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6
|
||||
echo "configure:6793: checking for gzread in -lz" >&5
|
||||
echo "configure:6791: checking for gzread in -lz" >&5
|
||||
ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
@ -6797,7 +6795,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $ZLIB_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6801 "configure"
|
||||
#line 6799 "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
|
||||
|
@ -6808,7 +6806,7 @@ int main() {
|
|||
gzread()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:6810: \"$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
|
||||
|
@ -6854,7 +6852,7 @@ if test "$PNG_DIR" = no; then
|
|||
SYSTEM_PNG=
|
||||
else
|
||||
echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
|
||||
echo "configure:6858: checking for png_get_valid in -lpng" >&5
|
||||
echo "configure:6856: checking for png_get_valid in -lpng" >&5
|
||||
ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
@ -6862,7 +6860,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpng $PNG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6866 "configure"
|
||||
#line 6864 "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
|
||||
|
@ -6873,7 +6871,7 @@ int main() {
|
|||
png_get_valid()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:6875: \"$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
|
||||
|
@ -6901,7 +6899,7 @@ if test "$SYSTEM_PNG" = 1 ; then
|
|||
SYSTEM_PNG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6905 "configure"
|
||||
#line 6903 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
|
@ -6915,7 +6913,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:6919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:6917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_PNG=1
|
||||
else
|
||||
|
@ -6959,10 +6957,10 @@ CFLAGS="$CFLAGS -I${FULLCIRCLE_DIR}"
|
|||
LDFLAGS="$LDFLAGS -L${FULLCIRCLE_DIR}"
|
||||
|
||||
echo $ac_n "checking "for FC_Initialize in -ltalkback"""... $ac_c" 1>&6
|
||||
echo "configure:6963: checking "for FC_Initialize in -ltalkback"" >&5;
|
||||
echo "configure:6961: checking "for FC_Initialize in -ltalkback"" >&5;
|
||||
LIBS="-ltalkback $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6966 "configure"
|
||||
#line 6964 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include "fullcircle.h"
|
||||
|
@ -6974,7 +6972,7 @@ FC_Initialize();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:6976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
FULLCIRCLE_LIB="-ltalkback $FULLCIRCLE_LIB" result="yes"
|
||||
else
|
||||
|
@ -7001,7 +6999,7 @@ 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:7005: checking for pthread_attr_init in -lpthread" >&5
|
||||
echo "configure:7003: 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
|
||||
|
@ -7009,7 +7007,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpthread $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7013 "configure"
|
||||
#line 7011 "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
|
||||
|
@ -7020,7 +7018,7 @@ int main() {
|
|||
pthread_attr_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:7022: \"$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
|
||||
|
@ -7070,13 +7068,13 @@ CFLAGS="$CFLAGS -I${NSPR_DIR}/include"
|
|||
LDFLAGS="$LDFLAGS -L${NSPR_DIR}/lib $NSPR_LIBS"
|
||||
|
||||
echo $ac_n "checking "for PR_GetCurrentThread in -lnspr21"""... $ac_c" 1>&6
|
||||
echo "configure:7074: checking "for PR_GetCurrentThread in -lnspr21"" >&5
|
||||
echo "configure:7072: checking "for PR_GetCurrentThread in -lnspr21"" >&5
|
||||
LIBS="-lnspr21 $NSPR_LIBS $LIBS"
|
||||
if test "$cross_compiling" = yes; then
|
||||
_NSPR_NEEDS_THREAD_LIB=1 result="no"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7080 "configure"
|
||||
#line 7078 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <nspr.h>
|
||||
|
@ -7086,7 +7084,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:7090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:7088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
NSPR_LIBS="-lnspr21 $NSPR_LIBS" result="yes"
|
||||
else
|
||||
|
@ -7107,7 +7105,7 @@ LIBS=$_SAVE_LIBS
|
|||
case "$target" in
|
||||
*-*-solaris*)
|
||||
echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
|
||||
echo "configure:7111: checking for pthread_attr_init in -lpthread" >&5
|
||||
echo "configure:7109: 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
|
||||
|
@ -7115,7 +7113,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpthread $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7119 "configure"
|
||||
#line 7117 "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
|
||||
|
@ -7126,7 +7124,7 @@ int main() {
|
|||
pthread_attr_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:7128: \"$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
|
||||
|
@ -7148,7 +7146,7 @@ fi
|
|||
;;
|
||||
*-*-linux*)
|
||||
echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
|
||||
echo "configure:7152: checking for pthread_attr_init in -lpthread" >&5
|
||||
echo "configure:7150: 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
|
||||
|
@ -7156,7 +7154,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpthread $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7160 "configure"
|
||||
#line 7158 "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
|
||||
|
@ -7167,7 +7165,7 @@ int main() {
|
|||
pthread_attr_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:7169: \"$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
|
||||
|
@ -7190,13 +7188,13 @@ fi
|
|||
esac
|
||||
|
||||
echo $ac_n "checking "for PR_GetCurrentThread in -lnspr21 with thread lib"""... $ac_c" 1>&6
|
||||
echo "configure:7194: checking "for PR_GetCurrentThread in -lnspr21 with thread lib"" >&5
|
||||
echo "configure:7192: checking "for PR_GetCurrentThread in -lnspr21 with thread lib"" >&5
|
||||
LIBS="-lnspr21 $NSPR_LIBS $LIBS"
|
||||
if test "$cross_compiling" = yes; then
|
||||
MISSING_NSPR="$MISSING_NSPR -lnspr21" result="no"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7200 "configure"
|
||||
#line 7198 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <nspr.h>
|
||||
|
@ -7206,7 +7204,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:7210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:7208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
NSPR_LIBS="-lnspr21 $NSPR_LIBS" result="yes"
|
||||
else
|
||||
|
@ -7224,7 +7222,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for PL_CreateOptState in -lplc21""... $ac_c" 1>&6
|
||||
echo "configure:7228: checking for PL_CreateOptState in -lplc21" >&5
|
||||
echo "configure:7226: checking for PL_CreateOptState in -lplc21" >&5
|
||||
ac_lib_var=`echo plc21'_'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
|
||||
|
@ -7232,7 +7230,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lplc21 $NSPR_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7236 "configure"
|
||||
#line 7234 "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
|
||||
|
@ -7243,7 +7241,7 @@ int main() {
|
|||
PL_CreateOptState()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:7245: \"$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
|
||||
|
@ -7265,7 +7263,7 @@ MISSING_NSPR="$MISSING_NSPR -lplc21"
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for PL_GetEvent in -lplds21""... $ac_c" 1>&6
|
||||
echo "configure:7269: checking for PL_GetEvent in -lplds21" >&5
|
||||
echo "configure:7267: checking for PL_GetEvent in -lplds21" >&5
|
||||
ac_lib_var=`echo plds21'_'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
|
||||
|
@ -7273,7 +7271,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lplds21 $NSPR_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7277 "configure"
|
||||
#line 7275 "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
|
||||
|
@ -7284,7 +7282,7 @@ int main() {
|
|||
PL_GetEvent()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:7286: \"$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
|
||||
|
@ -7318,7 +7316,7 @@ fi
|
|||
# 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:7322: checking for $ac_word" >&5
|
||||
echo "configure:7320: 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
|
||||
|
@ -7645,7 +7643,10 @@ xpfe/browser/src/Makefile
|
|||
xpfe/appshell/Makefile
|
||||
xpfe/appshell/src/Makefile
|
||||
xpfe/appshell/public/Makefile
|
||||
xpfe/bootstrap/Makefile"
|
||||
xpfe/bootstrap/Makefile
|
||||
xpfe/browser/Makefile
|
||||
xpfe/browser/src/Makefile
|
||||
"
|
||||
|
||||
EDITOR_MAKEFILES="
|
||||
editor/base/Makefile
|
||||
|
@ -7900,10 +7901,8 @@ s%@MOZ_IDL_TOOL@%$MOZ_IDL_TOOL%g
|
|||
s%@GTK_CONFIG@%$GTK_CONFIG%g
|
||||
s%@GTK_CFLAGS@%$GTK_CFLAGS%g
|
||||
s%@GTK_LIBS@%$GTK_LIBS%g
|
||||
s%@TK_GTK_CFLAGS@%$TK_GTK_CFLAGS%g
|
||||
s%@TK_GTK_LIBS@%$TK_GTK_LIBS%g
|
||||
s%@TK_MOTIF_CFLAGS@%$TK_MOTIF_CFLAGS%g
|
||||
s%@TK_MOTIF_LIBS@%$TK_MOTIF_LIBS%g
|
||||
s%@TK_CFLAGS@%$TK_CFLAGS%g
|
||||
s%@TK_LIBS@%$TK_LIBS%g
|
||||
s%@XCFLAGS@%$XCFLAGS%g
|
||||
s%@XLDFLAGS@%$XLDFLAGS%g
|
||||
s%@XLIBS@%$XLIBS%g
|
||||
|
|
Загрузка…
Ссылка в новой задаче