This commit is contained in:
briano%netscape.com 1999-08-25 11:46:26 +00:00
Родитель 1b066bb64a
Коммит f40054346c
1 изменённых файлов: 21 добавлений и 26 удалений

47
configure поставляемый
Просмотреть файл

@ -7961,12 +7961,7 @@ then
exit 1
fi
if test "$MOZ_MONOLITHIC_TOOLKIT"
then
MOZ_TIMER_LIBS=-ltimer_"$MOZ_WIDGET_TOOLKIT"_s
else
MOZ_TIMER_LIBS=-ltimer_s
fi
MOZ_TIMER_LIBS=-ltimer_s
NO_STATIC_LIB=1
@ -7995,7 +7990,7 @@ case "$target" in
# Extract the first word of "makeC++SharedLib_r", so it can be a program name with args.
set dummy makeC++SharedLib_r; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:7999: checking for $ac_word" >&5
echo "configure:7994: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_AIX_SHLIB_BIN'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -8103,7 +8098,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:8107: checking for jpeg_destroy_compress in -ljpeg" >&5
echo "configure:8102: 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
@ -8111,7 +8106,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ljpeg $JPEG_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 8115 "configure"
#line 8110 "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
@ -8122,7 +8117,7 @@ int main() {
jpeg_destroy_compress()
; return 0; }
EOF
if { (eval echo configure:8126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:8121: \"$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
@ -8151,7 +8146,7 @@ if test "$SYSTEM_JPEG" = 1; then
SYSTEM_JPEG=
else
cat > conftest.$ac_ext <<EOF
#line 8155 "configure"
#line 8150 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@ -8165,7 +8160,7 @@ else
}
EOF
if { (eval echo configure:8169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
if { (eval echo configure:8164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
SYSTEM_JPEG=1
else
@ -8203,16 +8198,16 @@ if test "$ZLIB_DIR" = no; then
SYSTEM_ZLIB=
else
echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
echo "configure:8207: checking "for zlib.h"" >&5
echo "configure:8202: checking "for zlib.h"" >&5
cat > conftest.$ac_ext <<EOF
#line 8209 "configure"
#line 8204 "configure"
#include "confdefs.h"
#include "zlib.h"
int main() {
; return 0; }
EOF
if { (eval echo configure:8216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:8211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
result="yes" SYSTEM_ZLIB=1
else
@ -8226,7 +8221,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:8230: checking for gzread in -lz" >&5
echo "configure:8225: 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
@ -8234,7 +8229,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lz $ZLIB_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 8238 "configure"
#line 8233 "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
@ -8245,7 +8240,7 @@ int main() {
gzread()
; return 0; }
EOF
if { (eval echo configure:8249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:8244: \"$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
@ -8291,7 +8286,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:8295: checking for png_get_valid in -lpng" >&5
echo "configure:8290: 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
@ -8299,7 +8294,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpng $PNG_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 8303 "configure"
#line 8298 "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
@ -8310,7 +8305,7 @@ int main() {
png_get_valid()
; return 0; }
EOF
if { (eval echo configure:8314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:8309: \"$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
@ -8338,7 +8333,7 @@ if test "$SYSTEM_PNG" = 1; then
SYSTEM_PNG=
else
cat > conftest.$ac_ext <<EOF
#line 8342 "configure"
#line 8337 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@ -8352,7 +8347,7 @@ else
}
EOF
if { (eval echo configure:8356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
if { (eval echo configure:8351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
SYSTEM_PNG=1
else
@ -8396,9 +8391,9 @@ CFLAGS="$CFLAGS -I${FULLCIRCLE_DIR}"
LDFLAGS="$LDFLAGS -L${FULLCIRCLE_DIR}"
LIBS="-ltalkback $LIBS"
echo $ac_n "checking "for FC_Initialize in -ltalkback"""... $ac_c" 1>&6
echo "configure:8400: checking "for FC_Initialize in -ltalkback"" >&5;
echo "configure:8395: checking "for FC_Initialize in -ltalkback"" >&5;
cat > conftest.$ac_ext <<EOF
#line 8402 "configure"
#line 8397 "configure"
#include "confdefs.h"
#include <stdio.h>
#include "fullcircle.h"
@ -8406,7 +8401,7 @@ int main() {
FC_Initialize(); exit(0);
; return 0; }
EOF
if { (eval echo configure:8410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:8405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
FULLCIRCLE_LIB="-ltalkback $FULLCIRCLE_LIB" result="yes"
else