зеркало из https://github.com/mozilla/pjs.git
Automated update
This commit is contained in:
Родитель
d135887292
Коммит
47ee42c0e7
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
|
||||
# Read in 'mozconfig.sh' script to set the initial options.
|
||||
# Read in '.mozconfig' script to set the initial options.
|
||||
# See the load-mozconfig.sh script for more details.
|
||||
TOPSRCDIR=`dirname $0`
|
||||
PATH="$TOPSRCDIR/build/autoconf:$PATH"
|
||||
|
@ -3131,7 +3131,7 @@ rm -f conftest*
|
|||
ac_cv_int16_t=$ac_int16_t
|
||||
fi
|
||||
|
||||
if test $ac_int16_t = true ; then
|
||||
if test "$ac_int16_t" = true ; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HAVE_INT16_T 1
|
||||
EOF
|
||||
|
@ -3167,7 +3167,7 @@ rm -f conftest*
|
|||
ac_cv_int32_t=$ac_int32_t
|
||||
fi
|
||||
|
||||
if test $ac_int32_t = true ; then
|
||||
if test "$ac_int32_t" = true ; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HAVE_INT32_T 1
|
||||
EOF
|
||||
|
@ -3203,7 +3203,7 @@ rm -f conftest*
|
|||
ac_cv_uint16_t=$ac_uint16_t
|
||||
fi
|
||||
|
||||
if test $ac_uint16_t = true ; then
|
||||
if test "$ac_uint16_t" = true ; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HAVE_UINT16_T 1
|
||||
EOF
|
||||
|
@ -6358,7 +6358,8 @@ if test "${enable_md+set}" = set; then
|
|||
enableval="$enable_md"
|
||||
if test "$enableval" = "yes"; then
|
||||
COMPILER_DEPEND=1
|
||||
_DEPEND_CFLAGS='$(filter-out %/.pp,-Wp,-MD,$(*D)/.deps/$(*F).pp)'
|
||||
MDDEPDIR='.deps'
|
||||
_DEPEND_CFLAGS='$(filter-out %/.pp,-Wp,-MD,$(MDDEPDIR)/$(*F).pp)'
|
||||
|
||||
elif test "$enableval" = "no"; then
|
||||
:
|
||||
|
@ -6368,6 +6369,7 @@ if test "${enable_md+set}" = set; then
|
|||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-pedantic or --disable-pedantic was given.
|
||||
if test "${enable_pedantic+set}" = set; then
|
||||
enableval="$enable_pedantic"
|
||||
|
@ -6662,7 +6664,7 @@ if test "$no_x" != "yes" ; then
|
|||
_SAVE_LDFLAGS="$LDFLAGS"
|
||||
LDFLAGS="$XLDFLAGS $LDFLAGS"
|
||||
echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6
|
||||
echo "configure:6666: checking for XDrawLines in -lX11" >&5
|
||||
echo "configure:6668: checking for XDrawLines in -lX11" >&5
|
||||
ac_lib_var=`echo X11'_'XDrawLines | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
@ -6670,7 +6672,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lX11 $XLIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6674 "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
|
||||
|
@ -6681,7 +6683,7 @@ int main() {
|
|||
XDrawLines()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6685: \"$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
|
||||
|
@ -6703,7 +6705,7 @@ MISSING_X="$MISSING_X -lX11"
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6
|
||||
echo "configure:6707: checking for XextAddDisplay in -lXext" >&5
|
||||
echo "configure:6709: checking for XextAddDisplay in -lXext" >&5
|
||||
ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
@ -6711,7 +6713,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lXext $XLIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6715 "configure"
|
||||
#line 6717 "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
|
||||
|
@ -6722,7 +6724,7 @@ int main() {
|
|||
XextAddDisplay()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:6728: \"$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
|
||||
|
@ -6744,7 +6746,7 @@ MISSING_X="$MISSING_X -lXext"
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6
|
||||
echo "configure:6748: checking for IceFlush in -lICE" >&5
|
||||
echo "configure:6750: checking for IceFlush in -lICE" >&5
|
||||
ac_lib_var=`echo ICE'_'IceFlush | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
@ -6752,7 +6754,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lICE $XLIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6756 "configure"
|
||||
#line 6758 "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
|
||||
|
@ -6763,7 +6765,7 @@ int main() {
|
|||
IceFlush()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:6769: \"$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
|
||||
|
@ -6784,7 +6786,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6
|
||||
echo "configure:6788: checking for SmcCloseConnection in -lSM" >&5
|
||||
echo "configure:6790: checking for SmcCloseConnection in -lSM" >&5
|
||||
ac_lib_var=`echo SM'_'SmcCloseConnection | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
@ -6792,7 +6794,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lSM $XLIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6796 "configure"
|
||||
#line 6798 "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
|
||||
|
@ -6803,7 +6805,7 @@ int main() {
|
|||
SmcCloseConnection()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:6809: \"$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
|
||||
|
@ -6824,7 +6826,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
|
||||
echo "configure:6828: checking for XtFree in -lXt" >&5
|
||||
echo "configure:6830: checking for XtFree in -lXt" >&5
|
||||
ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
@ -6832,7 +6834,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lXt $XLIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6836 "configure"
|
||||
#line 6838 "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
|
||||
|
@ -6843,7 +6845,7 @@ int main() {
|
|||
XtFree()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:6849: \"$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
|
||||
|
@ -6865,7 +6867,7 @@ MISSING_X="$MISSING_X -lXt"
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for XmuLookupString in -lXmu""... $ac_c" 1>&6
|
||||
echo "configure:6869: checking for XmuLookupString in -lXmu" >&5
|
||||
echo "configure:6871: checking for XmuLookupString in -lXmu" >&5
|
||||
ac_lib_var=`echo Xmu'_'XmuLookupString | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
@ -6873,7 +6875,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lXmu $XLIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6877 "configure"
|
||||
#line 6879 "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
|
||||
|
@ -6884,7 +6886,7 @@ int main() {
|
|||
XmuLookupString()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:6890: \"$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
|
||||
|
@ -6929,7 +6931,7 @@ fi
|
|||
LDFLAGS="$XLDFLAGS $LDFLAGS"
|
||||
if test "$MOTIF_REQUIRES_XPM" = "True" ; then
|
||||
echo $ac_n "checking for XpmWriteFileFromImage in -lXpm""... $ac_c" 1>&6
|
||||
echo "configure:6933: checking for XpmWriteFileFromImage in -lXpm" >&5
|
||||
echo "configure:6935: checking for XpmWriteFileFromImage in -lXpm" >&5
|
||||
ac_lib_var=`echo Xpm'_'XpmWriteFileFromImage | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
@ -6937,7 +6939,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lXpm $XLIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6941 "configure"
|
||||
#line 6943 "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
|
||||
|
@ -6948,7 +6950,7 @@ int main() {
|
|||
XpmWriteFileFromImage()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:6954: \"$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
|
||||
|
@ -6972,7 +6974,7 @@ fi
|
|||
fi
|
||||
if test "$MOTIF_VERSION" = "2.1" ; then
|
||||
echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6
|
||||
echo "configure:6976: checking for XpGetPrinterList in -lXp" >&5
|
||||
echo "configure:6978: checking for XpGetPrinterList in -lXp" >&5
|
||||
ac_lib_var=`echo Xp'_'XpGetPrinterList | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
@ -6980,7 +6982,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lXp $XLIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6984 "configure"
|
||||
#line 6986 "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
|
||||
|
@ -6991,7 +6993,7 @@ int main() {
|
|||
XpGetPrinterList()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:6997: \"$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
|
||||
|
@ -7049,7 +7051,7 @@ fi
|
|||
_SAVE_LDFLAGS="$LDFLAGS"
|
||||
LDFLAGS="$MOTIF_DYNAMIC_PATHS $XLDFLAGS $LDFLAGS"
|
||||
echo $ac_n "checking for XmStringCreate in -lXm""... $ac_c" 1>&6
|
||||
echo "configure:7053: checking for XmStringCreate in -lXm" >&5
|
||||
echo "configure:7055: checking for XmStringCreate in -lXm" >&5
|
||||
ac_lib_var=`echo Xm'_'XmStringCreate | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
@ -7057,7 +7059,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lXm $MOTIF_DYNAMIC_PATHS $TK_LIBS $XLIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7061 "configure"
|
||||
#line 7063 "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
|
||||
|
@ -7068,7 +7070,7 @@ int main() {
|
|||
XmStringCreate()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:7074: \"$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
|
||||
|
@ -7092,7 +7094,7 @@ fi
|
|||
LDFLAGS="$_SAVE_LDFLAGS"
|
||||
else
|
||||
echo $ac_n "checking for XmStringCreate in -lXm""... $ac_c" 1>&6
|
||||
echo "configure:7096: checking for XmStringCreate in -lXm" >&5
|
||||
echo "configure:7098: checking for XmStringCreate in -lXm" >&5
|
||||
ac_lib_var=`echo Xm'_'XmStringCreate | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
@ -7100,7 +7102,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lXm $TK_LIBS $XLIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7104 "configure"
|
||||
#line 7106 "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
|
||||
|
@ -7111,7 +7113,7 @@ int main() {
|
|||
XmStringCreate()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:7117: \"$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
|
||||
|
@ -7180,7 +7182,7 @@ fi
|
|||
# Extract the first word of "gtk-config", so it can be a program name with args.
|
||||
set dummy gtk-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:7184: checking for $ac_word" >&5
|
||||
echo "configure:7186: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -7211,7 +7213,7 @@ fi
|
|||
|
||||
min_gtk_version=$GTK_VERSION
|
||||
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
|
||||
echo "configure:7215: checking for GTK - version >= $min_gtk_version" >&5
|
||||
echo "configure:7217: checking for GTK - version >= $min_gtk_version" >&5
|
||||
no_gtk=""
|
||||
if test "$GTK_CONFIG" = "no" ; then
|
||||
no_gtk=yes
|
||||
|
@ -7234,7 +7236,7 @@ echo "configure:7215: checking for GTK - version >= $min_gtk_version" >&5
|
|||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7238 "configure"
|
||||
#line 7240 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
@ -7312,7 +7314,7 @@ main ()
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:7316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:7318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
|
@ -7346,7 +7348,7 @@ fi
|
|||
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
||||
LIBS="$LIBS $GTK_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7350 "configure"
|
||||
#line 7352 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
@ -7356,7 +7358,7 @@ int main() {
|
|||
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:7362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
echo "*** The test program compiled, but did not run. This usually means"
|
||||
echo "*** that the run-time linker is not finding GTK or finding the wrong"
|
||||
|
@ -7461,7 +7463,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:7465: checking for jpeg_destroy_compress in -ljpeg" >&5
|
||||
echo "configure:7467: 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
|
||||
|
@ -7469,7 +7471,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ljpeg $JPEG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7473 "configure"
|
||||
#line 7475 "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
|
||||
|
@ -7480,7 +7482,7 @@ int main() {
|
|||
jpeg_destroy_compress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:7486: \"$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
|
||||
|
@ -7509,7 +7511,7 @@ if test "$SYSTEM_JPEG" = 1 ; then
|
|||
SYSTEM_JPEG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7513 "configure"
|
||||
#line 7515 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
|
@ -7523,7 +7525,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:7527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:7529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_JPEG=1
|
||||
else
|
||||
|
@ -7561,16 +7563,16 @@ if test "$ZLIB_DIR" = no; then
|
|||
SYSTEM_ZLIB=
|
||||
else
|
||||
echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
|
||||
echo "configure:7565: checking "for zlib.h"" >&5
|
||||
echo "configure:7567: checking "for zlib.h"" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7567 "configure"
|
||||
#line 7569 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "zlib.h"
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:7576: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
result="yes" SYSTEM_ZLIB=1
|
||||
else
|
||||
|
@ -7584,7 +7586,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:7588: checking for gzread in -lz" >&5
|
||||
echo "configure:7590: 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
|
||||
|
@ -7592,7 +7594,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $ZLIB_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7596 "configure"
|
||||
#line 7598 "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
|
||||
|
@ -7603,7 +7605,7 @@ int main() {
|
|||
gzread()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:7609: \"$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
|
||||
|
@ -7649,7 +7651,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:7653: checking for png_get_valid in -lpng" >&5
|
||||
echo "configure:7655: 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
|
||||
|
@ -7657,7 +7659,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpng $PNG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7661 "configure"
|
||||
#line 7663 "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
|
||||
|
@ -7668,7 +7670,7 @@ int main() {
|
|||
png_get_valid()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:7674: \"$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
|
||||
|
@ -7696,7 +7698,7 @@ if test "$SYSTEM_PNG" = 1 ; then
|
|||
SYSTEM_PNG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7700 "configure"
|
||||
#line 7702 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
|
@ -7710,7 +7712,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:7714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:7716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_PNG=1
|
||||
else
|
||||
|
@ -7754,10 +7756,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:7758: checking "for FC_Initialize in -ltalkback"" >&5;
|
||||
echo "configure:7760: checking "for FC_Initialize in -ltalkback"" >&5;
|
||||
LIBS="-ltalkback $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7761 "configure"
|
||||
#line 7763 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include "fullcircle.h"
|
||||
|
@ -7769,7 +7771,7 @@ FC_Initialize();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:7775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
FULLCIRCLE_LIB="-ltalkback $FULLCIRCLE_LIB" result="yes"
|
||||
else
|
||||
|
@ -7796,7 +7798,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:7800: checking for pthread_attr_init in -lpthread" >&5
|
||||
echo "configure:7802: 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
|
||||
|
@ -7804,7 +7806,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpthread $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7808 "configure"
|
||||
#line 7810 "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
|
||||
|
@ -7815,7 +7817,7 @@ int main() {
|
|||
pthread_attr_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:7821: \"$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
|
||||
|
@ -7886,13 +7888,13 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking "for PR_GetCurrentThread in -lnspr3"""... $ac_c" 1>&6
|
||||
echo "configure:7890: checking "for PR_GetCurrentThread in -lnspr3"" >&5
|
||||
echo "configure:7892: 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 7896 "configure"
|
||||
#line 7898 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <nspr.h>
|
||||
|
@ -7902,7 +7904,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:7906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:7908: \"$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
|
||||
|
@ -7923,7 +7925,7 @@ LIBS=$_SAVE_LIBS
|
|||
case "$target" in
|
||||
*-*-solaris*)
|
||||
echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
|
||||
echo "configure:7927: checking for pthread_attr_init in -lpthread" >&5
|
||||
echo "configure:7929: 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
|
||||
|
@ -7931,7 +7933,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpthread $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7935 "configure"
|
||||
#line 7937 "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
|
||||
|
@ -7942,7 +7944,7 @@ int main() {
|
|||
pthread_attr_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:7948: \"$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
|
||||
|
@ -7964,7 +7966,7 @@ fi
|
|||
;;
|
||||
*-*-linux*)
|
||||
echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
|
||||
echo "configure:7968: checking for pthread_attr_init in -lpthread" >&5
|
||||
echo "configure:7970: 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
|
||||
|
@ -7972,7 +7974,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpthread $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7976 "configure"
|
||||
#line 7978 "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
|
||||
|
@ -7983,7 +7985,7 @@ int main() {
|
|||
pthread_attr_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:7989: \"$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
|
||||
|
@ -8006,13 +8008,13 @@ fi
|
|||
esac
|
||||
|
||||
echo $ac_n "checking "for PR_GetCurrentThread in -lnspr3 with thread lib"""... $ac_c" 1>&6
|
||||
echo "configure:8010: checking "for PR_GetCurrentThread in -lnspr3 with thread lib"" >&5
|
||||
echo "configure:8012: 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 8016 "configure"
|
||||
#line 8018 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <nspr.h>
|
||||
|
@ -8022,7 +8024,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:8026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:8028: \"$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
|
||||
|
@ -8040,7 +8042,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for PL_CreateOptState in -lplc3""... $ac_c" 1>&6
|
||||
echo "configure:8044: checking for PL_CreateOptState in -lplc3" >&5
|
||||
echo "configure:8046: 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
|
||||
|
@ -8048,7 +8050,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lplc3 $NSPR_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8052 "configure"
|
||||
#line 8054 "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
|
||||
|
@ -8059,7 +8061,7 @@ int main() {
|
|||
PL_CreateOptState()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8065: \"$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
|
||||
|
@ -8081,7 +8083,7 @@ MISSING_NSPR="$MISSING_NSPR -lplc3"
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for PL_GetEvent in -lplds3""... $ac_c" 1>&6
|
||||
echo "configure:8085: checking for PL_GetEvent in -lplds3" >&5
|
||||
echo "configure:8087: 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
|
||||
|
@ -8089,7 +8091,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lplds3 $NSPR_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8093 "configure"
|
||||
#line 8095 "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
|
||||
|
@ -8100,7 +8102,7 @@ int main() {
|
|||
PL_GetEvent()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8106: \"$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
|
||||
|
@ -8134,6 +8136,11 @@ if test -n "${NSPR_DIR}" && test -d "${NSPR_DIR}" ; then
|
|||
fi
|
||||
fi
|
||||
|
||||
LDFLAGS=`echo \
|
||||
$_WARNINGS_CFLAGS \
|
||||
$LDFLAGS \
|
||||
$CFLAGS`
|
||||
|
||||
CFLAGS=`echo \
|
||||
$_WARNINGS_CFLAGS \
|
||||
$_GPROF_CFLAGS \
|
||||
|
@ -8155,12 +8162,13 @@ if test "$MOZ_DEBUG"
|
|||
then
|
||||
CFLAGS=` echo $CFLAGS | sed 's/ *-O[^ ]*//g;'`
|
||||
CXXFLAGS=`echo $CXXFLAGS | sed 's/ *-O[^ ]*//g;'`
|
||||
LDFLAGS=`echo $LDFLAGS | sed 's/ *-O[^ ]*//g;'`
|
||||
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:8164: checking for $ac_word" >&5
|
||||
echo "configure:8172: 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
|
||||
|
@ -8546,6 +8554,7 @@ s%@GNU_CC@%$GNU_CC%g
|
|||
s%@GNU_CXX@%$GNU_CXX%g
|
||||
s%@ALLOCA@%$ALLOCA%g
|
||||
s%@LIBOBJS@%$LIBOBJS%g
|
||||
s%@MDDEPDIR@%$MDDEPDIR%g
|
||||
s%@AS@%$AS%g
|
||||
s%@ASFLAGS@%$ASFLAGS%g
|
||||
s%@AS_DASH_C_FLAG@%$AS_DASH_C_FLAG%g
|
||||
|
|
Загрузка…
Ссылка в новой задаче