diff --git a/AUTHORS b/AUTHORS index 770417c..a17281a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -399,3 +399,12 @@ zinov@waifu.club: Martin Michel : Updated the German translation Updated the initial bookmarks + +notcancername + Support AVIF images + +Juhani Krekela + Implement strike formatting + +Florian Weimer + Add "#define _GNU_SOURCE" to the configure test for memrchr diff --git a/ChangeLog b/ChangeLog index e7c5d9e..67053ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +=== RELEASE 2.29 === + +Thu Mar 9 19:51:20 CET 2023 Florian Weimer : + + Add "#define _GNU_SOURCE" to the configure test for memrchr + +Thu Mar 9 18:37:12 CET 2023 Juhani Krekela : + + Implement strike formatting + +Wed Mar 8 20:08:01 CET 2023 mikulas: + + Fixed a bug that image was sometimes displayed with too small size + +Mon Jan 23 19:25:18 CET 2023 mikulas: + + Fixed a bug that webp images from local disk could not be displayed + +Mon Jan 23 19:24:06 CET 2023 notcancername : + + Support AVIF images + +Sun Oct 9 15:54:06 CEST 2022 Jakub Bogusz : + + Updated Polish Translation + === RELEASE 2.28 === Sat Sep 17 21:54:44 CEST 2022 mikulas: diff --git a/INSTALL b/INSTALL index 9ced69f..0b02c3a 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -Links 2.28 -- How To Install +Links 2.29 -- How To Install ---------------------------- Follow this step-by-step: diff --git a/Makefile.am b/Makefile.am index 1bd51c2..3aba96d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ if JAVASCRIPT links_LDADD=builtin.o context.o ipret.o javascr.o javascript.o md5.o md5hl.o ns.o pomocny.o regexp.o endif -links_SOURCES=af_unix.c auth.c beos.c bfu.c block.c bookmark.c cache.c charsets.c compress.c connect.c cookies.c data.c default.c dip.c directfb.c dither.c dns.c doh.c dos.c drivers.c error.c file.c finger.c fn_impl.c fontconf.c font_inc.c framebuf.c freetype.c ftp.c gif.c grx.c hpux.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c string.c suffix.c svg.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c vms.c webp.c x.c xbm.c beos.h bits.h cfg.h codepage.h com-defs.h config-vms.h dfb_cur.h hpux.h language.h links.h os_dep.h os_depx.h setup.h arrow.inc certs.inc codepage.inc entity.inc fbcommon.inc language.inc links_ic.inc locase.inc suffix.inc suffix_x.inc uni_7b.inc upcase.inc vpipe.inc +links_SOURCES=af_unix.c avif.c auth.c beos.c bfu.c block.c bookmark.c cache.c charsets.c compress.c connect.c cookies.c data.c default.c dip.c directfb.c dither.c dns.c doh.c dos.c drivers.c error.c file.c finger.c fn_impl.c fontconf.c font_inc.c framebuf.c freetype.c ftp.c gif.c grx.c hpux.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c string.c suffix.c svg.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c vms.c webp.c x.c xbm.c beos.h bits.h cfg.h codepage.h com-defs.h config-vms.h dfb_cur.h hpux.h language.h links.h os_dep.h os_depx.h setup.h arrow.inc certs.inc codepage.inc entity.inc fbcommon.inc language.inc links_ic.inc locase.inc suffix.inc suffix_x.inc uni_7b.inc upcase.inc vpipe.inc # builtin.c context.c ipret.c javascr.c javascript.c md5.c md5hl.c ns.c pomocny.c regexp.c md5.h ns.h struct.h tree.h typy.h ipret.h javascript.h builtin.h builtin_keys.h dist-hook: @@ -45,4 +45,3 @@ haiku.o: $(srcdir)/haiku.cpp datadir = $(prefix)/@DATADIRNAME@ LIBS = @LIBS@ - diff --git a/Makefile.in b/Makefile.in index 659cba8..63acc3b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -78,7 +78,7 @@ bin_PROGRAMS = links @HAIKU_GR_TRUE@links_LDADD = haiku.o @JAVASCRIPT_TRUE@links_LDADD = builtin.o context.o ipret.o javascr.o javascript.o md5.o md5hl.o ns.o pomocny.o regexp.o -links_SOURCES = af_unix.c auth.c beos.c bfu.c block.c bookmark.c cache.c charsets.c compress.c connect.c cookies.c data.c default.c dip.c directfb.c dither.c dns.c doh.c dos.c drivers.c error.c file.c finger.c fn_impl.c fontconf.c font_inc.c framebuf.c freetype.c ftp.c gif.c grx.c hpux.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c string.c suffix.c svg.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c vms.c webp.c x.c xbm.c beos.h bits.h cfg.h codepage.h com-defs.h config-vms.h dfb_cur.h hpux.h language.h links.h os_dep.h os_depx.h setup.h arrow.inc certs.inc codepage.inc entity.inc fbcommon.inc language.inc links_ic.inc locase.inc suffix.inc suffix_x.inc uni_7b.inc upcase.inc vpipe.inc +links_SOURCES = af_unix.c avif.c auth.c beos.c bfu.c block.c bookmark.c cache.c charsets.c compress.c connect.c cookies.c data.c default.c dip.c directfb.c dither.c dns.c doh.c dos.c drivers.c error.c file.c finger.c fn_impl.c fontconf.c font_inc.c framebuf.c freetype.c ftp.c gif.c grx.c hpux.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c string.c suffix.c svg.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c vms.c webp.c x.c xbm.c beos.h bits.h cfg.h codepage.h com-defs.h config-vms.h dfb_cur.h hpux.h language.h links.h os_dep.h os_depx.h setup.h arrow.inc certs.inc codepage.inc entity.inc fbcommon.inc language.inc links_ic.inc locase.inc suffix.inc suffix_x.inc uni_7b.inc upcase.inc vpipe.inc CXXFLAGS = @CXXFLAGS@ @@ -94,7 +94,7 @@ PROGRAMS = $(bin_PROGRAMS) DEFS = @DEFS@ -I. -I$(srcdir) -I. CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ -links_OBJECTS = af_unix.o auth.o beos.o bfu.o block.o bookmark.o \ +links_OBJECTS = af_unix.o avif.o auth.o beos.o bfu.o block.o bookmark.o \ cache.o charsets.o compress.o connect.o cookies.o data.o default.o \ dip.o directfb.o dither.o dns.o doh.o dos.o drivers.o error.o file.o \ finger.o fn_impl.o fontconf.o font_inc.o framebuf.o freetype.o ftp.o \ @@ -103,10 +103,10 @@ img.o imgcache.o jpeg.o jsint.o kbd.o language.o listedit.o lru.o \ mailto.o main.o memory.o menu.o objreq.o os_dep.o pmshell.o png.o \ sched.o select.o session.o smb.o string.o suffix.o svg.o svgalib.o \ terminal.o tiff.o types.o url.o view.o view_gr.o vms.o webp.o x.o xbm.o +@ATHEOS_GR_TRUE@links_DEPENDENCIES = atheos.o @JAVASCRIPT_TRUE@links_DEPENDENCIES = builtin.o context.o ipret.o \ @JAVASCRIPT_TRUE@javascr.o javascript.o md5.o md5hl.o ns.o pomocny.o \ @JAVASCRIPT_TRUE@regexp.o -@ATHEOS_GR_TRUE@links_DEPENDENCIES = atheos.o @HAIKU_GR_TRUE@links_DEPENDENCIES = haiku.o links_LDFLAGS = CFLAGS = @CFLAGS@ @@ -352,6 +352,8 @@ af_unix.o: af_unix.c links.h cfg.h config.h com-defs.h os_dep.h \ os_depx.h setup.h language.h codepage.h auth.o: auth.c links.h cfg.h config.h com-defs.h os_dep.h os_depx.h \ setup.h language.h codepage.h +avif.o: avif.c cfg.h config.h links.h com-defs.h os_dep.h os_depx.h \ + setup.h language.h codepage.h beos.o: beos.c bfu.o: bfu.c links.h cfg.h config.h com-defs.h os_dep.h os_depx.h \ setup.h language.h codepage.h diff --git a/acconfig.h b/acconfig.h index a4f7b05..ee00b11 100644 --- a/acconfig.h +++ b/acconfig.h @@ -244,5 +244,8 @@ /* WebP */ #undef HAVE_WEBP +/* AVIF */ +#undef HAVE_AVIF + /* Gpm_Event has wdx and wdy */ #undef HAVE_WDX_WDY diff --git a/avif.c b/avif.c new file mode 100644 index 0000000..e3aa922 --- /dev/null +++ b/avif.c @@ -0,0 +1,105 @@ +#include "cfg.h" + +#ifdef G +#include "links.h" + +#ifdef HAVE_AVIF + +#include + +struct avif_decoder { + unsigned char *buffer; + int len; +}; + +void avif_start(struct cached_image *cimg) +{ + struct avif_decoder *deco; + deco = mem_alloc(sizeof(struct avif_decoder)); + deco->buffer = init_str(); + deco->len = 0; + cimg->decoder = deco; +} + +void avif_restart(struct cached_image *cimg, unsigned char *data, int length) +{ + struct avif_decoder *deco = (struct avif_decoder *)cimg->decoder; + add_bytes_to_str(&deco->buffer, &deco->len, data, length); +} + +void avif_finish(struct cached_image *cimg) +{ + avifRGBImage ari; + struct avif_decoder *deco; + avifDecoder *decoder; + + memset(&ari, 0, sizeof(avifRGBImage)); + + deco = (struct avif_decoder *)cimg->decoder; + decoder = avifDecoderCreate(); + if (!decoder) + goto end; +#if AVIF_VERSION > 90001 + decoder->strictFlags = AVIF_STRICT_DISABLED; +#endif + decoder->ignoreExif = 1; + decoder->ignoreXMP = 1; + if (avifDecoderSetIOMemory(decoder, deco->buffer, deco->len) != AVIF_RESULT_OK) + goto destroy_decoder; + if (avifDecoderParse(decoder) != AVIF_RESULT_OK) + goto destroy_decoder; + + cimg->width = decoder->image->width; + cimg->height = decoder->image->height; + cimg->buffer_bytes_per_pixel = 4; + cimg->red_gamma = cimg->green_gamma = cimg->blue_gamma = (float)sRGB_gamma; + cimg->strip_optimized = 0; + + if (avifDecoderNextImage(decoder) != AVIF_RESULT_OK) + goto destroy_decoder; + + avifRGBImageSetDefaults(&ari, decoder->image); + ari.depth = 8; + ari.format = AVIF_RGB_FORMAT_RGBA; + + if (header_dimensions_known(cimg)) + goto destroy_decoder; + + ari.pixels = cimg->buffer; + ari.rowBytes = (unsigned)cimg->width * 4; + + if (avifImageYUVToRGB(decoder->image, &ari) != AVIF_RESULT_OK) + goto destroy_decoder; + +destroy_decoder: + avifDecoderDestroy(decoder); +end: + img_end(cimg); +} + +void avif_destroy_decoder(struct cached_image *cimg) +{ + struct avif_decoder *deco = (struct avif_decoder *)cimg->decoder; + mem_free(deco->buffer); +} + +void add_avif_version(unsigned char **s, int *l) +{ + add_to_str(s, l, cast_uchar "AVIF ("); + add_num_to_str(s, l, AVIF_VERSION_MAJOR); + add_chr_to_str(s, l, '.'); + add_num_to_str(s, l, AVIF_VERSION_MINOR); + add_chr_to_str(s, l, '.'); + add_num_to_str(s, l, AVIF_VERSION_PATCH); +#ifdef AVIF_VERSION_DEVEL + if (AVIF_VERSION_DEVEL) { + add_chr_to_str(s, l, '-'); + add_num_to_str(s, l, AVIF_VERSION_DEVEL); + } +#endif + add_chr_to_str(s, l, ')'); +} + +#endif + +#endif diff --git a/cache.c b/cache.c index ca12924..6b47f26 100644 --- a/cache.c +++ b/cache.c @@ -232,9 +232,7 @@ void detach_cache_entry(struct cache_entry *e) static void mem_free_fragment(struct fragment *f) { - size_t s = (size_t)f->length; mem_free(f); - s += sizeof(struct fragment); } #define sf(x) e->data_size += (x), cache_size += (my_uintptr_t)(x) @@ -477,6 +475,11 @@ void delete_cache_entry(struct cache_entry *e) mem_free(e); } +void finish_cache_entry(struct cache_entry *e) +{ + e->count = cache_count++; +} + static int shrink_file_cache(int u) { int r = 0; diff --git a/config-vms.h b/config-vms.h index 69a1857..7efd2a3 100644 --- a/config-vms.h +++ b/config-vms.h @@ -558,6 +558,9 @@ /* Define if you have the header file. */ /* #undef HAVE_ATHEOS_THREADS_H */ +/* Define if you have the header file. */ +/* #undef HAVE_AVIF_AVIF_H */ + /* Define if you have the header file. */ /* #undef HAVE_BROTLI_DECODE_H */ @@ -828,6 +831,9 @@ /* Define if you have the atheos library (-latheos). */ /* #undef HAVE_LIBATHEOS */ +/* Define if you have the avif library (-lavif). */ +/* #undef HAVE_LIBAVIF */ + /* Define if you have the be library (-lbe). */ /* #undef HAVE_LIBBE */ @@ -934,11 +940,11 @@ #define PACKAGE "links" /* Version number of package */ -#define VERSION "2.28" +#define VERSION "2.29" /* */ -#define VERSION "2.28" +#define VERSION "2.29" /* */ /* #undef HAVE_OPENMP */ @@ -1174,5 +1180,8 @@ /* WebP */ /* #undef HAVE_WEBP */ +/* AVIF */ +/* #undef HAVE_AVIF */ + /* Gpm_Event has wdx and wdy */ /* #undef HAVE_WDX_WDY */ diff --git a/config.h.in b/config.h.in index 16b976c..20a386f 100644 --- a/config.h.in +++ b/config.h.in @@ -572,6 +572,9 @@ /* Define if you have the header file. */ #undef HAVE_ATHEOS_THREADS_H +/* Define if you have the header file. */ +#undef HAVE_AVIF_AVIF_H + /* Define if you have the header file. */ #undef HAVE_BROTLI_DECODE_H @@ -848,6 +851,9 @@ /* Define if you have the atheos library (-latheos). */ #undef HAVE_LIBATHEOS +/* Define if you have the avif library (-lavif). */ +#undef HAVE_LIBAVIF + /* Define if you have the be library (-lbe). */ #undef HAVE_LIBBE @@ -1203,5 +1209,8 @@ /* WebP */ #undef HAVE_WEBP +/* AVIF */ +#undef HAVE_AVIF + /* Gpm_Event has wdx and wdy */ #undef HAVE_WDX_WDY diff --git a/configure b/configure index ac5a1b3..354c422 100755 --- a/configure +++ b/configure @@ -89,6 +89,8 @@ ac_help="$ac_help --without-libwebp compile without WEBP support" ac_help="$ac_help --disable-webp-pkgconfig don't use pkgconfig when searching for librwebp" +ac_help="$ac_help + --without-libavif compile without AVIF support" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -632,7 +634,7 @@ am__api_version="1.4" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:638: checking for a BSD compatible install" >&5 +echo "configure:640: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -685,7 +687,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:691: checking whether build environment is sane" >&5 +echo "configure:693: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -742,7 +744,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:748: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:750: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -771,7 +773,7 @@ fi PACKAGE=links -VERSION=2.28 +VERSION=2.29 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -788,7 +790,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6 -echo "configure:794: checking for working aclocal-${am__api_version}" >&5 +echo "configure:796: checking for working aclocal-${am__api_version}" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -801,7 +803,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:807: checking for working autoconf" >&5 +echo "configure:809: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -814,7 +816,7 @@ else fi echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6 -echo "configure:820: checking for working automake-${am__api_version}" >&5 +echo "configure:822: checking for working automake-${am__api_version}" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -827,7 +829,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:833: checking for working autoheader" >&5 +echo "configure:835: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -840,7 +842,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:846: checking for working makeinfo" >&5 +echo "configure:848: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -872,7 +874,7 @@ export LIBS # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:878: checking for $ac_word" >&5 +echo "configure:880: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -902,7 +904,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:908: checking for $ac_word" >&5 +echo "configure:910: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -953,7 +955,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:959: checking for $ac_word" >&5 +echo "configure:961: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -985,7 +987,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:991: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:993: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -996,12 +998,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1002 "configure" +#line 1004 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1027,12 +1029,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1033: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1035: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1038: checking whether we are using GNU C" >&5 +echo "configure:1040: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1041,7 +1043,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1060,7 +1062,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1066: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1068: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1106,7 +1108,7 @@ if test -n "`uname|grep -i bsd`"; then fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1112: checking how to run the C preprocessor" >&5 +echo "configure:1114: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1121,13 +1123,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1138,13 +1140,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1155,13 +1157,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1169: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1186,12 +1188,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1192: checking for ANSI C header files" >&5 +echo "configure:1194: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1199,7 +1201,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1216,7 +1218,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1234,7 +1236,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1255,7 +1257,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1266,7 +1268,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1291,13 +1293,13 @@ fi if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:1297: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1299: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -1315,7 +1317,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1339,12 +1341,12 @@ fi echo $ac_n "checking for EMX""... $ac_c" 1>&6 -echo "configure:1345: checking for EMX" >&5 +echo "configure:1347: checking for EMX" >&5 if eval "test \"`echo '$''{'ac_cv_have_emx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_emx=yes else @@ -1375,12 +1377,12 @@ if test "$ac_cv_have_emx" = yes; then fi echo $ac_n "checking for OpenWatcom""... $ac_c" 1>&6 -echo "configure:1381: checking for OpenWatcom" >&5 +echo "configure:1383: checking for OpenWatcom" >&5 if eval "test \"`echo '$''{'ac_cv_have_watcom'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_watcom=yes else @@ -1406,12 +1408,12 @@ echo "$ac_t""$ac_cv_have_watcom" 1>&6 test "$ac_cv_have_watcom" = yes && ac_cv_lib_dir_opendir=no echo $ac_n "checking for DJGPP""... $ac_c" 1>&6 -echo "configure:1412: checking for DJGPP" >&5 +echo "configure:1414: checking for DJGPP" >&5 if eval "test \"`echo '$''{'ac_cv_have_djgpp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_djgpp=yes else @@ -1442,12 +1444,12 @@ if test "$ac_cv_have_djgpp" = yes; then fi echo $ac_n "checking for ARM64 ILP32""... $ac_c" 1>&6 -echo "configure:1448: checking for ARM64 ILP32" >&5 +echo "configure:1450: checking for ARM64 ILP32" >&5 if eval "test \"`echo '$''{'ac_cv_have_arm64_ilp32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_arm64_ilp32=yes else @@ -1473,12 +1475,12 @@ echo "$ac_t""$ac_cv_have_arm64_ilp32" 1>&6 test "$ac_cv_have_arm64_ilp32" = yes && disable_openmp=yes echo $ac_n "checking for volatile""... $ac_c" 1>&6 -echo "configure:1479: checking for volatile" >&5 +echo "configure:1481: checking for volatile" >&5 if eval "test \"`echo '$''{'ac_cv_have_volatile'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_volatile=yes else @@ -1510,12 +1512,12 @@ EOF fi echo $ac_n "checking for restrict""... $ac_c" 1>&6 -echo "configure:1516: checking for restrict" >&5 +echo "configure:1518: checking for restrict" >&5 if eval "test \"`echo '$''{'ac_cv_have_restrict'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_restrict=yes else @@ -1552,12 +1554,12 @@ EOF fi echo $ac_n "checking for __restrict""... $ac_c" 1>&6 -echo "configure:1558: checking for __restrict" >&5 +echo "configure:1560: checking for __restrict" >&5 if eval "test \"`echo '$''{'ac_cv_have___restrict'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have___restrict=yes else @@ -1594,19 +1596,19 @@ EOF fi echo $ac_n "checking for long long""... $ac_c" 1>&6 -echo "configure:1600: checking for long long" >&5 +echo "configure:1602: checking for long long" >&5 if eval "test \"`echo '$''{'ac_cv_have_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_long_long=yes else @@ -1626,7 +1628,7 @@ EOF echo $ac_n "checking for pointer comparison bug""... $ac_c" 1>&6 -echo "configure:1632: checking for pointer comparison bug" >&5 +echo "configure:1634: checking for pointer comparison bug" >&5 if eval "test \"`echo '$''{'ac_cv_pointer_comparison_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1639,7 +1641,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_pointer_comparison_bug=no else @@ -1672,7 +1674,7 @@ EOF if test "$ac_cv_have_long_long" = yes -a "$ac_cv_have_volatile" = yes; then echo $ac_n "checking for maxint conversion bug""... $ac_c" 1>&6 -echo "configure:1678: checking for maxint conversion bug" >&5 +echo "configure:1680: checking for maxint conversion bug" >&5 if eval "test \"`echo '$''{'ac_cv_maxint_conversion_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1685,7 +1687,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_maxint_conversion_bug=no else @@ -1719,19 +1721,19 @@ fi echo $ac_n "checking for stdlib.h""... $ac_c" 1>&6 -echo "configure:1725: checking for stdlib.h" >&5 +echo "configure:1727: checking for stdlib.h" >&5 if eval "test \"`echo '$''{'ac_cv_have_stdlib_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:1737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_stdlib_h=yes else @@ -1758,12 +1760,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:1764: checking for $ac_hdr that defines DIR" >&5 +echo "configure:1766: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -1771,7 +1773,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1796,7 +1798,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:1802: checking for opendir in -ldir" >&5 +echo "configure:1804: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1804,7 +1806,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1837,7 +1839,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1843: checking for opendir in -lx" >&5 +echo "configure:1845: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1845,7 +1847,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1879,12 +1881,12 @@ fi fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:1885: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:1887: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1900,7 +1902,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:1906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -1924,17 +1926,17 @@ for ac_hdr in alloca.h arpa/inet.h bsd/string.h cygwin/process.h cygwin/version. do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1930: checking for $ac_hdr" >&5 +echo "configure:1932: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1940: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1942: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1966,12 +1968,12 @@ if test "$ac_cv_header_stdarg_h" != yes; then fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1972: checking for working const" >&5 +echo "configure:1974: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2041,21 +2043,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:2047: checking for inline" >&5 +echo "configure:2049: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2063: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -2081,12 +2083,12 @@ EOF esac echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2087: checking for size_t" >&5 +echo "configure:2089: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2114,12 +2116,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:2120: checking for pid_t" >&5 +echo "configure:2122: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2147,12 +2149,12 @@ EOF fi echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:2153: checking for socklen_t" >&5 +echo "configure:2155: checking for socklen_t" >&5 if eval "test \"`echo '$''{'ac_cv_have_socklen_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2165,7 +2167,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_socklen_t=yes else @@ -2186,12 +2188,12 @@ EOF fi echo $ac_n "checking for errno""... $ac_c" 1>&6 -echo "configure:2192: checking for errno" >&5 +echo "configure:2194: checking for errno" >&5 if eval "test \"`echo '$''{'ac_cv_have_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2203,7 +2205,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_errno=yes else @@ -2225,12 +2227,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2231: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2233: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2239,7 +2241,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2260,12 +2262,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:2266: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:2268: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2273,7 +2275,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:2279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -2307,7 +2309,7 @@ else fi echo $ac_n "checking size of unsigned short""... $ac_c" 1>&6 -echo "configure:2313: checking size of unsigned short" >&5 +echo "configure:2315: checking size of unsigned short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2315,7 +2317,7 @@ else ac_cv_sizeof_unsigned_short="$default_short" else cat > conftest.$ac_ext < #include @@ -2327,7 +2329,7 @@ main() exit(0); } EOF -if { (eval echo configure:2333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_short=`cat conftestval` else @@ -2347,7 +2349,7 @@ EOF echo $ac_n "checking size of unsigned""... $ac_c" 1>&6 -echo "configure:2353: checking size of unsigned" >&5 +echo "configure:2355: checking size of unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2355,7 +2357,7 @@ else ac_cv_sizeof_unsigned="$default_int" else cat > conftest.$ac_ext < #include @@ -2367,7 +2369,7 @@ main() exit(0); } EOF -if { (eval echo configure:2373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned=`cat conftestval` else @@ -2387,7 +2389,7 @@ EOF echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6 -echo "configure:2393: checking size of unsigned long" >&5 +echo "configure:2395: checking size of unsigned long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2395,7 +2397,7 @@ else ac_cv_sizeof_unsigned_long="$default_long" else cat > conftest.$ac_ext < #include @@ -2407,7 +2409,7 @@ main() exit(0); } EOF -if { (eval echo configure:2413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_long=`cat conftestval` else @@ -2428,7 +2430,7 @@ EOF if test "$ac_cv_have_long_long" = yes; then echo $ac_n "checking size of unsigned long long""... $ac_c" 1>&6 -echo "configure:2434: checking size of unsigned long long" >&5 +echo "configure:2436: checking size of unsigned long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2436,7 +2438,7 @@ else ac_cv_sizeof_unsigned_long_long="$default_long_long" else cat > conftest.$ac_ext < #include @@ -2448,7 +2450,7 @@ main() exit(0); } EOF -if { (eval echo configure:2454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_long_long=`cat conftestval` else @@ -2472,7 +2474,7 @@ if test "$ac_cv_sizeof_unsigned" -ne 0 && test "$ac_cv_sizeof_unsigned" -lt 4; t { echo "configure: error: integer must have at least 32 bits" 1>&2; exit 1; } fi echo $ac_n "checking for big endian""... $ac_c" 1>&6 -echo "configure:2478: checking for big endian" >&5 +echo "configure:2480: checking for big endian" >&5 if eval "test \"`echo '$''{'ac_cv_big_endian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2480,7 +2482,7 @@ else ac_cv_big_endian=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_big_endian=yes else @@ -2509,7 +2511,7 @@ fi echo "$ac_t""$ac_cv_big_endian" 1>&6 echo $ac_n "checking for little endian""... $ac_c" 1>&6 -echo "configure:2515: checking for little endian" >&5 +echo "configure:2517: checking for little endian" >&5 if eval "test \"`echo '$''{'ac_cv_little_endian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2517,7 +2519,7 @@ else ac_cv_little_endian="$ac_cv_have_emx" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_little_endian=yes else @@ -2560,7 +2562,7 @@ fi fi echo $ac_n "checking if rename can replace existing files""... $ac_c" 1>&6 -echo "configure:2566: checking if rename can replace existing files" >&5 +echo "configure:2568: checking if rename can replace existing files" >&5 if eval "test \"`echo '$''{'ac_cv_rename_over_existing_files'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2568,7 +2570,7 @@ else ac_cv_rename_over_existing_files=no else cat > conftest.$ac_ext < @@ -2587,7 +2589,7 @@ else } EOF -if { (eval echo configure:2593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_rename_over_existing_files=yes else @@ -2612,12 +2614,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2618: checking return type of signal handlers" >&5 +echo "configure:2620: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2634,7 +2636,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2640: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2653,12 +2655,12 @@ EOF echo $ac_n "checking for strftime""... $ac_c" 1>&6 -echo "configure:2659: checking for strftime" >&5 +echo "configure:2661: checking for strftime" >&5 if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strftime=yes" else @@ -2703,7 +2705,7 @@ else echo "$ac_t""no" 1>&6 # strftime is in -lintl on SCO UNIX. echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 -echo "configure:2709: checking for strftime in -lintl" >&5 +echo "configure:2711: checking for strftime in -lintl" >&5 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2711,7 +2713,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2749,12 +2751,12 @@ fi fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:2755: checking for vprintf" >&5 +echo "configure:2757: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -2801,12 +2803,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:2807: checking for _doprnt" >&5 +echo "configure:2809: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -2856,12 +2858,12 @@ fi for ac_func in bcmp bcopy bzero calloc cfmakeraw chmod cygwin_conv_path cygwin_conv_to_full_win32_path dirfd fallocate freelocale getcwd getgrgid gethostname getpagesize getpid getpwuid getrlimit gettimeofday gmtime kqueue malloc_trim mallopt mktime newlocale nl_langinfo poll popen posix_fallocate raise select setlocale setpgid setrlimit setsid sigaction sigblock sigdelset sigprocmask sigsetmask snprintf strdup strerror_l strptime strtod strtoimax strtol strtoll strtoq strtoul sysconf tdelete tempnam tfind timegm tsearch uname unixpath2win utime utimes uwin_path winpath2unix _heapmin _msize _ucreate _udefault _udestroy _uopen __strtoll do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2862: checking for $ac_func" >&5 +echo "configure:2864: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2913,12 +2915,12 @@ done for ac_func in strlen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2919: checking for $ac_func" >&5 +echo "configure:2921: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2966,19 +2968,19 @@ fi done echo $ac_n "checking for strlen""... $ac_c" 1>&6 -echo "configure:2972: checking for strlen" >&5 +echo "configure:2974: checking for strlen" >&5 if eval "test \"`echo '$''{'ac_cv_have_strlen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; return strlen(str); ; return 0; } EOF -if { (eval echo configure:2984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strlen=yes else @@ -3002,12 +3004,12 @@ fi for ac_func in strnlen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3008: checking for $ac_func" >&5 +echo "configure:3010: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3055,19 +3057,19 @@ fi done echo $ac_n "checking for strnlen""... $ac_c" 1>&6 -echo "configure:3061: checking for strnlen" >&5 +echo "configure:3063: checking for strnlen" >&5 if eval "test \"`echo '$''{'ac_cv_have_strnlen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; return strnlen(str, 3); ; return 0; } EOF -if { (eval echo configure:3073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strnlen=yes else @@ -3091,12 +3093,12 @@ fi for ac_func in strcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3097: checking for $ac_func" >&5 +echo "configure:3099: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3144,19 +3146,19 @@ fi done echo $ac_n "checking for strcpy""... $ac_c" 1>&6 -echo "configure:3150: checking for strcpy" >&5 +echo "configure:3152: checking for strcpy" >&5 if eval "test \"`echo '$''{'ac_cv_have_strcpy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; char a[100]; strcpy(a, str); return a[0]; ; return 0; } EOF -if { (eval echo configure:3162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strcpy=yes else @@ -3180,12 +3182,12 @@ fi for ac_func in strncpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3186: checking for $ac_func" >&5 +echo "configure:3188: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3233,19 +3235,19 @@ fi done echo $ac_n "checking for strncpy""... $ac_c" 1>&6 -echo "configure:3239: checking for strncpy" >&5 +echo "configure:3241: checking for strncpy" >&5 if eval "test \"`echo '$''{'ac_cv_have_strncpy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; char a[100]; volatile int l = 1; strncpy(a, str, l); return a[0]; ; return 0; } EOF -if { (eval echo configure:3251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strncpy=yes else @@ -3269,12 +3271,12 @@ fi for ac_func in strchr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3275: checking for $ac_func" >&5 +echo "configure:3277: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3322,19 +3324,19 @@ fi done echo $ac_n "checking for strchr""... $ac_c" 1>&6 -echo "configure:3328: checking for strchr" >&5 +echo "configure:3330: checking for strchr" >&5 if eval "test \"`echo '$''{'ac_cv_have_strchr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; return !!strchr(str, 0); ; return 0; } EOF -if { (eval echo configure:3340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strchr=yes else @@ -3358,12 +3360,12 @@ fi for ac_func in strrchr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3364: checking for $ac_func" >&5 +echo "configure:3366: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3411,19 +3413,19 @@ fi done echo $ac_n "checking for strrchr""... $ac_c" 1>&6 -echo "configure:3417: checking for strrchr" >&5 +echo "configure:3419: checking for strrchr" >&5 if eval "test \"`echo '$''{'ac_cv_have_strrchr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; return !!strrchr(str, 0); ; return 0; } EOF -if { (eval echo configure:3429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strrchr=yes else @@ -3447,12 +3449,12 @@ fi for ac_func in strcmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3453: checking for $ac_func" >&5 +echo "configure:3455: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3500,19 +3502,19 @@ fi done echo $ac_n "checking for strcmp""... $ac_c" 1>&6 -echo "configure:3506: checking for strcmp" >&5 +echo "configure:3508: checking for strcmp" >&5 if eval "test \"`echo '$''{'ac_cv_have_strcmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; char * volatile str2 = ""; return strcmp(str2, str); ; return 0; } EOF -if { (eval echo configure:3518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strcmp=yes else @@ -3536,12 +3538,12 @@ fi for ac_func in strncmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3542: checking for $ac_func" >&5 +echo "configure:3544: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3589,19 +3591,19 @@ fi done echo $ac_n "checking for strncmp""... $ac_c" 1>&6 -echo "configure:3595: checking for strncmp" >&5 +echo "configure:3597: checking for strncmp" >&5 if eval "test \"`echo '$''{'ac_cv_have_strncmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; char * volatile str2 = ""; volatile int l = 1; return strncmp(str2, str, l); ; return 0; } EOF -if { (eval echo configure:3607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strncmp=yes else @@ -3625,12 +3627,12 @@ fi for ac_func in strcspn do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3631: checking for $ac_func" >&5 +echo "configure:3633: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3678,19 +3680,19 @@ fi done echo $ac_n "checking for strcspn""... $ac_c" 1>&6 -echo "configure:3684: checking for strcspn" >&5 +echo "configure:3686: checking for strcspn" >&5 if eval "test \"`echo '$''{'ac_cv_have_strcspn'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; char * volatile str2 = ""; return strcspn(str2, str); ; return 0; } EOF -if { (eval echo configure:3696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strcspn=yes else @@ -3714,12 +3716,12 @@ fi for ac_func in strspn do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3720: checking for $ac_func" >&5 +echo "configure:3722: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3767,19 +3769,19 @@ fi done echo $ac_n "checking for strspn""... $ac_c" 1>&6 -echo "configure:3773: checking for strspn" >&5 +echo "configure:3775: checking for strspn" >&5 if eval "test \"`echo '$''{'ac_cv_have_strspn'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; char * volatile str2 = ""; return strspn(str2, str); ; return 0; } EOF -if { (eval echo configure:3785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strspn=yes else @@ -3803,12 +3805,12 @@ fi for ac_func in strstr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3809: checking for $ac_func" >&5 +echo "configure:3811: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3856,19 +3858,19 @@ fi done echo $ac_n "checking for strstr""... $ac_c" 1>&6 -echo "configure:3862: checking for strstr" >&5 +echo "configure:3864: checking for strstr" >&5 if eval "test \"`echo '$''{'ac_cv_have_strstr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; char * volatile str2 = ""; return !!strstr(str2, str); ; return 0; } EOF -if { (eval echo configure:3874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strstr=yes else @@ -3892,12 +3894,12 @@ fi for ac_func in memchr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3898: checking for $ac_func" >&5 +echo "configure:3900: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3945,19 +3947,19 @@ fi done echo $ac_n "checking for memchr""... $ac_c" 1>&6 -echo "configure:3951: checking for memchr" >&5 +echo "configure:3953: checking for memchr" >&5 if eval "test \"`echo '$''{'ac_cv_have_memchr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; volatile int l = 1; return !!memchr(str, 0, l); ; return 0; } EOF -if { (eval echo configure:3963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_memchr=yes else @@ -3981,12 +3983,12 @@ fi for ac_func in memrchr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3987: checking for $ac_func" >&5 +echo "configure:3989: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4034,19 +4036,20 @@ fi done echo $ac_n "checking for memrchr""... $ac_c" 1>&6 -echo "configure:4040: checking for memrchr" >&5 +echo "configure:4042: checking for memrchr" >&5 if eval "test \"`echo '$''{'ac_cv_have_memrchr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; volatile int l = 1; return !!memrchr(str, 0, l); ; return 0; } EOF -if { (eval echo configure:4052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_memrchr=yes else @@ -4070,12 +4073,12 @@ fi for ac_func in memcmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4076: checking for $ac_func" >&5 +echo "configure:4079: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4123,19 +4126,19 @@ fi done echo $ac_n "checking for memcmp""... $ac_c" 1>&6 -echo "configure:4129: checking for memcmp" >&5 +echo "configure:4132: checking for memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_have_memcmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; char * volatile str2 = ""; volatile int l = 1; return memcmp(str2, str, l); ; return 0; } EOF -if { (eval echo configure:4141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_memcmp=yes else @@ -4159,12 +4162,12 @@ fi for ac_func in memcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4165: checking for $ac_func" >&5 +echo "configure:4168: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4212,19 +4215,19 @@ fi done echo $ac_n "checking for memcpy""... $ac_c" 1>&6 -echo "configure:4218: checking for memcpy" >&5 +echo "configure:4221: checking for memcpy" >&5 if eval "test \"`echo '$''{'ac_cv_have_memcpy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; char a[100]; volatile int l = 1; memcpy(a, str, l); return a[0]; ; return 0; } EOF -if { (eval echo configure:4230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_memcpy=yes else @@ -4248,12 +4251,12 @@ fi for ac_func in memmove do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4254: checking for $ac_func" >&5 +echo "configure:4257: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4301,19 +4304,19 @@ fi done echo $ac_n "checking for memmove""... $ac_c" 1>&6 -echo "configure:4307: checking for memmove" >&5 +echo "configure:4310: checking for memmove" >&5 if eval "test \"`echo '$''{'ac_cv_have_memmove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; char a[100]; volatile int l = 1; memmove(a, str, l); return a[0]; ; return 0; } EOF -if { (eval echo configure:4319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_memmove=yes else @@ -4337,12 +4340,12 @@ fi for ac_func in memset do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4343: checking for $ac_func" >&5 +echo "configure:4346: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4390,19 +4393,19 @@ fi done echo $ac_n "checking for memset""... $ac_c" 1>&6 -echo "configure:4396: checking for memset" >&5 +echo "configure:4399: checking for memset" >&5 if eval "test \"`echo '$''{'ac_cv_have_memset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char a[100]; char * volatile str = a; volatile int l = 1; memset(str, 0, l); return a[0]; ; return 0; } EOF -if { (eval echo configure:4408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_memset=yes else @@ -4426,12 +4429,12 @@ fi for ac_func in memmem do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4432: checking for $ac_func" >&5 +echo "configure:4435: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4479,12 +4482,12 @@ fi done echo $ac_n "checking for memmem""... $ac_c" 1>&6 -echo "configure:4485: checking for memmem" >&5 +echo "configure:4488: checking for memmem" >&5 if eval "test \"`echo '$''{'ac_cv_have_memmem'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -4492,7 +4495,7 @@ int main() { char * volatile str = ""; char * volatile str2 = ""; volatile int l = 1; volatile int l2 = 1; return !!memmem(str2, l2, str, l); ; return 0; } EOF -if { (eval echo configure:4498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_memmem=yes else @@ -4516,12 +4519,12 @@ fi for ac_func in strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4522: checking for $ac_func" >&5 +echo "configure:4525: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4569,19 +4572,19 @@ fi done echo $ac_n "checking for strerror""... $ac_c" 1>&6 -echo "configure:4575: checking for strerror" >&5 +echo "configure:4578: checking for strerror" >&5 if eval "test \"`echo '$''{'ac_cv_have_strerror'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { volatile int e = 1; return strerror(e)[0]; ; return 0; } EOF -if { (eval echo configure:4587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strerror=yes else @@ -4603,19 +4606,19 @@ EOF fi echo $ac_n "checking for sigfillset""... $ac_c" 1>&6 -echo "configure:4609: checking for sigfillset" >&5 +echo "configure:4612: checking for sigfillset" >&5 if eval "test \"`echo '$''{'ac_cv_have_sigfillset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { sigset_t set; sigfillset(&set); ; return 0; } EOF -if { (eval echo configure:4621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_sigfillset=yes else @@ -4637,19 +4640,19 @@ EOF fi echo $ac_n "checking for sigsetjmp/siglongjmp""... $ac_c" 1>&6 -echo "configure:4643: checking for sigsetjmp/siglongjmp" >&5 +echo "configure:4646: checking for sigsetjmp/siglongjmp" >&5 if eval "test \"`echo '$''{'ac_cv_have_sigsetjmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { sigjmp_buf env;sigsetjmp(env, 1);siglongjmp(env, 2); ; return 0; } EOF -if { (eval echo configure:4655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_sigsetjmp=yes else @@ -4671,7 +4674,7 @@ EOF fi echo $ac_n "checking for gcc assembler""... $ac_c" 1>&6 -echo "configure:4677: checking for gcc assembler" >&5 +echo "configure:4680: checking for gcc assembler" >&5 if eval "test \"`echo '$''{'ac_cv_have_gcc_assembler'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4679,7 +4682,7 @@ else ac_cv_have_gcc_assembler="$ac_cv_have_emx" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_have_gcc_assembler=yes else @@ -4736,19 +4739,19 @@ EOF fi echo $ac_n "checking for __builtin_add_overflow""... $ac_c" 1>&6 -echo "configure:4742: checking for __builtin_add_overflow" >&5 +echo "configure:4745: checking for __builtin_add_overflow" >&5 if eval "test \"`echo '$''{'ac_cv_have___builtin_add_overflow'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have___builtin_add_overflow=yes else @@ -4770,19 +4773,19 @@ EOF fi echo $ac_n "checking for __builtin_clz""... $ac_c" 1>&6 -echo "configure:4776: checking for __builtin_clz" >&5 +echo "configure:4779: checking for __builtin_clz" >&5 if eval "test \"`echo '$''{'ac_cv_have___builtin_clz'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have___builtin_clz=yes else @@ -4809,7 +4812,7 @@ if test "$ac_cv_func_select" != yes; then fi echo $ac_n "checking for strmode in -lbsd""... $ac_c" 1>&6 -echo "configure:4815: checking for strmode in -lbsd" >&5 +echo "configure:4818: checking for strmode in -lbsd" >&5 ac_lib_var=`echo bsd'_'strmode | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4817,7 +4820,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4858,7 +4861,7 @@ fi echo $ac_n "checking for requested debug level""... $ac_c" 1>&6 -echo "configure:4864: checking for requested debug level" >&5 +echo "configure:4867: checking for requested debug level" >&5 # Check whether --enable-debuglevel or --disable-debuglevel was given. if test "${enable_debuglevel+set}" = set; then enableval="$enable_debuglevel" @@ -4879,7 +4882,7 @@ EOF echo $ac_n "checking if you want to enable javascript""... $ac_c" 1>&6 -echo "configure:4885: checking if you want to enable javascript" >&5 +echo "configure:4888: checking if you want to enable javascript" >&5 cf_use_javascript=no # Check whether --enable-javascript or --disable-javascript was given. if test "${enable_javascript+set}" = set; then @@ -4894,7 +4897,7 @@ if test "$cf_use_javascript" = yes; then EOF echo $ac_n "checking if you want to link with system libfl""... $ac_c" 1>&6 -echo "configure:4900: checking if you want to link with system libfl" >&5 +echo "configure:4903: checking if you want to link with system libfl" >&5 cf_use_libfl=no # Check whether --with-libfl or --without-libfl was given. if test "${with_libfl+set}" = set; then @@ -4920,7 +4923,7 @@ EOF # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4926: checking for $ac_word" >&5 +echo "configure:4929: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4964,19 +4967,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for libpcre""... $ac_c" 1>&6 -echo "configure:4970: checking for libpcre" >&5 +echo "configure:4973: checking for libpcre" >&5 if $PKG_CONFIG --exists "libpcre" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBPCRE_CFLAGS""... $ac_c" 1>&6 -echo "configure:4977: checking LIBPCRE_CFLAGS" >&5 +echo "configure:4980: checking LIBPCRE_CFLAGS" >&5 LIBPCRE_CFLAGS=`$PKG_CONFIG --cflags "libpcre"` echo "$ac_t""$LIBPCRE_CFLAGS" 1>&6 echo $ac_n "checking LIBPCRE_LIBS""... $ac_c" 1>&6 -echo "configure:4982: checking LIBPCRE_LIBS" >&5 +echo "configure:4985: checking LIBPCRE_LIBS" >&5 LIBPCRE_LIBS=`$PKG_CONFIG --libs "libpcre"` echo "$ac_t""$LIBPCRE_LIBS" 1>&6 else @@ -5007,7 +5010,7 @@ echo "configure:4982: checking LIBPCRE_LIBS" >&5 LIBS="$LIBPCRE_LIBS $LIBS" fi echo $ac_n "checking for pcre_compile in -lpcre""... $ac_c" 1>&6 -echo "configure:5013: checking for pcre_compile in -lpcre" >&5 +echo "configure:5016: checking for pcre_compile in -lpcre" >&5 ac_lib_var=`echo pcre'_'pcre_compile | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5015,7 +5018,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpcre $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5057,17 +5060,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5063: checking for $ac_hdr" >&5 +echo "configure:5066: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5103,12 +5106,12 @@ EOF for ac_func in regcomp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5109: checking for $ac_func" >&5 +echo "configure:5112: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5159,17 +5162,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5165: checking for $ac_hdr" >&5 +echo "configure:5168: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5204,7 +5207,7 @@ EOF fi fi echo $ac_n "checking for fmod in -lm""... $ac_c" 1>&6 -echo "configure:5210: checking for fmod in -lm" >&5 +echo "configure:5213: checking for fmod in -lm" >&5 ac_lib_var=`echo m'_'fmod | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5212,7 +5215,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5254,7 +5257,7 @@ fi cf_use_graphics=no echo $ac_n "checking if you want to use graphics""... $ac_c" 1>&6 -echo "configure:5260: checking if you want to use graphics" >&5 +echo "configure:5263: checking if you want to use graphics" >&5 # Check whether --enable-graphics or --disable-graphics was given. if test "${enable_graphics+set}" = set; then enableval="$enable_graphics" @@ -5264,7 +5267,7 @@ fi echo "$ac_t""$cf_use_graphics" 1>&6 echo $ac_n "checking if you want to enable UTF-8 terminal""... $ac_c" 1>&6 -echo "configure:5270: checking if you want to enable UTF-8 terminal" >&5 +echo "configure:5273: checking if you want to enable UTF-8 terminal" >&5 cf_enable_utf8=yes # Check whether --enable-utf8 or --disable-utf8 was given. if test "${enable_utf8+set}" = set; then @@ -5288,12 +5291,12 @@ fi for ac_func in clock_gettime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5294: checking for $ac_func" >&5 +echo "configure:5297: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5342,7 +5345,7 @@ done if test $ac_cv_func_clock_gettime = no; then echo $ac_n "checking for clock_gettime in -lrt""... $ac_c" 1>&6 -echo "configure:5348: checking for clock_gettime in -lrt" >&5 +echo "configure:5351: checking for clock_gettime in -lrt" >&5 ac_lib_var=`echo rt'_'clock_gettime | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5350,7 +5353,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5397,12 +5400,12 @@ EOF fi echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:5403: checking for socket" >&5 +echo "configure:5406: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -5447,7 +5450,7 @@ fi if test "$cf_result" = no; then echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:5453: checking for socket in -lsocket" >&5 +echo "configure:5456: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5455,7 +5458,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5495,7 +5498,7 @@ fi if test "$ac_cv_lib_socket_socket" = no; then echo $ac_n "checking for socket in -lxnet""... $ac_c" 1>&6 -echo "configure:5501: checking for socket in -lxnet" >&5 +echo "configure:5504: checking for socket in -lxnet" >&5 ac_lib_var=`echo xnet'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5503,7 +5506,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lxnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5543,7 +5546,7 @@ fi if test "$ac_cv_lib_xnet_socket" = no; then echo $ac_n "checking for socket in -lnetwork""... $ac_c" 1>&6 -echo "configure:5549: checking for socket in -lnetwork" >&5 +echo "configure:5552: checking for socket in -lnetwork" >&5 ac_lib_var=`echo network'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5551,7 +5554,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnetwork $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5591,7 +5594,7 @@ fi if test "$ac_cv_lib_network_socket" = no; then echo $ac_n "checking for socket in -lwatt""... $ac_c" 1>&6 -echo "configure:5597: checking for socket in -lwatt" >&5 +echo "configure:5600: checking for socket in -lwatt" >&5 ac_lib_var=`echo watt'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5599,7 +5602,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lwatt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5645,12 +5648,12 @@ fi fi fi echo $ac_n "checking for setsockopt""... $ac_c" 1>&6 -echo "configure:5651: checking for setsockopt" >&5 +echo "configure:5654: checking for setsockopt" >&5 if eval "test \"`echo '$''{'ac_cv_func_setsockopt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setsockopt=yes" else @@ -5695,7 +5698,7 @@ fi if test "$cf_result" = no; then echo $ac_n "checking for setsockopt in -lsocket""... $ac_c" 1>&6 -echo "configure:5701: checking for setsockopt in -lsocket" >&5 +echo "configure:5704: checking for setsockopt in -lsocket" >&5 ac_lib_var=`echo socket'_'setsockopt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5703,7 +5706,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5744,12 +5747,12 @@ fi fi echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:5750: checking for gethostbyname" >&5 +echo "configure:5753: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -5794,7 +5797,7 @@ fi if test "$cf_result" = no; then echo $ac_n "checking for gethostbyname in -lsocket""... $ac_c" 1>&6 -echo "configure:5800: checking for gethostbyname in -lsocket" >&5 +echo "configure:5803: checking for gethostbyname in -lsocket" >&5 ac_lib_var=`echo socket'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5802,7 +5805,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5843,7 +5846,7 @@ fi cf_result="$ac_cv_lib_socket_gethostbyname" if test "$ac_cv_lib_socket_gethostbyname" = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:5849: checking for gethostbyname in -lnsl" >&5 +echo "configure:5852: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5851,7 +5854,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5899,7 +5902,7 @@ EOF if test "$cf_result" = yes && test "$ac_cv_have_watcom" = yes -o "`uname -s`" = SunOS; then echo $ac_n "checking for flawed gethostbyname""... $ac_c" 1>&6 -echo "configure:5905: checking for flawed gethostbyname" >&5 +echo "configure:5908: checking for flawed gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_gethostbyname_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5907,7 +5910,7 @@ else ac_cv_gethostbyname_bug="$ac_cv_have_watcom" else cat > conftest.$ac_ext < @@ -5917,7 +5920,7 @@ else } EOF -if { (eval echo configure:5923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_gethostbyname_bug=no else @@ -5950,12 +5953,12 @@ if test "$disable_getaddrinfo" != yes; then for ac_func in getaddrinfo freeaddrinfo gai_strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5956: checking for $ac_func" >&5 +echo "configure:5959: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6014,12 +6017,12 @@ fi for ac_func in inet_ntop inet_pton herror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6020: checking for $ac_func" >&5 +echo "configure:6023: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6075,12 +6078,12 @@ fi echo $ac_n "checking for ipv6""... $ac_c" 1>&6 -echo "configure:6081: checking for ipv6" >&5 +echo "configure:6084: checking for ipv6" >&5 if eval "test \"`echo '$''{'ac_cv_have_ipv6'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6094,7 +6097,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_ipv6=yes else @@ -6118,12 +6121,12 @@ else cf_have_ipv6=no fi echo $ac_n "checking for sockaddr_in6.sin6_scope_id""... $ac_c" 1>&6 -echo "configure:6124: checking for sockaddr_in6.sin6_scope_id" >&5 +echo "configure:6127: checking for sockaddr_in6.sin6_scope_id" >&5 if eval "test \"`echo '$''{'ac_cv_have_sin6_scope_id'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6137,7 +6140,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_sin6_scope_id=yes else @@ -6169,17 +6172,17 @@ if test "$disable_libevent" != yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6175: checking for $ac_hdr" >&5 +echo "configure:6178: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6207,7 +6210,7 @@ done if test "$ac_cv_header_event_h" = yes; then echo $ac_n "checking for event_loop in -levent""... $ac_c" 1>&6 -echo "configure:6213: checking for event_loop in -levent" >&5 +echo "configure:6216: checking for event_loop in -levent" >&5 ac_lib_var=`echo event'_'event_loop | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6215,7 +6218,7 @@ else ac_save_LIBS="$LIBS" LIBS="-levent $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6260,7 +6263,7 @@ fi if test "$cf_have_libevent" = no; then if test "$ac_cv_header_event_h" = yes -o "$ac_cv_header_ev_event_h" = yes; then echo $ac_n "checking for event_loop in -lev""... $ac_c" 1>&6 -echo "configure:6266: checking for event_loop in -lev" >&5 +echo "configure:6269: checking for event_loop in -lev" >&5 ac_lib_var=`echo ev'_'event_loop | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6268,7 +6271,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lev $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6316,12 +6319,12 @@ if test "$cf_have_libevent" != no; then for ac_func in event_base_set event_get_version event_get_method event_base_free event_base_new event_reinit event_base_get_method event_config_set_flag event_get_struct_event_size do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6322: checking for $ac_func" >&5 +echo "configure:6325: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6372,7 +6375,7 @@ fi if test "$cf_use_graphics" != no; then echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6 -echo "configure:6378: checking for pow in -lm" >&5 +echo "configure:6381: checking for pow in -lm" >&5 ac_lib_var=`echo m'_'pow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6380,7 +6383,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6420,7 +6423,7 @@ fi if test "$ac_cv_lib_m_pow" = no; then echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:6426: checking for main in -lm" >&5 +echo "configure:6429: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6428,14 +6431,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6464,19 +6467,19 @@ fi fi echo $ac_n "checking for pow""... $ac_c" 1>&6 -echo "configure:6470: checking for pow" >&5 +echo "configure:6473: checking for pow" >&5 if eval "test \"`echo '$''{'ac_cv_have_pow'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { volatile double a = 1.1; volatile double b = 2.2; return pow(a, b); ; return 0; } EOF -if { (eval echo configure:6482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_pow=yes else @@ -6497,19 +6500,19 @@ EOF fi echo $ac_n "checking for powf""... $ac_c" 1>&6 -echo "configure:6503: checking for powf" >&5 +echo "configure:6506: checking for powf" >&5 if eval "test \"`echo '$''{'ac_cv_have_powf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { volatile float a = 1.1; volatile float b = 2.2; return powf(a, b); ; return 0; } EOF -if { (eval echo configure:6515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_powf=yes else @@ -6546,17 +6549,17 @@ if test "$disable_gpm" != yes -a "$ac_cv_have_djgpp" != yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6552: checking for $ac_hdr" >&5 +echo "configure:6555: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6583,7 +6586,7 @@ fi done echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:6589: checking for Gpm_Open in -lgpm" >&5 +echo "configure:6592: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6591,7 +6594,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6632,12 +6635,12 @@ fi for ac_func in Gpm_GetLibVersion do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6638: checking for $ac_func" >&5 +echo "configure:6641: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6687,12 +6690,12 @@ done if test "$ac_cv_lib_gpm_Gpm_Open" = yes && test "$ac_cv_header_gpm_h" = yes; then cf_have_gpm=yes echo $ac_n "checking for Gpm_Event wdx and wdy""... $ac_c" 1>&6 -echo "configure:6693: checking for Gpm_Event wdx and wdy" >&5 +echo "configure:6696: checking for Gpm_Event wdx and wdy" >&5 if eval "test \"`echo '$''{'ac_cv_have_wdx_wdy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6707,7 +6710,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_wdx_wdy=yes else @@ -6735,21 +6738,21 @@ else fi echo $ac_n "checking for OS/2 threads""... $ac_c" 1>&6 -echo "configure:6741: checking for OS/2 threads" >&5 +echo "configure:6744: checking for OS/2 threads" >&5 if eval "test \"`echo '$''{'ac_cv_have_beginthread'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS_X="$CFLAGS" CFLAGS="$CFLAGS -Zmt" cat > conftest.$ac_ext < int main() { _beginthread(NULL, NULL, 0, NULL) ; return 0; } EOF -if { (eval echo configure:6755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_beginthread=yes else @@ -6775,17 +6778,17 @@ for ac_hdr in atheos/threads.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6781: checking for $ac_hdr" >&5 +echo "configure:6784: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6794: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6814,12 +6817,12 @@ done for ac_func in spawn_thread resume_thread do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6820: checking for $ac_func" >&5 +echo "configure:6823: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6870,12 +6873,12 @@ done for ac_func in MouOpen _read_kbd do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6876: checking for $ac_func" >&5 +echo "configure:6879: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6923,7 +6926,7 @@ fi done echo $ac_n "checking for XFree for OS/2""... $ac_c" 1>&6 -echo "configure:6929: checking for XFree for OS/2" >&5 +echo "configure:6932: checking for XFree for OS/2" >&5 if eval "test \"`echo '$''{'ac_cv_have_x2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6934,14 +6937,14 @@ else CPPFLAGS="$CPPFLAGS_X -I$X11ROOT/XFree86/include" LIBS="$LIBS_X -L$X11ROOT/XFree86/lib -lxf86_gcc" cat > conftest.$ac_ext < int main() { struct winsize win;ptioctl(1, TIOCGWINSZ, &win) ; return 0; } EOF -if { (eval echo configure:6947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_x2=xf86_gcc else @@ -6954,14 +6957,14 @@ rm -f conftest* if test "$ac_cv_have_x2" = no; then LIBS="$LIBS_X -L$X11ROOT/XFree86/lib -lxf86" cat > conftest.$ac_ext < int main() { struct winsize win;ptioctl(1, TIOCGWINSZ, &win) ; return 0; } EOF -if { (eval echo configure:6967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_x2=xf86 else @@ -7011,7 +7014,7 @@ if test -z "$disable_ssl"; then LIBS_X="$LIBS" if test "$static_link" != 0; then echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:7017: checking for dlopen in -ldl" >&5 +echo "configure:7020: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7019,7 +7022,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7058,7 +7061,7 @@ else fi echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:7064: checking for inflate in -lz" >&5 +echo "configure:7067: checking for inflate in -lz" >&5 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7066,7 +7069,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7118,7 +7121,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7124: checking for $ac_word" >&5 +echo "configure:7127: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7162,19 +7165,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for openssl""... $ac_c" 1>&6 -echo "configure:7168: checking for openssl" >&5 +echo "configure:7171: checking for openssl" >&5 if $PKG_CONFIG --exists "openssl" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking OPENSSL_CFLAGS""... $ac_c" 1>&6 -echo "configure:7175: checking OPENSSL_CFLAGS" >&5 +echo "configure:7178: checking OPENSSL_CFLAGS" >&5 OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl"` echo "$ac_t""$OPENSSL_CFLAGS" 1>&6 echo $ac_n "checking OPENSSL_LIBS""... $ac_c" 1>&6 -echo "configure:7180: checking OPENSSL_LIBS" >&5 +echo "configure:7183: checking OPENSSL_LIBS" >&5 OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl"` echo "$ac_t""$OPENSSL_LIBS" 1>&6 else @@ -7206,11 +7209,11 @@ echo "configure:7180: checking OPENSSL_LIBS" >&5 fi if test "$pkgconfig_openssl" = yes; then echo $ac_n "checking for OpenSSL""... $ac_c" 1>&6 -echo "configure:7212: checking for OpenSSL" >&5 +echo "configure:7215: checking for OpenSSL" >&5 CPPFLAGS="$CPPFLAGS_XX $OPENSSL_CFLAGS" LIBS="$OPENSSL_LIBS $LIBS_XX" cat > conftest.$ac_ext < #include @@ -7218,7 +7221,7 @@ int main() { SSL_CTX_new((void *)0) ; return 0; } EOF -if { (eval echo configure:7224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=openssl else @@ -7234,7 +7237,7 @@ rm -f conftest* if test "$cf_result" = no && test "$ssld" != nss; then echo $ac_n "checking for OpenSSL""... $ac_c" 1>&6 -echo "configure:7240: checking for OpenSSL" >&5 +echo "configure:7243: checking for OpenSSL" >&5 if test "$ssld" = yes -o "$ssld" = openssl; then ssld=". /usr /usr/local /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/local/www /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl" fi @@ -7248,7 +7251,7 @@ echo "configure:7240: checking for OpenSSL" >&5 CPPFLAGS="$CPPFLAGS_XX" fi cat > conftest.$ac_ext < #include @@ -7256,7 +7259,7 @@ int main() { SSL_CTX_new((void *)0) ; return 0; } EOF -if { (eval echo configure:7262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=openssl else @@ -7282,7 +7285,7 @@ rm -f conftest* # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7288: checking for $ac_word" >&5 +echo "configure:7291: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7326,19 +7329,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for nss""... $ac_c" 1>&6 -echo "configure:7332: checking for nss" >&5 +echo "configure:7335: checking for nss" >&5 if $PKG_CONFIG --exists "nss" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking NSS_CFLAGS""... $ac_c" 1>&6 -echo "configure:7339: checking NSS_CFLAGS" >&5 +echo "configure:7342: checking NSS_CFLAGS" >&5 NSS_CFLAGS=`$PKG_CONFIG --cflags "nss"` echo "$ac_t""$NSS_CFLAGS" 1>&6 echo $ac_n "checking NSS_LIBS""... $ac_c" 1>&6 -echo "configure:7344: checking NSS_LIBS" >&5 +echo "configure:7347: checking NSS_LIBS" >&5 NSS_LIBS=`$PKG_CONFIG --libs "nss"` echo "$ac_t""$NSS_LIBS" 1>&6 else @@ -7375,16 +7378,16 @@ echo "configure:7344: checking NSS_LIBS" >&5 CPPFLAGS="$CPPFLAGS_X $NSS_CFLAGS" LIBS="-lnss_compat_ossl $NSS_LIBS $LIBS_X" echo $ac_n "checking for NSS-compat-ossl""... $ac_c" 1>&6 -echo "configure:7381: checking for NSS-compat-ossl" >&5 +echo "configure:7384: checking for NSS-compat-ossl" >&5 cat > conftest.$ac_ext < int main() { SSL_CTX_new((void *)0) ; return 0; } EOF -if { (eval echo configure:7390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=nss else @@ -7417,17 +7420,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7423: checking for $ac_hdr" >&5 +echo "configure:7426: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7463,12 +7466,12 @@ EOF for ac_func in ASN1_STRING_get0_data ASN1_STRING_to_UTF8 OPENSSL_cleanup OPENSSL_init_ssl RAND_add RAND_egd RAND_file_name RAND_load_file RAND_write_file SSL_SESSION_is_resumable SSL_get0_verified_chain SSL_get1_peer_certificate SSL_get1_session SSL_load_error_strings SSL_set_security_level X509_VERIFY_PARAM_set_flags X509_check_host X509_check_ip do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7469: checking for $ac_func" >&5 +echo "configure:7472: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7516,12 +7519,12 @@ fi done echo $ac_n "checking for CRYPTO_set_mem_functions without file/line""... $ac_c" 1>&6 -echo "configure:7522: checking for CRYPTO_set_mem_functions without file/line" >&5 +echo "configure:7525: checking for CRYPTO_set_mem_functions without file/line" >&5 if eval "test \"`echo '$''{'ac_cv_have_crypto_set_mem_functions_1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < static int csmf(void *(*m)(size_t), void *(*r)(void *, size_t), void (*f)(void *)) { return 0; } @@ -7530,7 +7533,7 @@ int main() { return (int)(CRYPTO_set_mem_functions - csmf); ; return 0; } EOF -if { (eval echo configure:7536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_crypto_set_mem_functions_1=yes else @@ -7551,12 +7554,12 @@ EOF fi echo $ac_n "checking for CRYPTO_set_mem_functions with file/line""... $ac_c" 1>&6 -echo "configure:7557: checking for CRYPTO_set_mem_functions with file/line" >&5 +echo "configure:7560: checking for CRYPTO_set_mem_functions with file/line" >&5 if eval "test \"`echo '$''{'ac_cv_have_crypto_set_mem_functions_2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < static int csmf(void *(*m)(size_t, const char *, int), void *(*r)(void *, size_t, const char *, int), void (*f)(void *, const char *, int)) { return 0; } @@ -7565,7 +7568,7 @@ int main() { return (int)(CRYPTO_set_mem_functions - csmf); ; return 0; } EOF -if { (eval echo configure:7571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_crypto_set_mem_functions_2=yes else @@ -7633,17 +7636,17 @@ if test "$disable_zlib" != yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7639: checking for $ac_hdr" >&5 +echo "configure:7642: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7670,7 +7673,7 @@ fi done echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:7676: checking for inflate in -lz" >&5 +echo "configure:7679: checking for inflate in -lz" >&5 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7678,7 +7681,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7730,17 +7733,17 @@ if test "$disable_brotli" != yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7736: checking for $ac_hdr" >&5 +echo "configure:7739: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7767,7 +7770,7 @@ fi done echo $ac_n "checking for BrotliDecoderDecompressStream in -lbrotlidec""... $ac_c" 1>&6 -echo "configure:7773: checking for BrotliDecoderDecompressStream in -lbrotlidec" >&5 +echo "configure:7776: checking for BrotliDecoderDecompressStream in -lbrotlidec" >&5 ac_lib_var=`echo brotlidec'_'BrotliDecoderDecompressStream | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7775,7 +7778,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbrotlidec $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7827,17 +7830,17 @@ if test "$disable_zstd" != yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7833: checking for $ac_hdr" >&5 +echo "configure:7836: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7864,7 +7867,7 @@ fi done echo $ac_n "checking for ZSTD_decompressStream in -lzstd""... $ac_c" 1>&6 -echo "configure:7870: checking for ZSTD_decompressStream in -lzstd" >&5 +echo "configure:7873: checking for ZSTD_decompressStream in -lzstd" >&5 ac_lib_var=`echo zstd'_'ZSTD_decompressStream | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7872,7 +7875,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lzstd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7914,12 +7917,12 @@ fi for ac_func in ZSTD_getErrorCode do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7920: checking for $ac_func" >&5 +echo "configure:7923: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7979,17 +7982,17 @@ if test "$disable_bzip2" != yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7985: checking for $ac_hdr" >&5 +echo "configure:7988: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8016,7 +8019,7 @@ fi done echo $ac_n "checking for BZ2_bzDecompress in -lbz2""... $ac_c" 1>&6 -echo "configure:8022: checking for BZ2_bzDecompress in -lbz2" >&5 +echo "configure:8025: checking for BZ2_bzDecompress in -lbz2" >&5 ac_lib_var=`echo bz2'_'BZ2_bzDecompress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8024,7 +8027,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbz2 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8076,17 +8079,17 @@ if test "$disable_lzma" != yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8082: checking for $ac_hdr" >&5 +echo "configure:8085: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8095: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8113,7 +8116,7 @@ fi done echo $ac_n "checking for lzma_auto_decoder in -llzma""... $ac_c" 1>&6 -echo "configure:8119: checking for lzma_auto_decoder in -llzma" >&5 +echo "configure:8122: checking for lzma_auto_decoder in -llzma" >&5 ac_lib_var=`echo lzma'_'lzma_auto_decoder | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8121,7 +8124,7 @@ else ac_save_LIBS="$LIBS" LIBS="-llzma $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8173,17 +8176,17 @@ if test "$disable_lzip" != yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8179: checking for $ac_hdr" >&5 +echo "configure:8182: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8192: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8210,7 +8213,7 @@ fi done echo $ac_n "checking for LZ_decompress_open in -llz""... $ac_c" 1>&6 -echo "configure:8216: checking for LZ_decompress_open in -llz" >&5 +echo "configure:8219: checking for LZ_decompress_open in -llz" >&5 ac_lib_var=`echo lz'_'LZ_decompress_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8218,7 +8221,7 @@ else ac_save_LIBS="$LIBS" LIBS="-llz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8284,7 +8287,7 @@ fi cf_have_openmp=no if test "$disable_openmp" != yes; then echo $ac_n "checking for OpenMP""... $ac_c" 1>&6 -echo "configure:8290: checking for OpenMP" >&5 +echo "configure:8293: checking for OpenMP" >&5 if eval "test \"`echo '$''{'ac_cv_have_openmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8293,7 +8296,7 @@ else CFLAGS_X="$CFLAGS" CFLAGS="$CFLAGS $openmp_cflags" cat > conftest.$ac_ext < int main() { @@ -8315,7 +8318,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_openmp="$openmp_cflags" else @@ -8403,7 +8406,7 @@ if test "$disable_svgalib" != yes; then LIBS_X="$LIBS" if test "$static_link" != 0; then echo $ac_n "checking for LRMI_init in -lx86""... $ac_c" 1>&6 -echo "configure:8409: checking for LRMI_init in -lx86" >&5 +echo "configure:8412: checking for LRMI_init in -lx86" >&5 ac_lib_var=`echo x86'_'LRMI_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 @@ -8411,7 +8414,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx86 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8452,19 +8455,19 @@ fi fi LIBS="-lvga $LIBS" echo $ac_n "checking for svgalib""... $ac_c" 1>&6 -echo "configure:8458: checking for svgalib" >&5 +echo "configure:8461: checking for svgalib" >&5 if eval "test \"`echo '$''{'ac_cv_have_svgalib'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { vga_setmode(0) ; return 0; } EOF -if { (eval echo configure:8470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_svgalib=yes else @@ -8483,12 +8486,12 @@ echo "$ac_t""$ac_cv_have_svgalib" 1>&6 for ac_func in vga_runinbackground_version mouse_getposition_6d do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8489: checking for $ac_func" >&5 +echo "configure:8492: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8550,17 +8553,17 @@ if test "$disable_fb" != yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8556: checking for $ac_hdr" >&5 +echo "configure:8559: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8566: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8599,7 +8602,7 @@ if test "$disable_directfb" != yes; then # Extract the first word of "directfb-config", so it can be a program name with args. set dummy directfb-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8605: checking for $ac_word" >&5 +echo "configure:8608: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DIRECTFB_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8634,7 +8637,7 @@ fi if test "$DIRECTFB_CONFIG" != "no"; then echo $ac_n "checking for DirectFB >= 0.9.17""... $ac_c" 1>&6 -echo "configure:8640: checking for DirectFB >= 0.9.17" >&5 +echo "configure:8643: checking for DirectFB >= 0.9.17" >&5 directfb_version=`$DIRECTFB_CONFIG --version` if expr $directfb_version \>= 0.9.17 >/dev/null; then echo "$ac_t""yes" 1>&6 @@ -8654,7 +8657,7 @@ echo "configure:8640: checking for DirectFB >= 0.9.17" >&5 # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8660: checking for $ac_word" >&5 +echo "configure:8663: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8698,19 +8701,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for directfb""... $ac_c" 1>&6 -echo "configure:8704: checking for directfb" >&5 +echo "configure:8707: checking for directfb" >&5 if $PKG_CONFIG --exists "directfb" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking DIRECTFB_CFLAGS""... $ac_c" 1>&6 -echo "configure:8711: checking DIRECTFB_CFLAGS" >&5 +echo "configure:8714: checking DIRECTFB_CFLAGS" >&5 DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags "directfb"` echo "$ac_t""$DIRECTFB_CFLAGS" 1>&6 echo $ac_n "checking DIRECTFB_LIBS""... $ac_c" 1>&6 -echo "configure:8716: checking DIRECTFB_LIBS" >&5 +echo "configure:8719: checking DIRECTFB_LIBS" >&5 DIRECTFB_LIBS=`$PKG_CONFIG --libs "directfb"` echo "$ac_t""$DIRECTFB_LIBS" 1>&6 else @@ -8749,19 +8752,19 @@ echo "configure:8716: checking DIRECTFB_LIBS" >&5 LIBS="$DIRECTFB_LIBS $LIBS" echo $ac_n "checking for DirectFBInit""... $ac_c" 1>&6 -echo "configure:8755: checking for DirectFBInit" >&5 +echo "configure:8758: checking for DirectFBInit" >&5 if eval "test \"`echo '$''{'ac_cv_have_directfbinit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { DirectFBInit(NULL, NULL) ; return 0; } EOF -if { (eval echo configure:8767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_directfbinit=yes else @@ -8798,7 +8801,7 @@ if test "$disable_x" != yes; then # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:8804: checking for X" >&5 +echo "configure:8807: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -8860,12 +8863,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8938,14 +8941,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -9038,7 +9041,7 @@ fi if test "$static_link" != 0; then echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:9036: checking for pthread_create in -lpthread" >&5 +echo "configure:9039: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9046,7 +9049,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9085,7 +9088,7 @@ else fi echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:9083: checking for dlopen in -ldl" >&5 +echo "configure:9086: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9093,7 +9096,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9132,7 +9135,7 @@ else fi echo $ac_n "checking for XdmcpWrap in -lXdmcp""... $ac_c" 1>&6 -echo "configure:9130: checking for XdmcpWrap in -lXdmcp" >&5 +echo "configure:9133: checking for XdmcpWrap in -lXdmcp" >&5 ac_lib_var=`echo Xdmcp'_'XdmcpWrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9140,7 +9143,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXdmcp $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9179,7 +9182,7 @@ else fi echo $ac_n "checking for XauGetBestAuthByAddr in -lXau""... $ac_c" 1>&6 -echo "configure:9177: checking for XauGetBestAuthByAddr in -lXau" >&5 +echo "configure:9180: checking for XauGetBestAuthByAddr in -lXau" >&5 ac_lib_var=`echo Xau'_'XauGetBestAuthByAddr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9187,7 +9190,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXau $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9226,7 +9229,7 @@ else fi echo $ac_n "checking for xcb_connect in -lxcb""... $ac_c" 1>&6 -echo "configure:9224: checking for xcb_connect in -lxcb" >&5 +echo "configure:9227: checking for xcb_connect in -lxcb" >&5 ac_lib_var=`echo xcb'_'xcb_connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9234,7 +9237,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lxcb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9273,7 +9276,7 @@ else fi echo $ac_n "checking for xcb_get_request_sent in -lxcb-xlib""... $ac_c" 1>&6 -echo "configure:9271: checking for xcb_get_request_sent in -lxcb-xlib" >&5 +echo "configure:9274: checking for xcb_get_request_sent in -lxcb-xlib" >&5 ac_lib_var=`echo xcb-xlib'_'xcb_get_request_sent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9281,7 +9284,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lxcb-xlib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9331,17 +9334,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9329: checking for $ac_hdr" >&5 +echo "configure:9332: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9339: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9371,12 +9374,12 @@ done for ac_func in XOpenDisplay XOpenIM XCloseIM XCreateIC XDestroyIC XwcLookupString Xutf8LookupString XSupportsLocale XmbTextListToTextProperty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9369: checking for $ac_func" >&5 +echo "configure:9372: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9425,19 +9428,19 @@ done echo $ac_n "checking for Xsetlocale""... $ac_c" 1>&6 -echo "configure:9423: checking for Xsetlocale" >&5 +echo "configure:9426: checking for Xsetlocale" >&5 if eval "test \"`echo '$''{'ac_cv_have_Xsetlocale'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { setlocale(0, NULL); return 0; ; return 0; } EOF -if { (eval echo configure:9435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_Xsetlocale=yes else @@ -9474,12 +9477,12 @@ fi if test "$disable_pmshell" != yes && test "$ac_cv_header_sys_fmutex_h" = yes && test "$ac_cv_have_beginthread" = yes; then echo $ac_n "checking for pmshell""... $ac_c" 1>&6 -echo "configure:9472: checking for pmshell" >&5 +echo "configure:9475: checking for pmshell" >&5 if eval "test \"`echo '$''{'ac_cv_have_pmshell'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_pmshell=yes else @@ -9521,17 +9524,17 @@ if test "$disable_windows" != yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9519: checking for $ac_hdr" >&5 +echo "configure:9522: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9532: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9558,12 +9561,12 @@ fi done echo $ac_n "checking for ReleaseDC""... $ac_c" 1>&6 -echo "configure:9556: checking for ReleaseDC" >&5 +echo "configure:9559: checking for ReleaseDC" >&5 if eval "test \"`echo '$''{'ac_cv_have_windows11'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -9572,7 +9575,7 @@ int main() { ReleaseDC(NULL, NULL) ; return 0; } EOF -if { (eval echo configure:9570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_windows11=yes else @@ -9589,12 +9592,12 @@ echo "$ac_t""$ac_cv_have_windows11" 1>&6 if test "$ac_cv_have_windows11" = no; then LIBS="-luser32 $LIBS" echo $ac_n "checking for ReleaseDC in -luser32""... $ac_c" 1>&6 -echo "configure:9587: checking for ReleaseDC in -luser32" >&5 +echo "configure:9590: checking for ReleaseDC in -luser32" >&5 if eval "test \"`echo '$''{'ac_cv_have_windows12'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -9603,7 +9606,7 @@ int main() { ReleaseDC(NULL, NULL) ; return 0; } EOF -if { (eval echo configure:9601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_windows12=yes else @@ -9619,12 +9622,12 @@ fi echo "$ac_t""$ac_cv_have_windows12" 1>&6 fi echo $ac_n "checking for GdiFlush""... $ac_c" 1>&6 -echo "configure:9617: checking for GdiFlush" >&5 +echo "configure:9620: checking for GdiFlush" >&5 if eval "test \"`echo '$''{'ac_cv_have_windows21'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -9633,7 +9636,7 @@ int main() { GdiFlush() ; return 0; } EOF -if { (eval echo configure:9631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_windows21=yes else @@ -9650,12 +9653,12 @@ echo "$ac_t""$ac_cv_have_windows21" 1>&6 if test "$ac_cv_have_windows21" = no; then LIBS="-lgdi32 $LIBS" echo $ac_n "checking for GdiFlush in -lgdi32""... $ac_c" 1>&6 -echo "configure:9648: checking for GdiFlush in -lgdi32" >&5 +echo "configure:9651: checking for GdiFlush in -lgdi32" >&5 if eval "test \"`echo '$''{'ac_cv_have_windows22'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -9664,7 +9667,7 @@ int main() { GdiFlush() ; return 0; } EOF -if { (eval echo configure:9662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_windows22=yes else @@ -9698,17 +9701,17 @@ if test "$disable_atheos" != yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9696: checking for $ac_hdr" >&5 +echo "configure:9699: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9744,7 +9747,7 @@ done test "$ac_cv_header_util_locker_h" = yes && test "$ac_cv_header_util_application_h" = yes; then echo $ac_n "checking for main in -lstdc++""... $ac_c" 1>&6 -echo "configure:9742: checking for main in -lstdc++" >&5 +echo "configure:9745: checking for main in -lstdc++" >&5 ac_lib_var=`echo stdc++'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9752,14 +9755,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lstdc++ $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9787,7 +9790,7 @@ else fi echo $ac_n "checking for main in -latheos""... $ac_c" 1>&6 -echo "configure:9785: checking for main in -latheos" >&5 +echo "configure:9788: checking for main in -latheos" >&5 ac_lib_var=`echo atheos'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9795,14 +9798,14 @@ else ac_save_LIBS="$LIBS" LIBS="-latheos $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9831,7 +9834,7 @@ fi if test "$ac_cv_lib_atheos_main" = no; then echo $ac_n "checking for main in -lsyllable""... $ac_c" 1>&6 -echo "configure:9829: checking for main in -lsyllable" >&5 +echo "configure:9832: checking for main in -lsyllable" >&5 ac_lib_var=`echo syllable'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9839,14 +9842,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsyllable $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9880,7 +9883,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9878: checking for $ac_word" >&5 +echo "configure:9881: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9912,7 +9915,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:9910: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:9913: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -9923,12 +9926,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 9921 "configure" +#line 9924 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:9926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -9954,12 +9957,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:9952: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:9955: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:9957: checking whether we are using GNU C++" >&5 +echo "configure:9960: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9968,7 +9971,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:9966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:9969: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -9987,7 +9990,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:9985: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:9988: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10035,17 +10038,17 @@ if test "$disable_haiku" != yes ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10033: checking for $ac_hdr" >&5 +echo "configure:10036: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10080,7 +10083,7 @@ done test "$ac_cv_header_support_Locker_h" = yes && test "$ac_cv_header_app_Application_h" = yes; then echo $ac_n "checking for main in -lstdc++""... $ac_c" 1>&6 -echo "configure:10078: checking for main in -lstdc++" >&5 +echo "configure:10081: checking for main in -lstdc++" >&5 ac_lib_var=`echo stdc++'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10088,14 +10091,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lstdc++ $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10123,7 +10126,7 @@ else fi echo $ac_n "checking for main in -lbe""... $ac_c" 1>&6 -echo "configure:10121: checking for main in -lbe" >&5 +echo "configure:10124: checking for main in -lbe" >&5 ac_lib_var=`echo be'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10131,14 +10134,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lbe $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10171,7 +10174,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:10169: checking for $ac_word" >&5 +echo "configure:10172: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10203,7 +10206,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:10201: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:10204: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -10214,12 +10217,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 10212 "configure" +#line 10215 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:10217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -10245,12 +10248,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:10243: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:10246: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:10248: checking whether we are using GNU C++" >&5 +echo "configure:10251: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10259,7 +10262,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:10257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:10260: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -10278,7 +10281,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:10276: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:10279: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10325,17 +10328,17 @@ if test "$disable_grx" != yes -a "$ac_cv_have_djgpp" = yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10323: checking for $ac_hdr" >&5 +echo "configure:10326: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10336: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10362,7 +10365,7 @@ fi done echo $ac_n "checking for GrSetMode in -lgrx20""... $ac_c" 1>&6 -echo "configure:10360: checking for GrSetMode in -lgrx20" >&5 +echo "configure:10363: checking for GrSetMode in -lgrx20" >&5 ac_lib_var=`echo grx20'_'GrSetMode | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10370,7 +10373,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgrx20 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10447,7 +10450,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:10445: checking for $ac_word" >&5 +echo "configure:10448: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10491,19 +10494,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for freetype2 fontconfig""... $ac_c" 1>&6 -echo "configure:10489: checking for freetype2 fontconfig" >&5 +echo "configure:10492: checking for freetype2 fontconfig" >&5 if $PKG_CONFIG --exists "freetype2 fontconfig" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBFREETYPE_CFLAGS""... $ac_c" 1>&6 -echo "configure:10496: checking LIBFREETYPE_CFLAGS" >&5 +echo "configure:10499: checking LIBFREETYPE_CFLAGS" >&5 LIBFREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 fontconfig"` echo "$ac_t""$LIBFREETYPE_CFLAGS" 1>&6 echo $ac_n "checking LIBFREETYPE_LIBS""... $ac_c" 1>&6 -echo "configure:10501: checking LIBFREETYPE_LIBS" >&5 +echo "configure:10504: checking LIBFREETYPE_LIBS" >&5 LIBFREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 fontconfig"` echo "$ac_t""$LIBFREETYPE_LIBS" 1>&6 else @@ -10542,17 +10545,17 @@ echo "configure:10501: checking LIBFREETYPE_LIBS" >&5 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10540: checking for $ac_hdr" >&5 +echo "configure:10543: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10550: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10553: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10581,12 +10584,12 @@ done for ac_func in FcInit FT_Init_FreeType do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10579: checking for $ac_func" >&5 +echo "configure:10582: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10635,7 +10638,7 @@ done if test "$ac_cv_func_FT_Init_FreeType" != yes; then echo $ac_n "checking for FT_Init_FreeType in -lfreetype""... $ac_c" 1>&6 -echo "configure:10633: checking for FT_Init_FreeType in -lfreetype" >&5 +echo "configure:10636: checking for FT_Init_FreeType in -lfreetype" >&5 ac_lib_var=`echo freetype'_'FT_Init_FreeType | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10643,7 +10646,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lfreetype $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10684,7 +10687,7 @@ fi fi if test "$ac_cv_func_FcInit" != yes; then echo $ac_n "checking for FcInit in -lfontconfig""... $ac_c" 1>&6 -echo "configure:10682: checking for FcInit in -lfontconfig" >&5 +echo "configure:10685: checking for FcInit in -lfontconfig" >&5 ac_lib_var=`echo fontconfig'_'FcInit | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10692,7 +10695,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lfontconfig $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10737,12 +10740,12 @@ fi for ac_func in FcGetVersion FT_Library_Version do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10735: checking for $ac_func" >&5 +echo "configure:10738: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10813,7 +10816,7 @@ fi if test "$static_link" != 0; then echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:10811: checking for inflate in -lz" >&5 +echo "configure:10814: checking for inflate in -lz" >&5 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10821,7 +10824,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10868,7 +10871,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:10866: checking for $ac_word" >&5 +echo "configure:10869: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10912,19 +10915,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for libpng >= 1.0.0""... $ac_c" 1>&6 -echo "configure:10910: checking for libpng >= 1.0.0" >&5 +echo "configure:10913: checking for libpng >= 1.0.0" >&5 if $PKG_CONFIG --exists "libpng >= 1.0.0" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBPNG_CFLAGS""... $ac_c" 1>&6 -echo "configure:10917: checking LIBPNG_CFLAGS" >&5 +echo "configure:10920: checking LIBPNG_CFLAGS" >&5 LIBPNG_CFLAGS=`$PKG_CONFIG --cflags "libpng >= 1.0.0"` echo "$ac_t""$LIBPNG_CFLAGS" 1>&6 echo $ac_n "checking LIBPNG_LIBS""... $ac_c" 1>&6 -echo "configure:10922: checking LIBPNG_LIBS" >&5 +echo "configure:10925: checking LIBPNG_LIBS" >&5 LIBPNG_LIBS=`$PKG_CONFIG --libs "libpng >= 1.0.0"` echo "$ac_t""$LIBPNG_LIBS" 1>&6 else @@ -10964,7 +10967,7 @@ echo "configure:10922: checking LIBPNG_LIBS" >&5 # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:10962: checking for $ac_word" >&5 +echo "configure:10965: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11008,19 +11011,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for libpng12""... $ac_c" 1>&6 -echo "configure:11006: checking for libpng12" >&5 +echo "configure:11009: checking for libpng12" >&5 if $PKG_CONFIG --exists "libpng12" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBPNG12_CFLAGS""... $ac_c" 1>&6 -echo "configure:11013: checking LIBPNG12_CFLAGS" >&5 +echo "configure:11016: checking LIBPNG12_CFLAGS" >&5 LIBPNG12_CFLAGS=`$PKG_CONFIG --cflags "libpng12"` echo "$ac_t""$LIBPNG12_CFLAGS" 1>&6 echo $ac_n "checking LIBPNG12_LIBS""... $ac_c" 1>&6 -echo "configure:11018: checking LIBPNG12_LIBS" >&5 +echo "configure:11021: checking LIBPNG12_LIBS" >&5 LIBPNG12_LIBS=`$PKG_CONFIG --libs "libpng12"` echo "$ac_t""$LIBPNG12_LIBS" 1>&6 else @@ -11059,17 +11062,17 @@ echo "configure:11018: checking LIBPNG12_LIBS" >&5 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11057: checking for $ac_hdr" >&5 +echo "configure:11060: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11067: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11098,12 +11101,12 @@ done for ac_func in png_create_info_struct do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11096: checking for $ac_func" >&5 +echo "configure:11099: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11152,7 +11155,7 @@ done if test "$ac_cv_func_png_create_info_struct" != yes; then echo $ac_n "checking for png_create_info_struct in -lpng""... $ac_c" 1>&6 -echo "configure:11150: checking for png_create_info_struct in -lpng" >&5 +echo "configure:11153: checking for png_create_info_struct in -lpng" >&5 ac_lib_var=`echo png'_'png_create_info_struct | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11160,7 +11163,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11206,12 +11209,12 @@ fi for ac_func in png_set_rgb_to_gray png_get_libpng_ver png_get_image_width png_get_image_height png_get_gAMA png_get_color_type png_get_bit_depth png_set_strip_alpha png_get_valid png_get_sRGB do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11204: checking for $ac_func" >&5 +echo "configure:11207: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11281,17 +11284,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11279: checking for $ac_hdr" >&5 +echo "configure:11282: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11318,7 +11321,7 @@ fi done echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6 -echo "configure:11316: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo "configure:11319: checking for jpeg_destroy_decompress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11326,7 +11329,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11384,7 +11387,7 @@ fi if test "$disable_tiff" != yes; then if test "$static_link" != 0; then echo $ac_n "checking for jbg_enc_init in -ljbig""... $ac_c" 1>&6 -echo "configure:11382: checking for jbg_enc_init in -ljbig" >&5 +echo "configure:11385: checking for jbg_enc_init in -ljbig" >&5 ac_lib_var=`echo jbig'_'jbg_enc_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 @@ -11392,7 +11395,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljbig $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11435,17 +11438,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11433: checking for $ac_hdr" >&5 +echo "configure:11436: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11443: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11472,7 +11475,7 @@ fi done echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6 -echo "configure:11470: checking for TIFFClientOpen in -ltiff" >&5 +echo "configure:11473: checking for TIFFClientOpen in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11480,7 +11483,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11554,7 +11557,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:11552: checking for $ac_word" >&5 +echo "configure:11555: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11598,19 +11601,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for librsvg-2.0 >= 2.0.0 cairo""... $ac_c" 1>&6 -echo "configure:11596: checking for librsvg-2.0 >= 2.0.0 cairo" >&5 +echo "configure:11599: checking for librsvg-2.0 >= 2.0.0 cairo" >&5 if $PKG_CONFIG --exists "librsvg-2.0 >= 2.0.0 cairo" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBRSVG_CFLAGS""... $ac_c" 1>&6 -echo "configure:11603: checking LIBRSVG_CFLAGS" >&5 +echo "configure:11606: checking LIBRSVG_CFLAGS" >&5 LIBRSVG_CFLAGS=`$PKG_CONFIG --cflags "librsvg-2.0 >= 2.0.0 cairo"` echo "$ac_t""$LIBRSVG_CFLAGS" 1>&6 echo $ac_n "checking LIBRSVG_LIBS""... $ac_c" 1>&6 -echo "configure:11608: checking LIBRSVG_LIBS" >&5 +echo "configure:11611: checking LIBRSVG_LIBS" >&5 LIBRSVG_LIBS=`$PKG_CONFIG --libs "librsvg-2.0 >= 2.0.0 cairo"` echo "$ac_t""$LIBRSVG_LIBS" 1>&6 else @@ -11649,17 +11652,17 @@ echo "configure:11608: checking LIBRSVG_LIBS" >&5 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11647: checking for $ac_hdr" >&5 +echo "configure:11650: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11660: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11688,12 +11691,12 @@ done for ac_func in rsvg_handle_render_cairo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11686: checking for $ac_func" >&5 +echo "configure:11689: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11742,7 +11745,7 @@ done if test "$ac_cv_func_rsvg_handle_render_cairo" != yes; then echo $ac_n "checking for rsvg_handle_render_cairo in -lrsvg-2""... $ac_c" 1>&6 -echo "configure:11740: checking for rsvg_handle_render_cairo in -lrsvg-2" >&5 +echo "configure:11743: checking for rsvg_handle_render_cairo in -lrsvg-2" >&5 ac_lib_var=`echo rsvg-2'_'rsvg_handle_render_cairo | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11750,7 +11753,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrsvg-2 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11793,12 +11796,12 @@ fi for ac_func in rsvg_handle_read_stream_sync do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11791: checking for $ac_func" >&5 +echo "configure:11794: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11883,7 +11886,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:11881: checking for $ac_word" >&5 +echo "configure:11884: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11927,19 +11930,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for libwebp""... $ac_c" 1>&6 -echo "configure:11925: checking for libwebp" >&5 +echo "configure:11928: checking for libwebp" >&5 if $PKG_CONFIG --exists "libwebp" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBWEBP_CFLAGS""... $ac_c" 1>&6 -echo "configure:11932: checking LIBWEBP_CFLAGS" >&5 +echo "configure:11935: checking LIBWEBP_CFLAGS" >&5 LIBWEBP_CFLAGS=`$PKG_CONFIG --cflags "libwebp"` echo "$ac_t""$LIBWEBP_CFLAGS" 1>&6 echo $ac_n "checking LIBWEBP_LIBS""... $ac_c" 1>&6 -echo "configure:11937: checking LIBWEBP_LIBS" >&5 +echo "configure:11940: checking LIBWEBP_LIBS" >&5 LIBWEBP_LIBS=`$PKG_CONFIG --libs "libwebp"` echo "$ac_t""$LIBWEBP_LIBS" 1>&6 else @@ -11978,17 +11981,17 @@ echo "configure:11937: checking LIBWEBP_LIBS" >&5 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11976: checking for $ac_hdr" >&5 +echo "configure:11979: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11989: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12017,12 +12020,12 @@ done for ac_func in WebPDecodeRGBA do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12015: checking for $ac_func" >&5 +echo "configure:12018: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12071,7 +12074,7 @@ done if test "$ac_cv_func_WebPDecodeRGBA" != yes; then echo $ac_n "checking for WebPDecodeRGBA in -lwebp""... $ac_c" 1>&6 -echo "configure:12069: checking for WebPDecodeRGBA in -lwebp" >&5 +echo "configure:12072: checking for WebPDecodeRGBA in -lwebp" >&5 ac_lib_var=`echo webp'_'WebPDecodeRGBA | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12079,7 +12082,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lwebp $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12122,12 +12125,12 @@ fi for ac_func in WebPFree do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12120: checking for $ac_func" >&5 +echo "configure:12123: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12186,6 +12189,112 @@ EOF fi fi + # Check whether --with-libavif or --without-libavif was given. +if test "${with_libavif+set}" = set; then + withval="$with_libavif" + if test "$withval" = no; then disable_avif=yes; else disable_avif=no; fi +fi + + cf_have_avif=no + if test "$disable_avif" != yes; then + for ac_hdr in avif/avif.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:12199: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:12209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + + echo $ac_n "checking for avifDecoderSetIOMemory in -lavif""... $ac_c" 1>&6 +echo "configure:12236: checking for avifDecoderSetIOMemory in -lavif" >&5 +ac_lib_var=`echo avif'_'avifDecoderSetIOMemory | 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="-lavif $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 + ac_tr_lib=HAVE_LIB`echo avif | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + + if test "$ac_cv_header_avif_avif_h" = yes && test "$ac_cv_lib_avif_avifDecoderSetIOMemory" = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_AVIF 1 +EOF + + cf_have_avif=yes + image_formats="$image_formats AVIF" + fi + fi + + if test -z "$drivers" && test "$cf_use_graphics" != no; then { echo "configure: error: No graphics drivers found." 1>&2; exit 1; } fi @@ -12226,12 +12335,12 @@ test "$ac_cv_have_emx" = yes && LDFLAGS="$LDFLAGS -Zexe" for ac_func in pthread_sigmask do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12224: checking for $ac_func" >&5 +echo "configure:12333: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12281,7 +12390,7 @@ done if test "$ac_cv_func_pthread_sigmask" = yes; then echo $ac_n "checking for pthread_sigmask in -lpthread""... $ac_c" 1>&6 -echo "configure:12279: checking for pthread_sigmask in -lpthread" >&5 +echo "configure:12388: checking for pthread_sigmask in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_sigmask | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12289,7 +12398,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12786,4 +12895,3 @@ if test -n "`echo "$drivers"|grep -w WINDOWS`" -a "$ac_cv_func_uwin_path" = yes; fi - diff --git a/configure.in b/configure.in index 78313af..54d6107 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ AC_INIT(main.c) -AM_INIT_AUTOMAKE(links, 2.28) +AM_INIT_AUTOMAKE(links, 2.29) ACLOCAL="./missing aclocal" AUTOCONF="./missing autoconf" @@ -410,7 +410,8 @@ fi AC_HAVE_FUNCS(memrchr) AC_CACHE_CHECK([for memrchr], ac_cv_have_memrchr, - AC_TRY_LINK([#include ], [char * volatile str = ""; volatile int l = 1; return !!memrchr(str, 0, l);], ac_cv_have_memrchr=yes, ac_cv_have_memrchr=no) + AC_TRY_LINK([#define _GNU_SOURCE +#include ], [char * volatile str = ""; volatile int l = 1; return !!memrchr(str, 0, l);], ac_cv_have_memrchr=yes, ac_cv_have_memrchr=no) ) if test "$ac_cv_have_memrchr" = yes; then AC_DEFINE(HAVE_MEMRCHR) @@ -1489,6 +1490,19 @@ fi fi fi + AC_ARG_WITH(libavif, [ --without-libavif compile without AVIF support],[if test "$withval" = no; then disable_avif=yes; else disable_avif=no; fi]) + cf_have_avif=no + if test "$disable_avif" != yes; then + AC_CHECK_HEADERS(avif/avif.h) + AC_CHECK_LIB(avif, avifDecoderSetIOMemory) + if test "$ac_cv_header_avif_avif_h" = yes && test "$ac_cv_lib_avif_avifDecoderSetIOMemory" = yes; then + AC_DEFINE(HAVE_AVIF) + cf_have_avif=yes + image_formats="$image_formats AVIF" + fi + fi + + if test -z "$drivers" && test "$cf_use_graphics" != no; then AC_MSG_ERROR([No graphics drivers found.]) dnl else @@ -1577,4 +1591,3 @@ fi dnl mv Makefile Makefile.tmp dnl grep -v DEPS_MAGIC Makefile.tmp >Makefile dnl rm Makefile.tmp - diff --git a/descrip.mms b/descrip.mms index 97f12d7..6309c3d 100644 --- a/descrip.mms +++ b/descrip.mms @@ -76,7 +76,7 @@ CFLAGS=/DEFINE=(HAVE_CONFIG_VMS_H$(DEFS_OPTIMIZE)$(DEFS_SSL)$(DEFS_GFX)) /INCLUD LINKFLAGS=$(LIBS_SSL)$(LIBS_GFX)/MAP/FULL/THREADS_ENABLE -OBJS=AF_UNIX.OBJ,AUTH.OBJ,BEOS.OBJ,BFU.OBJ,BLOCK.OBJ,BOOKMARK.OBJ,CACHE.OBJ,CHARSETS.OBJ,COMPRESS.OBJ,CONNECT.OBJ,COOKIES.OBJ,DATA.OBJ,DEFAULT.OBJ,DIP.OBJ,DIRECTFB.OBJ,DITHER.OBJ,DNS.OBJ,DOH.OBJ,DOS.OBJ,DRIVERS.OBJ,ERROR.OBJ,FILE.OBJ,FINGER.OBJ,FN_IMPL.OBJ,FONT_INC.OBJ,FRAMEBUF.OBJ,FTP.OBJ,GIF.OBJ,HPUX.OBJ,HTML.OBJ,HTML_GR.OBJ,HTML_R.OBJ,HTML_TBL.OBJ,HTTP.OBJ,HTTPS.OBJ,IMG.OBJ,IMGCACHE.OBJ,JPEG.OBJ,JSINT.OBJ,KBD.OBJ,LANGUAGE.OBJ,LISTEDIT.OBJ,LRU.OBJ,MAILTO.OBJ,MAIN.OBJ,MEMORY.OBJ,MENU.OBJ,OBJREQ.OBJ,OS_DEP.OBJ,PMSHELL.OBJ,PNG.OBJ,SCHED.OBJ,SELECT.OBJ,SESSION.OBJ,SMB.OBJ,STRING.OBJ,SUFFIX.OBJ,SVG.OBJ,SVGALIB.OBJ,TERMINAL.OBJ,TIFF.OBJ,TYPES.OBJ,URL.OBJ,VIEW.OBJ,VIEW_GR.OBJ,VMS.OBJ,WEBP.OBJ,X.OBJ,XBM.OBJ +OBJS=AF_UNIX.OBJ,AUTH.OBJ,AVIF.OBJ,BEOS.OBJ,BFU.OBJ,BLOCK.OBJ,BOOKMARK.OBJ,CACHE.OBJ,CHARSETS.OBJ,COMPRESS.OBJ,CONNECT.OBJ,COOKIES.OBJ,DATA.OBJ,DEFAULT.OBJ,DIP.OBJ,DIRECTFB.OBJ,DITHER.OBJ,DNS.OBJ,DOH.OBJ,DOS.OBJ,DRIVERS.OBJ,ERROR.OBJ,FILE.OBJ,FINGER.OBJ,FN_IMPL.OBJ,FONT_INC.OBJ,FRAMEBUF.OBJ,FTP.OBJ,GIF.OBJ,HPUX.OBJ,HTML.OBJ,HTML_GR.OBJ,HTML_R.OBJ,HTML_TBL.OBJ,HTTP.OBJ,HTTPS.OBJ,IMG.OBJ,IMGCACHE.OBJ,JPEG.OBJ,JSINT.OBJ,KBD.OBJ,LANGUAGE.OBJ,LISTEDIT.OBJ,LRU.OBJ,MAILTO.OBJ,MAIN.OBJ,MEMORY.OBJ,MENU.OBJ,OBJREQ.OBJ,OS_DEP.OBJ,PMSHELL.OBJ,PNG.OBJ,SCHED.OBJ,SELECT.OBJ,SESSION.OBJ,SMB.OBJ,STRING.OBJ,SUFFIX.OBJ,SVG.OBJ,SVGALIB.OBJ,TERMINAL.OBJ,TIFF.OBJ,TYPES.OBJ,URL.OBJ,VIEW.OBJ,VIEW_GR.OBJ,VMS.OBJ,WEBP.OBJ,X.OBJ,XBM.OBJ LINKS.EXE : $(OBJS) $(LINK) /EXECUTABLE=LINKS.EXE $(OBJS)$(LINKFLAGS) diff --git a/dip.c b/dip.c index b8acd6a..2c75109 100644 --- a/dip.c +++ b/dip.c @@ -1996,11 +1996,14 @@ bypass_freetype: * at least 1 apart * Otherwise g_print_text will print nonsense (but won't segfault) */ -static void get_underline_pos(int height, int *top, int *bottom) +static void get_line_pos(int height, int *top, int *bottom, unsigned style) { int thickness, baseline; thickness=(height+15)/16; - baseline=height/7; + if (style == FF_STRIKE) + baseline=height/2 - height/12; + else + baseline=height/7; if (baseline<=0) baseline=1; if (thickness>baseline) thickness=baseline; *top=height-baseline; @@ -2010,38 +2013,39 @@ static void get_underline_pos(int height, int *top, int *bottom) /* *width will be advanced by the width of the text */ void g_print_text(struct graphics_device *device, int x, int y, struct style *style, unsigned char *text, int *width) { - int top_underline, bottom_underline, original_width, my_width; - unsigned char original_flags; + int top_line, bottom_line, original_width, my_width; + unsigned char original_flags, line_style; struct rect saved_clip; if (y + style->height <= device->clip.y1 || y >= device->clip.y2) goto o; - if (style->flags & FF_UNDERLINE) { - /* Underline */ + if (style->flags & FF_UNDERLINE || style->flags & FF_STRIKE) { + /* Underline or strike */ if (!width) { width = &my_width; *width = 0; } original_flags = style->flags; original_width = *width; - style->flags &= ~FF_UNDERLINE; - get_underline_pos(style->height, &top_underline, &bottom_underline); - restrict_clip_area(device, &saved_clip, 0, 0, device->size.x2, y + top_underline); + line_style = style->flags & FF_UNDERLINE ? FF_UNDERLINE : FF_STRIKE; + style->flags &= ~line_style; + get_line_pos(style->height, &top_line, &bottom_line, line_style); + restrict_clip_area(device, &saved_clip, 0, 0, device->size.x2, y + top_line); g_print_text(device, x, y, style, text, width); set_clip_area(device, &saved_clip); - if (bottom_underline - top_underline == 1) { + if (bottom_line - top_line == 1) { /* Line */ - drv->draw_hline(device, x, y + top_underline, safe_add(x, *width) - original_width, style->underline_color); + drv->draw_hline(device, x, y + top_line, safe_add(x, *width) - original_width, style->line_color); } else { /* Area */ - drv->fill_area(device, x, y + top_underline, safe_add(x, *width) - original_width, y + bottom_underline, style->underline_color); + drv->fill_area(device, x, y + top_line, safe_add(x, *width) - original_width, y + bottom_line, style->line_color); } - if (bottom_underline < style->height) { - /* Do the bottom half only if the underline is above + if (bottom_line < style->height) { + /* Do the bottom half only if the line is above * the bottom of the letters. */ *width = original_width; - restrict_clip_area(device, &saved_clip, 0, y + bottom_underline, device->size.x2, device->size.y2); + restrict_clip_area(device, &saved_clip, 0, y + bottom_line, device->size.x2, device->size.y2); g_print_text(device, x, y, style, text, width); set_clip_area(device, &saved_clip); } @@ -2275,9 +2279,11 @@ struct style *g_invert_style(struct style *old) #ifdef HAVE_FREETYPE st->ft_face = old->ft_face; #endif - if (st->flags & FF_UNDERLINE) { - /* We have to get a foreground color for underlining */ - st->underline_color = dip_get_color_sRGB((st->r1 << 16) | (st->g1 << 8) | (st->b1)); + if (st->flags & FF_UNDERLINE || st->flags & FF_STRIKE) { + /* We have to get a foreground color for underlining and + * striking + */ + st->line_color = dip_get_color_sRGB((st->r1 << 16) | (st->g1 << 8) | (st->b1)); } st->mono_space = old->mono_space; st->mono_height = old->mono_height; @@ -2323,9 +2329,11 @@ struct style *g_get_style_font(int fg, int bg, int size, int fflags, unsigned ch else st->ft_face = freetype_get_font(font); #endif - if (fflags & FF_UNDERLINE) { - /* We have to get a foreground color for underlining */ - st->underline_color = dip_get_color_sRGB(fg); + if (fflags & FF_UNDERLINE || fflags & FF_STRIKE) { + /* We have to get a foreground color for underlining and + * striking + */ + st->line_color = dip_get_color_sRGB(fg); } if (fflags & FF_MONOSPACED) load_metric(st, ' ', &st->mono_space, &st->mono_height); diff --git a/html.c b/html.c index 1d3c4cd..a094866 100644 --- a/html.c +++ b/html.c @@ -967,6 +967,12 @@ static void html_underline(unsigned char *a) format_.attr |= AT_UNDERLINE; } +static void html_strike(unsigned char *a) +{ + get_js_events(a); + format_.attr |= AT_STRIKE; +} + static void html_fixed(unsigned char *a) { get_js_events(a); @@ -1773,6 +1779,16 @@ static void html_button(unsigned char *a) { unsigned char *al; struct form_control *fc; + + if ((al = get_attr_val(a, cast_uchar "class"))) { /* Wikipedia hack */ + if (strstr(cast_const_char al, "vector-toc-toggle") || strstr(cast_const_char al, "vector-pinnable-header-toggle-button")) { + html_top.invisible = INVISIBLE; + mem_free(al); + return; + } + mem_free(al); + } + find_form_for_input(a); fc = mem_calloc(sizeof(struct form_control)); if (!(al = get_attr_val(a, cast_uchar "type"))) { @@ -2777,8 +2793,10 @@ static struct element_info elements[] = { {"EM", html_italic, 0, 0}, {"ABBR", html_italic, 0, 0}, {"U", html_underline, 0, 0}, - {"S", html_underline, 0, 0}, - {"STRIKE", html_underline, 0, 0}, + {"INS", html_underline, 0, 0}, + {"S", html_strike, 0, 0}, + {"DEL", html_strike, 0, 0}, + {"STRIKE", html_strike, 0, 0}, {"FIXED", html_fixed, 0, 0}, {"CODE", html_fixed, 0, 0}, {"TT", html_fixed, 0, 0}, @@ -3184,6 +3202,18 @@ do { \ format_.fontsize = list_struct(e->list_entry.next, struct html_element)->attr.fontsize; ln_break(lnb); while (e->list_entry.prev != &html_stack) kill_html_stack_item(list_struct(e->list_entry.prev, struct html_element)); + if (e->namelen == 4 && !casecmp(e->name, cast_uchar "SPAN", 4)) { /* Wikipedia hack */ + unsigned char *al; + if ((al = get_attr_val(e->options, cast_uchar "class"))) { + if (!strcmp(cast_const_char al, "vector-toc-numb")) + putsp = 1; + mem_free(al); + } + } + if (e->namelen == 2 && (!casecmp(e->name, cast_uchar "UL", 2) || !casecmp(e->name, cast_uchar "OL", 2))) { /* Wikipedia hack */ + while (html < eof && WHITECHAR(*html)) + html++; + } kill_html_stack_item(e); break; } diff --git a/html_gr.c b/html_gr.c index 2114cdc..e98affe 100644 --- a/html_gr.c +++ b/html_gr.c @@ -113,6 +113,7 @@ static struct style *get_style_by_ta(struct text_attrib *ta) fflags = 0; if (ta->attr & AT_UNDERLINE) fflags |= FF_UNDERLINE; + if (ta->attr & AT_STRIKE) fflags |= FF_STRIKE; if (ta->attr & AT_BOLD) fflags |= FF_BOLD; if (ta->attr & AT_ITALIC) fflags |= FF_ITALIC; if (ta->attr & AT_FIXED) fflags |= FF_MONOSPACED; diff --git a/html_r.c b/html_r.c index af4e48f..8b20b87 100644 --- a/html_r.c +++ b/html_r.c @@ -868,6 +868,7 @@ static void put_chars(void *p_, unsigned char *c, int l) fg = fg_color(fg, bg); if (format_.attr & AT_ITALIC) fg = fg ^ 0x01; if (format_.attr & AT_UNDERLINE) fg = (fg ^ 0x04) | 0x08; + if (format_.attr & AT_STRIKE) fg = (fg ^ 0x06); if (format_.attr & AT_BOLD) fg = fg | 0x08; fg = fg_color(fg, bg); if (format_.attr & AT_GRAPHICS) bg = bg | 0x10; diff --git a/http.c b/http.c index 3e1284e..7580827 100644 --- a/http.c +++ b/http.c @@ -551,7 +551,7 @@ static void add_user_agent(unsigned char **hdr, int *l, unsigned char *url) { add_to_str(hdr, l, cast_uchar "User-Agent: "); if (SCRUB_HEADERS) { - add_to_str(hdr, l, cast_uchar "Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0\r\n"); + add_to_str(hdr, l, cast_uchar "Mozilla/5.0 (Windows NT 10.0; rv:102.0) Gecko/20100101 Firefox/102.0\r\n"); } else if (!(*http_options.header.fake_useragent)) { /* @@ -661,7 +661,7 @@ static void add_accept(unsigned char **hdr, int *l, struct connection *c) if (c->doh) { add_to_str(hdr, l, cast_uchar "Accept: application/dns-message\r\n"); } else if (SCRUB_HEADERS) { - add_to_str(hdr, l, cast_uchar "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\n"); + add_to_str(hdr, l, cast_uchar "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8\r\n"); } else { add_to_str(hdr, l, cast_uchar "Accept: */*\r\n"); } diff --git a/img.c b/img.c index c678ef1..e4b78d9 100644 --- a/img.c +++ b/img.c @@ -65,6 +65,11 @@ static void destroy_decoder (struct cached_image *cimg) case IM_WEBP: webp_destroy_decoder(cimg); break; +#endif +#ifdef HAVE_AVIF + case IM_AVIF: + avif_destroy_decoder(cimg); + break; #endif } mem_free(cimg->decoder); @@ -782,6 +787,17 @@ static void type(struct cached_image *cimg, unsigned char *content_type, unsigne #ifdef HAVE_WEBP if (data[0] == 'R' && data[1] == 'I' && data[2] == 'F' && data[3] == 'F') goto have_webp; +#endif +#if 0 + if (data[4] == 'f' && data[5] == 't' && data[6] == 'y' && data[7] == 'p' && + (memcmp(data + 8, "avi", 3) && + (data[11] == 'f' || data[11] == 's' || data[11] == 'o')) || + (data[8] == 'm' && + (data[9] == 'i' || data[9] == 's') && + data[10] == 'f' && data[11] == '1') || + memcmp(data + 8, "miaf", 4) || + memcmp(data + 8, "MA1B", 4)) + goto have_avif; #endif if (data[0] == 0x89 && data[1] == 'P' && data[2] == 'N' && data[3] == 'G') goto have_png; @@ -835,6 +851,13 @@ static void type(struct cached_image *cimg, unsigned char *content_type, unsigne webp_start(cimg); } else #endif /* #ifdef HAVE_WEBP */ +#ifdef HAVE_AVIF + if (dtest(cast_uchar "image/avif",content_type)) { + /*have_avif:*/ + cimg->image_type=IM_AVIF; + avif_start(cimg); + } else +#endif /* #ifdef HAVE_AVIF */ { /* Error */ img_end(cimg); @@ -937,6 +960,11 @@ static int img_process_download(struct g_object_image *goi, struct f_data_c *fda webp_restart(cimg,data,length); break; #endif /* #ifdef HAVE_WEBP */ +#ifdef HAVE_AVIF + case IM_AVIF: + avif_restart(cimg,data,length); + break; +#endif /* #ifdef HAVE_AVIF */ #ifdef DEBUG default: fprintf(stderr,"cimg->image_type=%d\n",cimg->state); @@ -967,6 +995,10 @@ img_process_download.\n"); #ifdef HAVE_WEBP if (cimg->image_type==IM_WEBP) webp_finish(cimg); +#endif +#ifdef HAVE_AVIF + if (cimg->image_type==IM_AVIF) + avif_finish(cimg); #endif } cimg->eof_hit=1; @@ -1373,6 +1405,9 @@ int known_image_type(unsigned char *type) #ifdef HAVE_WEBP if (!casestrcmp(type, cast_uchar "image/webp")) return 1; #endif +#ifdef HAVE_AVIF + if (!casestrcmp(type, cast_uchar "image/avif")) return 1; +#endif #endif return 0; } diff --git a/intl/intl.txt b/intl/intl.txt index e952cda..6db4e76 100644 --- a/intl/intl.txt +++ b/intl/intl.txt @@ -1,7 +1,7 @@ When you add or delete any text, add or delete it in english.lng and run script ./synclang. It adds NULL entries to other languages. Then run ./gen-intl. -When you change any text, run ./get-intl. +When you change any text, run ./gen-intl. Menu hotkeys are also translated via this interface. You can specify more hotkeys. When using normal letters as hotkeys, always use upper case. When using diff --git a/intl/polish.lng b/intl/polish.lng index 14a851b..ad1a122 100644 --- a/intl/polish.lng +++ b/intl/polish.lng @@ -14,7 +14,7 @@ T_BAD_IP_ADDRESS, "B T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, "Nie mona uy lokalnego adresu IP", T_CONFIG_ERROR, "Bd konfiguracji", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Nie mona zapisa do pliku konfiguracyjnego", -T_HOME_DIRECTORY_INACCESSIBLE, NULL, +T_HOME_DIRECTORY_INACCESSIBLE, "Katalog domowy niedostpny", T_BOOKMARK_ERROR, "Bd zakadki", T_UNABLE_TO_WRITE_TO_BOOKMARK_FILE, "Nie mona zapisa pliku zakadek", T_ABOUT, "O programie", @@ -43,16 +43,16 @@ T_GPM_MOUSE_DRIVER, "Sterownik myszy GPM", T_XTERM_FOR_OS2, "Xterm dla OS/2", T_GRAPHICS_MODE, "Tryb graficzny", T_IMAGE_LIBRARIES, "Biblioteki obrazw", -T_FONT_RENDERING, NULL, -T_INTERNAL, NULL, +T_FONT_RENDERING, "Renderowanie fontw", +T_INTERNAL, "Wewntrzne", T_OPENMP, "OpenMP", -T_NOT_USED_IN_TEXT_MODE, NULL, +T_NOT_USED_IN_TEXT_MODE, "Nie uywane w trybie tekstowym", T_DISABLED, "Wyczone", T_THREAD, "wtek", T_THREADS, "wtki", T_THREADS5, "wtkw", -T_CONFIGURATION_DIRECTORY, NULL, -T_NONE, NULL, +T_CONFIGURATION_DIRECTORY, "Katalog konfiguracyjny", +T_NONE, "Brak", T_KEYS, "Klawiszologia", T_KEYS_DESC, "ESC poka menu\n^C, q wyjcie\np, l przewi gra,d\n[, ] przewi lewo,prawo\ngra, d zaznacz link\n-> wybierz link\n<- powrt\ng przejd do URL-a\nG przejd do URL-a bazujcego na aktualnym\n/ szukaj\nn znajd nastpny\nd pobierz\n* przecz wywietlanie obrazkw\n^W dopenij URL lub szukany acuch\n^B, ^X, ^V skopiuj, wytnij, wklej do/ze schowka\nAlt-1 .. Alt-9 przecz ekran wirtualny (svgalib lub framebuffer)", T_KEYS_BRAILLE_DESC, "a, t kursor do linii stanu lub tytuu\n{, } kursor do pocztku/koca linii\n^T, ^Y nastpny lub poprzedni odnonik", @@ -65,7 +65,7 @@ T_FONT_CACHE, "Pami T_IMAGE_CACHE, "Pami podrczna obrazw", T_FORMATTED_DOCUMENT_CACHE, "Sformatowane dokumenty w pamici podrcznej", T_DNS_CACHE, "Pami podrczna DNS", -T_TLS_SESSION_CACHE, NULL, +T_TLS_SESSION_CACHE, "Pami podrczna sesji TLS", T_HANDLES, "uchwyt(w)", T_TIMERS, "zegar(w)", T_WAITING, "oczekujcych", @@ -82,14 +82,14 @@ T_DOCUMENTS, "dokument T_SERVERS, "serwerw", T_MEMORY_ALLOCATED, "przydzielonej pamici", T_BLOCKS_ALLOCATED, "blokw", -T_MEMORY_LARGE_BLOCKS, NULL, -T_BLOCKS_LARGE_BLOCKS, NULL, +T_MEMORY_LARGE_BLOCKS, "przydzielonych w duych blokach", +T_BLOCKS_LARGE_BLOCKS, "duych blokw", T_MEMORY_REQUESTED, "danej z systemu pamici", T_BLOCKS_REQUESTED, "blokw", T_JS_MEMORY_ALLOCATED, "przydzielonej pamici dla javascriptu", T_MEMORY_INFO, "Informacje o pamici", -T_MOST_ALLOCATED, NULL, -T_LARGEST_BLOCKS, NULL, +T_MOST_ALLOCATED, "Najwicej przydzielone", +T_LARGEST_BLOCKS, "Najwiksze bloki", T_NO_HISTORY, "Brak historii", T_NO_DOWNLOADS, "Brak pobra", T_NO_FRAMES, "Brak ramek", @@ -97,7 +97,7 @@ T_VT_100_FRAMES, "Ramki VT100", T_LINUX_OR_OS2_FRAMES, "Ramki typu Linux lub OS/2", T_KOI8R_FRAMES, "Ramki KOI8-R", T_FREEBSD_FRAMES, "Ramki FreeBSD", -T_UTF8_FRAMES, NULL, +T_UTF8_FRAMES, "Ramki UTF-8", T_USE_11M, "Uyj ^[[11m", T_RESTRICT_FRAMES_IN_CP850_852, "Ogranicz ramki w cp850/852", T_BLOCK_CURSOR, "Kursor blokowy", @@ -126,30 +126,30 @@ T_SOCKS_4A_PROXY__USER_HOST_PORT, "Proxy Socks4a (user@host:port)", T_APPEND_TEXT_TO_SOCKS_LOOKUPS, "Doczanie tekstu do nazwy hosta (wybr wza tora)", T_NOPROXY_LIST, "Lista domen dostpnych bez proxy", T_ONLY_PROXIES, "czenie si tylko przez proxy lub Socks (przydatne z torem)", -T_TOR_MODE_ENABLED, NULL, +T_TOR_MODE_ENABLED, "Tryb TOR wczony, poniewa port socks to 9050.", T_SSL_OPTIONS, "Opcje SSL", T_ACCEPT_INVALID_CERTIFICATES, "Akceptowanie bdnych certyfikatw i sabych szyfrw", T_WARN_ON_INVALID_CERTIFICATES, "Ostrzeganie o bdnych certyfikatach i sabych szyfrach", T_REJECT_INVALID_CERTIFICATES, "Odrzucanie bdnych certyfikatw i sabych szyfrw", -T_USE_BUILT_IN_CERTIFICATES, NULL, +T_USE_BUILT_IN_CERTIFICATES, "Uycie wbudowanych certyfikatw", T_CLIENT_CERTIFICATE_KEY_FILE, "Plik klucza certyfikatu klienta", T_CLIENT_CERTIFICATE_FILE, "Plik certyfikatu klienta", T_CLIENT_CERTIFICATE_KEY_PASSWORD, "Haso certyfikatu klienta (nie bdzie zapisane w pliku konfiguracyjnym)", T_BAD_FILE, "Bdny plik", T_THE_FILE_DOES_NOT_EXIST, "Plik nie istnieje", T_THE_FILE_HAS_INVALID_FORMAT, "Plik ma bdny format", -T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, -T_FAILED, NULL, -T_DNS_OPTIONS, NULL, -T_DNS_OVER_HTTPS_URL, NULL, +T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, "Bd inicjowania wbudowanych certyfikatw", +T_FAILED, "nie powiodo si", +T_DNS_OPTIONS, "Opcje DNS", +T_DNS_OVER_HTTPS_URL, "DNS po HTTPS (host lub URL)", T_CONNECTIONS, "Poczenia", T_MAX_CONNECTIONS, "Maksymalna liczba pocze", T_MAX_CONNECTIONS_TO_ONE_HOST, "Maksymalna liczba pocze z jednym serwerem", T_RETRIES, "Prby (0 - bez ogranicze)", T_RECEIVE_TIMEOUT_SEC, "Maksymalny czas oczekiwania na poczenie (sek)", T_TIMEOUT_WHEN_UNRESTARTABLE, "Maks. czas oczekiwania na poczenie niewznawialne", -T_TIMEOUT_WHEN_TRYING_MULTIPLE_ADDRESSES, NULL, -T_TIMEOUT_WHEN_TRYING_KEEPALIVE_CONNECTION, NULL, +T_TIMEOUT_WHEN_TRYING_MULTIPLE_ADDRESSES, "Maks. czas oczekiwania przy wielu adresach", +T_TIMEOUT_WHEN_TRYING_KEEPALIVE_CONNECTION, "Maks. czas oczekiwania przy poczeniach podtrzymywanych", T_BIND_TO_LOCAL_IP_ADDRESS, "Przypisanie do lokalnego adresu IP", T_BIND_TO_LOCAL_IPV6_ADDRESS, "... adresu IPv6", T_ASYNC_DNS_LOOKUP, "Asynchroniczne szukanie nazw", @@ -217,9 +217,9 @@ T_FIND_PREVIOUS, "Znajd T_TOGGLE_HTML_PLAIN, "Przecz html/plain", T_DOCUMENT_INFO, "Informacje o dokumencie", T_FRAME_AT_FULL_SCREEN, "Ramka na caym ekranie", -T_SAVE_CLIPBOARD_TO_A_FILE, NULL, -T_LOAD_CLIPBOARD_FROM_A_FILE, NULL, -T_THE_CLIPBOARD_IS_EMPTY, NULL, +T_SAVE_CLIPBOARD_TO_A_FILE, "Zapis schowka do pliku", +T_LOAD_CLIPBOARD_FROM_A_FILE, "Odczyt schowka z pliku", +T_THE_CLIPBOARD_IS_EMPTY, "Schowek jest pusty", T_SAVE_HTML_OPTIONS, "Zapisz ustawienia HTML", T_CHARACTER_SET, "Zestaw znakw", T_DEFAULT_CHARSET, "Domylny", @@ -233,7 +233,7 @@ T_FILE, "Plik", T_VIEW, "Widok", T_LINK, "Link", T_DOWNLOADS, "Pobieranie", -T_WINDOWS, NULL, +T_WINDOWS, "Okna", T_SETUP, "Ustawienia", T_HELP, "Pomoc", T_ENTER_URL, "Wprowad URL", @@ -244,8 +244,8 @@ T_SEARCH_FOR_TEXT, "Znajd T_PAGE_P, "(s. ", T_PAGE_OF, " z ", T_PAGE_CL, ")", -T_FORMATTING_DOCUMENT, NULL, -T_SEARCHING, NULL, +T_FORMATTING_DOCUMENT, "Formatowanie dokumentu", +T_SEARCHING, "Wyszukiwanie", T_WAITING_IN_QUEUE, "Oczekujce w kolejce", T_LOOKING_UP_HOST, "Szukam serwera", T_MAKING_CONNECTION, "Nawizywanie poczenia", @@ -261,7 +261,7 @@ T_INTERRUPTED, "Przerwano", T_INTERNAL_ERROR, "Bd wewntrzny", T_OUT_OF_MEMORY, "Brak pamici", T_HOST_NOT_FOUND, "Nie znaleziono serwera", -T_PROXY_NOT_FOUND, NULL, +T_PROXY_NOT_FOUND, "Nie znaleziono proxy", T_ERROR_WRITING_TO_SOCKET, "Bd przy zapisywaniu do gniazda", T_ERROR_READING_FROM_SOCKET, "Bd przy czytaniu z gniazda", T_DATA_MODIFIED, "Dane zostay zmodyfikowane", @@ -273,7 +273,7 @@ T_CANT_GET_SOCKET_STATE, "Nie mo T_CYCLIC_REDIRECT, "Cykliczne przekierowanie", T_TOO_LARGE_FILE, "Plik zbyt duy", T_BAD_HTTP_RESPONSE, "Nieprawidowa odpowied HTTP", -T_HTTP_100, NULL, +T_HTTP_100, "HTTP 100 (\?\?\?)", T_NO_CONTENT, "Plik pusty", T_HTTPS_FWD_ERROR, "Przekierowanie HTTPS nie powiodo si", T_INVALID_CERTIFICATE, "Bdny certyfikat", @@ -314,7 +314,7 @@ T_ABORT, "Przerwij", T_ABORT_AND_DELETE_FILE, "Przerwij i usu plik", T_YES, "Tak", T_NO, "Nie", -T_NEVER, NULL, +T_NEVER, "Nigdy", T_DIRECTORY, "Katalog", T_FILE_ALREADY_EXISTS, "Plik ju istnieje", T_ALREADY_EXISTS_AS_DOWNLOAD, "ju istnieje jako aktywne ciganie.", @@ -375,7 +375,7 @@ T_NO_PREVIOUS_SEARCH, "Niczego wcze T_SEARCH_STRING_NOT_FOUND, "Nie znaleziono wyraenia", T_SAVE_ERROR, "Bd zapisu", T_ERROR_WRITING_TO_FILE, "Bd zapisu do pliku", -T_ERROR_READING_THE_FILE, NULL, +T_ERROR_READING_THE_FILE, "Bd odczytu z pliku", T_DISPLAY_USEMAP, "Poka map obrazkw", T_FOLLOW_LINK, "Wybierz link", T_OPEN_IN_NEW_WINDOW, "Otwrz w nowym oknie", @@ -418,8 +418,8 @@ T_HEADER_INFO, "Informacje nag T_YOU_ARE_NOWHERE, "Tak naprawd to jeste nigdzie!", T_NO_HEADER, "Dokument nie ma nagwka", T_URL, "URL", -T_IP_ADDRESS, NULL, -T_IP_ADDRESSES, NULL, +T_IP_ADDRESS, "Adres IP", +T_IP_ADDRESSES, "Adresy IP", T_SIZE, "Rozmiar", T_COMPRESSED_WITH, "skompresowany", T_INCOMPLETE, "niekompletne", @@ -430,8 +430,8 @@ T_SERVER, "Serwer", T_DATE, "Data", T_LAST_MODIFIED, "Ostatnia zmiana", T_SSL_CIPHER, "Szyfr SSL", -T_CERTIFICATE_AUTHORITY, NULL, -T_CERTIFICATE_AUTHORITIES, NULL, +T_CERTIFICATE_AUTHORITY, "Instytucja certyfikacji", +T_CERTIFICATE_AUTHORITIES, "Instytucje certyfikacji", T_LANGUAGE, "Jzyk", T_DEFAULT_LANG, "Domylny", T_GO_TO_LINK, "Przejd do odnonika", @@ -446,7 +446,7 @@ T_fOLDER, "folder", T_ADD, "Dodaj", T_DELETE, "Usu", T_EDIT, "Edytuj", -T_SELECT, NULL, +T_SELECT, "Zaznacz", T_MOVE, "Przenie", T_NO_ITEMS_SELECTED, "Nie zaznaczye niczego", T_UNSELECT_ALL, "Odznacz wszystkie", @@ -507,8 +507,8 @@ T_TELNET_PROG, "Program us T_TN3270_PROG, "Program Tn3270 (% jest zastpowany przez \"host\" lub przez \"host port\")", T_MMS_PROG, "Program MMS (% jest zastpowany przez URL)", T_MAGNET_PROG, "Program Magnet (% jest zastpowany przez URL)", -T_GOPHER_PROG, NULL, -T_SHELL_PROG, "Program powoki", +T_GOPHER_PROG, "Program Gopher (% jest zastpowany przez URL)", +T_SHELL_PROG, "Powoka do wykonywania polece zewntrznych (% jest zastpowany poleceniem)", T_MAIL_AND_TELNET_PROGRAMS, "Obsuga poczty i usugi Telnet", T_MAIL_TELNET_AND_SHELL_PROGRAMS, "Obsuga poczty, usugi Telnet i powoki", T_NO_PROGRAM, "Nie okrelono programu", @@ -518,7 +518,7 @@ T_TELNET, "telneta", T_TN3270, "tn3270", T_MMS, "mms", T_MAGNET, "magneta", -T_GOPHER, NULL, +T_GOPHER, "gopher", T_BAD_MAILTO_URL, "Bdny adres e-mail", T_BAD_TELNET_URL, "Niewaciwy adres serwera dla programu Telnet", T_BAD_TN3270_URL, "Niewaciwy adres serwera dla programu Tn3270", @@ -555,9 +555,9 @@ T_DITHER_IMAGES, "Dithering obraz T_8_BIT_GAMMA_CORRECTION, "8-bitowa korekcja gamma", T_16_BIT_GAMMA_CORRECTION, "16-bitowa korekcja gamma", T_AUTO_GAMMA_CORRECTION, "Automatyczna korekcja gamma", -T_RGB_PALETTE_8x8x4, NULL, -T_RGB_PALETTE_6x6x6, NULL, -T_SWITCH_PALETTE, NULL, +T_RGB_PALETTE_8x8x4, "Paleta RGB 8x8x4", +T_RGB_PALETTE_6x6x6, "Paleta RGB 6x6x6", +T_SWITCH_PALETTE, "Zmie palet", T_OVERWRITE_SCREEN_INSTEAD_OF_SCROLLING_IT, "Przykrycie ekranu zamiast przewijania", T_ALERT, "Uwaga", T_QUESTION, "Pytanie", @@ -571,16 +571,16 @@ T_ENABLE_JAVASCRIPT, "W T_VERBOSE_JS_ERRORS, "ledzenie bdw Javascriptu", T_VERBOSE_JS_WARNINGS, "ledzenie ostrzee Javascriptu", T_MISCELANEOUS_OPTIONS, "Opcje rne", -T_FONTS, NULL, -T_REGULAR_FONT, NULL, -T_BOLD_FONT, NULL, -T_MONOSPACED_FONT, NULL, -T_MONOSPACED_BOLD_FONT, NULL, -T_ITALIC_FONT, NULL, -T_ITALIC_BOLD_FONT, NULL, -T_MONOSPACED_ITALIC_FONT, NULL, -T_MONOSPACED_ITALIC_BOLD_FONT, NULL, -T_BUILT_IN_FONT, NULL, +T_FONTS, "Fonty", +T_REGULAR_FONT, "Font zwyky", +T_BOLD_FONT, "Font pogrubiony", +T_MONOSPACED_FONT, "Font o staej szerokoci", +T_MONOSPACED_BOLD_FONT, "Font pogrubiony o staej szerokoci", +T_ITALIC_FONT, "Font pochyy", +T_ITALIC_BOLD_FONT, "Font pochyy pogrubiony", +T_MONOSPACED_ITALIC_FONT, "Font pochyy o staej szerokoci", +T_MONOSPACED_ITALIC_BOLD_FONT, "Font pochyy, pogrubiony o staej szerokoci", +T_BUILT_IN_FONT, "Font wbudowany", T_JAVASCRIPT_ERROR, "Bd Javascriptu", T_JAVASCRIPT_WARNING, "Ostrzeenie Javascriptu", T_DISMISS, "Pomi", @@ -606,12 +606,12 @@ T_SCROLL_BAR_AREA_COLOR, "Kolor obszaru paska przewijania", T_SCROLL_BAR_FRAME_COLOR, "Kolor ramki paska przewijania", T_BOOKMARKS_FILE, "Plik zakadek", T_SAVE_URL_HISTORY_ON_EXIT, "Zapis historii URL-i przy wyczaniu", -T_COOKIES, NULL, -T_ENABLE_COOKIES, NULL, -T_SAVE_COOKIES, NULL, -T_MAX_COOKIE_AGE, NULL, -T_CLEAR_COOKIES, NULL, -T_COOKIES_WERE_CLEARED, NULL, +T_COOKIES, "Ciasteczka", +T_ENABLE_COOKIES, "Wczenie ciasteczek", +T_SAVE_COOKIES, "Zapis ciasteczek", +T_MAX_COOKIE_AGE, "Maksymalny wiek ciasteczek w dniach (0 - nieskoczony)", +T_CLEAR_COOKIES, "Wyczy ciasteczka", +T_COOKIES_WERE_CLEARED, "ciasteczka zostay wyczyszczone", T_ENTER_COLORS_AS_RGB_TRIPLETS, "Wpisz kolory jako trjki RGB", T_JS_MEMORY_LIMIT_KB, "Pami dla Javascriptu", T_SCALE_ALL_IMAGES_BY, "Skalowanie wszystkich obrazw", @@ -683,7 +683,7 @@ T_HK_CACHE, "P", T_HK_MAIL_AND_TELNEL, "C", T_HK_ASSOCIATIONS, "S", T_HK_FILE_EXTENSIONS, "R", -T_HK_BLOCK_LIST, NULL, +T_HK_BLOCK_LIST, "B", T_HK_SAVE_OPTIONS, "O", T_HK_ABOUT, "O", T_HK_KEYS, "K", diff --git a/language.inc b/language.inc index f014af4..62b6626 100644 --- a/language.inc +++ b/language.inc @@ -15242,7 +15242,7 @@ static_const struct translation translation_polish [] = { { "Nie mo\277na u\277y\346 lokalnego adresu IP" }, { "B\263\261d konfiguracji" }, { "Nie mo\277na zapisa\346 do pliku konfiguracyjnego" }, - { NULL }, + { "Katalog domowy niedost\352pny" }, { "B\263\261d zak\263adki" }, { "Nie mo\277na zapisa\346 pliku zak\263adek" }, { "O programie" }, @@ -15271,16 +15271,16 @@ static_const struct translation translation_polish [] = { { "Xterm dla OS/2" }, { "Tryb graficzny" }, { "Biblioteki obraz\363w" }, - { NULL }, - { NULL }, + { "Renderowanie font\363w" }, + { "Wewn\352trzne" }, { "OpenMP" }, - { NULL }, + { "Nie u\277ywane w trybie tekstowym" }, { "Wy\263\261czone" }, { "w\261tek" }, { "w\261tki" }, { "w\261tk\363w" }, - { NULL }, - { NULL }, + { "Katalog konfiguracyjny" }, + { "Brak" }, { "Klawiszologia" }, { "ESC poka\277 menu\n^C, q wyj\266cie\np, l przewi\361 g\363ra,d\363\263\n[, ] przewi\361 lewo,prawo\ng\363ra, d\363\263 zaznacz link\n-> wybierz link\n<- powr\363t\ng przejd\274 do URL-a\nG przejd\274 do URL-a bazuj\261cego na aktualnym\n/ szukaj\nn znajd\274 nast\352pny\nd pobierz\n* prze\263\261cz wy\266wietlanie obrazk\363w\n^W dope\263nij URL lub szukany \263a\361cuch\n^B, ^X, ^V skopiuj, wytnij, wklej do/ze schowka\nAlt-1 .. Alt-9 prze\263\261cz ekran wirtualny (svgalib lub framebuffer)" }, { "a, t kursor do linii stanu lub tytu\263u\n{, } kursor do pocz\261tku/ko\361ca linii\n^T, ^Y nast\352pny lub poprzedni odno\266nik" }, @@ -15293,7 +15293,7 @@ static_const struct translation translation_polish [] = { { "Pami\352\346 podr\352czna obraz\363w" }, { "Sformatowane dokumenty w pami\352ci podr\352cznej" }, { "Pami\352\346 podr\352czna DNS" }, - { NULL }, + { "Pami\352\346 podr\352czna sesji TLS" }, { "uchwyt(\363w)" }, { "zegar(\363w)" }, { "oczekuj\261cych" }, @@ -15310,14 +15310,14 @@ static_const struct translation translation_polish [] = { { "serwer\363w" }, { "przydzielonej pami\352ci" }, { "blok\363w" }, - { NULL }, - { NULL }, + { "przydzielonych w du\277ych blokach" }, + { "du\277ych blok\363w" }, { "\277\261danej z systemu pami\352ci" }, { "blok\363w" }, { "przydzielonej pami\352ci dla javascriptu" }, { "Informacje o pami\352ci" }, - { NULL }, - { NULL }, + { "Najwi\352cej przydzielone" }, + { "Najwi\352ksze bloki" }, { "Brak historii" }, { "Brak pobra\361" }, { "Brak ramek" }, @@ -15325,7 +15325,7 @@ static_const struct translation translation_polish [] = { { "Ramki typu Linux lub OS/2" }, { "Ramki KOI8-R" }, { "Ramki FreeBSD" }, - { NULL }, + { "Ramki UTF-8" }, { "U\277yj ^[[11m" }, { "Ogranicz ramki w cp850/852" }, { "Kursor blokowy" }, @@ -15354,30 +15354,30 @@ static_const struct translation translation_polish [] = { { "Do\263\261czanie tekstu do nazwy hosta (wyb\363r w\352z\263a tora)" }, { "Lista domen dost\352pnych bez proxy" }, { "\243\261czenie si\352 tylko przez proxy lub Socks (przydatne z torem)" }, - { NULL }, + { "Tryb TOR w\263\261czony, poniewa\277 port socks to 9050." }, { "Opcje SSL" }, { "Akceptowanie b\263\352dnych certyfikat\363w i s\263abych szyfr\363w" }, { "Ostrzeganie o b\263\352dnych certyfikatach i s\263abych szyfrach" }, { "Odrzucanie b\263\352dnych certyfikat\363w i s\263abych szyfr\363w" }, - { NULL }, + { "U\277ycie wbudowanych certyfikat\363w" }, { "Plik klucza certyfikatu klienta" }, { "Plik certyfikatu klienta" }, { "Has\263o certyfikatu klienta (nie b\352dzie zapisane w pliku konfiguracyjnym)" }, { "B\263\352dny plik" }, { "Plik nie istnieje" }, { "Plik ma b\263\352dny format" }, - { NULL }, - { NULL }, - { NULL }, - { NULL }, + { "B\263\261d inicjowania wbudowanych certyfikat\363w" }, + { "nie powiod\263o si\352" }, + { "Opcje DNS" }, + { "DNS po HTTPS (host lub URL)" }, { "Po\263\261czenia" }, { "Maksymalna liczba po\263\261cze\361" }, { "Maksymalna liczba po\263\261cze\361 z jednym serwerem" }, { "Pr\363by (0 - bez ogranicze\361)" }, { "Maksymalny czas oczekiwania na po\263\261czenie (sek)" }, { "Maks. czas oczekiwania na po\263\261czenie niewznawialne" }, - { NULL }, - { NULL }, + { "Maks. czas oczekiwania przy wielu adresach" }, + { "Maks. czas oczekiwania przy po\263\261czeniach podtrzymywanych" }, { "Przypisanie do lokalnego adresu IP" }, { "... adresu IPv6" }, { "Asynchroniczne szukanie nazw" }, @@ -15445,9 +15445,9 @@ static_const struct translation translation_polish [] = { { "Prze\263\261cz html/plain" }, { "Informacje o dokumencie" }, { "Ramka na ca\263ym ekranie" }, - { NULL }, - { NULL }, - { NULL }, + { "Zapis schowka do pliku" }, + { "Odczyt schowka z pliku" }, + { "Schowek jest pusty" }, { "Zapisz ustawienia HTML" }, { "Zestaw znak\363w" }, { "Domy\266lny" }, @@ -15461,7 +15461,7 @@ static_const struct translation translation_polish [] = { { "Widok" }, { "Link" }, { "Pobieranie" }, - { NULL }, + { "Okna" }, { "Ustawienia" }, { "Pomoc" }, { "Wprowad\274 URL" }, @@ -15472,8 +15472,8 @@ static_const struct translation translation_polish [] = { { "(s. " }, { " z " }, { ")" }, - { NULL }, - { NULL }, + { "Formatowanie dokumentu" }, + { "Wyszukiwanie" }, { "Oczekuj\261ce w kolejce" }, { "Szukam serwera" }, { "Nawi\261zywanie po\263\261czenia" }, @@ -15489,7 +15489,7 @@ static_const struct translation translation_polish [] = { { "B\263\261d wewn\352trzny" }, { "Brak pami\352ci" }, { "Nie znaleziono serwera" }, - { NULL }, + { "Nie znaleziono proxy" }, { "B\263\261d przy zapisywaniu do gniazda" }, { "B\263\261d przy czytaniu z gniazda" }, { "Dane zosta\263y zmodyfikowane" }, @@ -15501,7 +15501,7 @@ static_const struct translation translation_polish [] = { { "Cykliczne przekierowanie" }, { "Plik zbyt du\277y" }, { "Nieprawid\263owa odpowied\274 HTTP" }, - { NULL }, + { "HTTP 100 (\?\?\?)" }, { "Plik pusty" }, { "Przekierowanie HTTPS nie powiod\263o si\352" }, { "B\263\352dny certyfikat" }, @@ -15542,7 +15542,7 @@ static_const struct translation translation_polish [] = { { "Przerwij i usu\361 plik" }, { "Tak" }, { "Nie" }, - { NULL }, + { "Nigdy" }, { "Katalog" }, { "Plik ju\277 istnieje" }, { "ju\277 istnieje jako aktywne \266ci\261ganie." }, @@ -15603,7 +15603,7 @@ static_const struct translation translation_polish [] = { { "Nie znaleziono wyra\277enia" }, { "B\263\261d zapisu" }, { "B\263\261d zapisu do pliku" }, - { NULL }, + { "B\263\261d odczytu z pliku" }, { "Poka\277 map\352 obrazk\363w" }, { "Wybierz link" }, { "Otw\363rz w nowym oknie" }, @@ -15646,8 +15646,8 @@ static_const struct translation translation_polish [] = { { "Tak naprawd\352 to jeste\266 nigdzie!" }, { "Dokument nie ma nag\263\363wka" }, { "URL" }, - { NULL }, - { NULL }, + { "Adres IP" }, + { "Adresy IP" }, { "Rozmiar" }, { "skompresowany" }, { "niekompletne" }, @@ -15658,8 +15658,8 @@ static_const struct translation translation_polish [] = { { "Data" }, { "Ostatnia zmiana" }, { "Szyfr SSL" }, - { NULL }, - { NULL }, + { "Instytucja certyfikacji" }, + { "Instytucje certyfikacji" }, { "J\352zyk" }, { "Domy\266lny" }, { "Przejd\274 do odno\266nika" }, @@ -15674,7 +15674,7 @@ static_const struct translation translation_polish [] = { { "Dodaj" }, { "Usu\361" }, { "Edytuj" }, - { NULL }, + { "Zaznacz" }, { "Przenie\266" }, { "Nie zaznaczy\263e\266 niczego" }, { "Odznacz wszystkie" }, @@ -15735,8 +15735,8 @@ static_const struct translation translation_polish [] = { { "Program Tn3270 (% jest zast\352powany przez \"host\" lub przez \"host port\")" }, { "Program MMS (% jest zast\352powany przez URL)" }, { "Program Magnet (% jest zast\352powany przez URL)" }, - { NULL }, - { "Program pow\263oki" }, + { "Program Gopher (% jest zast\352powany przez URL)" }, + { "Pow\263oka do wykonywania polece\361 zewn\352trznych (% jest zast\352powany poleceniem)" }, { "Obs\263uga poczty i us\263ugi Telnet" }, { "Obs\263uga poczty, us\263ugi Telnet i pow\263oki" }, { "Nie okre\266lono programu" }, @@ -15746,7 +15746,7 @@ static_const struct translation translation_polish [] = { { "tn3270" }, { "mms" }, { "magneta" }, - { NULL }, + { "gopher" }, { "B\263\352dny adres e-mail" }, { "Niew\263a\266ciwy adres serwera dla programu Telnet" }, { "Niew\263a\266ciwy adres serwera dla programu Tn3270" }, @@ -15783,9 +15783,9 @@ static_const struct translation translation_polish [] = { { "8-bitowa korekcja gamma" }, { "16-bitowa korekcja gamma" }, { "Automatyczna korekcja gamma" }, - { NULL }, - { NULL }, - { NULL }, + { "Paleta RGB 8x8x4" }, + { "Paleta RGB 6x6x6" }, + { "Zmie\361 palet\352" }, { "Przykrycie ekranu zamiast przewijania" }, { "Uwaga" }, { "Pytanie" }, @@ -15799,16 +15799,16 @@ static_const struct translation translation_polish [] = { { "\246ledzenie b\263\352d\363w Javascriptu" }, { "\246ledzenie ostrze\277e\361 Javascriptu" }, { "Opcje r\363\277ne" }, - { NULL }, - { NULL }, - { NULL }, - { NULL }, - { NULL }, - { NULL }, - { NULL }, - { NULL }, - { NULL }, - { NULL }, + { "Fonty" }, + { "Font zwyk\263y" }, + { "Font pogrubiony" }, + { "Font o sta\263ej szeroko\266ci" }, + { "Font pogrubiony o sta\263ej szeroko\266ci" }, + { "Font pochy\263y" }, + { "Font pochy\263y pogrubiony" }, + { "Font pochy\263y o sta\263ej szeroko\266ci" }, + { "Font pochy\263y, pogrubiony o sta\263ej szeroko\266ci" }, + { "Font wbudowany" }, { "B\263\261d Javascriptu" }, { "Ostrze\277enie Javascriptu" }, { "Pomi\361" }, @@ -15834,12 +15834,12 @@ static_const struct translation translation_polish [] = { { "Kolor ramki paska przewijania" }, { "Plik zak\263adek" }, { "Zapis historii URL-i przy wy\263\261czaniu" }, - { NULL }, - { NULL }, - { NULL }, - { NULL }, - { NULL }, - { NULL }, + { "Ciasteczka" }, + { "W\263\261czenie ciasteczek" }, + { "Zapis ciasteczek" }, + { "Maksymalny wiek ciasteczek w dniach (0 - niesko\361czony)" }, + { "Wyczy\266\346 ciasteczka" }, + { "ciasteczka zosta\263y wyczyszczone" }, { "Wpisz kolory jako tr\363jki RGB" }, { "Pami\352\346 dla Javascriptu" }, { "Skalowanie wszystkich obraz\363w" }, @@ -15911,7 +15911,7 @@ static_const struct translation translation_polish [] = { { "C" }, { "S" }, { "R" }, - { NULL }, + { "B" }, { "O" }, { "O" }, { "K" }, diff --git a/links.h b/links.h index fa25835..3a29a08 100644 --- a/links.h +++ b/links.h @@ -1049,7 +1049,7 @@ unsigned char *os_conv_to_external_path(unsigned char *, unsigned char *); unsigned char *os_fixup_external_program(unsigned char *); int exe(unsigned char *, int); #ifdef WIN -int exe_on_background(unsigned char *, unsigned char *); +int exe_on_background(unsigned char *, unsigned char *, int); int windows_charset(void); #define HAVE_EXE_ON_BACKGROUND #endif @@ -1300,8 +1300,9 @@ int defrag_entry(struct cache_entry *); void truncate_entry(struct cache_entry *, off_t, int); void free_entry_to(struct cache_entry *, off_t); void delete_entry_content(struct cache_entry *); -void delete_cache_entry(struct cache_entry *e); void trim_cache_entry(struct cache_entry *e); +void delete_cache_entry(struct cache_entry *e); +void finish_cache_entry(struct cache_entry *e); /* sched.c */ @@ -2174,9 +2175,11 @@ struct style { /* ?0 are background, ?1 foreground. * These are unrounded 8-bit sRGB space */ - unsigned char flags; /* non-zero means underline */ + unsigned char flags; /* FF_ flags */ int height; - long underline_color; /* Valid only if flags are nonzero */ + long line_color; /* Valid only if flags includes FF_UNDERLINE or + * FF_STRIKE + */ int mono_space; /* -1 if the font is not monospaced * width of the space otherwise */ @@ -2266,6 +2269,7 @@ int hack_rgb(int rgb); #define FF_MONOSPACED 2 #define FF_ITALIC 4 #define FF_UNDERLINE 8 +#define FF_STRIKE 16 #ifndef USE_ITALIC #define FF_SHAPES 4 @@ -3168,6 +3172,10 @@ struct g_object_tag { #define IM_WEBP 6 #endif /* #ifdef HAVE_WEBP */ +#ifdef HAVE_AVIF +#define IM_AVIF 7 +#endif /* #ifdef HAVE_AVIF */ + #define MEANING_DIMS 0 #define MEANING_AUTOSCALE 1 struct cached_image { @@ -4380,6 +4388,19 @@ void add_webp_version(unsigned char **s, int *l); #endif +/* avif.c */ + +#if defined(G) && defined(HAVE_AVIF) + +void avif_start(struct cached_image *cimg); +void avif_restart(struct cached_image *cimg, unsigned char *data, int length); +void avif_finish(struct cached_image *cimg); +void avif_destroy_decoder(struct cached_image *cimg); + +void add_avif_version(unsigned char **s, int *l); + +#endif + /* img.c */ #ifdef G @@ -4539,6 +4560,7 @@ void init_grview(void); #define AT_FIXED 8 #define AT_GRAPHICS 16 #define AT_INVERT 32 +#define AT_STRIKE 64 #define AL_LEFT 0 #define AL_CENTER 1 diff --git a/links.wis b/links.wis index 19b0ea1..e01cfa1 100644 --- a/links.wis +++ b/links.wis @@ -1,7 +1,7 @@ cache) + finish_cache_entry(c->cache); if (c->state < 0 && state >= 0) c->prev_error = c->state; if ((c->state = state) == S_TRANS) { struct remaining_info *r = &c->prg; diff --git a/session.c b/session.c index 889be26..ad2281d 100644 --- a/session.c +++ b/session.c @@ -278,7 +278,8 @@ static void x_print_screen_status(struct terminal *term, void *ses_) { struct session *ses = (struct session *)ses_; if (!F) { - unsigned char color = get_session_attribute(ses, proxies.only_proxies); + decc_volatile int p = proxies.only_proxies; + unsigned char color = get_session_attribute(ses, p); fill_area(term, 0, term->y - 1, term->x, 1, ' ', color); if (ses->st) print_text(term, 0, term->y - 1, (int)strlen(cast_const_char ses->st), ses->st, COLOR_STATUS); #ifdef G @@ -294,7 +295,8 @@ static void x_print_screen_title(struct terminal *term, void *ses_) { struct session *ses = (struct session *)ses_; unsigned char *m; - unsigned char color = get_session_attribute(ses, proxies.only_proxies); + decc_volatile int p = proxies.only_proxies; + unsigned char color = get_session_attribute(ses, p); if (!term->spec->col) color = COLOR_TITLE; fill_area(term, 0, 0, term->x, 1, ' ', color); if ((m = print_current_title(ses))) { diff --git a/suffix.inc b/suffix.inc index 6338bc6..9f7256d 100644 --- a/suffix.inc +++ b/suffix.inc @@ -68,6 +68,7 @@ static_const const_char_ptr domain_suffix[] = { "*.oci.customer-oci.com", "*.ocp.customer-oci.com", "*.ocs.customer-oci.com", + "*.on-acorn.io", "*.on-k3s.io", "*.on-rancher.cloud", "*.on-rio.io", @@ -99,6 +100,7 @@ static_const const_char_ptr domain_suffix[] = { "*.triton.zone", "*.tst.site", "*.uberspace.de", + "*.user.fm", "*.user.localcert.dev", "*.usercontent.goog", "*.vps.myjino.ru", @@ -111,12 +113,29 @@ static_const const_char_ptr domain_suffix[] = { "0e.vc", "1.azurestaticapps.net", "1.bg", + "123hjemmeside.dk", + "123hjemmeside.no", + "123homepage.it", + "123kotisivu.fi", + "123minsida.se", + "123miweb.es", + "123paginaweb.pt", + "123sait.ru", + "123siteweb.fr", + "123webseite.at", + "123webseite.de", + "123website.be", + "123website.ch", + "123website.lu", + "123website.nl", "12hp.at", "12hp.ch", "12hp.de", "1337.pictures", "16-b.it", + "180r.com", "1kapp.com", + "2-d.jp", "2.azurestaticapps.net", "2.bg", "2000.hu", @@ -124,6 +143,7 @@ static_const const_char_ptr domain_suffix[] = { "2ix.at", "2ix.ch", "2ix.de", + "3.azurestaticapps.net", "3.bg", "32-b.it", "3utilities.com", @@ -231,15 +251,17 @@ static_const const_char_ptr domain_suffix[] = { "aco", "act.au", "act.edu.au", + "activetrail.biz", "actor", "ad", "ad.jp", - "adac", "adachi.tokyo.jp", "adimo.co.uk", "adm.br", "adobeaemcloud.com", "adobeaemcloud.net", + "adobeio-static.net", + "adobeioruntime.net", "ads", "adult", "adult.ht", @@ -264,6 +286,7 @@ static_const const_char_ptr domain_suffix[] = { "afjord.no", "afl", "africa", + "africa.bj", "africa.com", "ag", "ag.it", @@ -279,6 +302,7 @@ static_const const_char_ptr domain_suffix[] = { "agric.za", "agriculture.museum", "agrigento.it", + "agro.bj", "agro.bo", "agro.pl", "aguni.okinawa.jp", @@ -318,8 +342,19 @@ static_const const_char_ptr domain_suffix[] = { "aju.br", "ak.us", "akabira.hokkaido.jp", + "akadns.net", "akagi.shimane.jp", "akaiwa.okayama.jp", + "akamai-staging.net", + "akamai.net", + "akamaiedge-staging.net", + "akamaiedge.net", + "akamaihd-staging.net", + "akamaihd.net", + "akamaiorigin-staging.net", + "akamaiorigin.net", + "akamaized-staging.net", + "akamaized.net", "akashi.hyogo.jp", "akdn", "aki.kochi.jp", @@ -403,7 +438,6 @@ static_const const_char_ptr domain_suffix[] = { "anan.tokushima.jp", "anani.br", "ancona.it", - "and.mom", "and.museum", "andasuolo.no", "andebu.no", @@ -447,6 +481,7 @@ static_const const_char_ptr domain_suffix[] = { "ap.gov.pl", "ap.it", "ap.leg.br", + "ap.ngrok.io", "aparecida.br", "apartments", "api.gov.uk", @@ -489,6 +524,7 @@ static_const const_char_ptr domain_suffix[] = { "archaeological.museum", "archaeology.museum", "archi", + "architectes.bj", "architecture.museum", "ardal.no", "aremark.no", @@ -565,7 +601,6 @@ static_const const_char_ptr domain_suffix[] = { "assassination.museum", "assisi.museum", "assn.lk", - "asso.bj", "asso.ci", "asso.dz", "asso.eu.org", @@ -579,6 +614,7 @@ static_const const_char_ptr domain_suffix[] = { "associates", "association.aero", "association.museum", + "assur.bj", "asti.it", "astronomy.museum", "asuke.aichi.jp", @@ -600,6 +636,7 @@ static_const const_char_ptr domain_suffix[] = { "attorney", "au", "au.eu.org", + "au.ngrok.io", "auction", "audi", "audible", @@ -622,6 +659,7 @@ static_const const_char_ptr domain_suffix[] = { "author.aero", "auto", "auto.pl", + "autocode.dev", "automotive.museum", "autos", "av.it", @@ -632,6 +670,7 @@ static_const const_char_ptr domain_suffix[] = { "aviation.museum", "avocat.fr", "avocat.pro", + "avocats.bj", "avoues.fr", "aw", "awaji.hyogo.jp", @@ -713,7 +752,6 @@ static_const const_char_ptr domain_suffix[] = { "bari.it", "barletta-trani-andria.it", "barlettatraniandria.it", - "barreau.bj", "barrel-of-knowledge.info", "barrell-of-knowledge.info", "barsy.bg", @@ -1013,6 +1051,7 @@ static_const const_char_ptr domain_suffix[] = { "bolzano.it", "bom", "bomlo.no", + "bona.jp", "bond", "bonn.museum", "boo", @@ -1084,7 +1123,6 @@ static_const const_char_ptr domain_suffix[] = { "bt.it", "bu.no", "budejju.no", - "bugatti", "build", "builders", "building.museum", @@ -1163,9 +1201,10 @@ static_const const_char_ptr domain_suffix[] = { "campobasso.it", "can.museum", "canada.museum", - "cancerresearch", "candypop.jp", "canon", + "canva-apps.cn", + "canva-apps.com", "capebreton.museum", "capetown", "capital", @@ -1293,6 +1332,7 @@ static_const const_char_ptr domain_suffix[] = { "cesena-forli.it", "cesenaforli.it", "cf", + "cf-ipfs.com", "cfa", "cfd", "cg", @@ -1431,6 +1471,7 @@ static_const const_char_ptr domain_suffix[] = { "cloudapps.digital", "cloudcontrolapp.com", "cloudcontrolled.com", + "cloudflare-ipfs.com", "cloudfront.net", "cloudfunctions.net", "cloudjiffy.net", @@ -1472,6 +1513,7 @@ static_const const_char_ptr domain_suffix[] = { "co.at", "co.bb", "co.bi", + "co.bj", "co.bn", "co.business", "co.bw", @@ -1576,6 +1618,7 @@ static_const const_char_ptr domain_suffix[] = { "com.bb", "com.bh", "com.bi", + "com.bj", "com.bm", "com.bn", "com.bo", @@ -1778,6 +1821,7 @@ static_const const_char_ptr domain_suffix[] = { "crafts.museum", "cranbrook.museum", "cranky.jp", + "crap.jp", "crd.co", "creation.museum", "credit", @@ -1872,6 +1916,7 @@ static_const const_char_ptr domain_suffix[] = { "davvenjarga.no", "davvesiida.no", "day", + "daynight.jp", "dazaifu.fukuoka.jp", "dc.us", "dclk", @@ -2012,6 +2057,7 @@ static_const const_char_ptr domain_suffix[] = { "doesntexist.com", "doesntexist.org", "dog", + "dojin.com", "dolls.museum", "domains", "donetsk.ua", @@ -2128,9 +2174,11 @@ static_const const_char_ptr domain_suffix[] = { "echizen.fukui.jp", "ecn.br", "eco", + "eco.bj", "eco.br", "ecologia.bo", "ecommerce-shop.pl", + "econo.bj", "economia.bo", "ed.ao", "ed.ci", @@ -2140,7 +2188,11 @@ static_const const_char_ptr domain_suffix[] = { "edeka", "edgeapp.net", "edgecompute.app", + "edgekey-staging.net", + "edgekey.net", "edgestack.me", + "edgesuite-staging.net", + "edgesuite.net", "editorx.io", "edogawa.tokyo.jp", "edu", @@ -2154,6 +2206,7 @@ static_const const_char_ptr domain_suffix[] = { "edu.bb", "edu.bh", "edu.bi", + "edu.bj", "edu.bm", "edu.bn", "edu.bo", @@ -2280,6 +2333,7 @@ static_const const_char_ptr domain_suffix[] = { "edugit.io", "ee", "ee.eu.org", + "eek.jp", "eero-stage.online", "eero.online", "eg", @@ -2398,6 +2452,7 @@ static_const const_char_ptr domain_suffix[] = { "eu.encoway.cloud", "eu.int", "eu.meteorapp.com", + "eu.ngrok.io", "eu.org", "eu.platform.sh", "eu.pythonanywhere.com", @@ -2448,6 +2503,7 @@ static_const const_char_ptr domain_suffix[] = { "fashion", "fashionstore.jp", "fast", + "fastly-edge.com", "fastly-terrarium.com", "fastlylb.net", "faststacks.net", @@ -2521,6 +2577,7 @@ static_const const_char_ptr domain_suffix[] = { "firewall-gateway.com", "firewall-gateway.de", "firewall-gateway.net", + "firewalledreplit.co", "fireweb.app", "firm.co", "firm.dk", @@ -2555,6 +2612,7 @@ static_const const_char_ptr domain_suffix[] = { "flights", "flir", "flog.br", + "flop.jp", "floppy.jp", "flora.no", "florence.it", @@ -2589,10 +2647,6 @@ static_const const_char_ptr domain_suffix[] = { "for-our.info", "for-some.biz", "for-the.biz", - "for.men", - "for.mom", - "for.one", - "for.sale", "force.museum", "ford", "forde.no", @@ -2723,8 +2777,7 @@ static_const const_char_ptr domain_suffix[] = { "from-wv.com", "from-wy.com", "from.hr", - "from.marketing", - "from.work", + "from.tv", "frontdoor", "frontier", "frosinone.it", @@ -3002,7 +3055,6 @@ static_const const_char_ptr domain_suffix[] = { "gotpantheon.com", "gotsu.shimane.jp", "goupile.fr", - "gouv.bj", "gouv.ci", "gouv.fr", "gouv.ht", @@ -3227,7 +3279,6 @@ static_const const_char_ptr domain_suffix[] = { "gv.vc", "gw", "gwangju.kr", - "gwiddle.co.uk", "gx.cn", "gy", "gyeongbuk.kr", @@ -3263,6 +3314,7 @@ static_const const_char_ptr domain_suffix[] = { "hakusan.ishikawa.jp", "halden.no", "half.host", + "halfmoon.jp", "halloffame.museum", "halsa.no", "ham-radio-op.net", @@ -3591,6 +3643,7 @@ static_const const_char_ptr domain_suffix[] = { "icurus.jp", "id", "id.au", + "id.firewalledreplit.co", "id.forgerock.io", "id.ir", "id.lv", @@ -3604,6 +3657,7 @@ static_const const_char_ptr domain_suffix[] = { "idv.tw", "ie", "ie.eu.org", + "ie.ua", "ieee", "if.ua", "ifm", @@ -3665,9 +3719,9 @@ static_const const_char_ptr domain_suffix[] = { "in-vpn.net", "in-vpn.org", "in.eu.org", - "in.london", "in.na", "in.net", + "in.ngrok.io", "in.ni", "in.rs", "in.th", @@ -3718,6 +3772,7 @@ static_const const_char_ptr domain_suffix[] = { "info.au", "info.az", "info.bb", + "info.bj", "info.bo", "info.co", "info.cx", @@ -3919,6 +3974,7 @@ static_const const_char_ptr domain_suffix[] = { "isumi.chiba.jp", "it", "it.ao", + "it.com", "it.eu.org", "it1.eur.aruba.jenv-aruba.cloud", "it1.jenv-aruba.cloud", @@ -3940,6 +3996,7 @@ static_const const_char_ptr domain_suffix[] = { "ivanovo.su", "iveland.no", "ivgu.no", + "ivory.ne.jp", "iwade.wakayama.jp", "iwafune.tochigi.jp", "iwaizumi.iwate.jp", @@ -3989,6 +4046,7 @@ static_const const_char_ptr domain_suffix[] = { "je", "jed.wafaicloud.com", "jeep", + "jeez.jp", "jefferson.museum", "jeju.kr", "jelastic.dogado.eu", @@ -4051,8 +4109,10 @@ static_const const_char_ptr domain_suffix[] = { "jp.kg", "jp.md", "jp.net", + "jp.ngrok.io", "jpmorgan", "jpn.com", + "jpn.org", "jprs", "js.cn", "js.org", @@ -4337,6 +4397,7 @@ static_const const_char_ptr domain_suffix[] = { "kinko.kagoshima.jp", "kinokawa.wakayama.jp", "kira.aichi.jp", + "kirara.st", "kirkenes.no", "kirovograd.ua", "kiryu.gunma.jp", @@ -4754,7 +4815,6 @@ static_const const_char_ptr domain_suffix[] = { "locus", "lodi.it", "lodingen.no", - "loft", "log.br", "loginline.app", "loginline.dev", @@ -4766,6 +4826,7 @@ static_const const_char_ptr domain_suffix[] = { "logoip.com", "logoip.de", "lohmus.me", + "loisirs.bj", "lol", "lolipop.io", "lolipopmc.jp", @@ -4857,7 +4918,6 @@ static_const const_char_ptr domain_suffix[] = { "maceio.br", "macerata.it", "machida.tokyo.jp", - "macys", "mad.museum", "madrid", "madrid.museum", @@ -4866,6 +4926,7 @@ static_const const_char_ptr domain_suffix[] = { "magnet.page", "maibara.shiga.jp", "maif", + "mail-box.ne.jp", "mail.pl", "main.jp", "maintenance.aero", @@ -4928,6 +4989,7 @@ static_const const_char_ptr domain_suffix[] = { "masuda.shimane.jp", "mat.br", "matera.it", + "matrix.jp", "matsubara.osaka.jp", "matsubushi.saitama.jp", "matsuda.kanagawa.jp", @@ -5137,6 +5199,7 @@ static_const const_char_ptr domain_suffix[] = { "mill.museum", "mima.tokushima.jp", "mimata.miyazaki.jp", + "mimoza.jp", "minakami.gunma.jp", "minamata.kumamoto.jp", "minami-alps.yamanashi.jp", @@ -5177,6 +5240,7 @@ static_const const_char_ptr domain_suffix[] = { "minowa.nagano.jp", "mint", "mintere.site", + "mints.ne.jp", "mircloud.host", "mircloud.ru", "mircloud.us", @@ -5270,6 +5334,7 @@ static_const const_char_ptr domain_suffix[] = { "moe", "moi", "moka.tochigi.jp", + "mokuren.ne.jp", "mol.it", "molde.no", "molise.it", @@ -5279,6 +5344,7 @@ static_const const_char_ptr domain_suffix[] = { "monash", "mond.jp", "money", + "money.bj", "money.museum", "mongolian.jp", "monmouth.museum", @@ -5402,6 +5468,7 @@ static_const const_char_ptr domain_suffix[] = { "my.eu.org", "my.id", "myactivedirectory.com", + "myamaze.net", "myasustor.com", "mycd.eu", "mycloud.by", @@ -5433,7 +5500,6 @@ static_const const_char_ptr domain_suffix[] = { "mypi.co", "mypsx.net", "myqnapcloud.com", - "myravendb.com", "mysecuritycamera.com", "mysecuritycamera.net", "mysecuritycamera.org", @@ -5458,6 +5524,8 @@ static_const const_char_ptr domain_suffix[] = { "myspreadshop.no", "myspreadshop.pl", "myspreadshop.se", + "mytabit.co.il", + "mytabit.com", "mytis.ru", "mytuleap.com", "myvnc.com", @@ -5645,6 +5713,7 @@ static_const const_char_ptr domain_suffix[] = { "net.ba", "net.bb", "net.bh", + "net.bj", "net.bm", "net.bn", "net.bo", @@ -5769,6 +5838,7 @@ static_const const_char_ptr domain_suffix[] = { "net.zm", "netbank", "netflix", + "netgamers.jp", "netlify.app", "network", "neues.museum", @@ -5798,7 +5868,12 @@ static_const const_char_ptr domain_suffix[] = { "ngo.ng", "ngo.ph", "ngo.za", + "ngrok-free.app", + "ngrok-free.dev", + "ngrok.app", + "ngrok.dev", "ngrok.io", + "ngrok.pizza", "nh-serv.co.uk", "nh.us", "nhk", @@ -5991,6 +6066,7 @@ static_const const_char_ptr domain_suffix[] = { "ny.us", "nyaa.am", "nyan.to", + "nyanta.jp", "nyc", "nyc.mn", "nyc.museum", @@ -6002,6 +6078,7 @@ static_const const_char_ptr domain_suffix[] = { "nz.eu.org", "o.bg", "o.se", + "o0o0.jp", "oamishirasato.chiba.jp", "oarai.ibaraki.jp", "obama.fukui.jp", @@ -6027,9 +6104,7 @@ static_const const_char_ptr domain_suffix[] = { "odo.br", "oe.yamagata.jp", "of.by", - "of.fashion", "of.je", - "of.london", "of.no", "off.ai", "office", @@ -6161,6 +6236,7 @@ static_const const_char_ptr domain_suffix[] = { "ooo", "oops.jp", "ooshika.nagano.jp", + "opal.ne.jp", "open", "openair.museum", "opencraft.hosting", @@ -6207,6 +6283,7 @@ static_const const_char_ptr domain_suffix[] = { "org.bb", "org.bh", "org.bi", + "org.bj", "org.bm", "org.bn", "org.bo", @@ -6389,6 +6466,7 @@ static_const const_char_ptr domain_suffix[] = { "otama.fukushima.jp", "otari.nagano.jp", "otaru.hokkaido.jp", + "ote.bj", "other.nf", "oto.fukuoka.jp", "otobe.hokkaido.jp", @@ -6625,7 +6703,6 @@ static_const const_char_ptr domain_suffix[] = { "pomorze.pl", "poniatowa.pl", "ponpes.id", - "pony.club", "pordenone.it", "porn", "porsanger.no", @@ -6681,6 +6758,7 @@ static_const const_char_ptr domain_suffix[] = { "priv.me", "priv.no", "priv.pl", + "privatelink.snowflake.app", "privatizehealthinsurance.net", "pro", "pro.az", @@ -6778,6 +6856,7 @@ static_const const_char_ptr domain_suffix[] = { "r.bg", "r.cdn77.net", "r.se", + "r2.dev", "ra.it", "racing", "rackmaze.com", @@ -6817,6 +6896,7 @@ static_const const_char_ptr domain_suffix[] = { "rawa-maz.pl", "rc.it", "rdv.to", + "rdy.jp", "re", "re.it", "re.kr", @@ -6868,7 +6948,6 @@ static_const const_char_ptr domain_suffix[] = { "rep.br", "rep.kp", "repair", - "repair.men", "repbody.aero", "repl.co", "repl.run", @@ -6888,11 +6967,14 @@ static_const const_char_ptr domain_suffix[] = { "resistance.museum", "rest", "restaurant", + "restaurant.bj", + "resto.bj", "review", "reviews", "revista.bo", "rexroth", "rg.it", + "rgr.jp", "rhcloud.com", "ri.it", "ri.us", @@ -6969,6 +7051,7 @@ static_const const_char_ptr domain_suffix[] = { "rs.ba", "rs.gov.br", "rs.leg.br", + "rs.webaccel.jp", "rsc.cdn77.org", "rsvp", "ru", @@ -6977,6 +7060,7 @@ static_const const_char_ptr domain_suffix[] = { "ru.net", "rugby", "ruhr", + "rulez.jp", "run", "run.app", "ruovat.no", @@ -7052,6 +7136,8 @@ static_const const_char_ptr domain_suffix[] = { "s3.eu-west-2.amazonaws.com", "s3.eu-west-3.amazonaws.com", "s3.fr-par.scw.cloud", + "s3.isk01.sakurastorage.jp", + "s3.isk02.sakurastorage.jp", "s3.nl-ams.scw.cloud", "s3.pl-waw.scw.cloud", "s3.teckids.org", @@ -7065,6 +7151,7 @@ static_const const_char_ptr domain_suffix[] = { "sa.gov.au", "sa.gov.pl", "sa.it", + "sa.ngrok.io", "saarland", "sabae.fukui.jp", "sadist.jp", @@ -7101,9 +7188,13 @@ static_const const_char_ptr domain_suffix[] = { "sakuho.nagano.jp", "sakura", "sakura.chiba.jp", + "sakura.ne.jp", "sakura.tochigi.jp", + "sakura.tv", "sakuragawa.ibaraki.jp", "sakurai.nara.jp", + "sakuratan.com", + "sakuraweb.com", "sakyo.kyoto.jp", "salangen.no", "salat.no", @@ -7111,6 +7202,7 @@ static_const const_char_ptr domain_suffix[] = { "salem.museum", "salerno.it", "salon", + "saloon.jp", "saltdal.no", "salud.bo", "salvador.br", @@ -7183,6 +7275,7 @@ static_const const_char_ptr domain_suffix[] = { "sb", "sb.ua", "sbi", + "sblo.jp", "sbs", "sc", "sc.cn", @@ -7332,7 +7425,6 @@ static_const const_char_ptr domain_suffix[] = { "service.one", "services", "services.aero", - "ses", "setagaya.tokyo.jp", "seto.aichi.jp", "setouchi.okayama.jp", @@ -7490,6 +7582,10 @@ static_const const_char_ptr domain_suffix[] = { "silk", "silk.museum", "simple-url.com", + "simplesite.com", + "simplesite.com.br", + "simplesite.gr", + "simplesite.pl", "sina", "sinaapp.com", "singles", @@ -7524,6 +7620,7 @@ static_const const_char_ptr domain_suffix[] = { "skoczow.pl", "skodje.no", "skole.museum", + "skr.jp", "sky", "skydiving.aero", "skygearapp.com", @@ -7552,6 +7649,7 @@ static_const const_char_ptr domain_suffix[] = { "sncf", "snillfjord.no", "snoasa.no", + "snowflake.app", "so", "so.gov.pl", "so.it", @@ -7631,6 +7729,7 @@ static_const const_char_ptr domain_suffix[] = { "square7.ch", "square7.de", "square7.net", + "squares.net", "sr", "sr.gov.pl", "sr.it", @@ -7701,6 +7800,7 @@ static_const const_char_ptr domain_suffix[] = { "strand.no", "stranda.no", "stream", + "streamlit.app", "streamlitapp.com", "stripper.jp", "stryn.no", @@ -7730,6 +7830,7 @@ static_const const_char_ptr domain_suffix[] = { "suli.hu", "sumida.tokyo.jp", "sumita.iwate.jp", + "sumomo.ne.jp", "sumoto.hyogo.jp", "sumoto.kumamoto.jp", "sumy.ua", @@ -7874,6 +7975,7 @@ static_const const_char_ptr domain_suffix[] = { "tanabe.wakayama.jp", "tanagura.fukushima.jp", "tananger.no", + "tank.jp", "tank.museum", "tanohata.iwate.jp", "taobao", @@ -7902,7 +8004,6 @@ static_const const_char_ptr domain_suffix[] = { "tax", "taxi", "taxi.br", - "tbits.me", "tc", "tc.br", "tci", @@ -7955,7 +8056,6 @@ static_const const_char_ptr domain_suffix[] = { "tg", "tgory.pl", "th", - "that.win", "thd", "the.br", "theater", @@ -8015,7 +8115,6 @@ static_const const_char_ptr domain_suffix[] = { "to.it", "to.leg.br", "to.md", - "to.work", "toba.mie.jp", "tobe.ehime.jp", "tobetsu.hokkaido.jp", @@ -8073,6 +8172,7 @@ static_const const_char_ptr domain_suffix[] = { "tools", "toon.ehime.jp", "top", + "topaz.ne.jp", "topology.museum", "torahime.shiga.jp", "toray", @@ -8092,6 +8192,7 @@ static_const const_char_ptr domain_suffix[] = { "tottori.jp", "tottori.tottori.jp", "touch.museum", + "tourism.bj", "tourism.pl", "tourism.tn", "tours", @@ -8305,6 +8406,7 @@ static_const const_char_ptr domain_suffix[] = { "ug", "ug.gov.pl", "ugim.gov.pl", + "uh-oh.jp", "uhren.museum", "ui.nabu.casa", "uji.kyoto.jp", @@ -8335,12 +8437,13 @@ static_const const_char_ptr domain_suffix[] = { "umig.gov.pl", "unazuki.toyama.jp", "under.jp", - "under.one", "undersea.museum", + "undo.jp", "uni5.net", "unicloud.pl", "unicom", "union.aero", + "univ.bj", "univ.sn", "university", "university.museum", @@ -8391,6 +8494,7 @@ static_const const_char_ptr domain_suffix[] = { "us.in", "us.kg", "us.na", + "us.ngrok.io", "us.org", "us.platform.sh", "us.reclaim.cloud", @@ -8404,6 +8508,7 @@ static_const const_char_ptr domain_suffix[] = { "user.aseinet.ne.jp", "user.party.eus", "user.srcf.net", + "user.webaccel.jp", "usercontent.jp", "users.scale.virtualcloud.com.br", "usgarden.museum", @@ -8693,6 +8798,7 @@ static_const const_char_ptr domain_suffix[] = { "webredirect.org", "website", "website.yandexcloud.net", + "websozai.jp", "webspace.rocks", "webthings.io", "webview-assets.cloud9.af-south-1.amazonaws.com", @@ -8757,7 +8863,6 @@ static_const const_char_ptr domain_suffix[] = { "winners", "wios.gov.pl", "witd.gov.pl", - "with.marketing", "withgoogle.com", "withyoutube.com", "wiw.gov.pl", @@ -8805,12 +8910,15 @@ static_const const_char_ptr domain_suffix[] = { "x.bg", "x.mythic-beasts.com", "x.se", + "x0.com", + "x0.to", "x443.pw", "xbox", "xen.prgmr.com", "xerox", "xfinity", "xihuan", + "xii.jp", "xin", "xj.cn", "xn--0trq7p7nn.jp", @@ -9015,7 +9123,6 @@ static_const const_char_ptr domain_suffix[] = { "xn--j1amh", "xn--j6w193g", "xn--jlq480n2rg", - "xn--jlq61u9w7b", "xn--jlster-bya.no", "xn--jrpeland-54a.no", "xn--jvr189m", diff --git a/suffix/public_suffix_list.dat b/suffix/public_suffix_list.dat index 5676a31..4fa60bc 100644 --- a/suffix/public_suffix_list.dat +++ b/suffix/public_suffix_list.dat @@ -380,11 +380,29 @@ org.bi // biz : https://en.wikipedia.org/wiki/.biz biz -// bj : https://en.wikipedia.org/wiki/.bj +// bj : https://nic.bj/bj-suffixes.txt +// submitted by registry bj -asso.bj -barreau.bj -gouv.bj +africa.bj +agro.bj +architectes.bj +assur.bj +avocats.bj +co.bj +com.bj +eco.bj +econo.bj +edu.bj +info.bj +loisirs.bj +money.bj +net.bj +org.bj +ote.bj +resto.bj +restaurant.bj +tourism.bj +univ.bj // bm : http://www.bermudanic.bm/dnr-text.txt bm @@ -7171,7 +7189,7 @@ org.zw // newGTLDs -// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2022-09-15T15:17:34Z +// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2023-03-08T15:15:40Z // This list is auto-generated, don't edit it manually. // aaa : 2015-02-26 American Automobile Association, Inc. aaa @@ -7221,9 +7239,6 @@ aco // actor : 2013-12-12 Dog Beach, LLC actor -// adac : 2015-07-16 Allgemeiner Deutscher Automobil-Club e.V. (ADAC) -adac - // ads : 2014-12-04 Charleston Road Registry Inc. ads @@ -7341,7 +7356,7 @@ arab // aramco : 2014-11-20 Aramco Services Company aramco -// archi : 2014-02-06 Afilias Limited +// archi : 2014-02-06 Identity Digital Limited archi // army : 2014-03-06 Dog Beach, LLC @@ -7389,7 +7404,7 @@ auto // autos : 2014-01-09 XYZ.COM LLC autos -// avianca : 2015-01-08 Avianca Holdings S.A. +// avianca : 2015-01-08 Avianca Inc. avianca // aws : 2015-06-25 AWS Registry LLC @@ -7485,7 +7500,7 @@ best // bestbuy : 2015-07-31 BBY Solutions, Inc. bestbuy -// bet : 2015-05-07 Afilias Limited +// bet : 2015-05-07 Identity Digital Limited bet // bharti : 2014-01-09 Bharti Enterprises (Holding) Private Limited @@ -7506,10 +7521,10 @@ bing // bingo : 2014-12-04 Binky Moon, LLC bingo -// bio : 2014-03-06 Afilias Limited +// bio : 2014-03-06 Identity Digital Limited bio -// black : 2014-01-16 Afilias Limited +// black : 2014-01-16 Identity Digital Limited black // blackfriday : 2014-01-16 Registry Services, LLC @@ -7524,7 +7539,7 @@ blog // bloomberg : 2014-07-17 Bloomberg IP Holdings LLC bloomberg -// blue : 2013-11-07 Afilias Limited +// blue : 2013-11-07 Identity Digital Limited blue // bms : 2014-10-30 Bristol-Myers Squibb Company @@ -7596,9 +7611,6 @@ brother // brussels : 2014-02-06 DNS.be vzw brussels -// bugatti : 2015-07-23 Bugatti International SA -bugatti - // build : 2013-11-07 Plan Bee LLC build @@ -7641,9 +7653,6 @@ camera // camp : 2013-11-07 Binky Moon, LLC camp -// cancerresearch : 2014-05-15 Australian Cancer Research Foundation -cancerresearch - // canon : 2014-09-12 Canon Inc. canon @@ -7782,7 +7791,7 @@ claims // cleaning : 2013-12-05 Binky Moon, LLC cleaning -// click : 2014-06-05 UNR Corp. +// click : 2014-06-05 Internet Naming Company LLC click // clinic : 2014-03-20 Binky Moon, LLC @@ -8379,7 +8388,7 @@ glass // gle : 2014-07-24 Charleston Road Registry Inc. gle -// global : 2014-04-17 Dot Global Domain Registry Limited +// global : 2014-04-17 Identity Digital Limited global // globo : 2013-12-19 Globo Comunicação e Participações S.A @@ -8436,7 +8445,7 @@ graphics // gratis : 2014-03-20 Binky Moon, LLC gratis -// green : 2014-05-08 Afilias Limited +// green : 2014-05-08 Identity Digital Limited green // gripe : 2014-03-06 Binky Moon, LLC @@ -8517,7 +8526,7 @@ hisamitsu // hitachi : 2014-10-31 Hitachi, Ltd. hitachi -// hiv : 2014-03-13 UNR Corp. +// hiv : 2014-03-13 Internet Naming Company LLC hiv // hkt : 2015-05-14 PCCW-HKT DataCom Services Limited @@ -8721,7 +8730,7 @@ jpmorgan // jprs : 2014-09-18 Japan Registry Services Co., Ltd. jprs -// juegos : 2014-03-20 UNR Corp. +// juegos : 2014-03-20 Internet Naming Company LLC juegos // juniper : 2015-07-30 JUNIPER NETWORKS, INC. @@ -8751,7 +8760,7 @@ kia // kids : 2021-08-13 DotKids Foundation Limited kids -// kim : 2013-09-23 Afilias Limited +// kim : 2013-09-23 Identity Digital Limited kim // kinder : 2014-11-07 Ferrero Trading Lux S.A. @@ -8856,7 +8865,7 @@ lego // lexus : 2015-04-23 TOYOTA MOTOR CORPORATION lexus -// lgbt : 2014-05-08 Afilias Limited +// lgbt : 2014-05-08 Identity Digital Limited lgbt // lidl : 2014-09-18 Schwarz Domains und Services GmbH & Co. KG @@ -8904,7 +8913,7 @@ live // living : 2015-07-30 Lifestyle Domain Holdings, Inc. living -// llc : 2017-12-14 Afilias Limited +// llc : 2017-12-14 Identity Digital Limited llc // llp : 2019-08-26 Intercap Registry Inc. @@ -8922,9 +8931,6 @@ locker // locus : 2015-06-25 Locus Analytics LLC locus -// loft : 2015-07-30 Annco, Inc. -loft - // lol : 2015-01-30 XYZ.COM LLC lol @@ -8934,7 +8940,7 @@ london // lotte : 2014-11-07 Lotte Holdings Co., Ltd. lotte -// lotto : 2014-04-10 Afilias Limited +// lotto : 2014-04-10 Identity Digital Limited lotto // love : 2014-12-22 Merchant Law Group LLP @@ -8961,9 +8967,6 @@ luxe // luxury : 2013-10-17 Luxury Partners, LLC luxury -// macys : 2015-07-31 Macys, Inc. -macys - // madrid : 2014-05-01 Comunidad de Madrid madrid @@ -9282,7 +9285,7 @@ oracle // orange : 2015-03-12 Orange Brand Services Limited orange -// organic : 2014-03-27 Afilias Limited +// organic : 2014-03-27 Identity Digital Limited organic // origins : 2015-10-01 The Estée Lauder Companies Inc. @@ -9330,7 +9333,7 @@ pay // pccw : 2015-05-14 PCCW Enterprises Limited pccw -// pet : 2015-05-07 Afilias Limited +// pet : 2015-05-07 Identity Digital Limited pet // pfizer : 2015-09-11 Pfizer Inc. @@ -9378,7 +9381,7 @@ pin // ping : 2015-06-11 Ping Registry Provider, Inc. ping -// pink : 2013-10-01 Afilias Limited +// pink : 2013-10-01 Identity Digital Limited pink // pioneer : 2015-07-16 Pioneer Corporation @@ -9408,7 +9411,7 @@ pnc // pohl : 2014-06-23 Deutsche Vermögensberatung Aktiengesellschaft DVAG pohl -// poker : 2014-07-03 Afilias Limited +// poker : 2014-07-03 Identity Digital Limited poker // politie : 2015-08-20 Politie Nederland @@ -9441,13 +9444,13 @@ prof // progressive : 2015-07-23 Progressive Casualty Insurance Company progressive -// promo : 2014-12-18 Afilias Limited +// promo : 2014-12-18 Identity Digital Limited promo // properties : 2013-12-05 Binky Moon, LLC properties -// property : 2014-05-22 UNR Corp. +// property : 2014-05-22 Internet Naming Company LLC property // protection : 2015-04-23 XYZ.COM LLC @@ -9465,7 +9468,7 @@ pub // pwc : 2015-10-29 PricewaterhouseCoopers LLP pwc -// qpon : 2013-11-14 dotCOOL, Inc. +// qpon : 2013-11-14 dotQPON LLC qpon // quebec : 2013-12-19 PointQuébec Inc @@ -9495,7 +9498,7 @@ realty // recipes : 2013-10-17 Binky Moon, LLC recipes -// red : 2013-11-07 Afilias Limited +// red : 2013-11-07 Identity Digital Limited red // redstone : 2014-10-31 Redstone Haute Couture Co., Ltd. @@ -9711,9 +9714,6 @@ sener // services : 2014-02-27 Binky Moon, LLC services -// ses : 2015-07-23 SES -ses - // seven : 2015-08-06 Seven West Media Ltd seven @@ -9723,7 +9723,7 @@ sew // sex : 2014-11-13 ICM Registry SX LLC sex -// sexy : 2013-09-11 UNR Corp. +// sexy : 2013-09-11 Internet Naming Company LLC sexy // sfr : 2015-08-13 Societe Francaise du Radiotelephone - SFR @@ -9744,7 +9744,7 @@ shell // shia : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti. shia -// shiksha : 2013-11-14 Afilias Limited +// shiksha : 2013-11-14 Identity Digital Limited shiksha // shoes : 2013-10-02 Binky Moon, LLC @@ -9777,7 +9777,7 @@ singles // site : 2015-01-15 Radix FZC site -// ski : 2015-04-09 Afilias Limited +// ski : 2015-04-09 Identity Digital Limited ski // skin : 2015-01-15 XYZ.COM LLC @@ -9798,7 +9798,7 @@ smart // smile : 2014-12-18 Amazon Registry Services, Inc. smile -// sncf : 2015-02-19 Société Nationale des Chemins de fer Francais S N C F +// sncf : 2015-02-19 Société Nationale SNCF sncf // soccer : 2015-03-26 Binky Moon, LLC @@ -10035,7 +10035,7 @@ toray // toshiba : 2014-04-10 TOSHIBA Corporation toshiba -// total : 2015-08-06 TOTAL SE +// total : 2015-08-06 TotalEnergies SE total // tours : 2015-01-22 Binky Moon, LLC @@ -10071,7 +10071,7 @@ travelers // travelersinsurance : 2015-03-26 Travelers TLD, LLC travelersinsurance -// trust : 2014-10-16 UNR Corp. +// trust : 2014-10-16 Internet Naming Company LLC trust // trv : 2015-03-26 Travelers TLD, LLC @@ -10218,7 +10218,7 @@ wanggou // watch : 2013-11-14 Binky Moon, LLC watch -// watches : 2014-12-22 Afilias Limited +// watches : 2014-12-22 Identity Digital Limited watches // weather : 2015-01-08 International Business Machines Corporation @@ -10353,7 +10353,7 @@ xin // xn--5tzm5g : 2014-12-22 Global Website TLD Asia Limited 网站 -// xn--6frz82g : 2013-09-23 Afilias Limited +// xn--6frz82g : 2013-09-23 Identity Digital Limited 移动 // xn--6qq986b3xl : 2013-09-13 Tycoon Treasure Limited @@ -10470,9 +10470,6 @@ xin // xn--jlq480n2rg : 2019-12-19 Amazon Registry Services, Inc. 亚马逊 -// xn--jlq61u9w7b : 2015-01-08 Nokia Corporation -诺基亚 - // xn--jvr189m : 2015-02-26 Amazon Registry Services, Inc. 食品 @@ -10660,6 +10657,14 @@ graphox.us // Submitted by accesso Team *.devcdnaccesso.com +// Acorn Labs : https://acorn.io +// Submitted by Craig Jellick +*.on-acorn.io + +// ActiveTrail: https://www.activetrail.biz/ +// Submitted by Ofer Kalaora +activetrail.biz + // Adobe : https://www.adobe.com/ // Submitted by Ian Boston and Lars Trieloff adobeaemcloud.com @@ -10669,6 +10674,11 @@ adobeaemcloud.net hlx.page hlx3.page +// Adobe Developer Platform : https://developer.adobe.com +// Submitted by Jesse MacFadyen +adobeio-static.net +adobeioruntime.net + // Agnat sp. z o.o. : https://domena.pl // Submitted by Przemyslaw Plewa beep.pl @@ -10683,6 +10693,24 @@ airkitapps.eu // Submitted by Etienne Stalmans aivencloud.com +// Akamai : https://www.akamai.com/ +// Submitted by Akamai Team +akadns.net +akamai.net +akamai-staging.net +akamaiedge.net +akamaiedge-staging.net +akamaihd.net +akamaihd-staging.net +akamaiorigin.net +akamaiorigin-staging.net +akamaized.net +akamaized-staging.net +edgekey.net +edgekey-staging.net +edgesuite.net +edgesuite-staging.net + // alboto.ca : http://alboto.ca // Submitted by Anton Avramov barsy.ca @@ -10704,51 +10732,53 @@ altervista.org // Submitted by Cyril alwaysdata.net -// Amazon CloudFront : https://aws.amazon.com/cloudfront/ +// Amaze Software : https://amaze.co +// Submitted by Domain Admin +myamaze.net + +// Amazon : https://www.amazon.com/ +// Submitted by AWS Security +// Subsections of Amazon/subsidiaries will appear until "concludes" tag + +// Amazon CloudFront // Submitted by Donavan Miller +// Reference: 54144616-fd49-4435-8535-19c6a601bdb3 cloudfront.net -// Amazon Elastic Compute Cloud : https://aws.amazon.com/ec2/ +// Amazon EC2 // Submitted by Luke Wells +// Reference: 4c38fa71-58ac-4768-99e5-689c1767e537 *.compute.amazonaws.com *.compute-1.amazonaws.com *.compute.amazonaws.com.cn us-east-1.amazonaws.com -// Amazon Elastic Beanstalk : https://aws.amazon.com/elasticbeanstalk/ -// Submitted by Luke Wells -cn-north-1.eb.amazonaws.com.cn -cn-northwest-1.eb.amazonaws.com.cn -elasticbeanstalk.com -ap-northeast-1.elasticbeanstalk.com -ap-northeast-2.elasticbeanstalk.com -ap-northeast-3.elasticbeanstalk.com -ap-south-1.elasticbeanstalk.com -ap-southeast-1.elasticbeanstalk.com -ap-southeast-2.elasticbeanstalk.com -ca-central-1.elasticbeanstalk.com -eu-central-1.elasticbeanstalk.com -eu-west-1.elasticbeanstalk.com -eu-west-2.elasticbeanstalk.com -eu-west-3.elasticbeanstalk.com -sa-east-1.elasticbeanstalk.com -us-east-1.elasticbeanstalk.com -us-east-2.elasticbeanstalk.com -us-gov-west-1.elasticbeanstalk.com -us-west-1.elasticbeanstalk.com -us-west-2.elasticbeanstalk.com - -// Amazon Elastic Load Balancing : https://aws.amazon.com/elasticloadbalancing/ -// Submitted by Luke Wells -*.elb.amazonaws.com -*.elb.amazonaws.com.cn - -// Amazon Global Accelerator : https://aws.amazon.com/global-accelerator/ -// Submitted by Daniel Massaguer -awsglobalaccelerator.com - -// Amazon S3 : https://aws.amazon.com/s3/ +// Amazon S3 // Submitted by Luke Wells +// Reference: d068bd97-f0a9-4838-a6d8-954b622ef4ae +s3.cn-north-1.amazonaws.com.cn +s3.dualstack.ap-northeast-1.amazonaws.com +s3.dualstack.ap-northeast-2.amazonaws.com +s3.ap-northeast-2.amazonaws.com +s3-website.ap-northeast-2.amazonaws.com +s3.dualstack.ap-south-1.amazonaws.com +s3.ap-south-1.amazonaws.com +s3-website.ap-south-1.amazonaws.com +s3.dualstack.ap-southeast-1.amazonaws.com +s3.dualstack.ap-southeast-2.amazonaws.com +s3.dualstack.ca-central-1.amazonaws.com +s3.ca-central-1.amazonaws.com +s3-website.ca-central-1.amazonaws.com +s3.dualstack.eu-central-1.amazonaws.com +s3.eu-central-1.amazonaws.com +s3-website.eu-central-1.amazonaws.com +s3.dualstack.eu-west-1.amazonaws.com +s3.dualstack.eu-west-2.amazonaws.com +s3.eu-west-2.amazonaws.com +s3-website.eu-west-2.amazonaws.com +s3.dualstack.eu-west-3.amazonaws.com +s3.eu-west-3.amazonaws.com +s3-website.eu-west-3.amazonaws.com s3.amazonaws.com s3-ap-northeast-1.amazonaws.com s3-ap-northeast-2.amazonaws.com @@ -10763,48 +10793,25 @@ s3-eu-west-3.amazonaws.com s3-external-1.amazonaws.com s3-fips-us-gov-west-1.amazonaws.com s3-sa-east-1.amazonaws.com -s3-us-gov-west-1.amazonaws.com s3-us-east-2.amazonaws.com +s3-us-gov-west-1.amazonaws.com s3-us-west-1.amazonaws.com s3-us-west-2.amazonaws.com -s3.ap-northeast-2.amazonaws.com -s3.ap-south-1.amazonaws.com -s3.cn-north-1.amazonaws.com.cn -s3.ca-central-1.amazonaws.com -s3.eu-central-1.amazonaws.com -s3.eu-west-2.amazonaws.com -s3.eu-west-3.amazonaws.com -s3.us-east-2.amazonaws.com -s3.dualstack.ap-northeast-1.amazonaws.com -s3.dualstack.ap-northeast-2.amazonaws.com -s3.dualstack.ap-south-1.amazonaws.com -s3.dualstack.ap-southeast-1.amazonaws.com -s3.dualstack.ap-southeast-2.amazonaws.com -s3.dualstack.ca-central-1.amazonaws.com -s3.dualstack.eu-central-1.amazonaws.com -s3.dualstack.eu-west-1.amazonaws.com -s3.dualstack.eu-west-2.amazonaws.com -s3.dualstack.eu-west-3.amazonaws.com -s3.dualstack.sa-east-1.amazonaws.com -s3.dualstack.us-east-1.amazonaws.com -s3.dualstack.us-east-2.amazonaws.com -s3-website-us-east-1.amazonaws.com -s3-website-us-west-1.amazonaws.com -s3-website-us-west-2.amazonaws.com s3-website-ap-northeast-1.amazonaws.com s3-website-ap-southeast-1.amazonaws.com s3-website-ap-southeast-2.amazonaws.com s3-website-eu-west-1.amazonaws.com s3-website-sa-east-1.amazonaws.com -s3-website.ap-northeast-2.amazonaws.com -s3-website.ap-south-1.amazonaws.com -s3-website.ca-central-1.amazonaws.com -s3-website.eu-central-1.amazonaws.com -s3-website.eu-west-2.amazonaws.com -s3-website.eu-west-3.amazonaws.com +s3-website-us-east-1.amazonaws.com +s3-website-us-west-1.amazonaws.com +s3-website-us-west-2.amazonaws.com +s3.dualstack.sa-east-1.amazonaws.com +s3.dualstack.us-east-1.amazonaws.com +s3.dualstack.us-east-2.amazonaws.com +s3.us-east-2.amazonaws.com s3-website.us-east-2.amazonaws.com -// AWS Cloud9 : https://aws.amazon.com/cloud9/ +// AWS Cloud9 // Submitted by: AWS Security // Reference: 2b6dfa9a-3a7f-4367-b2e7-0321e77c0d59 vfs.cloud9.af-south-1.amazonaws.com @@ -10850,6 +10857,49 @@ webview-assets.cloud9.us-west-1.amazonaws.com vfs.cloud9.us-west-2.amazonaws.com webview-assets.cloud9.us-west-2.amazonaws.com +// AWS Elastic Beanstalk +// Submitted by Luke Wells +// Reference: aa202394-43a0-4857-b245-8db04549137e +cn-north-1.eb.amazonaws.com.cn +cn-northwest-1.eb.amazonaws.com.cn +elasticbeanstalk.com +ap-northeast-1.elasticbeanstalk.com +ap-northeast-2.elasticbeanstalk.com +ap-northeast-3.elasticbeanstalk.com +ap-south-1.elasticbeanstalk.com +ap-southeast-1.elasticbeanstalk.com +ap-southeast-2.elasticbeanstalk.com +ca-central-1.elasticbeanstalk.com +eu-central-1.elasticbeanstalk.com +eu-west-1.elasticbeanstalk.com +eu-west-2.elasticbeanstalk.com +eu-west-3.elasticbeanstalk.com +sa-east-1.elasticbeanstalk.com +us-east-1.elasticbeanstalk.com +us-east-2.elasticbeanstalk.com +us-gov-west-1.elasticbeanstalk.com +us-west-1.elasticbeanstalk.com +us-west-2.elasticbeanstalk.com + +// (AWS) Elastic Load Balancing +// Submitted by Luke Wells +// Reference: 12a3d528-1bac-4433-a359-a395867ffed2 +*.elb.amazonaws.com.cn +*.elb.amazonaws.com + +// AWS Global Accelerator +// Submitted by Daniel Massaguer +// Reference: d916759d-a08b-4241-b536-4db887383a6a +awsglobalaccelerator.com + +// eero +// Submitted by Yue Kang +// Reference: 264afe70-f62c-4c02-8ab9-b5281ed24461 +eero.online +eero-stage.online + +// concludes Amazon + // Amune : https://amune.org/ // Submitted by Team Amune t3l3p0rt.net @@ -10905,6 +10955,10 @@ cdn.prod.atlassian-dev.net // Submitted by Lukas Reschke translated.page +// Autocode : https://autocode.com +// Submitted by Jacob Lee +autocode.dev + // AVM : https://avm.de // Submitted by Andreas Weise myfritz.net @@ -11033,6 +11087,11 @@ cafjs.com // Submitted by Marcus Popp mycd.eu +// Canva Pty Ltd : https://canva.com/ +// Submitted by Joel Aquilina +canva-apps.cn +canva-apps.com + // Carrd : https://carrd.co // Submitted by AJ drr.ac @@ -11162,8 +11221,11 @@ cloudcontrolapp.com // Cloudflare, Inc. : https://www.cloudflare.com/ // Submitted by Cloudflare Team -pages.dev +cf-ipfs.com +cloudflare-ipfs.com trycloudflare.com +pages.dev +r2.dev workers.dev // Clovyr : https://clovyr.io @@ -11745,11 +11807,6 @@ e4.cz easypanel.app easypanel.host -// eero : https://eero.com/ -// Submitted by Yue Kang -eero.online -eero-stage.online - // Elementor : Elementor Ltd. // Submitted by Anton Barkan elementor.cloud @@ -11952,6 +12009,7 @@ u.channelsdvr.net // Fastly Inc. : http://www.fastly.com/ // Submitted by Fastly Security edgecompute.app +fastly-edge.com fastly-terrarium.com fastlylb.net map.fastlylb.net @@ -11963,6 +12021,10 @@ a.ssl.fastly.net b.ssl.fastly.net global.ssl.fastly.net +// Fastmail : https://www.fastmail.com/ +// Submitted by Marc Bradshaw +*.user.fm + // FASTVPS EESTI OU : https://fastvps.ru/ // Submitted by Likhachev Vasiliy fastvps-server.com @@ -12432,7 +12494,6 @@ herokussl.com // Hibernating Rhinos // Submitted by Oren Eini ravendb.cloud -myravendb.com ravendb.community ravendb.me development.run @@ -12463,6 +12524,10 @@ ngo.ng edu.scot sch.so +// HostFly : https://www.ie.ua +// Submitted by Bohdan Dub +ie.ua + // HostyHosting (hostyhosting.com) hostyhosting.io @@ -12921,6 +12986,7 @@ cloudapp.net azurestaticapps.net 1.azurestaticapps.net 2.azurestaticapps.net +3.azurestaticapps.net centralus.azurestaticapps.net eastasia.azurestaticapps.net eastus2.azurestaticapps.net @@ -12973,25 +13039,6 @@ cust.retrosnub.co.uk // Submitted by Paulus Schoutsen ui.nabu.casa -// Names.of.London : https://names.of.london/ -// Submitted by James Stevens or -pony.club -of.fashion -in.london -of.london -from.marketing -with.marketing -for.men -repair.men -and.mom -for.mom -for.one -under.one -for.sale -that.win -from.work -to.work - // Net at Work Gmbh : https://www.netatwork.de // Submitted by Jan Jaeschke cloud.nospamproxy.com @@ -13006,7 +13053,19 @@ netlify.app // ngrok : https://ngrok.com/ // Submitted by Alan Shreve +ngrok.app +ngrok-free.app +ngrok.dev +ngrok-free.dev ngrok.io +ap.ngrok.io +au.ngrok.io +eu.ngrok.io +in.ngrok.io +jp.ngrok.io +sa.ngrok.io +us.ngrok.io +ngrok.pizza // Nimbus Hosting Ltd. : https://www.nimbushosting.co.uk/ // Submitted by Nicholas Ford @@ -13188,7 +13247,26 @@ omniwe.site // One.com: https://www.one.com/ // Submitted by Jacob Bunk Nielsen +123hjemmeside.dk +123hjemmeside.no +123homepage.it +123kotisivu.fi +123minsida.se +123miweb.es +123paginaweb.pt +123sait.ru +123siteweb.fr +123webseite.at +123webseite.de +123website.be +123website.ch +123website.lu +123website.nl service.one +simplesite.com +simplesite.com.br +simplesite.gr +simplesite.pl // One Fold Media : http://www.onefoldmedia.com/ // Submitted by Eddie Jones @@ -13457,7 +13535,9 @@ app.render.com onrender.com // Repl.it : https://repl.it -// Submitted by Mason Clayton +// Submitted by Lincoln Bergeson +firewalledreplit.co +id.firewalledreplit.co repl.co id.repl.co repl.run @@ -13505,6 +13585,56 @@ rocky.page спб.рус я.рус +// SAKURA Internet Inc. : https://www.sakura.ad.jp/ +// Submitted by Internet Service Department +180r.com +dojin.com +sakuratan.com +sakuraweb.com +x0.com +2-d.jp +bona.jp +crap.jp +daynight.jp +eek.jp +flop.jp +halfmoon.jp +jeez.jp +matrix.jp +mimoza.jp +ivory.ne.jp +mail-box.ne.jp +mints.ne.jp +mokuren.ne.jp +opal.ne.jp +sakura.ne.jp +sumomo.ne.jp +topaz.ne.jp +netgamers.jp +nyanta.jp +o0o0.jp +rdy.jp +rgr.jp +rulez.jp +s3.isk01.sakurastorage.jp +s3.isk02.sakurastorage.jp +saloon.jp +sblo.jp +skr.jp +tank.jp +uh-oh.jp +undo.jp +rs.webaccel.jp +user.webaccel.jp +websozai.jp +xii.jp +squares.net +jpn.org +kirara.st +x0.to +from.tv +sakura.tv + // Salesforce.com, Inc. https://salesforce.com/ // Submitted by Michael Biven *.builder.code.com @@ -13657,6 +13787,9 @@ vp4.me // Snowflake Inc : https://www.snowflake.com/ // Submitted by Faith Olapade +snowflake.app +privatelink.snowflake.app +streamlit.app streamlitapp.com // Snowplow Analytics : https://snowplowanalytics.com/ @@ -13792,6 +13925,8 @@ direct.quickconnect.to // Tabit Technologies Ltd. : https://tabit.cloud/ // Submitted by Oren Agiv tabitorder.co.il +mytabit.co.il +mytabit.com // TAIFUN Software AG : http://taifun-software.de // Submitted by Bjoern Henke @@ -13824,10 +13959,6 @@ telebit.app telebit.io *.telebit.xyz -// The Gwiddle Foundation : https://gwiddlefoundation.org.uk -// Submitted by Joshua Bayfield -gwiddle.co.uk - // Thingdust AG : https://thingdust.com/ // Submitted by Adrian Imboden *.firenet.ch @@ -13862,10 +13993,6 @@ pages.torproject.net bloxcms.com townnews-staging.com -// TradableBits: https://tradablebits.com -// Submitted by Dmitry Khrisanov dmitry@tradablebits.com -tbits.me - // TrafficPlex GmbH : https://www.trafficplex.de/ // Submitted by Phillipp Röll 12hp.at @@ -13938,6 +14065,10 @@ hk.org ltd.hk inc.hk +// UK Intis Telecom LTD : https://it.com +// Submitted by ITComdomains +it.com + // UNIVERSAL DOMAIN REGISTRY : https://www.udr.org.yt/ // see also: whois -h whois.udr.org.yt help // Submitted by Atanunu Igbunuroghene diff --git a/terminal.c b/terminal.c index c067428..f90c429 100644 --- a/terminal.c +++ b/terminal.c @@ -1334,14 +1334,14 @@ void exec_on_terminal(struct terminal *term, unsigned char *path, unsigned char int rs; if (path && !*path) return; if (!path) path = cast_uchar ""; -#ifdef NO_FG_EXEC - fg = 0; -#endif #ifdef HAVE_EXE_ON_BACKGROUND if (*path) { - rs = exe_on_background(path, delet); + rs = exe_on_background(path, delet, fg); if (!rs) return; } +#endif +#ifdef NO_FG_EXEC + fg = 0; #endif if (term->master) { if (!*path) { diff --git a/types.c b/types.c index a663d17..5a9f3ae 100644 --- a/types.c +++ b/types.c @@ -785,6 +785,7 @@ void create_initial_extensions(void) ext.ext = cast_uchar "dvi", ext.ct=cast_uchar "application/x-dvi", update_ext(&ext); ext.ext = cast_uchar "dl", ext.ct=cast_uchar "video/dl", update_ext(&ext); ext.ext = cast_uchar "deb", ext.ct=cast_uchar "application/x-debian-package", update_ext(&ext); + ext.ext = cast_uchar "avif", ext.ct=cast_uchar "image/avif", update_ext(&ext); ext.ext = cast_uchar "avi", ext.ct=cast_uchar "video/x-msvideo", update_ext(&ext); ext.ext = cast_uchar "au,snd", ext.ct=cast_uchar "audio/basic", update_ext(&ext); ext.ext = cast_uchar "aif,aiff,aifc", ext.ct=cast_uchar "audio/x-aiff", update_ext(&ext); @@ -903,7 +904,8 @@ unsigned char *get_content_type_by_extension(unsigned char *url) if ((extl == 3 && !casecmp(ext, cast_uchar "tif", 3)) || (extl == 4 && !casecmp(ext, cast_uchar "tiff", 4))) return stracpy(cast_uchar "image/tiff"); if ((extl == 3 && !casecmp(ext, cast_uchar "svg", 3))) return stracpy(cast_uchar "image/svg+xml"); - if ((extl == 3 && !casecmp(ext, cast_uchar "webp", 3))) return stracpy(cast_uchar "image/webp"); + if ((extl == 4 && !casecmp(ext, cast_uchar "webp", 4))) return stracpy(cast_uchar "image/webp"); + if ((extl == 4 && !casecmp(ext, cast_uchar "avif", 4))) return stracpy(cast_uchar "image/avif"); exxt = init_str(); el = 0; add_to_str(&exxt, &el, cast_uchar "application/x-"); add_bytes_to_str(&exxt, &el, ext, extl); @@ -966,6 +968,8 @@ static unsigned char *get_extension_by_content_type(unsigned char *ct) return stracpy(cast_uchar "svg"); if (!casestrcmp(ct, cast_uchar "image/webp")) return stracpy(cast_uchar "webp"); + if (!casestrcmp(ct, cast_uchar "image/avif")) + return stracpy(cast_uchar "avif"); if (!cmpbeg(ct, cast_uchar "application/x-")) { x = ct + strlen("application/x-"); if (casestrcmp(x, cast_uchar "z") && @@ -1328,4 +1332,3 @@ void free_types(void) free_history(ext_search_history); free_history(assoc_search_history); } -