[Pkg-mc-commits] r80 - in trunk/debian: . patches
winnie at alioth.debian.org
winnie at alioth.debian.org
Wed Feb 27 11:52:21 UTC 2008
Author: winnie
Date: 2008-02-27 11:52:19 +0000 (Wed, 27 Feb 2008)
New Revision: 80
Added:
trunk/debian/patches/01_mc.ext.in.mime.patch
trunk/debian/patches/02_debian_syntax.patch
trunk/debian/patches/03_conffiles_in_mans.patch
trunk/debian/patches/04_off64t.patch
trunk/debian/patches/06_smbconf_path.patch
trunk/debian/patches/08_awk.patch
trunk/debian/patches/09_de.po.patch
trunk/debian/patches/10_it.po.patch
trunk/debian/patches/13_syntax.patch
trunk/debian/patches/14_cxx.syntax.patch
trunk/debian/patches/18_sh_syntax.patch
trunk/debian/patches/22_main.c.patch
trunk/debian/patches/28_mc-ctype.patch
trunk/debian/patches/28_mc-dontrewrite.patch
trunk/debian/patches/32_c-vs-cxx.patch
trunk/debian/patches/45_ftpfs_symlink2.patch
trunk/debian/patches/47_mc.menu.patch
trunk/debian/patches/48_utf8-slang2.patch
trunk/debian/patches/49_64bit.patch
trunk/debian/patches/50_ignore_ftp_chmod_error.patch
trunk/debian/patches/51_html-syntax.patch
trunk/debian/patches/52_debian_dsc.patch
trunk/debian/patches/53_strace_syntax.patch
trunk/debian/patches/54_named_syntax.patch
trunk/debian/patches/60_recode.patch
Removed:
trunk/debian/patches/01_mc.ext.in.mime.patch
trunk/debian/patches/02_debian_syntax.patch
trunk/debian/patches/03_conffiles_in_mans.patch
trunk/debian/patches/04_off64t.patch
trunk/debian/patches/05_smbconf_path.patch
trunk/debian/patches/06_awk.patch
trunk/debian/patches/07_de.po.patch
trunk/debian/patches/08_it.po.patch
trunk/debian/patches/09_syntax.patch
trunk/debian/patches/10_cxx.syntax.patch
trunk/debian/patches/11_sh_syntax.patch
trunk/debian/patches/13_mc-ctype.patch
trunk/debian/patches/14_mc-dontrewrite.patch
trunk/debian/patches/15_c-vs-cxx.patch
trunk/debian/patches/16_ftpfs_symlink2.patch
trunk/debian/patches/17_autogen_sh.patch
trunk/debian/patches/18_mc.menu.patch
trunk/debian/patches/19_64bit.patch
trunk/debian/patches/20_ignore_ftp_chmod_error.patch
trunk/debian/patches/21_html-syntax.patch
trunk/debian/patches/22_debian_dsc.patch
trunk/debian/patches/23_strace_syntax.patch
trunk/debian/patches/24_named_syntax.patch
trunk/debian/patches/25_19757string_regexp_search-match-eol.patch
trunk/debian/patches/26_21030copy_file_file_chmod.patch
trunk/debian/patches/28_dont_ignore_returnval_localtime.patch
trunk/debian/patches/29_mc-00-slang.patch
trunk/debian/patches/29_mc-01-api.patch
trunk/debian/patches/29_mc-02-hotkey.patch
trunk/debian/patches/29_mc-03-button.patch
trunk/debian/patches/29_mc-04-radio.patch
trunk/debian/patches/29_mc-05-check.patch
trunk/debian/patches/29_mc-06-input.patch
trunk/debian/patches/29_mc-07-label.patch
trunk/debian/patches/29_mc-08-listbox.patch
trunk/debian/patches/29_mc-09-groupbox.patch
trunk/debian/patches/29_mc-10-buttonbar.patch
trunk/debian/patches/29_mc-11-panels.patch
trunk/debian/patches/29_mc-12-menu.patch
trunk/debian/patches/29_mc-13-file.patch
trunk/debian/patches/29_mc-14-wtools.patch
trunk/debian/patches/29_mc-15-dialog.patch
trunk/debian/patches/29_mc-16-boxes.patch
trunk/debian/patches/29_mc-17-layout.patch
trunk/debian/patches/29_mc-18-option.patch
trunk/debian/patches/29_mc-19-find.patch
trunk/debian/patches/29_mc-20-dir.patch
trunk/debian/patches/29_mc-21-hotlist.patch
trunk/debian/patches/29_mc-22-info.patch
trunk/debian/patches/29_mc-23-profile.patch
trunk/debian/patches/29_mc-24-achown.patch
trunk/debian/patches/29_mc-25-key.patch
trunk/debian/patches/29_mc-26-help.patch
trunk/debian/patches/29_mc-27-hint.patch
trunk/debian/patches/29_mc-28-fix.patch
trunk/debian/patches/29_mc-29-vfs.patch
trunk/debian/patches/29_mc-30-view.patch
trunk/debian/patches/31_autogen-run.patch
trunk/debian/patches/32_show_hostname.patch
trunk/debian/patches/33_escaping.patch
Modified:
trunk/debian/changelog
Log:
Revert for further uploading.. uploading to exerimental will be done from new-utf8 branch
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/changelog 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,11 +1,13 @@
mc (1:4.6.2~pre1-5) UNRELEASED; urgency=low
+ * Revert new utf8 patch since it doesn't work with all locales atm.
* revert patch to make scp work again.
* show again hostname in xterm title.
- + added as 32_show_hostname.patch (and removed from propsed-patches)
- * Added patch for escaping and unescaping foldernames (Closes: #326047, #458403)
+ + added as 32_show_hostname.patch (and removed from proposed-patches)
+ * Added patch for (un-)escaping foldernames (Closes: #326047, #458403)
+ * Don't chmod if preserve Attributes is unchecked (Closes: #466370)
- -- Patrick Winnertz <winnie at debian.org> Wed, 27 Feb 2008 01:28:12 +0100
+ -- Patrick Winnertz <winnie at debian.org> Wed, 27 Feb 2008 11:34:34 +0100
mc (1:4.6.2~pre1-4) experimental; urgency=low
Deleted: trunk/debian/patches/01_mc.ext.in.mime.patch
===================================================================
--- trunk/debian/patches/01_mc.ext.in.mime.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/01_mc.ext.in.mime.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,350 +0,0 @@
-diff -Nurwd mc-4.6.2~pre1.orig/lib/mc.ext.in mc-4.6.2~pre1/lib/mc.ext.in
---- mc-4.6.2~pre1.orig/lib/mc.ext.in 2008-02-16 16:08:28.000000000 +0100
-+++ mc-4.6.2~pre1/lib/mc.ext.in 2008-02-16 16:09:41.000000000 +0100
-@@ -132,7 +132,7 @@
- # tar
- regex/\.(tar|TAR)$
- Open=%cd %p#utar
-- View=%view{ascii} tar tvvf %f
-+ View=%view{ascii} tar tvvf - < %f
-
- # lha
- type/^LHa\ .*archive
-@@ -142,7 +142,7 @@
- # arj
- regex/\.a(rj|[0-9][0-9])$
- Open=%cd %p#uarj
-- View=%view{ascii} unarj l %f
-+ View=%view{ascii} arj l %f
-
- # ha
- regex/\.([Hh][Aa])$
-@@ -201,6 +201,15 @@
- Open=%cd %p#deb
- View=%view{ascii} dpkg-deb -I %f && echo && dpkg-deb -c %f
-
-+# dpkg
-+shell/.debd
-+ Open=%cd %p#debd
-+ View=%view{ascii} dpkg -s `echo %p | sed 's/\([0-9a-z.-]*\).*/\1/'`
-+# apt
-+shell/.deba
-+ Open=%cd %p#deba
-+ View=%view{ascii} apt-cache show `echo %p | sed 's/\([0-9a-z.-]*\).*/\1/'`
-+
- # ISO9660
- regex/\.iso$
- Open=%cd %p#iso9660
-@@ -220,28 +229,28 @@
-
- # C
- shell/.c
-- Open=%var{EDITOR:vi} %f
-+ Open=sensible-editor %f
-
- # Fortran
- shell/.f
-- Open=%var{EDITOR:vi} %f
-+ Open=sensible-editor %f
-
- # Header
- regex/\.(h|hpp)$
-- Open=%var{EDITOR:vi} %f
-+ Open=sensible-editor %f
-
- # Object
- type/^ELF
-- #Open=%var{PAGER:more} %f
-+ #Open=sensible-pager %f
- View=%view{ascii} file %f && nm %f
-
- # Asm
- shell/.s
-- Open=%var{EDITOR:vi} %f
-+ Open=sensible-editor %f
-
- # C++
- regex/\.(C|cc|cpp)$
-- Open=%var{EDITOR:vi} %f
-+ Open=sensible-editor %f
-
-
- ### Documentation ###
-@@ -262,7 +271,7 @@
- View=%view{ascii} file %f && nm %f
-
- regex/(([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])|\.man)$
-- Open=case %d/%f in */log/*|*/logs/*) cat %f ;; *) nroff @MAN_FLAGS@ @MANDOC@ %f ;; esac | %var{PAGER:more}
-+ Open=case %d/%f in */log/*|*/logs/*) cat %f ;; *) nroff @MAN_FLAGS@ @MANDOC@ %f ;; esac | sensible-pager
- View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) cat %f ;; *) nroff @MAN_FLAGS@ @MANDOC@ %f ;; esac
-
- # Perl pod page
-@@ -277,25 +286,25 @@
- View=
-
- shell/.me
-- Open=nroff @MAN_FLAGS@ -me %f | %var{PAGER:more}
-+ Open=nroff @MAN_FLAGS@ -me %f | sensible-pager
- View=%view{ascii,nroff} nroff @MAN_FLAGS@ -me %f
-
- # Troff with ms macros.
- shell/.ms
-- Open=nroff @MAN_FLAGS@ -ms %f | %var{PAGER:more}
-+ Open=nroff @MAN_FLAGS@ -ms %f | sensible-pager
- View=%view{ascii,nroff} nroff @MAN_FLAGS@ -ms %f
-
- # Manual page - compressed
- regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.g?[Zz]$
-- Open=case %d/%f in */log/*|*/logs/*) gzip -dc %f ;; *) gzip -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | %var{PAGER:more}
-+ Open=case %d/%f in */log/*|*/logs/*) gzip -dc %f ;; *) gzip -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | sensible-pager
- View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) gzip -dc %f ;; *) gzip -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac
-
- regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.bz$
-- Open=case %d/%f in */log/*|*/logs/*) bzip -dc %f ;; *) bzip -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | %var{PAGER:more}
-+ Open=case %d/%f in */log/*|*/logs/*) bzip -dc %f ;; *) bzip -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | sensible-pager
- View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) bzip -dc %f ;; *) bzip -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac
-
- regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.bz2$
-- Open=case %d/%f in */log/*|*/logs/*) bzip2 -dc %f ;; *) bzip2 -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | %var{PAGER:more}
-+ Open=case %d/%f in */log/*|*/logs/*) bzip2 -dc %f ;; *) bzip2 -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | sensible-pager
- View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) bzip2 -dc %f ;; *) bzip2 -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac
-
-
-@@ -305,6 +314,7 @@
- Include=image
-
- type/^JPEG
-+ View=%view{ascii} identify %f; test -x /usr/bin/exif && echo && exif %f
- Include=image
-
- type/^PC\ bitmap
-@@ -329,17 +339,19 @@
- Include=image
-
- shell/.xcf
-- Open=(gimp %f &)
-+ Open=(gimp-remote %f &)
-
- shell/.xbm
-- Open=bitmap %f
-+ Include=image
-+ #Open=bitmap %f
-
- shell/.xpm
- Include=image
- View=sxpm %f
-
- include/image
-- Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (gqview %f &); fi
-+ Open=see %f &
-+ #Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (gqview %f &); fi
- View=%view{ascii} identify %f
- #View=%view{ascii} asciiview %f
-
-@@ -347,25 +359,30 @@
- ### Sound files ###
-
- regex/\.([wW][aA][vV]|[sS][nN][dD]|[vV][oO][cC]|[aA][uU]|[sS][mM][pP]|[aA][iI][fF][fF]|[sS][nN][dD])$
-- Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
-+ Open=run-mailcap audio/x-wav %f 2>&1 &
-+ #Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms -e %f 1>/dev/null 2>&1 &); fi
-
- regex/\.([mM][oO][dD]|[sS]3[mM]|[xX][mM]|[iI][tT]|[mM][tT][mM]|669|[sS][tT][mM]|[uU][lL][tT]|[fF][aA][rR])$
-- Open=mikmod %f
-+ Open=run-mailcap application/x-mod %f 2>&1 &
-+ #Open=mikmod %f
- #Open=tracker %f
-
- regex/\.([wW][aA][wW]22)$
- Open=vplay -s 22 %f
-
- regex/\.([mM][pP]3)$
-- Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
-- View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
-+ Open=run-mailcap audio/mpeg %f 2>&1 &
-+ #Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f &); fi
-+ View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/Title:/,/Comment:/p;/^MPEG/,/^Audio/p'
-
- regex/\.([oO][gG][gG])$
-- Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
-+ Open=run-mailcap application/x-ogg %f 2>&1 &
-+ #Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f &); fi
- View=%view{ascii} ogginfo %s
-
- regex/\.([mM][iI][dD][iI]?|[rR][mM][iI][dD]?)$
-- Open=timidity %f
-+ Open=run-mailcap audio/midi %f 2>&1 &
-+ #Open=timidity %f
-
- regex/\.([wW][mM][aA])$
- Open=mplayer -vo null %f
-@@ -405,10 +422,12 @@
- Include=video
-
- regex/\.([rR][aA]?[mM])$
-- Open=(realplay %f >/dev/null 2>&1 &)
-+ Open=run-mailcap audio/x-pn-realaudio %f 2>&1
-+ #Open=(realplay %f >/dev/null 2>&1 &)
-
- include/video
-- Open=(mplayer %f >/dev/null 2>&1 &)
-+ Open=see %f &
-+ #Open=(mplayer %f >/dev/null 2>&1 &)
- #Open=(gtv %f >/dev/null 2>&1 &)
- #Open=(xanim %f >/dev/null 2>&1 &)
-
-@@ -417,12 +436,14 @@
-
- # Postscript
- type/^PostScript
-- Open=(gv %f &)
-+ Open=run-mailcap application/postscript %f 2>&1 &
-+ #Open=(gv %f &)
- View=%view{ascii} ps2ascii %f
-
- # PDF
- type/^PDF
-- Open=(xpdf %f &)
-+ Open=run-mailcap application/pdf %f 2>&1 &
-+ #Open=(xpdf %f &)
- #Open=(acroread %f &)
- #Open=(ghostview %f &)
- View=%view{ascii} pdftotext %f -
-@@ -432,8 +453,9 @@
-
- # html
- regex/\.([hH][tT][mM][lL]?)$
-- Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null
-- View=%view{ascii} lynx -dump -force_html %f
-+ Open=run-mailcap text/html %f 2>&1 &
-+ #Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null
-+ View=%view{ascii} links -dump %f 2>/dev/null || w3m -dump %f 2>/dev/null || lynx -dump -force_html %f
-
- # StarOffice 5.2
- shell/.sdw
-@@ -450,22 +472,26 @@
-
- # Microsoft Word Document
- regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$
-- Open=(abiword %f >/dev/null 2>&1 &)
-- View=%view{ascii} catdoc -w %f || word2x -f text %f - || strings %f
-+ Open=run-mailcap application/msword %f 2>&1 &
-+ #Open=(abiword %f >/dev/null 2>&1 &)
-+ View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
- type/^Microsoft\ Word
- Open=(abiword %f >/dev/null 2>&1 &)
-- View=%view{ascii} catdoc -w %f || word2x -f text %f - || strings %f
-+ View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
-
- # RTF document
- regex/\.([rR][tT][fF])$
-- Open=(abiword %f >/dev/null 2>&1 &)
-+ Open=run-mailcap text/rtf %f 2>&1 &
-+ #Open=(abiword %f >/dev/null 2>&1 &)
-
- # Microsoft Excel Worksheet
- regex/\.([xX][lL][sSwW])$
-- Open=(gnumeric %f >/dev/null 2>&1 &)
-+ Open=run-mailcap application/vnd.ms-excel %f 2>&1 &
-+ #Open=(gnumeric %f >/dev/null 2>&1 &)
- View=%view{ascii} xls2csv %f || strings %f
- type/^Microsoft\ Excel
-- Open=(gnumeric %f >/dev/null 2>&1 &)
-+ Open=run-mailcap application/vnd.ms-excel %f 2>&1 &
-+ #Open=(gnumeric %f >/dev/null 2>&1 &)
- View=%view{ascii} xls2csv %f || strings %f
-
- # Use OpenOffice.org to open any MS Office documents
-@@ -478,12 +504,14 @@
-
- # DVI
- regex/\.([dD][vV][iI])$
-- Open=if [ x$DISPLAY = x ]; then dvisvga %f; else (xdvi %f &); fi
-+ Open=run-mailcap application/x-dvi %f 2>&1 &
-+ #Open=if [ x$DISPLAY = x ]; then dvisvga %f; else (xdvi %f &); fi
- View=%view{ascii} dvi2tty %f
-
- # TeX
- regex/\.([Tt][Ee][Xx])$
-- Open=%var{EDITOR:vi} %f
-+ Open=sensible-editor %f
-+ #Open=%var{EDITOR:vi} %f
-
-
- ### Miscellaneous ###
-@@ -509,6 +537,33 @@
- regex/\.(rexx?|cmd)$
- Open=rexx %f %{Enter parameters};echo "Press ENTER";read y
-
-+### Debian additions ###
-+
-+# view gzipped HTML
-+regex/\.([hH][tT][mM][lL]?)\.([gG][zZ])$
-+ Open=zcat %f|run-mailcap text/html - &
-+ View=zcat %f|%view{ascii} w3m -dump -T text/html 2>&1 ||zcat %f|%view{ascii} links -dump 2>&1 ||zcat %f|lynx -dump -force_html 2>&1
-+
-+# view bzipped HTML
-+regex/\.([hH][tT][mM][lL]?)\.([bB][zZ])2$
-+ Open=bzcat %f|run-mailcap text/html - &
-+ View=bzcat %f|%view{ascii} w3m -dump -T text/html 2>&1||zcat %f|%view{ascii} links -dump 2>&1||zcat %f|lynx -dump -force_html 2>&1
-+
-+# view gzipped (E)PS
-+regex/\.(e|)ps\.gz$
-+ Open=gv %f 2>&1 &
-+ Icon=postscript.xpm
-+ View with GhostView=gv %f 2>&1 &
-+
-+# compressed PDF
-+shell/.pdf.gz
-+ Open=zxpdf %f 2>&1 &
-+ View=zxpdf %f 2>&1 &
-+
-+# compressed postscript
-+shell/.ps.gz
-+ Open=gv %f 2>&1 &
-+ View=gv %f 2>&1 &
-
- ### Plain compressed files ###
-
-@@ -524,30 +579,36 @@
-
- # gzip
- type/^gzip
-- Open=gzip -dc %f | %var{PAGER:more}
-+ Open=gzip -dc %f | sensible-pager
- View=%view{ascii} gzip -dc %f 2>/dev/null
-
- # bzip2
- type/^bzip2
-- Open=bzip2 -dc %f | %var{PAGER:more}
-+ Open=bzip2 -dc %f | sensible-pager
- View=%view{ascii} bzip2 -dc %f 2>/dev/null
-
- # bzip
- type/^bzip
-- Open=bzip -dc %f | %var{PAGER:more}
-+ Open=bzip -dc %f | sensible-pager
- View=%view{ascii} bzip -dc %f 2>/dev/null
-
- # compress
- type/^compress
-- Open=gzip -dc %f | %var{PAGER:more}
-+ Open=gzip -dc %f | sensible-pager
- View=%view{ascii} gzip -dc %f 2>/dev/null
-
-+### Debian additions ###
-+
-+
-+# Gettext Catalogs
-+shell/.mo
-+ View=%view{ascii} msgunfmt %f || cat %f
-
- ### Default ###
-
- # Default target for anything not described above
- default/*
-- Open=
-+ Open=
- View=
-
-
Copied: trunk/debian/patches/01_mc.ext.in.mime.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/01_mc.ext.in.mime.patch)
===================================================================
--- trunk/debian/patches/01_mc.ext.in.mime.patch (rev 0)
+++ trunk/debian/patches/01_mc.ext.in.mime.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,350 @@
+diff -Nurwd mc-4.6.2~pre1.orig/lib/mc.ext.in mc-4.6.2~pre1/lib/mc.ext.in
+--- mc-4.6.2~pre1.orig/lib/mc.ext.in 2008-02-16 16:08:28.000000000 +0100
++++ mc-4.6.2~pre1/lib/mc.ext.in 2008-02-16 16:09:41.000000000 +0100
+@@ -132,7 +132,7 @@
+ # tar
+ regex/\.(tar|TAR)$
+ Open=%cd %p#utar
+- View=%view{ascii} tar tvvf %f
++ View=%view{ascii} tar tvvf - < %f
+
+ # lha
+ type/^LHa\ .*archive
+@@ -142,7 +142,7 @@
+ # arj
+ regex/\.a(rj|[0-9][0-9])$
+ Open=%cd %p#uarj
+- View=%view{ascii} unarj l %f
++ View=%view{ascii} arj l %f
+
+ # ha
+ regex/\.([Hh][Aa])$
+@@ -201,6 +201,15 @@
+ Open=%cd %p#deb
+ View=%view{ascii} dpkg-deb -I %f && echo && dpkg-deb -c %f
+
++# dpkg
++shell/.debd
++ Open=%cd %p#debd
++ View=%view{ascii} dpkg -s `echo %p | sed 's/\([0-9a-z.-]*\).*/\1/'`
++# apt
++shell/.deba
++ Open=%cd %p#deba
++ View=%view{ascii} apt-cache show `echo %p | sed 's/\([0-9a-z.-]*\).*/\1/'`
++
+ # ISO9660
+ regex/\.iso$
+ Open=%cd %p#iso9660
+@@ -220,28 +229,28 @@
+
+ # C
+ shell/.c
+- Open=%var{EDITOR:vi} %f
++ Open=sensible-editor %f
+
+ # Fortran
+ shell/.f
+- Open=%var{EDITOR:vi} %f
++ Open=sensible-editor %f
+
+ # Header
+ regex/\.(h|hpp)$
+- Open=%var{EDITOR:vi} %f
++ Open=sensible-editor %f
+
+ # Object
+ type/^ELF
+- #Open=%var{PAGER:more} %f
++ #Open=sensible-pager %f
+ View=%view{ascii} file %f && nm %f
+
+ # Asm
+ shell/.s
+- Open=%var{EDITOR:vi} %f
++ Open=sensible-editor %f
+
+ # C++
+ regex/\.(C|cc|cpp)$
+- Open=%var{EDITOR:vi} %f
++ Open=sensible-editor %f
+
+
+ ### Documentation ###
+@@ -262,7 +271,7 @@
+ View=%view{ascii} file %f && nm %f
+
+ regex/(([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])|\.man)$
+- Open=case %d/%f in */log/*|*/logs/*) cat %f ;; *) nroff @MAN_FLAGS@ @MANDOC@ %f ;; esac | %var{PAGER:more}
++ Open=case %d/%f in */log/*|*/logs/*) cat %f ;; *) nroff @MAN_FLAGS@ @MANDOC@ %f ;; esac | sensible-pager
+ View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) cat %f ;; *) nroff @MAN_FLAGS@ @MANDOC@ %f ;; esac
+
+ # Perl pod page
+@@ -277,25 +286,25 @@
+ View=
+
+ shell/.me
+- Open=nroff @MAN_FLAGS@ -me %f | %var{PAGER:more}
++ Open=nroff @MAN_FLAGS@ -me %f | sensible-pager
+ View=%view{ascii,nroff} nroff @MAN_FLAGS@ -me %f
+
+ # Troff with ms macros.
+ shell/.ms
+- Open=nroff @MAN_FLAGS@ -ms %f | %var{PAGER:more}
++ Open=nroff @MAN_FLAGS@ -ms %f | sensible-pager
+ View=%view{ascii,nroff} nroff @MAN_FLAGS@ -ms %f
+
+ # Manual page - compressed
+ regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.g?[Zz]$
+- Open=case %d/%f in */log/*|*/logs/*) gzip -dc %f ;; *) gzip -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | %var{PAGER:more}
++ Open=case %d/%f in */log/*|*/logs/*) gzip -dc %f ;; *) gzip -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | sensible-pager
+ View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) gzip -dc %f ;; *) gzip -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac
+
+ regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.bz$
+- Open=case %d/%f in */log/*|*/logs/*) bzip -dc %f ;; *) bzip -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | %var{PAGER:more}
++ Open=case %d/%f in */log/*|*/logs/*) bzip -dc %f ;; *) bzip -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | sensible-pager
+ View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) bzip -dc %f ;; *) bzip -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac
+
+ regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.bz2$
+- Open=case %d/%f in */log/*|*/logs/*) bzip2 -dc %f ;; *) bzip2 -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | %var{PAGER:more}
++ Open=case %d/%f in */log/*|*/logs/*) bzip2 -dc %f ;; *) bzip2 -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | sensible-pager
+ View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) bzip2 -dc %f ;; *) bzip2 -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac
+
+
+@@ -305,6 +314,7 @@
+ Include=image
+
+ type/^JPEG
++ View=%view{ascii} identify %f; test -x /usr/bin/exif && echo && exif %f
+ Include=image
+
+ type/^PC\ bitmap
+@@ -329,17 +339,19 @@
+ Include=image
+
+ shell/.xcf
+- Open=(gimp %f &)
++ Open=(gimp-remote %f &)
+
+ shell/.xbm
+- Open=bitmap %f
++ Include=image
++ #Open=bitmap %f
+
+ shell/.xpm
+ Include=image
+ View=sxpm %f
+
+ include/image
+- Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (gqview %f &); fi
++ Open=see %f &
++ #Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (gqview %f &); fi
+ View=%view{ascii} identify %f
+ #View=%view{ascii} asciiview %f
+
+@@ -347,25 +359,30 @@
+ ### Sound files ###
+
+ regex/\.([wW][aA][vV]|[sS][nN][dD]|[vV][oO][cC]|[aA][uU]|[sS][mM][pP]|[aA][iI][fF][fF]|[sS][nN][dD])$
+- Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
++ Open=run-mailcap audio/x-wav %f 2>&1 &
++ #Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms -e %f 1>/dev/null 2>&1 &); fi
+
+ regex/\.([mM][oO][dD]|[sS]3[mM]|[xX][mM]|[iI][tT]|[mM][tT][mM]|669|[sS][tT][mM]|[uU][lL][tT]|[fF][aA][rR])$
+- Open=mikmod %f
++ Open=run-mailcap application/x-mod %f 2>&1 &
++ #Open=mikmod %f
+ #Open=tracker %f
+
+ regex/\.([wW][aA][wW]22)$
+ Open=vplay -s 22 %f
+
+ regex/\.([mM][pP]3)$
+- Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
+- View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
++ Open=run-mailcap audio/mpeg %f 2>&1 &
++ #Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f &); fi
++ View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/Title:/,/Comment:/p;/^MPEG/,/^Audio/p'
+
+ regex/\.([oO][gG][gG])$
+- Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
++ Open=run-mailcap application/x-ogg %f 2>&1 &
++ #Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f &); fi
+ View=%view{ascii} ogginfo %s
+
+ regex/\.([mM][iI][dD][iI]?|[rR][mM][iI][dD]?)$
+- Open=timidity %f
++ Open=run-mailcap audio/midi %f 2>&1 &
++ #Open=timidity %f
+
+ regex/\.([wW][mM][aA])$
+ Open=mplayer -vo null %f
+@@ -405,10 +422,12 @@
+ Include=video
+
+ regex/\.([rR][aA]?[mM])$
+- Open=(realplay %f >/dev/null 2>&1 &)
++ Open=run-mailcap audio/x-pn-realaudio %f 2>&1
++ #Open=(realplay %f >/dev/null 2>&1 &)
+
+ include/video
+- Open=(mplayer %f >/dev/null 2>&1 &)
++ Open=see %f &
++ #Open=(mplayer %f >/dev/null 2>&1 &)
+ #Open=(gtv %f >/dev/null 2>&1 &)
+ #Open=(xanim %f >/dev/null 2>&1 &)
+
+@@ -417,12 +436,14 @@
+
+ # Postscript
+ type/^PostScript
+- Open=(gv %f &)
++ Open=run-mailcap application/postscript %f 2>&1 &
++ #Open=(gv %f &)
+ View=%view{ascii} ps2ascii %f
+
+ # PDF
+ type/^PDF
+- Open=(xpdf %f &)
++ Open=run-mailcap application/pdf %f 2>&1 &
++ #Open=(xpdf %f &)
+ #Open=(acroread %f &)
+ #Open=(ghostview %f &)
+ View=%view{ascii} pdftotext %f -
+@@ -432,8 +453,9 @@
+
+ # html
+ regex/\.([hH][tT][mM][lL]?)$
+- Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null
+- View=%view{ascii} lynx -dump -force_html %f
++ Open=run-mailcap text/html %f 2>&1 &
++ #Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null
++ View=%view{ascii} links -dump %f 2>/dev/null || w3m -dump %f 2>/dev/null || lynx -dump -force_html %f
+
+ # StarOffice 5.2
+ shell/.sdw
+@@ -450,22 +472,26 @@
+
+ # Microsoft Word Document
+ regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$
+- Open=(abiword %f >/dev/null 2>&1 &)
+- View=%view{ascii} catdoc -w %f || word2x -f text %f - || strings %f
++ Open=run-mailcap application/msword %f 2>&1 &
++ #Open=(abiword %f >/dev/null 2>&1 &)
++ View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
+ type/^Microsoft\ Word
+ Open=(abiword %f >/dev/null 2>&1 &)
+- View=%view{ascii} catdoc -w %f || word2x -f text %f - || strings %f
++ View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
+
+ # RTF document
+ regex/\.([rR][tT][fF])$
+- Open=(abiword %f >/dev/null 2>&1 &)
++ Open=run-mailcap text/rtf %f 2>&1 &
++ #Open=(abiword %f >/dev/null 2>&1 &)
+
+ # Microsoft Excel Worksheet
+ regex/\.([xX][lL][sSwW])$
+- Open=(gnumeric %f >/dev/null 2>&1 &)
++ Open=run-mailcap application/vnd.ms-excel %f 2>&1 &
++ #Open=(gnumeric %f >/dev/null 2>&1 &)
+ View=%view{ascii} xls2csv %f || strings %f
+ type/^Microsoft\ Excel
+- Open=(gnumeric %f >/dev/null 2>&1 &)
++ Open=run-mailcap application/vnd.ms-excel %f 2>&1 &
++ #Open=(gnumeric %f >/dev/null 2>&1 &)
+ View=%view{ascii} xls2csv %f || strings %f
+
+ # Use OpenOffice.org to open any MS Office documents
+@@ -478,12 +504,14 @@
+
+ # DVI
+ regex/\.([dD][vV][iI])$
+- Open=if [ x$DISPLAY = x ]; then dvisvga %f; else (xdvi %f &); fi
++ Open=run-mailcap application/x-dvi %f 2>&1 &
++ #Open=if [ x$DISPLAY = x ]; then dvisvga %f; else (xdvi %f &); fi
+ View=%view{ascii} dvi2tty %f
+
+ # TeX
+ regex/\.([Tt][Ee][Xx])$
+- Open=%var{EDITOR:vi} %f
++ Open=sensible-editor %f
++ #Open=%var{EDITOR:vi} %f
+
+
+ ### Miscellaneous ###
+@@ -509,6 +537,33 @@
+ regex/\.(rexx?|cmd)$
+ Open=rexx %f %{Enter parameters};echo "Press ENTER";read y
+
++### Debian additions ###
++
++# view gzipped HTML
++regex/\.([hH][tT][mM][lL]?)\.([gG][zZ])$
++ Open=zcat %f|run-mailcap text/html - &
++ View=zcat %f|%view{ascii} w3m -dump -T text/html 2>&1 ||zcat %f|%view{ascii} links -dump 2>&1 ||zcat %f|lynx -dump -force_html 2>&1
++
++# view bzipped HTML
++regex/\.([hH][tT][mM][lL]?)\.([bB][zZ])2$
++ Open=bzcat %f|run-mailcap text/html - &
++ View=bzcat %f|%view{ascii} w3m -dump -T text/html 2>&1||zcat %f|%view{ascii} links -dump 2>&1||zcat %f|lynx -dump -force_html 2>&1
++
++# view gzipped (E)PS
++regex/\.(e|)ps\.gz$
++ Open=gv %f 2>&1 &
++ Icon=postscript.xpm
++ View with GhostView=gv %f 2>&1 &
++
++# compressed PDF
++shell/.pdf.gz
++ Open=zxpdf %f 2>&1 &
++ View=zxpdf %f 2>&1 &
++
++# compressed postscript
++shell/.ps.gz
++ Open=gv %f 2>&1 &
++ View=gv %f 2>&1 &
+
+ ### Plain compressed files ###
+
+@@ -524,30 +579,36 @@
+
+ # gzip
+ type/^gzip
+- Open=gzip -dc %f | %var{PAGER:more}
++ Open=gzip -dc %f | sensible-pager
+ View=%view{ascii} gzip -dc %f 2>/dev/null
+
+ # bzip2
+ type/^bzip2
+- Open=bzip2 -dc %f | %var{PAGER:more}
++ Open=bzip2 -dc %f | sensible-pager
+ View=%view{ascii} bzip2 -dc %f 2>/dev/null
+
+ # bzip
+ type/^bzip
+- Open=bzip -dc %f | %var{PAGER:more}
++ Open=bzip -dc %f | sensible-pager
+ View=%view{ascii} bzip -dc %f 2>/dev/null
+
+ # compress
+ type/^compress
+- Open=gzip -dc %f | %var{PAGER:more}
++ Open=gzip -dc %f | sensible-pager
+ View=%view{ascii} gzip -dc %f 2>/dev/null
+
++### Debian additions ###
++
++
++# Gettext Catalogs
++shell/.mo
++ View=%view{ascii} msgunfmt %f || cat %f
+
+ ### Default ###
+
+ # Default target for anything not described above
+ default/*
+- Open=
++ Open=
+ View=
+
+
Deleted: trunk/debian/patches/02_debian_syntax.patch
===================================================================
--- trunk/debian/patches/02_debian_syntax.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/02_debian_syntax.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,111 +0,0 @@
---- /dev/null 2008-01-24 11:33:29.248015015 +0100
-+++ ./syntax/debian-changelog.syntax 2008-01-24 22:59:41.000000000 +0100
-@@ -0,0 +1,20 @@
-+context default
-+
-+ keyword linestart \s\s\* brightcyan/17
-+ keyword linestart \s-- brightred/19
-+ keyword linestart \s\s\s\s\+ cyan/17
-+
-+ keyword <*@*> brightred/19
-+ keyword whole experimental; brightmagenta/magenta
-+ keyword whole unstable; brightmagenta/magenta
-+ keyword whole stable; brightmagenta/magenta
-+ keyword whole urgency=low yellow/24
-+ keyword whole urgency=medium brightgreen/6
-+ keyword whole urgency=high white/25
-+ keyword whole urgency=LOW yellow/24
-+ keyword whole urgency=MEDIUM brightgreen/6
-+ keyword whole urgency=HIGH white/25
-+
-+ keyword whole bug white/25
-+ keyword whole Bug white/25
-+ keyword whole BUG white/25
---- /dev/null 2008-01-24 11:33:29.248015015 +0100
-+++ ./syntax/debian-control.syntax 2008-01-24 22:59:41.000000000 +0100
-@@ -0,0 +1,23 @@
-+context default
-+ keyword linestart Source brightmagenta/20
-+ keyword linestart Section brightmagenta/20
-+ keyword linestart Priority brightmagenta/20
-+ keyword linestart Maintainer brightmagenta/20
-+ keyword linestart Standards-Version brightmagenta/20
-+ keyword linestart Package green/6
-+ keyword linestart Architecture green/6
-+ keyword linestart Depends green/6
-+ keyword linestart Recommends green/6
-+ keyword linestart Suggests green/6
-+ keyword linestart Conflicts green/6
-+ keyword linestart Replaces green/6
-+ keyword linestart Provides green/6
-+ keyword linestart Pre-Depends green/6
-+ keyword linestart Build-Depends green/6
-+ keyword linestart Build-Depends-Indep green/6
-+ keyword linestart Build-Conflicts green/6
-+ keyword linestart Build-Conflicts-Indep green/6
-+ keyword linestart Description green/6
-+ keyword <*@*> brightred/19
-+
-+context linestart \s \n brown/22
---- /dev/null 2008-01-24 11:33:29.248015015 +0100
-+++ ./syntax/debian-sources-list.syntax 2008-01-24 22:59:41.000000000 +0100
-@@ -0,0 +1,12 @@
-+context default
-+ keyword linestart deb-src brightmagenta/20
-+ keyword linestart deb brightmagenta/20
-+ keyword \$\(ARCH\) brightred/18
-+
-+context # \n brown/22
-+context ftp\:\/\/ \s green/6
-+context http\:\/\/ \s green/6
-+context cdrom\:\/ \s yellow/24
-+context file\:\/ \s brightcyan/14
-+
-+###############################################################################
---- ./syntax/Makefile.in 2007-09-11 16:33:39.000000000 +0200
-+++ ./syntax/Makefile.in 2008-01-24 22:59:12.000000000 +0100
-@@ -241,6 +241,9 @@
- assembler.syntax \
- c.syntax \
- changelog.syntax \
-+ debian-changelog.syntax \
-+ debian-control.syntax \
-+ debian-sources-list.syntax \
- cs.syntax \
- css.syntax \
- d.syntax \
---- ./syntax/Makefile.am 2007-08-27 08:56:47.000000000 +0200
-+++ ./syntax/Makefile.am 2008-01-24 22:59:18.000000000 +0100
-@@ -5,6 +5,9 @@
- assembler.syntax \
- c.syntax \
- changelog.syntax \
-+ debian-changelog.syntax \
-+ debian-control.syntax \
-+ debian-sources-list.syntax \
- cs.syntax \
- css.syntax \
- d.syntax \
---- ./syntax/Syntax 2007-08-27 08:56:47.000000000 +0200
-+++ ./syntax/Syntax 2008-01-24 23:02:04.000000000 +0100
-@@ -148,5 +148,20 @@
- file Don_t_match_me Mail\sfolder ^From\s
- include mail.syntax
-
-+file sources.list$ sources\slist
-+include debian-sources-list.syntax
-+
-+file control$ Debian\scontrol\sfile
-+include debian-control.syntax
-+
-+file (rules|rocks)$ Debian\srules
-+include makefile.syntax
-+
-+file .\*changelog$ Debian\schangelog\sfile
-+include debian-changelog.syntax
-+
-+file changelog.Debian$ Debian\schangelog\sfile
-+include debian-changelog.syntax
-+
- file .\* unknown
- include unknown.syntax
Copied: trunk/debian/patches/02_debian_syntax.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/02_debian_syntax.patch)
===================================================================
--- trunk/debian/patches/02_debian_syntax.patch (rev 0)
+++ trunk/debian/patches/02_debian_syntax.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,111 @@
+--- /dev/null 2008-01-24 11:33:29.248015015 +0100
++++ ./syntax/debian-changelog.syntax 2008-01-24 22:59:41.000000000 +0100
+@@ -0,0 +1,20 @@
++context default
++
++ keyword linestart \s\s\* brightcyan/17
++ keyword linestart \s-- brightred/19
++ keyword linestart \s\s\s\s\+ cyan/17
++
++ keyword <*@*> brightred/19
++ keyword whole experimental; brightmagenta/magenta
++ keyword whole unstable; brightmagenta/magenta
++ keyword whole stable; brightmagenta/magenta
++ keyword whole urgency=low yellow/24
++ keyword whole urgency=medium brightgreen/6
++ keyword whole urgency=high white/25
++ keyword whole urgency=LOW yellow/24
++ keyword whole urgency=MEDIUM brightgreen/6
++ keyword whole urgency=HIGH white/25
++
++ keyword whole bug white/25
++ keyword whole Bug white/25
++ keyword whole BUG white/25
+--- /dev/null 2008-01-24 11:33:29.248015015 +0100
++++ ./syntax/debian-control.syntax 2008-01-24 22:59:41.000000000 +0100
+@@ -0,0 +1,23 @@
++context default
++ keyword linestart Source brightmagenta/20
++ keyword linestart Section brightmagenta/20
++ keyword linestart Priority brightmagenta/20
++ keyword linestart Maintainer brightmagenta/20
++ keyword linestart Standards-Version brightmagenta/20
++ keyword linestart Package green/6
++ keyword linestart Architecture green/6
++ keyword linestart Depends green/6
++ keyword linestart Recommends green/6
++ keyword linestart Suggests green/6
++ keyword linestart Conflicts green/6
++ keyword linestart Replaces green/6
++ keyword linestart Provides green/6
++ keyword linestart Pre-Depends green/6
++ keyword linestart Build-Depends green/6
++ keyword linestart Build-Depends-Indep green/6
++ keyword linestart Build-Conflicts green/6
++ keyword linestart Build-Conflicts-Indep green/6
++ keyword linestart Description green/6
++ keyword <*@*> brightred/19
++
++context linestart \s \n brown/22
+--- /dev/null 2008-01-24 11:33:29.248015015 +0100
++++ ./syntax/debian-sources-list.syntax 2008-01-24 22:59:41.000000000 +0100
+@@ -0,0 +1,12 @@
++context default
++ keyword linestart deb-src brightmagenta/20
++ keyword linestart deb brightmagenta/20
++ keyword \$\(ARCH\) brightred/18
++
++context # \n brown/22
++context ftp\:\/\/ \s green/6
++context http\:\/\/ \s green/6
++context cdrom\:\/ \s yellow/24
++context file\:\/ \s brightcyan/14
++
++###############################################################################
+--- ./syntax/Makefile.in 2007-09-11 16:33:39.000000000 +0200
++++ ./syntax/Makefile.in 2008-01-24 22:59:12.000000000 +0100
+@@ -241,6 +241,9 @@
+ assembler.syntax \
+ c.syntax \
+ changelog.syntax \
++ debian-changelog.syntax \
++ debian-control.syntax \
++ debian-sources-list.syntax \
+ cs.syntax \
+ css.syntax \
+ d.syntax \
+--- ./syntax/Makefile.am 2007-08-27 08:56:47.000000000 +0200
++++ ./syntax/Makefile.am 2008-01-24 22:59:18.000000000 +0100
+@@ -5,6 +5,9 @@
+ assembler.syntax \
+ c.syntax \
+ changelog.syntax \
++ debian-changelog.syntax \
++ debian-control.syntax \
++ debian-sources-list.syntax \
+ cs.syntax \
+ css.syntax \
+ d.syntax \
+--- ./syntax/Syntax 2007-08-27 08:56:47.000000000 +0200
++++ ./syntax/Syntax 2008-01-24 23:02:04.000000000 +0100
+@@ -148,5 +148,20 @@
+ file Don_t_match_me Mail\sfolder ^From\s
+ include mail.syntax
+
++file sources.list$ sources\slist
++include debian-sources-list.syntax
++
++file control$ Debian\scontrol\sfile
++include debian-control.syntax
++
++file (rules|rocks)$ Debian\srules
++include makefile.syntax
++
++file .\*changelog$ Debian\schangelog\sfile
++include debian-changelog.syntax
++
++file changelog.Debian$ Debian\schangelog\sfile
++include debian-changelog.syntax
++
+ file .\* unknown
+ include unknown.syntax
Deleted: trunk/debian/patches/03_conffiles_in_mans.patch
===================================================================
--- trunk/debian/patches/03_conffiles_in_mans.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/03_conffiles_in_mans.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,90 +0,0 @@
-diff -Nurwd mc-4.6.2~pre1/doc/mc.1.in mc-4.6.2~pre1/doc/mc.1.in
---- mc-4.6.2~pre1/doc/mc.1.in 2007-09-10 16:25:30.000000000 +0200
-+++ mc-4.6.2~pre1/doc/mc.1.in 2008-01-24 23:04:13.000000000 +0100
-@@ -1396,7 +1396,7 @@
- but only if it is owned by user or root and is not world-writable.
- If no such file found, ~/.mc/menu is tried in the same way,
- and otherwise mc uses the default system-wide menu
-- at prefix@/share/mc/mc.menu.
-+/etc/mc/mc.menu.
- .PP
- The format of the menu file is very simple. Lines that start with
- anything but space or tab are considered entries for the menu (in
-@@ -1923,7 +1923,7 @@
- At startup the Midnight Commander will try to load initialization
- information from the ~/.mc/ini file. If this file doesn't exist, it will
- load the information from the system-wide configuration file, located in
-- at prefix@/share/mc/mc.ini. If the system-wide configuration file doesn't
-+/etc/mc/mc.ini. If the system-wide configuration file doesn't
- exist, MC uses the default settings.
- .PP
- The
-@@ -3251,7 +3251,7 @@
- .IP
- The help file for the program.
- .PP
--.I @prefix@/share/mc/mc.ext
-+.I /etc/mc/mc.ext
- .IP
- The default system-wide extensions file.
- .PP
-@@ -3260,12 +3260,12 @@
- User's own extension, view configuration and edit configuration
- file. They override the contents of the system wide files if present.
- .PP
--.I @prefix@/share/mc/mc.ini
-+.I /etc/mc/mc.ini
- .IP
- The default system-wide setup for the Midnight Commander, used only if
- the user doesn't have his own ~/.mc/ini file.
- .PP
--.I @prefix@/share/mc/mc.lib
-+.I /etc/mc/mc.lib
- .IP
- Global settings for the Midnight Commander. Settings in this file
- affect all users, whether they have ~/.mc/ini or not. Currently, only
-@@ -3283,7 +3283,7 @@
- .IP
- This file contains the hints displayed by the program.
- .PP
--.I @prefix@/share/mc/mc.menu
-+.I /etc/mc/mc.menu
- .IP
- This file contains the default system-wide applications menu.
- .PP
-diff -Nurwd mc-4.6.2~pre1/doc/mcedit.1.in mc-4.6.2~pre1/doc/mcedit.1.in
---- mc-4.6.2~pre1/doc/mcedit.1.in 2003-03-04 11:34:28.000000000 +0100
-+++ mc-4.6.2~pre1/doc/mcedit.1.in 2008-01-24 23:04:13.000000000 +0100
-@@ -464,12 +464,12 @@
- .IP
- The help file for the program.
- .PP
--.I @prefix@/share/mc/mc.ini
-+.I /etc/mc/mc.ini
- .IP
- The default system-wide setup for GNU Midnight Commander, used only if
- the user's own ~/.mc/ini file is missing.
- .PP
--.I @prefix@/share/mc/mc.lib
-+.I /etc/mc/mc.lib
- .IP
- Global settings for the Midnight Commander. Settings in this file
- affect all users, whether they have ~/.mc/ini or not.
-diff -Nurwd mc-4.6.2~pre1/doc/mcview.1.in mc-4.6.2~pre1/doc/mcview.1.in
---- mc-4.6.2~pre1/doc/mcview.1.in 2003-01-20 15:08:22.000000000 +0100
-+++ mc-4.6.2~pre1/doc/mcview.1.in 2008-01-24 23:04:13.000000000 +0100
-@@ -65,12 +65,12 @@
- .IP
- The help file for the program.
- .PP
--.I @prefix@/share/mc/mc.ini
-+.I /etc/mc/mc.ini
- .IP
- The default system-wide setup for GNU Midnight Commander, used only if
- the user's own ~/.mc/ini file is missing.
- .PP
--.I @prefix@/share/mc/mc.lib
-+.I /etc/mc/mc.lib
- .IP
- Global settings for the Midnight Commander. Settings in this file
- affect all users, whether they have ~/.mc/ini or not.
Copied: trunk/debian/patches/03_conffiles_in_mans.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/03_conffiles_in_mans.patch)
===================================================================
--- trunk/debian/patches/03_conffiles_in_mans.patch (rev 0)
+++ trunk/debian/patches/03_conffiles_in_mans.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,90 @@
+diff -Nurwd mc-4.6.2~pre1/doc/mc.1.in mc-4.6.2~pre1/doc/mc.1.in
+--- mc-4.6.2~pre1/doc/mc.1.in 2007-09-10 16:25:30.000000000 +0200
++++ mc-4.6.2~pre1/doc/mc.1.in 2008-01-24 23:04:13.000000000 +0100
+@@ -1396,7 +1396,7 @@
+ but only if it is owned by user or root and is not world-writable.
+ If no such file found, ~/.mc/menu is tried in the same way,
+ and otherwise mc uses the default system-wide menu
+- at prefix@/share/mc/mc.menu.
++/etc/mc/mc.menu.
+ .PP
+ The format of the menu file is very simple. Lines that start with
+ anything but space or tab are considered entries for the menu (in
+@@ -1923,7 +1923,7 @@
+ At startup the Midnight Commander will try to load initialization
+ information from the ~/.mc/ini file. If this file doesn't exist, it will
+ load the information from the system-wide configuration file, located in
+- at prefix@/share/mc/mc.ini. If the system-wide configuration file doesn't
++/etc/mc/mc.ini. If the system-wide configuration file doesn't
+ exist, MC uses the default settings.
+ .PP
+ The
+@@ -3251,7 +3251,7 @@
+ .IP
+ The help file for the program.
+ .PP
+-.I @prefix@/share/mc/mc.ext
++.I /etc/mc/mc.ext
+ .IP
+ The default system-wide extensions file.
+ .PP
+@@ -3260,12 +3260,12 @@
+ User's own extension, view configuration and edit configuration
+ file. They override the contents of the system wide files if present.
+ .PP
+-.I @prefix@/share/mc/mc.ini
++.I /etc/mc/mc.ini
+ .IP
+ The default system-wide setup for the Midnight Commander, used only if
+ the user doesn't have his own ~/.mc/ini file.
+ .PP
+-.I @prefix@/share/mc/mc.lib
++.I /etc/mc/mc.lib
+ .IP
+ Global settings for the Midnight Commander. Settings in this file
+ affect all users, whether they have ~/.mc/ini or not. Currently, only
+@@ -3283,7 +3283,7 @@
+ .IP
+ This file contains the hints displayed by the program.
+ .PP
+-.I @prefix@/share/mc/mc.menu
++.I /etc/mc/mc.menu
+ .IP
+ This file contains the default system-wide applications menu.
+ .PP
+diff -Nurwd mc-4.6.2~pre1/doc/mcedit.1.in mc-4.6.2~pre1/doc/mcedit.1.in
+--- mc-4.6.2~pre1/doc/mcedit.1.in 2003-03-04 11:34:28.000000000 +0100
++++ mc-4.6.2~pre1/doc/mcedit.1.in 2008-01-24 23:04:13.000000000 +0100
+@@ -464,12 +464,12 @@
+ .IP
+ The help file for the program.
+ .PP
+-.I @prefix@/share/mc/mc.ini
++.I /etc/mc/mc.ini
+ .IP
+ The default system-wide setup for GNU Midnight Commander, used only if
+ the user's own ~/.mc/ini file is missing.
+ .PP
+-.I @prefix@/share/mc/mc.lib
++.I /etc/mc/mc.lib
+ .IP
+ Global settings for the Midnight Commander. Settings in this file
+ affect all users, whether they have ~/.mc/ini or not.
+diff -Nurwd mc-4.6.2~pre1/doc/mcview.1.in mc-4.6.2~pre1/doc/mcview.1.in
+--- mc-4.6.2~pre1/doc/mcview.1.in 2003-01-20 15:08:22.000000000 +0100
++++ mc-4.6.2~pre1/doc/mcview.1.in 2008-01-24 23:04:13.000000000 +0100
+@@ -65,12 +65,12 @@
+ .IP
+ The help file for the program.
+ .PP
+-.I @prefix@/share/mc/mc.ini
++.I /etc/mc/mc.ini
+ .IP
+ The default system-wide setup for GNU Midnight Commander, used only if
+ the user's own ~/.mc/ini file is missing.
+ .PP
+-.I @prefix@/share/mc/mc.lib
++.I /etc/mc/mc.lib
+ .IP
+ Global settings for the Midnight Commander. Settings in this file
+ affect all users, whether they have ~/.mc/ini or not.
Deleted: trunk/debian/patches/04_off64t.patch
===================================================================
--- trunk/debian/patches/04_off64t.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/04_off64t.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,190 +0,0 @@
-diff -Nurwd mc-4.6.2~pre1/vfs/cpio.c mc-4.6.2~pre1/vfs/cpio.c
---- mc-4.6.2~pre1/vfs/cpio.c 2005-05-27 05:35:16.000000000 +0200
-+++ mc-4.6.2~pre1/vfs/cpio.c 2008-01-24 23:07:35.000000000 +0100
-@@ -90,7 +90,7 @@
- };
-
- /* FIXME: should be off_t instead of int. */
--static int cpio_position;
-+static off_t cpio_position;
-
- static int cpio_find_head(struct vfs_class *me, struct vfs_s_super *super);
- static int cpio_read_bin_head(struct vfs_class *me, struct vfs_s_super *super);
-@@ -114,7 +114,7 @@
- return l;
- }
-
--static int cpio_skip_padding(struct vfs_s_super *super)
-+static off_t cpio_skip_padding(struct vfs_s_super *super)
- {
- switch(super->u.arch.type) {
- case CPIO_BIN:
-diff -Nurwd mc-4.6.2~pre1/vfs/direntry.c mc-4.6.2~pre1/vfs/direntry.c
---- mc-4.6.2~pre1/vfs/direntry.c 2006-03-30 15:04:50.000000000 +0200
-+++ mc-4.6.2~pre1/vfs/direntry.c 2008-01-24 23:09:01.000000000 +0100
-@@ -849,7 +849,7 @@
- return 0;
- }
-
--static int
-+static off_t
- vfs_s_lseek (void *fh, off_t offset, int whence)
- {
- off_t size = FH->ino->st.st_size;
-@@ -858,7 +858,7 @@
- vfs_die ("cannot lseek() after linear_read!");
-
- if (FH->handle != -1){ /* If we have local file opened, we want to work with it */
-- int retval = lseek (FH->handle, offset, whence);
-+ off_t retval = lseek (FH->handle, offset, whence);
- if (retval == -1)
- FH->ino->super->me->verrno = errno;
- return retval;
-diff -Nurwd mc-4.6.2~pre1/vfs/extfs.c mc-4.6.2~pre1/vfs/extfs.c
---- mc-4.6.2~pre1/vfs/extfs.c 2006-03-23 16:00:50.000000000 +0100
-+++ mc-4.6.2~pre1/vfs/extfs.c 2008-01-24 23:06:15.000000000 +0100
-@@ -1140,7 +1140,7 @@
- return 0;
- }
-
--static int extfs_lseek (void *data, off_t offset, int whence)
-+static off_t extfs_lseek (void *data, off_t offset, int whence)
- {
- struct pseudofile *file = (struct pseudofile *) data;
-
-diff -Nurwd mc-4.6.2~pre1/vfs/local.c mc-4.6.2~pre1/vfs/local.c
---- mc-4.6.2~pre1/vfs/local.c 2005-07-05 23:01:57.000000000 +0200
-+++ mc-4.6.2~pre1/vfs/local.c 2008-01-24 23:06:15.000000000 +0100
-@@ -226,7 +226,7 @@
- return chdir (path);
- }
-
--int
-+off_t
- local_lseek (void *data, off_t offset, int whence)
- {
- int fd = * (int *) data;
-diff -Nurwd mc-4.6.2~pre1/vfs/local.h mc-4.6.2~pre1/vfs/local.h
---- mc-4.6.2~pre1/vfs/local.h 2005-07-05 23:01:57.000000000 +0200
-+++ mc-4.6.2~pre1/vfs/local.h 2008-01-24 23:09:40.000000000 +0100
-@@ -11,6 +11,6 @@
- extern int local_read (void *data, char *buffer, int count);
- extern int local_fstat (void *data, struct stat *buf);
- extern int local_errno (struct vfs_class *me);
--extern int local_lseek (void *data, off_t offset, int whence);
-+extern off_t local_lseek (void *data, off_t offset, int whence);
-
- #endif
-diff -Nurwd mc-4.6.2~pre1/vfs/mcfs.c mc-4.6.2~pre1/vfs/mcfs.c
---- mc-4.6.2~pre1/vfs/mcfs.c 2005-06-08 02:34:55.000000000 +0200
-+++ mc-4.6.2~pre1/vfs/mcfs.c 2008-01-24 23:06:15.000000000 +0100
-@@ -1068,7 +1068,7 @@
- return 0;
- }
-
--static int
-+static off_t
- mcfs_lseek (void *data, off_t offset, int whence)
- {
- mcfs_handle *info = (mcfs_handle *) data;
-diff -Nurwd mc-4.6.2~pre1/vfs/smbfs.c mc-4.6.2~pre1/vfs/smbfs.c
---- mc-4.6.2~pre1/vfs/smbfs.c 2005-11-11 03:22:02.000000000 +0100
-+++ mc-4.6.2~pre1/vfs/smbfs.c 2008-01-24 23:06:15.000000000 +0100
-@@ -1624,7 +1624,7 @@
-
- #define smbfs_lstat smbfs_stat /* no symlinks on smb filesystem? */
-
--static int
-+static off_t
- smbfs_lseek (void *data, off_t offset, int whence)
- {
- smbfs_handle *info = (smbfs_handle *) data;
-diff -Nurwd mc-4.6.2~pre1/vfs/tar.c mc-4.6.2~pre1/vfs/tar.c
---- mc-4.6.2~pre1/vfs/tar.c 2006-04-18 09:27:21.000000000 +0200
-+++ mc-4.6.2~pre1/vfs/tar.c 2008-01-24 23:06:15.000000000 +0100
-@@ -209,7 +209,7 @@
- }
-
- /* As we open one archive at a time, it is safe to have this static */
--static int current_tar_position = 0;
-+static off_t current_tar_position = 0;
-
- /* Returns fd of the open tar file */
- static int
-@@ -521,7 +521,7 @@
- struct stat st;
- struct vfs_s_entry *entry;
- struct vfs_s_inode *inode, *parent;
-- long data_position;
-+ off_t data_position;
- char *q;
- int len;
- char *current_file_name, *current_link_name;
-@@ -750,8 +750,9 @@
- int fd = FH_SUPER->u.arch.fd;
- struct vfs_class *me = FH_SUPER->me;
-
-- if (mc_lseek (fd, begin + FH->pos, SEEK_SET) !=
-- begin + FH->pos) ERRNOR (EIO, -1);
-+
-+ off_t o = mc_lseek(fd, begin + FH->pos, SEEK_SET);
-+ if ( o != begin + FH->pos) ERRNOR (EIO, -1);
-
- count = MIN(count, FH->ino->st.st_size - FH->pos);
-
-diff -Nurwd mc-4.6.2~pre1/vfs/undelfs.c mc-4.6.2~pre1/vfs/undelfs.c
---- mc-4.6.2~pre1/vfs/undelfs.c 2005-05-27 05:35:16.000000000 +0200
-+++ mc-4.6.2~pre1/vfs/undelfs.c 2008-01-24 23:06:15.000000000 +0100
-@@ -648,7 +648,7 @@
- }
-
- /* this has to stay here for now: vfs layer does not know how to emulate it */
--static int
-+static off_t
- undelfs_lseek(void *vfs_info, off_t offset, int whence)
- {
- return -1;
-diff -Nurwd mc-4.6.2~pre1/vfs/vfs.c mc-4.6.2~pre1/vfs/vfs.c
---- mc-4.6.2~pre1/vfs/vfs.c 2005-07-05 23:01:57.000000000 +0200
-+++ mc-4.6.2~pre1/vfs/vfs.c 2008-01-24 23:06:15.000000000 +0100
-@@ -627,14 +627,14 @@
- off_t mc_lseek (int fd, off_t offset, int whence)
- {
- struct vfs_class *vfs;
-- int result;
-+ off_t result;
-
- if (fd == -1)
- return -1;
-
- vfs = vfs_op (fd);
- result = vfs->lseek ? (*vfs->lseek)(vfs_info (fd), offset, whence) : -1;
-- if (result == -1)
-+ if (result == (off_t)-1)
- errno = vfs->lseek ? ferrno (vfs) : E_NOTSUPP;
- return result;
- }
-diff -Nurwd mc-4.6.2~pre1/vfs/vfs-impl.h mc-4.6.2~pre1/vfs/vfs-impl.h
---- mc-4.6.2~pre1/vfs/vfs-impl.h 2005-11-15 23:27:45.000000000 +0100
-+++ mc-4.6.2~pre1/vfs/vfs-impl.h 2008-01-24 23:06:15.000000000 +0100
-@@ -70,7 +70,7 @@
- int (*rename) (struct vfs_class *me, const char *p1, const char *p2);
- int (*chdir) (struct vfs_class *me, const char *path);
- int (*ferrno) (struct vfs_class *me);
-- int (*lseek) (void *vfs_info, off_t offset, int whence);
-+ off_t (*lseek) (void *vfs_info, off_t offset, int whence);
- int (*mknod) (struct vfs_class *me, const char *path, int mode, int dev);
-
- vfsid (*getid) (struct vfs_class *me, const char *path);
-diff -Nurwd mc-4.6.2~pre1/vfs/xdirentry.h mc-4.6.2~pre1/vfs/xdirentry.h
---- mc-4.6.2~pre1/vfs/xdirentry.h 2006-01-27 23:16:45.000000000 +0100
-+++ mc-4.6.2~pre1/vfs/xdirentry.h 2008-01-24 23:06:15.000000000 +0100
-@@ -94,7 +94,7 @@
- char *linkname; /* Symlink's contents */
- char *localname; /* Filename of local file, if we have one */
- struct timeval timestamp; /* Subclass specific */
-- long data_offset; /* Subclass specific */
-+ off_t data_offset; /* Subclass specific */
- };
-
- /* Data associated with an open file */
Copied: trunk/debian/patches/04_off64t.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/04_off64t.patch)
===================================================================
--- trunk/debian/patches/04_off64t.patch (rev 0)
+++ trunk/debian/patches/04_off64t.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,190 @@
+diff -Nurwd mc-4.6.2~pre1/vfs/cpio.c mc-4.6.2~pre1/vfs/cpio.c
+--- mc-4.6.2~pre1/vfs/cpio.c 2005-05-27 05:35:16.000000000 +0200
++++ mc-4.6.2~pre1/vfs/cpio.c 2008-01-24 23:07:35.000000000 +0100
+@@ -90,7 +90,7 @@
+ };
+
+ /* FIXME: should be off_t instead of int. */
+-static int cpio_position;
++static off_t cpio_position;
+
+ static int cpio_find_head(struct vfs_class *me, struct vfs_s_super *super);
+ static int cpio_read_bin_head(struct vfs_class *me, struct vfs_s_super *super);
+@@ -114,7 +114,7 @@
+ return l;
+ }
+
+-static int cpio_skip_padding(struct vfs_s_super *super)
++static off_t cpio_skip_padding(struct vfs_s_super *super)
+ {
+ switch(super->u.arch.type) {
+ case CPIO_BIN:
+diff -Nurwd mc-4.6.2~pre1/vfs/direntry.c mc-4.6.2~pre1/vfs/direntry.c
+--- mc-4.6.2~pre1/vfs/direntry.c 2006-03-30 15:04:50.000000000 +0200
++++ mc-4.6.2~pre1/vfs/direntry.c 2008-01-24 23:09:01.000000000 +0100
+@@ -849,7 +849,7 @@
+ return 0;
+ }
+
+-static int
++static off_t
+ vfs_s_lseek (void *fh, off_t offset, int whence)
+ {
+ off_t size = FH->ino->st.st_size;
+@@ -858,7 +858,7 @@
+ vfs_die ("cannot lseek() after linear_read!");
+
+ if (FH->handle != -1){ /* If we have local file opened, we want to work with it */
+- int retval = lseek (FH->handle, offset, whence);
++ off_t retval = lseek (FH->handle, offset, whence);
+ if (retval == -1)
+ FH->ino->super->me->verrno = errno;
+ return retval;
+diff -Nurwd mc-4.6.2~pre1/vfs/extfs.c mc-4.6.2~pre1/vfs/extfs.c
+--- mc-4.6.2~pre1/vfs/extfs.c 2006-03-23 16:00:50.000000000 +0100
++++ mc-4.6.2~pre1/vfs/extfs.c 2008-01-24 23:06:15.000000000 +0100
+@@ -1140,7 +1140,7 @@
+ return 0;
+ }
+
+-static int extfs_lseek (void *data, off_t offset, int whence)
++static off_t extfs_lseek (void *data, off_t offset, int whence)
+ {
+ struct pseudofile *file = (struct pseudofile *) data;
+
+diff -Nurwd mc-4.6.2~pre1/vfs/local.c mc-4.6.2~pre1/vfs/local.c
+--- mc-4.6.2~pre1/vfs/local.c 2005-07-05 23:01:57.000000000 +0200
++++ mc-4.6.2~pre1/vfs/local.c 2008-01-24 23:06:15.000000000 +0100
+@@ -226,7 +226,7 @@
+ return chdir (path);
+ }
+
+-int
++off_t
+ local_lseek (void *data, off_t offset, int whence)
+ {
+ int fd = * (int *) data;
+diff -Nurwd mc-4.6.2~pre1/vfs/local.h mc-4.6.2~pre1/vfs/local.h
+--- mc-4.6.2~pre1/vfs/local.h 2005-07-05 23:01:57.000000000 +0200
++++ mc-4.6.2~pre1/vfs/local.h 2008-01-24 23:09:40.000000000 +0100
+@@ -11,6 +11,6 @@
+ extern int local_read (void *data, char *buffer, int count);
+ extern int local_fstat (void *data, struct stat *buf);
+ extern int local_errno (struct vfs_class *me);
+-extern int local_lseek (void *data, off_t offset, int whence);
++extern off_t local_lseek (void *data, off_t offset, int whence);
+
+ #endif
+diff -Nurwd mc-4.6.2~pre1/vfs/mcfs.c mc-4.6.2~pre1/vfs/mcfs.c
+--- mc-4.6.2~pre1/vfs/mcfs.c 2005-06-08 02:34:55.000000000 +0200
++++ mc-4.6.2~pre1/vfs/mcfs.c 2008-01-24 23:06:15.000000000 +0100
+@@ -1068,7 +1068,7 @@
+ return 0;
+ }
+
+-static int
++static off_t
+ mcfs_lseek (void *data, off_t offset, int whence)
+ {
+ mcfs_handle *info = (mcfs_handle *) data;
+diff -Nurwd mc-4.6.2~pre1/vfs/smbfs.c mc-4.6.2~pre1/vfs/smbfs.c
+--- mc-4.6.2~pre1/vfs/smbfs.c 2005-11-11 03:22:02.000000000 +0100
++++ mc-4.6.2~pre1/vfs/smbfs.c 2008-01-24 23:06:15.000000000 +0100
+@@ -1624,7 +1624,7 @@
+
+ #define smbfs_lstat smbfs_stat /* no symlinks on smb filesystem? */
+
+-static int
++static off_t
+ smbfs_lseek (void *data, off_t offset, int whence)
+ {
+ smbfs_handle *info = (smbfs_handle *) data;
+diff -Nurwd mc-4.6.2~pre1/vfs/tar.c mc-4.6.2~pre1/vfs/tar.c
+--- mc-4.6.2~pre1/vfs/tar.c 2006-04-18 09:27:21.000000000 +0200
++++ mc-4.6.2~pre1/vfs/tar.c 2008-01-24 23:06:15.000000000 +0100
+@@ -209,7 +209,7 @@
+ }
+
+ /* As we open one archive at a time, it is safe to have this static */
+-static int current_tar_position = 0;
++static off_t current_tar_position = 0;
+
+ /* Returns fd of the open tar file */
+ static int
+@@ -521,7 +521,7 @@
+ struct stat st;
+ struct vfs_s_entry *entry;
+ struct vfs_s_inode *inode, *parent;
+- long data_position;
++ off_t data_position;
+ char *q;
+ int len;
+ char *current_file_name, *current_link_name;
+@@ -750,8 +750,9 @@
+ int fd = FH_SUPER->u.arch.fd;
+ struct vfs_class *me = FH_SUPER->me;
+
+- if (mc_lseek (fd, begin + FH->pos, SEEK_SET) !=
+- begin + FH->pos) ERRNOR (EIO, -1);
++
++ off_t o = mc_lseek(fd, begin + FH->pos, SEEK_SET);
++ if ( o != begin + FH->pos) ERRNOR (EIO, -1);
+
+ count = MIN(count, FH->ino->st.st_size - FH->pos);
+
+diff -Nurwd mc-4.6.2~pre1/vfs/undelfs.c mc-4.6.2~pre1/vfs/undelfs.c
+--- mc-4.6.2~pre1/vfs/undelfs.c 2005-05-27 05:35:16.000000000 +0200
++++ mc-4.6.2~pre1/vfs/undelfs.c 2008-01-24 23:06:15.000000000 +0100
+@@ -648,7 +648,7 @@
+ }
+
+ /* this has to stay here for now: vfs layer does not know how to emulate it */
+-static int
++static off_t
+ undelfs_lseek(void *vfs_info, off_t offset, int whence)
+ {
+ return -1;
+diff -Nurwd mc-4.6.2~pre1/vfs/vfs.c mc-4.6.2~pre1/vfs/vfs.c
+--- mc-4.6.2~pre1/vfs/vfs.c 2005-07-05 23:01:57.000000000 +0200
++++ mc-4.6.2~pre1/vfs/vfs.c 2008-01-24 23:06:15.000000000 +0100
+@@ -627,14 +627,14 @@
+ off_t mc_lseek (int fd, off_t offset, int whence)
+ {
+ struct vfs_class *vfs;
+- int result;
++ off_t result;
+
+ if (fd == -1)
+ return -1;
+
+ vfs = vfs_op (fd);
+ result = vfs->lseek ? (*vfs->lseek)(vfs_info (fd), offset, whence) : -1;
+- if (result == -1)
++ if (result == (off_t)-1)
+ errno = vfs->lseek ? ferrno (vfs) : E_NOTSUPP;
+ return result;
+ }
+diff -Nurwd mc-4.6.2~pre1/vfs/vfs-impl.h mc-4.6.2~pre1/vfs/vfs-impl.h
+--- mc-4.6.2~pre1/vfs/vfs-impl.h 2005-11-15 23:27:45.000000000 +0100
++++ mc-4.6.2~pre1/vfs/vfs-impl.h 2008-01-24 23:06:15.000000000 +0100
+@@ -70,7 +70,7 @@
+ int (*rename) (struct vfs_class *me, const char *p1, const char *p2);
+ int (*chdir) (struct vfs_class *me, const char *path);
+ int (*ferrno) (struct vfs_class *me);
+- int (*lseek) (void *vfs_info, off_t offset, int whence);
++ off_t (*lseek) (void *vfs_info, off_t offset, int whence);
+ int (*mknod) (struct vfs_class *me, const char *path, int mode, int dev);
+
+ vfsid (*getid) (struct vfs_class *me, const char *path);
+diff -Nurwd mc-4.6.2~pre1/vfs/xdirentry.h mc-4.6.2~pre1/vfs/xdirentry.h
+--- mc-4.6.2~pre1/vfs/xdirentry.h 2006-01-27 23:16:45.000000000 +0100
++++ mc-4.6.2~pre1/vfs/xdirentry.h 2008-01-24 23:06:15.000000000 +0100
+@@ -94,7 +94,7 @@
+ char *linkname; /* Symlink's contents */
+ char *localname; /* Filename of local file, if we have one */
+ struct timeval timestamp; /* Subclass specific */
+- long data_offset; /* Subclass specific */
++ off_t data_offset; /* Subclass specific */
+ };
+
+ /* Data associated with an open file */
Deleted: trunk/debian/patches/05_smbconf_path.patch
===================================================================
--- trunk/debian/patches/05_smbconf_path.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/05_smbconf_path.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,12 +0,0 @@
-diff -Nurwd mc-4.6.2~pre1/vfs/smbfs.c mc-4.6.2~pre1.patched/vfs/smbfs.c
---- mc-4.6.2~pre1/vfs/smbfs.c 2005-11-11 03:22:02.000000000 +0100
-+++ mc-4.6.2~pre1/vfs/smbfs.c 2008-01-24 23:17:43.000000000 +0100
-@@ -294,7 +294,7 @@
- static int
- smbfs_init (struct vfs_class * me)
- {
-- const char *servicesf = CONFIGDIR PATH_SEP_STR "smb.conf";
-+ const char *servicesf = CONFIGDIR PATH_SEP_STR "samba/smb.conf";
-
- /* DEBUGLEVEL = 4; */
-
Deleted: trunk/debian/patches/06_awk.patch
===================================================================
--- trunk/debian/patches/06_awk.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/06_awk.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,12 +0,0 @@
-diff -Nurwd mc-4.6.2~pre1/configure mc-4.6.2~pre1.patched/configure
---- mc-4.6.2~pre1/configure 2007-09-11 16:33:32.000000000 +0200
-+++ mc-4.6.2~pre1/configure 2008-01-24 23:37:34.000000000 +0100
-@@ -1562,7 +1562,7 @@
- fi
- fi
-
--for ac_prog in gawk mawk nawk awk
-+for ac_prog in awk gawk mawk nawk
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
Copied: trunk/debian/patches/06_smbconf_path.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/06_smbconf_path.patch)
===================================================================
--- trunk/debian/patches/06_smbconf_path.patch (rev 0)
+++ trunk/debian/patches/06_smbconf_path.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,12 @@
+diff -Nurwd mc-4.6.2~pre1/vfs/smbfs.c mc-4.6.2~pre1.patched/vfs/smbfs.c
+--- mc-4.6.2~pre1/vfs/smbfs.c 2005-11-11 03:22:02.000000000 +0100
++++ mc-4.6.2~pre1/vfs/smbfs.c 2008-01-24 23:17:43.000000000 +0100
+@@ -294,7 +294,7 @@
+ static int
+ smbfs_init (struct vfs_class * me)
+ {
+- const char *servicesf = CONFIGDIR PATH_SEP_STR "smb.conf";
++ const char *servicesf = CONFIGDIR PATH_SEP_STR "samba/smb.conf";
+
+ /* DEBUGLEVEL = 4; */
+
Deleted: trunk/debian/patches/07_de.po.patch
===================================================================
--- trunk/debian/patches/07_de.po.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/07_de.po.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,57 +0,0 @@
-diff -Nurwd mc-4.6.2~pre1/po/de.po mc-4.6.2~pre1.patched/po/de.po
---- mc-4.6.2~pre1/po/de.po 2007-09-11 16:35:05.000000000 +0200
-+++ mc-4.6.2~pre1/po/de.po 2008-01-24 23:42:24.000000000 +0100
-@@ -1147,7 +1147,7 @@
-
- #, c-format
- msgid " edit symlink: %s "
--msgstr " symbolschen Link barbeiten: %s"
-+msgstr " symbolschen Link bearbeiten: %s"
-
- #, c-format
- msgid "`%s' is not a symbolic link"
-@@ -1246,7 +1246,7 @@
- " Cannot create temporary command file \n"
- " %s "
- msgstr ""
--" Kann temporäre Befehlsdaei nicht anlegen \n"
-+" Kann temporäre Befehlsdatei nicht anlegen \n"
- " %s "
-
- msgid " Parameter "
-@@ -1332,7 +1332,7 @@
- " Cannot stat source file \"%s\" \n"
- " %s "
- msgstr ""
--" Kann Quelldaei \"%s\" nicht untersuchen \n"
-+" Kann Quelldatei \"%s\" nicht untersuchen \n"
- " %s "
-
- #, c-format
-@@ -2071,7 +2071,7 @@
-
- #, c-format
- msgid " You have entered \"%s\""
--msgstr " Sie haben \"%s\" einggeben"
-+msgstr " Sie haben \"%s\" eingegeben"
-
- #. TRANSLATORS: This label appears near learned keys. Keep it short.
- msgid "OK"
-@@ -2145,7 +2145,7 @@
- msgstr "FT&P-Verbindung..."
-
- msgid "S&hell link..."
--msgstr "Shell-Verbindung..."
-+msgstr "S&hell-Verbindung..."
-
- msgid "SM&B link..."
- msgstr "SM&B-Verbindung..."
-@@ -3383,7 +3383,7 @@
-
- #, c-format
- msgid "ftpfs: connection to server failed: %s"
--msgstr "ftpfs: Verbindung zum Server fehlgeschlgen: %s"
-+msgstr "ftpfs: Verbindung zum Server fehlgeschlagen: %s"
-
- #, c-format
- msgid "Waiting to retry... %d (Control-C to cancel)"
Copied: trunk/debian/patches/08_awk.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/08_awk.patch)
===================================================================
--- trunk/debian/patches/08_awk.patch (rev 0)
+++ trunk/debian/patches/08_awk.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,12 @@
+diff -Nurwd mc-4.6.2~pre1/configure mc-4.6.2~pre1.patched/configure
+--- mc-4.6.2~pre1/configure 2007-09-11 16:33:32.000000000 +0200
++++ mc-4.6.2~pre1/configure 2008-01-24 23:37:34.000000000 +0100
+@@ -1562,7 +1562,7 @@
+ fi
+ fi
+
+-for ac_prog in gawk mawk nawk awk
++for ac_prog in awk gawk mawk nawk
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
Deleted: trunk/debian/patches/08_it.po.patch
===================================================================
--- trunk/debian/patches/08_it.po.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/08_it.po.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,12 +0,0 @@
-diff -Nurwd mc-4.6.2~pre1/po/it.po mc-4.6.2~pre1.patched/po/it.po
---- mc-4.6.2~pre1/po/it.po 2007-09-11 16:35:06.000000000 +0200
-+++ mc-4.6.2~pre1/po/it.po 2008-01-24 23:44:48.000000000 +0100
-@@ -1683,7 +1683,7 @@
- msgstr "&Riprendi"
-
- msgid "A&ppend"
--msgstr "Atta&cca"
-+msgstr "atta&Cca"
-
- msgid "Overwrite this target?"
- msgstr "Sovrascrivo questo file?"
Copied: trunk/debian/patches/09_de.po.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/09_de.po.patch)
===================================================================
--- trunk/debian/patches/09_de.po.patch (rev 0)
+++ trunk/debian/patches/09_de.po.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,57 @@
+diff -Nurwd mc-4.6.2~pre1/po/de.po mc-4.6.2~pre1.patched/po/de.po
+--- mc-4.6.2~pre1/po/de.po 2007-09-11 16:35:05.000000000 +0200
++++ mc-4.6.2~pre1/po/de.po 2008-01-24 23:42:24.000000000 +0100
+@@ -1147,7 +1147,7 @@
+
+ #, c-format
+ msgid " edit symlink: %s "
+-msgstr " symbolschen Link barbeiten: %s"
++msgstr " symbolschen Link bearbeiten: %s"
+
+ #, c-format
+ msgid "`%s' is not a symbolic link"
+@@ -1246,7 +1246,7 @@
+ " Cannot create temporary command file \n"
+ " %s "
+ msgstr ""
+-" Kann temporäre Befehlsdaei nicht anlegen \n"
++" Kann temporäre Befehlsdatei nicht anlegen \n"
+ " %s "
+
+ msgid " Parameter "
+@@ -1332,7 +1332,7 @@
+ " Cannot stat source file \"%s\" \n"
+ " %s "
+ msgstr ""
+-" Kann Quelldaei \"%s\" nicht untersuchen \n"
++" Kann Quelldatei \"%s\" nicht untersuchen \n"
+ " %s "
+
+ #, c-format
+@@ -2071,7 +2071,7 @@
+
+ #, c-format
+ msgid " You have entered \"%s\""
+-msgstr " Sie haben \"%s\" einggeben"
++msgstr " Sie haben \"%s\" eingegeben"
+
+ #. TRANSLATORS: This label appears near learned keys. Keep it short.
+ msgid "OK"
+@@ -2145,7 +2145,7 @@
+ msgstr "FT&P-Verbindung..."
+
+ msgid "S&hell link..."
+-msgstr "Shell-Verbindung..."
++msgstr "S&hell-Verbindung..."
+
+ msgid "SM&B link..."
+ msgstr "SM&B-Verbindung..."
+@@ -3383,7 +3383,7 @@
+
+ #, c-format
+ msgid "ftpfs: connection to server failed: %s"
+-msgstr "ftpfs: Verbindung zum Server fehlgeschlgen: %s"
++msgstr "ftpfs: Verbindung zum Server fehlgeschlagen: %s"
+
+ #, c-format
+ msgid "Waiting to retry... %d (Control-C to cancel)"
Deleted: trunk/debian/patches/09_syntax.patch
===================================================================
--- trunk/debian/patches/09_syntax.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/09_syntax.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,15 +0,0 @@
-diff -Nurwd mc-4.6.2~pre1/syntax/Syntax mc-4.6.2~pre1.patched/syntax/Syntax
---- mc-4.6.2~pre1/syntax/Syntax 2007-08-27 08:56:47.000000000 +0200
-+++ mc-4.6.2~pre1.patched/syntax/Syntax 2008-01-24 23:52:28.000000000 +0100
-@@ -46,9 +46,10 @@
- file ..\*\\.(rb|RB)$ Ruby\sProgram ^#!.\*([\s/]ruby|@RUBY@)
- include ruby.syntax
-
--file ..\*\\.(man|[0-9n]|[0-9]x)$ NROFF\sSource
-+file ..\*\\.(man|[0-9n]|[0-9](x|ncurses|ssl|p|pm|menu|form|vga|t|td))$ NROFF\sSource
- include nroff.syntax
-
-+
- file ..\*\\.(htm|html|HTM|HTML)$ HTML\sFile
- include html.syntax
-
Deleted: trunk/debian/patches/10_cxx.syntax.patch
===================================================================
--- trunk/debian/patches/10_cxx.syntax.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/10_cxx.syntax.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,143 +0,0 @@
-diff -Nurwd mc-4.6.2~pre1/syntax/cxx.syntax mc-4.6.2~pre1.patched/syntax/cxx.syntax
---- mc-4.6.2~pre1/syntax/cxx.syntax 1970-01-01 00:00:00.000000000 +0000
-+++ mc-4.6.2~pre1/syntax/cxx.syntax 2008-01-24 23:57:05.000000000 +0100
-@@ -0,0 +1,128 @@
-+context default
-+ keyword whole auto yellow
-+ keyword whole break yellow
-+ keyword whole case yellow
-+ keyword whole char yellow
-+ keyword whole const yellow
-+ keyword whole continue yellow
-+ keyword whole default yellow
-+ keyword whole do yellow
-+ keyword whole double yellow
-+ keyword whole else yellow
-+ keyword whole enum yellow
-+ keyword whole extern yellow
-+ keyword whole float yellow
-+ keyword whole for yellow
-+ keyword whole goto yellow
-+ keyword whole if yellow
-+ keyword whole int yellow
-+ keyword whole long yellow
-+ keyword whole register yellow
-+ keyword whole return yellow
-+ keyword whole short yellow
-+ keyword whole signed yellow
-+ keyword whole sizeof yellow
-+ keyword whole static yellow
-+ keyword whole struct yellow
-+ keyword whole switch yellow
-+ keyword whole typedef yellow
-+ keyword whole union yellow
-+ keyword whole unsigned yellow
-+ keyword whole void yellow
-+ keyword whole volatile yellow
-+ keyword whole while yellow
-+ keyword whole asm yellow
-+ keyword whole catch yellow
-+ keyword whole class yellow
-+ keyword whole friend yellow
-+ keyword whole delete yellow
-+ keyword whole inline yellow
-+ keyword whole new yellow
-+ keyword whole operator yellow
-+ keyword whole private yellow
-+ keyword whole protected yellow
-+ keyword whole public yellow
-+ keyword whole this yellow
-+ keyword whole throw yellow
-+ keyword whole template yellow
-+ keyword whole try yellow
-+ keyword whole virtual yellow
-+ keyword whole bool yellow
-+ keyword whole const_cast yellow
-+ keyword whole dynamic_cast yellow
-+ keyword whole explicit yellow
-+ keyword whole false yellow
-+ keyword whole mutable yellow
-+ keyword whole namespace yellow
-+ keyword whole reinterpret_cast yellow
-+ keyword whole static_cast yellow
-+ keyword whole true yellow
-+ keyword whole typeid yellow
-+ keyword whole typename yellow
-+ keyword whole using yellow
-+ keyword whole wchar_t yellow
-+ keyword whole ... yellow
-+ keyword whole linestart \{\s\t\}\[\s\t\]#*\n brightmagenta
-+
-+ keyword /\* brown
-+ keyword \*/ brown
-+ keyword // brown
-+
-+ keyword '\\\{"abtnvfr\}' brightgreen
-+ keyword '\\\{0123\}\{01234567\}\{01234567\}' brightgreen
-+ keyword '\\'' brightgreen
-+ keyword '\\\\' brightgreen
-+ keyword '\\0' brightgreen
-+ keyword '\{\s!"#$%&()\*\+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~ ¡¢£¤¥¦§¨©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ\}' brightgreen
-+
-+ keyword > yellow
-+ keyword < yellow
-+ keyword \+ yellow
-+ keyword - yellow
-+ keyword \* yellow
-+ keyword / yellow
-+ keyword % yellow
-+ keyword = yellow
-+ keyword != yellow
-+ keyword == yellow
-+ keyword { brightcyan
-+ keyword } brightcyan
-+ keyword ( brightcyan
-+ keyword ) brightcyan
-+ keyword [ brightcyan
-+ keyword ] brightcyan
-+ keyword , brightcyan
-+ keyword : brightcyan
-+ keyword ? brightcyan
-+ keyword ; brightmagenta
-+
-+context exclusive /\* \*/ brown
-+ spellcheck
-+
-+context exclusive // \n brown
-+ spellcheck
-+
-+context linestart # \n brightred
-+ keyword \\\n yellow
-+ keyword /\**\*/ brown
-+ keyword //*\n brown
-+ keyword "+" red
-+ keyword <+> red
-+
-+context " " green
-+ spellcheck
-+ keyword \\" brightgreen
-+ keyword %% brightgreen
-+ keyword %\[#0\s-\+,\]\[0123456789\*\]\[.\]\[0123456789\*\]\[L\]\{eEfgGoxX\} brightgreen
-+ keyword %\[0\s-\+,\]\[0123456789\*\]\[.\]\[0123456789\*\]\[hl\]\{diuxX\} brightgreen
-+ keyword %\[hl\]n brightgreen
-+ keyword %\[-\]\[0123456789\*\]\[.\]\[0123456789\*\]s brightgreen
-+ keyword %[*] brightgreen
-+ keyword %c brightgreen
-+ keyword %p brightgreen
-+ keyword \\\{0123\}\{01234567\}\{01234567\} brightgreen
-+ keyword \\\\ brightgreen
-+ keyword \\' brightgreen
-+ keyword \\\{abtnvfr\} brightgreen
-+
-+
-diff -Nurwd mc-4.6.2~pre1/syntax/Makefile.in mc-4.6.2~pre1.patched/syntax/Makefile.in
---- mc-4.6.2~pre1/syntax/Makefile.in 2007-09-11 16:33:39.000000000 +0200
-+++ mc-4.6.2~pre1/syntax/Makefile.in 2008-01-24 23:58:04.000000000 +0100
-@@ -240,6 +240,7 @@
- aspx.syntax \
- assembler.syntax \
- c.syntax \
-+ cxx.syntax \
- changelog.syntax \
- cs.syntax \
- css.syntax \
Copied: trunk/debian/patches/10_it.po.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/10_it.po.patch)
===================================================================
--- trunk/debian/patches/10_it.po.patch (rev 0)
+++ trunk/debian/patches/10_it.po.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,12 @@
+diff -Nurwd mc-4.6.2~pre1/po/it.po mc-4.6.2~pre1.patched/po/it.po
+--- mc-4.6.2~pre1/po/it.po 2007-09-11 16:35:06.000000000 +0200
++++ mc-4.6.2~pre1/po/it.po 2008-01-24 23:44:48.000000000 +0100
+@@ -1683,7 +1683,7 @@
+ msgstr "&Riprendi"
+
+ msgid "A&ppend"
+-msgstr "Atta&cca"
++msgstr "atta&Cca"
+
+ msgid "Overwrite this target?"
+ msgstr "Sovrascrivo questo file?"
Deleted: trunk/debian/patches/11_sh_syntax.patch
===================================================================
--- trunk/debian/patches/11_sh_syntax.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/11_sh_syntax.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,2144 +0,0 @@
-diff -Nurwd mc-4.6.2~pre1.orig/syntax/sh.syntax mc-4.6.2~pre1/syntax/sh.syntax
---- mc-4.6.2~pre1.orig/syntax/sh.syntax 2008-02-16 13:55:35.000000000 +0100
-+++ mc-4.6.2~pre1/syntax/sh.syntax 2008-02-16 13:57:21.000000000 +0100
-@@ -1,3 +1,8 @@
-+# Since I regulary update ths file, please send any comments
-+# to: Michelle Konzack <linux4michelle at freenet.de>
-+# Last Update: Thu, 01 Jun 2006 22:10:07 +0200
-+
-+
- context default
- keyword ;; brightred
- keyword \\@ brightred
-@@ -8,13 +13,13 @@
- keyword \\` brightred
- keyword ` brightred
- keyword ; brightcyan
-- keyword $( brightcyan
-- keyword ( brightcyan
-- keyword ) brightcyan
-+ keyword $(*) brightgreen
- keyword ${*} brightgreen
- keyword { brightcyan
- keyword } brightcyan
-
-+ keyword whole linestart #!\[\s\]*\n brightcyan black
-+
- keyword $\* brightred
- keyword $@ brightred
- keyword $# brightred
-@@ -22,7 +27,12 @@
- keyword $- brightred
- keyword $$ brightred
- keyword $! brightred
-- keyword whole $_ brightred
-+ keyword $_ brightred
-+
-+ keyword whole 2>&1 brightred
-+ keyword whole 1>&2 brightred
-+ keyword whole 2> brightred
-+ keyword whole 1> brightred
-
- keyword wholeright $\[0123456789\] brightred
-
-@@ -36,134 +46,1042 @@
-
- wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._
-
-- keyword whole alias yellow
-- keyword whole bg yellow
- keyword whole break yellow
- keyword whole case yellow
-+ keyword whole clear yellow
- keyword whole continue yellow
-+ keyword whole declare yellow
- keyword whole done yellow
- keyword whole do yellow
- keyword whole elif yellow
- keyword whole else yellow
- keyword whole esac yellow
-- keyword whole eval yellow
-- keyword whole exec yellow
- keyword whole exit yellow
-- keyword whole export yellow
-- keyword whole fg yellow
- keyword whole fi yellow
- keyword whole for yellow
-+ keyword whole getopts yellow
- keyword whole if yellow
- keyword whole in yellow
-- keyword whole read yellow
- keyword whole return yellow
- keyword whole select yellow
-- keyword whole set yellow
- keyword whole shift yellow
-+ keyword whole source yellow
- keyword whole then yellow
- keyword whole trap yellow
-- keyword whole umask yellow
-- keyword whole unset yellow
- keyword whole until yellow
- keyword whole wait yellow
- keyword whole while yellow
-
-+ keyword whole accept cyan
-+ keyword whole accessdb cyan
-+ keyword whole activate cyan
-+ keyword whole addgroup cyan
-+ keyword whole add-shell cyan
-+ keyword whole adduser cyan
-+ keyword whole anytopnm cyan
-+ keyword whole apropos cyan
-+ keyword whole apt-cache cyan
-+ keyword whole apt-cdrom cyan
-+ keyword whole apt-config cyan
-+ keyword whole apt-file cyan
-+ keyword whole apt-ftparchive cyan
-+ keyword whole apt-get cyan
-+ keyword whole aptitude cyan
-+ keyword whole apt-sortpkgs cyan
-+ keyword whole apt-source cyan
-+ keyword whole ar cyan
- keyword whole arch cyan
-+ keyword whole arp cyan
-+ keyword whole as cyan
- keyword whole ash cyan
-+ keyword whole at cyan
-+ keyword whole atd cyan
-+ keyword whole atrun cyan
-+ keyword whole atq cyan
-+ keyword whole autoconf cyan
-+ keyword whole autoheader cyan
-+ keyword whole automake cyan
-+ keyword whole autopoint cyan
-+ keyword whole autoscan cyan
- keyword whole awk cyan
-+ keyword whole badblocks cyan
-+ keyword whole base64-decode cyan
-+ keyword whole base64-encode cyan
- keyword whole basename cyan
- keyword whole bash cyan
-+ keyword whole batch cyan
-+ keyword whole bc cyan
- keyword whole bg_backup cyan
- keyword whole bg_restore cyan
-+ keyword whole blockdev cyan
-+ keyword whole bootlogd cyan
-+ keyword whole bsd-write cyan
- keyword whole bsh cyan
-+ keyword whole bunzip2 cyan
-+ keyword whole bzcat cyan
-+ keyword whole bzcmp cyan
-+ keyword whole bzdiff cyan
-+ keyword whole bzegrep cyan
-+ keyword whole bzexe cyan
-+ keyword whole bzfgrep cyan
-+ keyword whole bzgrep cyan
-+ keyword whole bzip cyan
-+ keyword whole bzip2 cyan
-+ keyword whole bzip2recover cyan
-+ keyword whole bzless cyan
-+ keyword whole bzmore cyan
-+ keyword whole cabextract cyan
-+ keyword whole cal cyan
-+ keyword whole calendar cyan
-+ keyword whole cam cyan
-+ keyword whole cancel cyan
-+ keyword whole captoinfo cyan
- keyword whole cat cyan
-+ keyword whole catchsegv cyan
-+ keyword whole catman cyan
- keyword whole cd cyan
-+ keyword whole cdda2ogg cyan
-+ keyword whole cdda2mp3 cyan
-+ keyword whole cdda2wav cyan
-+ keyword whole cdrecord cyan
-+ keyword whole cfdisk cyan
-+ keyword whole chage cyan
-+ keyword whole charset cyan
-+ keyword whole chattr cyan
-+ keyword whole checkbashisms cyan
-+ keyword whole chfn cyan
- keyword whole chgrp cyan
-+ keyword whole chkdupexe cyan
- keyword whole chmod cyan
- keyword whole chown cyan
-+ keyword whole chpasswd cyan
-+ keyword whole chroot cyan
-+ keyword whole chsh cyan
-+ keyword whole chvt cyan
-+ keyword whole cksum cyan
-+ keyword whole clear cyan
-+ keyword whole cmp cyan
-+ keyword whole codepage cyan
-+ keyword whole col cyan
-+ keyword whole colcrt cyan
-+ keyword whole colrm cyan
-+ keyword whole column cyan
-+ keyword whole comm cyan
-+ keyword whole compose cyan
-+ keyword whole compress cyan
-+ keyword whole consolechars cyan
- keyword whole cp cyan
-+ keyword whole cpan cyan
-+ keyword whole cpgr cyan
- keyword whole cpio cyan
-+ keyword whole cpp cyan
-+ keyword whole cramfsck cyan
-+ keyword whole createdb cyan
-+ keyword whole createlang cyan
-+ keyword whole createuser cyan
-+ keyword whole c_rehash cyan
-+ keyword whole crontab cyan
- keyword whole csh cyan
-+ keyword whole csplit cyan
-+ keyword whole cupsaccept cyan
-+ keyword whole cupsaddsmb cyan
-+ keyword whole cupsd cyan
-+ keyword whole cupsreject cyan
-+ keyword whole curl cyan
-+ keyword whole cut cyan
- keyword whole date cyan
-+ keyword whole dash cyan
-+ keyword whole dch cyan
- keyword whole dd cyan
-+ keyword whole deallocvt cyan
-+ keyword whole debugfs cyan
-+ keyword whole delgroup cyan
-+ keyword whole deluser cyan
-+ keyword whole depmod cyan
-+ keyword whole devdump cyan
- keyword whole df cyan
-+ keyword whole dialog cyan
-+ keyword whole diff cyan
-+ keyword whole diff3 cyan
-+ keyword whole dir cyan
-+ keyword whole dircolors cyan
-+ keyword whole directomatic cyan
-+ keyword whole dirname cyan
-+ keyword whole dirsplit cyan
-+ keyword whole disable cyan
-+ keyword whole diskd cyan
-+ keyword whole diskseekd cyan
-+ keyword whole disown cyan
- keyword whole dmesg cyan
- keyword whole dnsdomainname cyan
- keyword whole doexec cyan
- keyword whole domainname cyan
-+ keyword whole dosfsck cyan
-+ keyword whole dotextwrap cyan
-+ keyword whole dotlockfile cyan
-+ keyword whole dpasswd cyan
-+ keyword whole dpkg cyan
-+ keyword whole dpkg-architekture cyan
-+ keyword whole dpkg-buildpackage cyan
-+ keyword whole dpkg-deb cyan
-+ keyword whole dpkg-name cyan
-+ keyword whole dpkg-query cyan
-+ keyword whole dpkg-reconfigure cyan
-+ keyword whole dpkg-scanpackages cyan
-+ keyword whole dpkg-scansources cyan
-+ keyword whole dpkg-split cyan
-+ keyword whole dpkg-source cyan
-+ keyword whole dropdb cyan
-+ keyword whole droplang cyan
-+ keyword whole dropuser cyan
-+ keyword whole dscverify cyan
-+ keyword whole du cyan
-+ keyword whole dumpe2fs cyan
-+ keyword whole dumpkeys cyan
-+ keyword whole dvipdf cyan
-+ keyword whole e2fsck cyan
-+ keyword whole e2image cyan
-+ keyword whole e2label cyan
- keyword whole echo cyan
- keyword whole ed cyan
-+ keyword whole edit cyan
-+ keyword whole editor cyan
- keyword whole egrep cyan
-+ keyword whole eject cyan
-+ keyword whole enable cyan
-+ keyword whole env cyan
-+ keyword whole envsubst cyan
-+ keyword whole eqn cyan
-+ keyword whole eval_gettext cyan
- keyword whole ex cyan
-+ keyword whole expand cyan
-+ keyword whole expiry cyan
-+ keyword whole expr cyan
-+ keyword whole factor cyan
-+ keyword whole fakeroot cyan
-+ keyword whole faillog cyan
- keyword whole false cyan
-+ keyword whole fbset cyan
-+ keyword whole fc-cache cyan
-+ keyword whole fc-list cyan
-+ keyword whole fc-match cyan
-+ keyword whole fdformat cyan
-+ keyword whole fdisk cyan
-+ keyword whole fdlist cyan
-+ keyword whole fdmount cyan
-+ keyword whole fdmountd cyan
-+ keyword whole fdrawcmd cyan
-+ keyword whole fdumount cyan
-+ keyword whole fetchmail cyan
-+ keyword whole fgconsole cyan
- keyword whole fgrep cyan
-+ keyword whole file cyan
-+ keyword whole filefrag cyan
- keyword whole find cyan
-+ keyword whole find2perl cyan
-+ keyword whole findfs cyan
-+ keyword whole fitstopnm cyan
-+ keyword whole floppycontrol cyan
-+ keyword whole floppymeter cyan
-+ keyword whole fmt cyan
-+ keyword whole fold cyan
-+ keyword whole font2psf cyan
-+ keyword whole formail cyan
-+ keyword whole fping cyan
-+ keyword whole fping6 cyan
-+ keyword whole free cyan
-+ keyword whole freeze cyan
-+ keyword whole fribidi cyan
-+ keyword whole from cyan
-+ keyword whole fsck cyan
-+ keyword whole fsck.cramfs cyan
-+ keyword whole fsck.ext2 cyan
-+ keyword whole fsck.ext3 cyan
-+ keyword whole fsck.minix cyan
-+ keyword whole fsck.msdos cyan
-+ keyword whole fsck.nfs cyan
-+ keyword whole fsck.vfat cyan
- keyword whole fsconf cyan
-+ keyword whole funzip cyan
-+ keyword whole fuser cyan
-+ keyword whole fvwm cyan
- keyword whole gawk cyan
-+ keyword whole gdb cyan
-+ keyword whole gdbtui cyan
-+ keyword whole gcc cyan
-+ keyword whole gcov cyan
-+ keyword whole genksyms cyan
-+ keyword whole getconf cyan
-+ keyword whole getent cyan
-+ keyword whole getfdprm cyan
-+ keyword whole getkeycodes cyan
-+ keyword whole getopt cyan
-+ keyword whole gettext cyan
-+ keyword whole gettextize cyan
-+ keyword whole getty cyan
-+ keyword whole gpasswd cyan
-+ keyword whole gpgsplit cyan
-+ keyword whole gpgv cyan
-+ keyword whole gprof cyan
- keyword whole grep cyan
-+ keyword whole groff cyan
-+ keyword whole groupadd cyan
-+ keyword whole groupdel cyan
-+ keyword whole groupmod cyan
-+ keyword whole groups cyan
-+ keyword whole grpck cyan
-+ keyword whole grpconv cyan
-+ keyword whole grpunconv cyan
-+ keyword whole gs cyan
-+ keyword whole gsbj cyan
-+ keyword whole gsdj cyan
-+ keyword whole gsdj500 cyan
-+ keyword whole gs-gpl cyan
-+ keyword whole gslj cyan
-+ keyword whole gslp cyan
-+ keyword whole gsmctl cyan
-+ keyword whole gsmpb cyan
-+ keyword whole gsmsendsms cyan
-+ keyword whole gsmsiectl cyan
-+ keyword whole gsmsiexfer cyan
-+ keyword whole gsmsmsd cyan
-+ keyword whole gsmsmsstore cyan
-+ keyword whole gsnd cyan
- keyword whole gunzip cyan
-+ keyword whole gzexe cyan
- keyword whole gzip cyan
-+ keyword whole ha cyan
-+ keyword whole halt cyan
-+ keyword whole hd cyan
-+ keyword whole hdparm cyan
-+ keyword whole hddtemp cyan
-+ keyword whole head cyan
-+ keyword whole hexdump cyan
-+ keyword whole hman cyan
-+ keyword whole host cyan
-+ keyword whole hostid cyan
- keyword whole hostname cyan
-+ keyword whole hotkeys cyan
-+ keyword whole html2text cyan
-+ keyword whole hwclock cyan
-+ keyword whole iconv cyan
-+ keyword whole iconvconfig cyan
-+ keyword whole id cyan
-+ keyword whole ifconfig cyan
-+ keyword whole ifdown cyan
-+ keyword whole ifnames cyan
-+ keyword whole ifup cyan
- keyword whole igawk cyan
-+ keyword whole info cyan
-+ keyword whole infobrowser cyan
-+ keyword whole infocmp cyan
-+ keyword whole infokey cyan
-+ keyword whole infotocap cyan
-+ keyword whole init cyan
-+ keyword whole insmod cyan
-+ keyword whole install cyan
-+ keyword whole installkernel cyan
-+ keyword whole install-menu cyan
- keyword whole ipcalc cyan
-+ keyword whole ipcs cyan
-+ keyword whole ipmaddr cyan
-+ keyword whole ippool cyan
-+ keyword whole iptables cyan
-+ keyword whole iptunnel cyan
-+ keyword whole isoinfo cyan
-+ keyword whole join cyan
-+ keyword whole kallsyms cyan
-+ keyword whole kbdconfig cyan
-+ keyword whole kbd_mode cyan
-+ keyword whole kbdrate cyan
-+ keyword whole klogd cyan
-+ keyword whole kernelversion cyan
- keyword whole kill cyan
-+ keyword whole killall cyan
- keyword whole ksh cyan
-+ keyword whole ksyms cyan
-+ keyword whole lame cyan
-+ keyword whole last cyan
-+ keyword whole lastb cyan
-+ keyword whole lastlog cyan
-+ keyword whole ld cyan
-+ keyword whole ldconfig cyan
-+ keyword whole ldd cyan
-+ keyword whole less cyan
-+ keyword whole lessecho cyan
-+ keyword whole lessfile cyan
-+ keyword whole lesskey cyan
-+ keyword whole lesspipe cyan
-+ keyword whole lharc cyan
-+ keyword whole libtool cyan
-+ keyword whole lilo cyan
-+ keyword whole line cyan
-+ keyword whole link cyan
-+ keyword whole links2 cyan
-+ keyword whole linux_logo cyan
- keyword whole linuxconf cyan
-+ keyword whole list_audio_tracks cyan
- keyword whole ln cyan
-+ keyword whole loadkeys cyan
-+ keyword whole locale cyan
-+ keyword whole localedef cyan
-+ keyword whole locale-gen cyan
-+ keyword whole locate cyan
-+ keyword whole lockfile cyan
-+ keyword whole logger cyan
- keyword whole login cyan
-+ keyword whole logname cyan
-+ keyword whole logrotate cyan
-+ keyword whole logsave cyan
-+ keyword whole look cyan
-+ keyword whole lorder cyan
-+ keyword whole losetup cyan
-+ keyword whole lp cyan
-+ keyword whole lpadmin cyan
-+ keyword whole lpc cyan
- keyword whole lpdconf cyan
-+ keyword whole lpdomatic cyan
-+ keyword whole lpinfo cyan
-+ keyword whole lpmove cyan
-+ keyword whole lpoptions cyan
-+ keyword whole lppasswd cyan
-+ keyword whole lpq cyan
-+ keyword whole lpr cyan
-+ keyword whole lprm cyan
-+ keyword whole lprsetup cyan
-+ keyword whole lpstat cyan
- keyword whole ls cyan
-+ keyword whole lsattr cyan
-+ keyword whole lsmod cyan
-+ keyword whole lspci cyan
-+ keyword whole lsusb cyan
-+ keyword whole lynx cyan
-+ keyword whole MAKEDEV cyan
-+ keyword whole MAKEFLOPPIES cyan
- keyword whole mail cyan
-+ keyword whole mailq cyan
-+ keyword whole mailstat cyan
-+ keyword whole mailx cyan
-+ keyword whole make cyan
-+ keyword whole make-kpkg cyan
-+ keyword whole man cyan
-+ keyword whole man2html cyan
-+ keyword whole manpath cyan
-+ keyword whole mawk cyan
-+ keyword whole mc cyan
-+ keyword whole mcedit cyan
-+ keyword whole mcookie cyan
-+ keyword whole mcview cyan
-+ keyword whole mcmfmt cyan
-+ keyword whole memstat cyan
-+ keyword whole mergechanges cyan
-+ keyword whole mesg cyan
-+ keyword whole mev cyan
-+ keyword whole mkboot cyan
-+ keyword whole mkfifo cyan
-+ keyword whole mkhybrid cyan
-+ keyword whole mkisofs cyan
-+ keyword whole mk_modmap cyan
-+ keyword whole mkpasswd cyan
-+ keyword whole mii-tool cyan
-+ keyword whole mimedecode cyan
-+ keyword whole mkcramfs cyan
- keyword whole mkdir cyan
-+ keyword whole mkdirhier cyan
-+ keyword whole mkfs cyan
-+ keyword whole mkfs.cramfs cyan
-+ keyword whole mkfs.ext2 cyan
-+ keyword whole mkfs.ext3 cyan
-+ keyword whole mkfs.minix cyan
-+ keyword whole mkfs.msdos cyan
-+ keyword whole mkfs.vfat cyan
-+ keyword whole mke2fs cyan
-+ keyword whole mkdosfs cyan
-+ keyword whole mkinitrd cyan
- keyword whole mknod cyan
-+ keyword whole mkrescue cyan
-+ keyword whole mkswap cyan
- keyword whole mktemp cyan
-+ keyword whole modconf cyan
-+ keyword whole modinfo cyan
-+ keyword whole modprobe cyan
- keyword whole more cyan
- keyword whole mount cyan
-+ keyword whole mountpoint cyan
-+ keyword whole mozilla cyan
-+ keyword whole mp3info cyan
-+ keyword whole mpexpand cyan
-+ keyword whole munpack cyan
-+ keyword whole msgattrib cyan
-+ keyword whole msgcat cyan
-+ keyword whole msgcmp cyan
-+ keyword whole msgcomm cyan
-+ keyword whole msgconv cyan
-+ keyword whole msgen cyan
-+ keyword whole msgexec cyan
-+ keyword whole msgfilter cyan
-+ keyword whole msgfmt cyan
-+ keyword whole msggrep cyan
-+ keyword whole msginit cyan
-+ keyword whole msgmerge cyan
-+ keyword whole msgunfmt cyan
-+ keyword whole msguniq cyan
-+ keyword whole msmtp cyan
- keyword whole mt cyan
-+ keyword whole mt-gnu cyan
-+ keyword whole mtrace cyan
-+ keyword whole mute cyan
-+ keyword whole mutt cyan
- keyword whole mv cyan
-+ keyword whole nameif cyan
-+ keyword whole namei cyan
-+ keyword whole nano cyan
-+ keyword whole nawk cyan
-+ keyword whole ncal cyan
-+ keyword whole neqn cyan
- keyword whole netconf cyan
- keyword whole netstat cyan
-+ keyword whole newaliases cyan
-+ keyword whole newgrp cyan
-+ keyword whole newusers cyan
-+ keyword whole nex cyan
-+ keyword whole nfsstat cyan
-+ keyword whole ngettext cyan
- keyword whole nice cyan
- keyword whole nisdomainname cyan
-+ keyword whole nl cyan
-+ keyword whole nm cyan
-+ keyword whole nohup cyan
-+ keyword whole nroff cyan
-+ keyword whole nsmod cyan
-+ keyword whole nvi cyan
-+ keyword whole nview cyan
-+ keyword whole objcopy cyan
-+ keyword whole objdump cyan
-+ keyword whole od cyan
-+ keyword whole ogg123 cyan
-+ keyword whole oggdec cyan
-+ keyword whole oggenc cyan
-+ keyword whole ogginfo cyan
-+ keyword whole open cyan
-+ keyword whole openvt cyan
-+ keyword whole pager cyan
-+ keyword whole pam_getenv cyan
-+ keyword whole paperconf cyan
-+ keyword whole par cyan
-+ keyword whole passwd cyan
-+ keyword whole paste cyan
-+ keyword whole patch cyan
-+ keyword whole pathchk cyan
-+ keyword whole pcimodules cyan
-+ keyword whole pcretest cyan
-+ keyword whole pdfinfo cyan
-+ keyword whole perl cyan
-+ keyword whole perldoc cyan
-+ keyword whole pg cyan
-+ keyword whole pgrep cyan
-+ keyword whole pic cyan
-+ keyword whole pico cyan
-+ keyword whole piconv cyan
-+ keyword whole pidof cyan
-+ keyword whole pinfo cyan
- keyword whole ping cyan
-+ keyword whole pkill cyan
-+ keyword whole pmap cyan
-+ keyword whole portmap cyan
-+ keyword whole poweroff cyan
-+ keyword whole pr cyan
-+ keyword whole print cyan
-+ keyword whole printenv cyan
-+ keyword whole printf cyan
-+ keyword whole procmail cyan
-+ keyword whole prove cyan
- keyword whole ps cyan
-+ keyword whole psed cyan
-+ keyword whole psql cyan
-+ keyword whole pstree cyan
-+ keyword whole pstruct cyan
-+ keyword whole ptx cyan
-+ keyword whole pwconv cyan
-+ keyword whole pwck cyan
- keyword whole pwd cyan
-+ keyword whole pwunconv cyan
-+ keyword whole ramsize cyan
-+ keyword whole ranlib cyan
-+ keyword whole rar cyan
-+ keyword whole rarp cyan
-+ keyword whole raw cyan
-+ keyword whole rbash cyan
-+ keyword whole rcp cyan
-+ keyword whole rdev cyan
-+ keyword whole readcd cyan
-+ keyword whole readelf cyan
-+ keyword whole readlink cyan
-+ keyword whole readprofile cyan
-+ keyword whole reboot cyan
- keyword whole red cyan
-+ keyword whole regcomp cyan
-+ keyword whole reject cyan
- keyword whole remadmin cyan
-+ keyword whole remove-shell cyan
-+ keyword whole rename cyan
-+ keyword whole renice cyan
-+ keyword whole reset cyan
-+ keyword whole resize2fs cyan
-+ keyword whole rev cyan
-+ keyword whole revpath cyan
-+ keyword whole rgrep cyan
-+ keyword whole rlogin cyan
- keyword whole rm cyan
- keyword whole rmdir cyan
-+ keyword whole rmmod cyan
-+ keyword whole rmt cyan
-+ keyword whole route cyan
-+ keyword whole rpcgen cyan
-+ keyword whole rpcinfo cyan
-+ keyword whole rplay cyan
-+ keyword whole rplayd cyan
-+ keyword whole rplaydsp cyan
- keyword whole rpm cyan
-+ keyword whole rpm2cpio cyan
-+ keyword whole rptp cyan
-+ keyword whole rsh cyan
-+ keyword whole rstartd cyan
-+ keyword whole runlevel cyan
-+ keyword whole run-mailcap cyan
-+ keyword whole run-parts cyan
-+ keyword whole savelog cyan
-+ keyword whole scanimage cyan
-+ keyword whole scanpci cyan
-+ keyword whole screendump cyan
-+ keyword whole script cyan
-+ keyword whole scriptreplay cyan
-+ keyword whole sdiff cyan
- keyword whole sed cyan
-+ keyword whole see cyan
-+ keyword whole sendmail cyan
-+ keyword whole seq cyan
- keyword whole set cyan
-+ keyword whole setfdprm cyan
-+ keyword whole setkeycodes cyan
-+ keyword whole setleds cyan
-+ keyword whole setlogcons cyan
-+ keyword whole setmetamode cyan
-+ keyword whole setpci cyan
- keyword whole setserial cyan
-+ keyword whole setsid cyan
-+ keyword whole setterm cyan
-+ keyword whole setvesablank cyan
-+ keyword whole setxkbmap cyan
-+ keyword whole sfdisk cyan
-+ keyword whole sftp cyan
-+ keyword whole sg cyan
- keyword whole sh cyan
-+ keyword whole sha1sum cyan
-+ keyword whole shadowconfig cyan
-+ keyword whole showcfont cyan
-+ keyword whole showkey cyan
-+ keyword whole showmount cyan
-+ keyword whole shred cyan
-+ keyword whole shutdown cyan
-+ keyword whole size cyan
-+ keyword whole skill cyan
-+ keyword whole slabtop cyan
-+ keyword whole slattach cyan
- keyword whole sleep cyan
-+ keyword whole slogin cyan
-+ keyword whole smime_keys cyan
-+ keyword whole snice cyan
-+ keyword whole soelim cyan
- keyword whole sort cyan
-+ keyword whole sa-learn cyan
-+ keyword whole spamassassin cyan
-+ keyword whole spamc cyan
-+ keyword whole spamd cyan
-+ keyword whole splain cyan
-+ keyword whole split cyan
-+ keyword whole ssh-add cyan
-+ keyword whole ssh-copy-id cyan
-+ keyword whole ssh-keygen cyan
-+ keyword whole ssh-keyscan cyan
-+ keyword whole ssmtp cyan
-+ keyword whole start-stop-daemon cyan
-+ keyword whole stat cyan
-+ keyword whole strace cyan
-+ keyword whole strings cyan
-+ keyword whole strip cyan
- keyword whole stty cyan
- keyword whole su cyan
-+ keyword whole sulogin cyan
-+ keyword whole sum cyan
-+ keyword whole superformat cyan
-+ keyword whole su-to-root cyan
-+ keyword whole svlc cyan
-+ keyword whole swapoff cyan
-+ keyword whole swapon cyan
- keyword whole sync cyan
-+ keyword whole sysctl cyan
-+ keyword whole syslogd cyan
-+ keyword whole syslogd-listfiles cyan
-+ keyword whole syslog-facility cyan
-+ keyword whole tac cyan
-+ keyword whole tack cyan
-+ keyword whole tail cyan
- keyword whole taper cyan
- keyword whole tar cyan
-+ keyword whole tbl cyan
-+ keyword whole tcpdchk cyan
-+ keyword whole tcpdump cyan
-+ keyword whole tclsh cyan
- keyword whole tcsh cyan
-+ keyword whole tdbox cyan
-+ keyword whole tdcheckserver cyan
-+ keyword whole tddebidate cyan
-+ keyword whole tdfileview cyan
-+ keyword whole tdfmlogstrip cyan
-+ keyword whole tdformail cyan
-+ keyword whole tdlinuxcounter cyan
-+ keyword whole tdlinuxlogo cyan
-+ keyword whole tdmailblacklist cyan
-+ keyword whole tdmailbody cyan
-+ keyword whole tdmailcopy cyan
-+ keyword whole tdmaildirmake cyan
-+ keyword whole tdmailsubject cyan
-+ keyword whole tdmailwhitelist cyan
-+ keyword whole tdnewmsg cyan
-+ keyword whole tdsysbackup cyan
-+ keyword whole tee cyan
-+ keyword whole telinit cyan
-+ keyword whole telnet cyan
- keyword whole test cyan
-+ keyword whole tempfile cyan
-+ keyword whole tic cyan
- keyword whole time cyan
-+ keyword whole tload cyan
-+ keyword whole tnef cyan
-+ keyword whole toe cyan
-+ keyword whole toolame cyan
-+ keyword whole top cyan
- keyword whole touch cyan
-+ keyword whole tput cyan
-+ keyword whole tr cyan
-+ keyword whole troff cyan
- keyword whole true cyan
-+ keyword whole tset cyan
-+ keyword whole tsort cyan
-+ keyword whole tty cyan
-+ keyword whole tunctl cyan
-+ keyword whole tune2fs cyan
-+ keyword whole tunelp cyan
-+ keyword whole tzconfig cyan
-+ keyword whole tzselect cyan
-+ keyword whole tzsetup cyan
-+ keyword whole ucf cyan
-+ keyword whole ul cyan
- keyword whole umount cyan
- keyword whole uname cyan
-+ keyword whole unarj cyan
-+ keyword whole uncompress cyan
-+ keyword whole unexpand cyan
-+ keyword whole unicode_start cyan
-+ keyword whole unicode_stop cyan
-+ keyword whole unix_chkpwd cyan
-+ keyword whole uniq cyan
-+ keyword whole unlink cyan
-+ keyword whole unzip cyan
-+ keyword whole unzipsfx cyan
-+ keyword whole updatedb cyan
-+ keyword whole update-menus cyan
-+ keyword whole update-modules cyan
-+ keyword whole update-pciids cyan
-+ keyword whole uprecords cyan
-+ keyword whole uptime cyan
-+ keyword whole urlview cyan
-+ keyword whole usbmodules cyan
-+ keyword whole uscan cyan
-+ keyword whole useradd cyan
- keyword whole userconf cyan
-+ keyword whole userdel cyan
-+ keyword whole usermod cyan
-+ keyword whole users cyan
- keyword whole usleep cyan
-+ keyword whole uufilter cyan
-+ keyword whole uuidgen cyan
-+ keyword whole vacuumdb cyan
-+ keyword whole validlocale cyan
-+ keyword whole vcstime cyan
-+ keyword whole vcut cyan
-+ keyword whole vdir cyan
- keyword whole vi cyan
-+ keyword whole vidmode cyan
- keyword whole view cyan
-+ keyword whole vigr cyan
- keyword whole vim cyan
-+ keyword whole vipw cyan
-+ keyword whole vlc cyan
-+ keyword whole vmstat cyan
-+ keyword whole volname cyan
-+ keyword whole vorbiscomment cyan
-+ keyword whole vt-is-UTF8 cyan
-+ keyword whole w cyan
-+ keyword whole wall cyan
-+ keyword whole watch cyan
-+ keyword whole wc cyan
-+ keyword whole wget cyan
-+ keyword whole whatis cyan
-+ keyword whole whereis cyan
-+ keyword whole which cyan
-+ keyword whole whiptail cyan
-+ keyword whole who cyan
-+ keyword whole whoami cyan
-+ keyword whole whois cyan
-+ keyword whole wish cyan
-+ keyword whole write cyan
-+ keyword whole writevt cyan
-+ keyword whole wvWare cyan
-+ keyword whole wxvlc cyan
-+ keyword whole xargs cyan
-+ keyword whole xbmbrowser cyan
-+ keyword whole xbindkeys cyan
- keyword whole xconf cyan
-+ keyword whole xdfcopy cyan
-+ keyword whole xdfformat cyan
-+ keyword whole Xdialog cyan
-+ keyword whole xgettext cyan
-+ keyword whole xloadimage cyan
-+ keyword whole xmessage cyan
-+ keyword whole xmodmap cyan
-+ keyword whole xmms cyan
-+ keyword whole xpmroot cyan
-+ keyword whole xrdb cyan
-+ keyword whole xset cyan
-+ keyword whole xsetbg cyan
-+ keyword whole xsetmode cyan
-+ keyword whole xsetpointer cyan
-+ keyword whole xsetroot cyan
-+ keyword whole xterm cyan
-+ keyword whole xview cyan
-+ keyword whole xwd cyan
-+ keyword whole xwud cyan
-+ keyword whole xzgv cyan
-+ keyword whole yes cyan
- keyword whole ypdomainname cyan
-+ keyword whole yydecode cyan
- keyword whole zcat cyan
-+ keyword whole zcmp cyan
-+ keyword whole zdiff cyan
-+ keyword whole zdump cyan
-+ keyword whole zegrep cyan
-+ keyword whole zfgrep cyan
-+ keyword whole zforce cyan
-+ keyword whole zgrep cyan
-+ keyword whole zgv cyan
-+ keyword whole zic cyan
-+ keyword whole zip cyan
-+ keyword whole zipcloak cyan
-+ keyword whole zipgrep cyan
-+ keyword whole zipinfo cyan
-+ keyword whole zipnote cyan
-+ keyword whole zipsplit cyan
-+ keyword whole zless cyan
-+ keyword whole zmore cyan
-+ keyword whole znew cyan
-+ keyword whole zoo cyan
- keyword whole zsh cyan
-+ keyword whole zsoelim cyan
-+ keyword whole zxpdf cyan
-
--wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_
-+ keyword whole pamcut cyan
-+ keyword whole pamdeinterlace cyan
-+ keyword whole pamdice cyan
-+ keyword whole pamfile cyan
-+ keyword whole pamoil cyan
-+ keyword whole pamstack cyan
-+ keyword whole pamstretch cyan
-+ keyword whole pamstretch-gen cyan
-
--context linestart #! \n brightcyan black
-+ keyword whole pbmclean cyan
-+ keyword whole pbmlife cyan
-+ keyword whole pbmmake cyan
-+ keyword whole pbmmask cyan
-+ keyword whole pbmpage cyan
-+ keyword whole pbmpscale cyan
-+ keyword whole pbmreduce cyan
-+ keyword whole pbmtext cyan
-+ keyword whole pbmtextps cyan
-+ keyword whole pbmupc cyan
-+
-+ keyword whole pbmtoascii cyan
-+ keyword whole pbmtoepsi cyan
-+ keyword whole pbmtog3 cyan
-+ keyword whole pbmtoicon cyan
-+ keyword whole pbmtolj cyan
-+ keyword whole pbmtomacp cyan
-+ keyword whole pbmtonokia cyan
-+ keyword whole pbmtopgm cyan
-+ keyword whole pbmtoplot cyan
-+ keyword whole pbmtoppa cyan
-+ keyword whole pbmtopsg3 cyan
-+ keyword whole pbmtowbmp cyan
-+ keyword whole pbmtoxbm cyan
-+
-+ keyword whole g3topbm cyan
-+ keyword whole thinkjettopbm cyan
-+ keyword whole wbmptopbm cyan
-+ keyword whole xbmtopbm cyan
-+
-+ keyword whole pgmbentley cyan
-+ keyword whole pgmcrater cyan
-+ keyword whole pgmedge cyan
-+ keyword whole pgmenhance cyan
-+ keyword whole pgmhist cyan
-+ keyword whole pgmkernel cyan
-+ keyword whole pgmnoise cyan
-+ keyword whole pgmnorm cyan
-+ keyword whole pgmoil cyan
-+ keyword whole pgmramp cyan
-+ keyword whole pgmslice cyan
-+ keyword whole pgmtexture cyan
-+
-+ keyword whole pgmtopbm cyan
-+ keyword whole pgmtoppm cyan
-+
-+ keyword whole asciitopgm cyan
-+ keyword whole bioradtopgm cyan
-+ keyword whole icontopgm cyan
-+ keyword whole jpegtopgm cyan
-+ keyword whole macptopgm cyan
-+ keyword whole rawtopgm cyan
-+
-+ keyword whole pnmalias cyan
-+ keyword whole pnmarith cyan
-+ keyword whole pnmcat cyan
-+ keyword whole pnmcolormap cyan
-+ keyword whole pnmcomp cyan
-+ keyword whole pnmconvol cyan
-+ keyword whole pnmcrop cyan
-+ keyword whole pnmcut cyan
-+ keyword whole pnmdepth cyan
-+ keyword whole pnmenlarge cyan
-+ keyword whole pnmfile cyan
-+ keyword whole pnmflip cyan
-+ keyword whole pnmgamma cyan
-+ keyword whole pnmhisteq cyan
-+ keyword whole pnmhistmap cyan
-+ keyword whole pnmindex cyan
-+ keyword whole pnminterp cyan
-+ keyword whole pnminterp-gen cyan
-+ keyword whole pnminvert cyan
-+ keyword whole pnmmargin cyan
-+ keyword whole pnmmontage cyan
-+ keyword whole pnmnlfilt cyan
-+ keyword whole pnmnoraw cyan
-+ keyword whole pnmnorm cyan
-+ keyword whole pnmpad cyan
-+ keyword whole pnmpaste cyan
-+ keyword whole pnmpsnr cyan
-+ keyword whole pnmquant cyan
-+ keyword whole pnmremap cyan
-+ keyword whole pnmrotate cyan
-+ keyword whole pnmscale cyan
-+ keyword whole pnmscalefixed cyan
-+ keyword whole pnmshear cyan
-+ keyword whole pnmsmooth cyan
-+ keyword whole pnmsplit cyan
-+ keyword whole pnmtile cyan
-+
-+ keyword whole pnmtofits cyan
-+ keyword whole pnmtojpeg cyan
-+ keyword whole pnmtopalm cyan
-+ keyword whole pnmtoplainpnm cyan
-+ keyword whole pnmtopng cyan
-+ keyword whole pnmtops cyan
-+ keyword whole pnmtorle cyan
-+ keyword whole pnmtotiff cyan
-+ keyword whole pnmtoxwd cyan
-+
-+ keyword whole bpmtopnm cyan
-+ keyword whole giftopnm cyan
-+ keyword whole palmtopnm cyan
-+ keyword whole pngtopnm cyan
-+ keyword whole pstopnm cyan
-+ keyword whole rletopnm cyan
-+ keyword whole tifftopnm cyan
-+ keyword whole xwdtopnm cyan
-+
-+ keyword whole ppm3d cyan
-+ keyword whole ppmbrighten cyan
-+ keyword whole ppmchange cyan
-+ keyword whole ppmcie cyan
-+ keyword whole ppmcolormask cyan
-+ keyword whole ppmcolors cyan
-+ keyword whole ppmdim cyan
-+ keyword whole ppmdist cyan
-+ keyword whole ppmdither cyan
-+ keyword whole ppmfade cyan
-+ keyword whole ppmflash cyan
-+ keyword whole ppmforge cyan
-+ keyword whole ppmhist cyan
-+ keyword whole ppmlabel cyan
-+ keyword whole ppmmake cyan
-+ keyword whole ppmmix cyan
-+ keyword whole ppmnorm cyan
-+ keyword whole ppmntsc cyan
-+ keyword whole ppmpat cyan
-+ keyword whole ppmquant cyan
-+ keyword whole ppmquantall cyan
-+ keyword whole ppmqvgq cyan
-+ keyword whole ppmrainbow cyan
-+ keyword whole ppmrelief cyan
-+ keyword whole ppmshadow cyan
-+ keyword whole ppmshift cyan
-+ keyword whole ppmspread cyan
-+ keyword whole ppmtv cyan
-+
-+ keyword whole ppmtoacad cyan
-+ keyword whole ppmtobmp cyan
-+ keyword whole ppmtogif cyan
-+ keyword whole ppmtojpeg cyan
-+ keyword whole ppmtolj cyan
-+ keyword whole ppmtomap cyan
-+ keyword whole ppmtompeg cyan
-+ keyword whole ppmtopcx cyan
-+ keyword whole ppmtopgm cyan
-+ keyword whole ppmtorgb3 cyan
-+ keyword whole ppmtowinicon cyan
-+ keyword whole ppmtoxpm cyan
-+
-+ keyword whole bpmtoppm cyan
-+ keyword whole pcxtoppm cyan
-+ keyword whole pdftoppm cyan
-+ keyword whole pjtoppm cyan
-+ keyword whole rawtoppm cyan
-+ keyword whole rgb3toppm cyan
-+ keyword whole winicontoppm cyan
-+ keyword whole xpmtoppm cyan
-+ keyword whole xvminitoppm cyan
-+
-+ keyword whole gpg red
-+ keyword whole md5sum red
-+ keyword whole openssl red
-+ keyword whole ssh red
-+ keyword whole scp red
-+
-+ keyword whole gettext.sh magenta
-+ keyword whole TEXTDOMAINDIR magenta
-+ keyword whole TEXTDOMAIN magenta
-+ keyword whole VERSION magenta
-+
-+ keyword whole /dev/audio brightblue
-+ keyword whole /dev/dsp brightblue
-+ keyword whole /dev/null brightblue
-+ keyword whole /dev/mixed brightblue
-+ keyword whole /dev/stdin brightblue
-+ keyword whole /dev/stdout brightblue
-+ keyword whole /dev/stderr brightblue
-+ keyword whole /dev/zero brightblue
-+
-+wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_
-
- context # \n brown
- spellcheck
-@@ -215,6 +1133,10 @@
- keyword $! brightred
- keyword $_ brightred
-
-+ keyword whole 2>&1 brightred
-+ keyword whole 2> brightred
-+ keyword whole 1> brightred
-+
- keyword wholeright $\[0123456789\] brightred
-
- keyword wholeright $+ brightgreen
-@@ -225,7 +1147,9 @@
-
- keyword whole break yellow
- keyword whole case yellow
-+ keyword whole clear yellow
- keyword whole continue yellow
-+ keyword whole declare yellow
- keyword whole done yellow
- keyword whole do yellow
- keyword whole elif yellow
-@@ -234,105 +1158,1024 @@
- keyword whole exit yellow
- keyword whole fi yellow
- keyword whole for yellow
-+ keyword whole getopts yellow
- keyword whole if yellow
- keyword whole in yellow
- keyword whole return yellow
- keyword whole select yellow
- keyword whole shift yellow
-+ keyword whole source yellow
- keyword whole then yellow
- keyword whole trap yellow
- keyword whole until yellow
-+ keyword whole wait yellow
- keyword whole while yellow
-
-+ keyword whole accept cyan
-+ keyword whole accessdb cyan
-+ keyword whole activate cyan
-+ keyword whole addgroup cyan
-+ keyword whole add-shell cyan
-+ keyword whole adduser cyan
-+ keyword whole anytopnm cyan
-+ keyword whole apropos cyan
-+ keyword whole apt-cache cyan
-+ keyword whole apt-cdrom cyan
-+ keyword whole apt-config cyan
-+ keyword whole apt-file cyan
-+ keyword whole apt-ftparchive cyan
-+ keyword whole apt-get cyan
-+ keyword whole aptitude cyan
-+ keyword whole apt-sortpkgs cyan
-+ keyword whole apt-source cyan
-+ keyword whole ar cyan
- keyword whole arch cyan
-+ keyword whole arp cyan
-+ keyword whole as cyan
- keyword whole ash cyan
-+ keyword whole at cyan
-+ keyword whole atd cyan
-+ keyword whole atrun cyan
-+ keyword whole atq cyan
-+ keyword whole autoconf cyan
-+ keyword whole autoheader cyan
-+ keyword whole automake cyan
-+ keyword whole autopoint cyan
-+ keyword whole autoscan cyan
- keyword whole awk cyan
-+ keyword whole badblocks cyan
-+ keyword whole base64-decode cyan
-+ keyword whole base64-encode cyan
- keyword whole basename cyan
- keyword whole bash cyan
-+ keyword whole batch cyan
-+ keyword whole bc cyan
- keyword whole bg_backup cyan
- keyword whole bg_restore cyan
-+ keyword whole blockdev cyan
-+ keyword whole bootlogd cyan
-+ keyword whole bsd-write cyan
- keyword whole bsh cyan
-+ keyword whole bunzip2 cyan
-+ keyword whole bzcat cyan
-+ keyword whole bzcmp cyan
-+ keyword whole bzdiff cyan
-+ keyword whole bzegrep cyan
-+ keyword whole bzexe cyan
-+ keyword whole bzfgrep cyan
-+ keyword whole bzgrep cyan
-+ keyword whole bzip cyan
-+ keyword whole bzip2 cyan
-+ keyword whole bzip2recover cyan
-+ keyword whole bzless cyan
-+ keyword whole bzmore cyan
-+ keyword whole cabextract cyan
-+ keyword whole cal cyan
-+ keyword whole calendar cyan
-+ keyword whole cam cyan
-+ keyword whole cancel cyan
-+ keyword whole captoinfo cyan
- keyword whole cat cyan
-+ keyword whole catchsegv cyan
-+ keyword whole catman cyan
- keyword whole cd cyan
-+ keyword whole cdda2ogg cyan
-+ keyword whole cdda2mp3 cyan
-+ keyword whole cdda2wav cyan
-+ keyword whole cdrecord cyan
-+ keyword whole cfdisk cyan
-+ keyword whole chage cyan
-+ keyword whole charset cyan
-+ keyword whole chattr cyan
-+ keyword whole checkbashisms cyan
-+ keyword whole chfn cyan
- keyword whole chgrp cyan
-+ keyword whole chkdupexe cyan
- keyword whole chmod cyan
- keyword whole chown cyan
-+ keyword whole chpasswd cyan
-+ keyword whole chroot cyan
-+ keyword whole chsh cyan
-+ keyword whole chvt cyan
-+ keyword whole cksum cyan
-+ keyword whole clear cyan
-+ keyword whole cmp cyan
-+ keyword whole codepage cyan
-+ keyword whole col cyan
-+ keyword whole colcrt cyan
-+ keyword whole colrm cyan
-+ keyword whole column cyan
-+ keyword whole comm cyan
-+ keyword whole compose cyan
-+ keyword whole compress cyan
-+ keyword whole consolechars cyan
- keyword whole cp cyan
-+ keyword whole cpan cyan
-+ keyword whole cpgr cyan
- keyword whole cpio cyan
-+ keyword whole cpp cyan
-+ keyword whole cramfsck cyan
-+ keyword whole createdb cyan
-+ keyword whole createlang cyan
-+ keyword whole createuser cyan
-+ keyword whole c_rehash cyan
-+ keyword whole crontab cyan
- keyword whole csh cyan
-+ keyword whole csplit cyan
-+ keyword whole cupsaccept cyan
-+ keyword whole cupsaddsmb cyan
-+ keyword whole cupsd cyan
-+ keyword whole cupsreject cyan
-+ keyword whole curl cyan
-+ keyword whole cut cyan
- keyword whole date cyan
-+ keyword whole dash cyan
-+ keyword whole dch cyan
- keyword whole dd cyan
-+ keyword whole deallocvt cyan
-+ keyword whole debugfs cyan
-+ keyword whole delgroup cyan
-+ keyword whole deluser cyan
-+ keyword whole depmod cyan
-+ keyword whole devdump cyan
- keyword whole df cyan
-+ keyword whole dialog cyan
-+ keyword whole diff cyan
-+ keyword whole diff3 cyan
-+ keyword whole dir cyan
-+ keyword whole dircolors cyan
-+ keyword whole directomatic cyan
-+ keyword whole dirname cyan
-+ keyword whole dirsplit cyan
-+ keyword whole disable cyan
-+ keyword whole diskd cyan
-+ keyword whole diskseekd cyan
-+ keyword whole disown cyan
- keyword whole dmesg cyan
- keyword whole dnsdomainname cyan
- keyword whole doexec cyan
- keyword whole domainname cyan
-+ keyword whole dosfsck cyan
-+ keyword whole dotextwrap cyan
-+ keyword whole dotlockfile cyan
-+ keyword whole dpasswd cyan
-+ keyword whole dpkg cyan
-+ keyword whole dpkg-architekture cyan
-+ keyword whole dpkg-buildpackage cyan
-+ keyword whole dpkg-deb cyan
-+ keyword whole dpkg-name cyan
-+ keyword whole dpkg-query cyan
-+ keyword whole dpkg-reconfigure cyan
-+ keyword whole dpkg-scanpackages cyan
-+ keyword whole dpkg-scansources cyan
-+ keyword whole dpkg-split cyan
-+ keyword whole dpkg-source cyan
-+ keyword whole dropdb cyan
-+ keyword whole droplang cyan
-+ keyword whole dropuser cyan
-+ keyword whole dscverify cyan
-+ keyword whole du cyan
-+ keyword whole dumpe2fs cyan
-+ keyword whole dumpkeys cyan
-+ keyword whole dvipdf cyan
-+ keyword whole e2fsck cyan
-+ keyword whole e2image cyan
-+ keyword whole e2label cyan
- keyword whole echo cyan
- keyword whole ed cyan
-+ keyword whole edit cyan
-+ keyword whole editor cyan
- keyword whole egrep cyan
-+ keyword whole eject cyan
-+ keyword whole enable cyan
-+ keyword whole env cyan
-+ keyword whole envsubst cyan
-+ keyword whole eqn cyan
-+ keyword whole eval_gettext cyan
- keyword whole ex cyan
-+ keyword whole expand cyan
-+ keyword whole expiry cyan
-+ keyword whole expr cyan
-+ keyword whole factor cyan
-+ keyword whole fakeroot cyan
-+ keyword whole faillog cyan
- keyword whole false cyan
-+ keyword whole fbset cyan
-+ keyword whole fc-cache cyan
-+ keyword whole fc-list cyan
-+ keyword whole fc-match cyan
-+ keyword whole fdformat cyan
-+ keyword whole fdisk cyan
-+ keyword whole fdlist cyan
-+ keyword whole fdmount cyan
-+ keyword whole fdmountd cyan
-+ keyword whole fdrawcmd cyan
-+ keyword whole fdumount cyan
-+ keyword whole fetchmail cyan
-+ keyword whole fgconsole cyan
- keyword whole fgrep cyan
-+ keyword whole file cyan
-+ keyword whole filefrag cyan
- keyword whole find cyan
-+ keyword whole find2perl cyan
-+ keyword whole findfs cyan
-+ keyword whole fitstopnm cyan
-+ keyword whole floppycontrol cyan
-+ keyword whole floppymeter cyan
-+ keyword whole fmt cyan
-+ keyword whole fold cyan
-+ keyword whole font2psf cyan
-+ keyword whole formail cyan
-+ keyword whole fping cyan
-+ keyword whole fping6 cyan
-+ keyword whole free cyan
-+ keyword whole freeze cyan
-+ keyword whole fribidi cyan
-+ keyword whole from cyan
-+ keyword whole fsck cyan
-+ keyword whole fsck.cramfs cyan
-+ keyword whole fsck.ext2 cyan
-+ keyword whole fsck.ext3 cyan
-+ keyword whole fsck.minix cyan
-+ keyword whole fsck.msdos cyan
-+ keyword whole fsck.nfs cyan
-+ keyword whole fsck.vfat cyan
- keyword whole fsconf cyan
-+ keyword whole funzip cyan
-+ keyword whole fuser cyan
-+ keyword whole fvwm cyan
- keyword whole gawk cyan
-+ keyword whole gdb cyan
-+ keyword whole gdbtui cyan
-+ keyword whole gcc cyan
-+ keyword whole gcov cyan
-+ keyword whole genksyms cyan
-+ keyword whole getconf cyan
-+ keyword whole getent cyan
-+ keyword whole getfdprm cyan
-+ keyword whole getkeycodes cyan
-+ keyword whole getopt cyan
-+ keyword whole gettext cyan
-+ keyword whole gettextize cyan
-+ keyword whole getty cyan
-+ keyword whole gpasswd cyan
-+ keyword whole gpgsplit cyan
-+ keyword whole gpgv cyan
-+ keyword whole gprof cyan
- keyword whole grep cyan
-+ keyword whole groff cyan
-+ keyword whole groupadd cyan
-+ keyword whole groupdel cyan
-+ keyword whole groupmod cyan
-+ keyword whole groups cyan
-+ keyword whole grpck cyan
-+ keyword whole grpconv cyan
-+ keyword whole grpunconv cyan
-+ keyword whole gs cyan
-+ keyword whole gsbj cyan
-+ keyword whole gsdj cyan
-+ keyword whole gsdj500 cyan
-+ keyword whole gs-gpl cyan
-+ keyword whole gslj cyan
-+ keyword whole gslp cyan
-+ keyword whole gsmctl cyan
-+ keyword whole gsmpb cyan
-+ keyword whole gsmsendsms cyan
-+ keyword whole gsmsiectl cyan
-+ keyword whole gsmsiexfer cyan
-+ keyword whole gsmsmsd cyan
-+ keyword whole gsmsmsstore cyan
-+ keyword whole gsnd cyan
- keyword whole gunzip cyan
-+ keyword whole gzexe cyan
- keyword whole gzip cyan
-+ keyword whole ha cyan
-+ keyword whole halt cyan
-+ keyword whole hd cyan
-+ keyword whole hdparm cyan
-+ keyword whole hddtemp cyan
-+ keyword whole head cyan
-+ keyword whole hexdump cyan
-+ keyword whole hman cyan
-+ keyword whole host cyan
-+ keyword whole hostid cyan
- keyword whole hostname cyan
-+ keyword whole hotkeys cyan
-+ keyword whole html2text cyan
-+ keyword whole hwclock cyan
-+ keyword whole iconv cyan
-+ keyword whole iconvconfig cyan
-+ keyword whole id cyan
-+ keyword whole ifconfig cyan
-+ keyword whole ifdown cyan
-+ keyword whole ifnames cyan
-+ keyword whole ifup cyan
- keyword whole igawk cyan
-+ keyword whole info cyan
-+ keyword whole infobrowser cyan
-+ keyword whole infocmp cyan
-+ keyword whole infokey cyan
-+ keyword whole infotocap cyan
-+ keyword whole init cyan
-+ keyword whole insmod cyan
-+ keyword whole install cyan
-+ keyword whole installkernel cyan
-+ keyword whole install-menu cyan
- keyword whole ipcalc cyan
-+ keyword whole ipcs cyan
-+ keyword whole ipmaddr cyan
-+ keyword whole ippool cyan
-+ keyword whole iptables cyan
-+ keyword whole iptunnel cyan
-+ keyword whole isoinfo cyan
-+ keyword whole join cyan
-+ keyword whole kallsyms cyan
-+ keyword whole kbdconfig cyan
-+ keyword whole kbd_mode cyan
-+ keyword whole kbdrate cyan
-+ keyword whole klogd cyan
-+ keyword whole kernelversion cyan
- keyword whole kill cyan
-+ keyword whole killall cyan
- keyword whole ksh cyan
-+ keyword whole ksyms cyan
-+ keyword whole lame cyan
-+ keyword whole last cyan
-+ keyword whole lastb cyan
-+ keyword whole lastlog cyan
-+ keyword whole ld cyan
-+ keyword whole ldconfig cyan
-+ keyword whole ldd cyan
-+ keyword whole less cyan
-+ keyword whole lessecho cyan
-+ keyword whole lessfile cyan
-+ keyword whole lesskey cyan
-+ keyword whole lesspipe cyan
-+ keyword whole lharc cyan
-+ keyword whole libtool cyan
-+ keyword whole lilo cyan
-+ keyword whole line cyan
-+ keyword whole link cyan
-+ keyword whole links2 cyan
-+ keyword whole linux_logo cyan
- keyword whole linuxconf cyan
-+ keyword whole list_audio_tracks cyan
- keyword whole ln cyan
-+ keyword whole loadkeys cyan
-+ keyword whole locale cyan
-+ keyword whole localedef cyan
-+ keyword whole locale-gen cyan
-+ keyword whole locate cyan
-+ keyword whole lockfile cyan
-+ keyword whole logger cyan
- keyword whole login cyan
-+ keyword whole logname cyan
-+ keyword whole logrotate cyan
-+ keyword whole logsave cyan
-+ keyword whole look cyan
-+ keyword whole lorder cyan
-+ keyword whole losetup cyan
-+ keyword whole lp cyan
-+ keyword whole lpadmin cyan
-+ keyword whole lpc cyan
- keyword whole lpdconf cyan
-+ keyword whole lpdomatic cyan
-+ keyword whole lpinfo cyan
-+ keyword whole lpmove cyan
-+ keyword whole lpoptions cyan
-+ keyword whole lppasswd cyan
-+ keyword whole lpq cyan
-+ keyword whole lpr cyan
-+ keyword whole lprm cyan
-+ keyword whole lprsetup cyan
-+ keyword whole lpstat cyan
- keyword whole ls cyan
-+ keyword whole lsattr cyan
-+ keyword whole lsmod cyan
-+ keyword whole lspci cyan
-+ keyword whole lsusb cyan
-+ keyword whole lynx cyan
-+ keyword whole MAKEDEV cyan
-+ keyword whole MAKEFLOPPIES cyan
- keyword whole mail cyan
-+ keyword whole mailq cyan
-+ keyword whole mailstat cyan
-+ keyword whole mailx cyan
-+ keyword whole make cyan
-+ keyword whole make-kpkg cyan
-+ keyword whole man cyan
-+ keyword whole man2html cyan
-+ keyword whole manpath cyan
-+ keyword whole mawk cyan
-+ keyword whole mc cyan
-+ keyword whole mcedit cyan
-+ keyword whole mcookie cyan
-+ keyword whole mcview cyan
-+ keyword whole mcmfmt cyan
-+ keyword whole memstat cyan
-+ keyword whole mergechanges cyan
-+ keyword whole mesg cyan
-+ keyword whole mev cyan
-+ keyword whole mkboot cyan
-+ keyword whole mkfifo cyan
-+ keyword whole mkhybrid cyan
-+ keyword whole mkisofs cyan
-+ keyword whole mk_modmap cyan
-+ keyword whole mkpasswd cyan
-+ keyword whole mii-tool cyan
-+ keyword whole mimedecode cyan
-+ keyword whole mkcramfs cyan
- keyword whole mkdir cyan
-+ keyword whole mkdirhier cyan
-+ keyword whole mkfs cyan
-+ keyword whole mkfs.cramfs cyan
-+ keyword whole mkfs.ext2 cyan
-+ keyword whole mkfs.ext3 cyan
-+ keyword whole mkfs.minix cyan
-+ keyword whole mkfs.msdos cyan
-+ keyword whole mkfs.vfat cyan
-+ keyword whole mke2fs cyan
-+ keyword whole mkdosfs cyan
-+ keyword whole mkinitrd cyan
- keyword whole mknod cyan
-+ keyword whole mkrescue cyan
-+ keyword whole mkswap cyan
- keyword whole mktemp cyan
-+ keyword whole modconf cyan
-+ keyword whole modinfo cyan
-+ keyword whole modprobe cyan
- keyword whole more cyan
- keyword whole mount cyan
-+ keyword whole mountpoint cyan
-+ keyword whole mozilla cyan
-+ keyword whole mp3info cyan
-+ keyword whole mpexpand cyan
-+ keyword whole munpack cyan
-+ keyword whole msgattrib cyan
-+ keyword whole msgcat cyan
-+ keyword whole msgcmp cyan
-+ keyword whole msgcomm cyan
-+ keyword whole msgconv cyan
-+ keyword whole msgen cyan
-+ keyword whole msgexec cyan
-+ keyword whole msgfilter cyan
-+ keyword whole msgfmt cyan
-+ keyword whole msggrep cyan
-+ keyword whole msginit cyan
-+ keyword whole msgmerge cyan
-+ keyword whole msgunfmt cyan
-+ keyword whole msguniq cyan
-+ keyword whole msmtp cyan
- keyword whole mt cyan
-+ keyword whole mt-gnu cyan
-+ keyword whole mtrace cyan
-+ keyword whole mute cyan
-+ keyword whole mutt cyan
- keyword whole mv cyan
-+ keyword whole nameif cyan
-+ keyword whole namei cyan
-+ keyword whole nano cyan
-+ keyword whole nawk cyan
-+ keyword whole ncal cyan
-+ keyword whole neqn cyan
- keyword whole netconf cyan
- keyword whole netstat cyan
-+ keyword whole newaliases cyan
-+ keyword whole newgrp cyan
-+ keyword whole newusers cyan
-+ keyword whole nex cyan
-+ keyword whole nfsstat cyan
-+ keyword whole ngettext cyan
- keyword whole nice cyan
- keyword whole nisdomainname cyan
-+ keyword whole nl cyan
-+ keyword whole nm cyan
-+ keyword whole nohup cyan
-+ keyword whole nroff cyan
-+ keyword whole nsmod cyan
-+ keyword whole nvi cyan
-+ keyword whole nview cyan
-+ keyword whole objcopy cyan
-+ keyword whole objdump cyan
-+ keyword whole od cyan
-+ keyword whole ogg123 cyan
-+ keyword whole oggdec cyan
-+ keyword whole oggenc cyan
-+ keyword whole ogginfo cyan
-+ keyword whole open cyan
-+ keyword whole openvt cyan
-+ keyword whole pager cyan
-+ keyword whole pam_getenv cyan
-+ keyword whole paperconf cyan
-+ keyword whole par cyan
-+ keyword whole passwd cyan
-+ keyword whole paste cyan
-+ keyword whole patch cyan
-+ keyword whole pathchk cyan
-+ keyword whole pcimodules cyan
-+ keyword whole pcretest cyan
-+ keyword whole pdfinfo cyan
-+ keyword whole perl cyan
-+ keyword whole perldoc cyan
-+ keyword whole pg cyan
-+ keyword whole pgrep cyan
-+ keyword whole pic cyan
-+ keyword whole pico cyan
-+ keyword whole piconv cyan
-+ keyword whole pidof cyan
-+ keyword whole pinfo cyan
- keyword whole ping cyan
-+ keyword whole pkill cyan
-+ keyword whole pmap cyan
-+ keyword whole portmap cyan
-+ keyword whole poweroff cyan
-+ keyword whole pr cyan
-+ keyword whole print cyan
-+ keyword whole printenv cyan
-+ keyword whole printf cyan
-+ keyword whole procmail cyan
-+ keyword whole prove cyan
- keyword whole ps cyan
-+ keyword whole psed cyan
-+ keyword whole psql cyan
-+ keyword whole pstree cyan
-+ keyword whole pstruct cyan
-+ keyword whole ptx cyan
-+ keyword whole pwconv cyan
-+ keyword whole pwck cyan
- keyword whole pwd cyan
-+ keyword whole pwunconv cyan
-+ keyword whole ramsize cyan
-+ keyword whole ranlib cyan
-+ keyword whole rar cyan
-+ keyword whole rarp cyan
-+ keyword whole raw cyan
-+ keyword whole rbash cyan
-+ keyword whole rcp cyan
-+ keyword whole rdev cyan
-+ keyword whole readcd cyan
-+ keyword whole readelf cyan
-+ keyword whole readlink cyan
-+ keyword whole readprofile cyan
-+ keyword whole reboot cyan
- keyword whole red cyan
-+ keyword whole regcomp cyan
-+ keyword whole reject cyan
- keyword whole remadmin cyan
-+ keyword whole remove-shell cyan
-+ keyword whole rename cyan
-+ keyword whole renice cyan
-+ keyword whole reset cyan
-+ keyword whole resize2fs cyan
-+ keyword whole rev cyan
-+ keyword whole revpath cyan
-+ keyword whole rgrep cyan
-+ keyword whole rlogin cyan
- keyword whole rm cyan
- keyword whole rmdir cyan
-+ keyword whole rmmod cyan
-+ keyword whole rmt cyan
-+ keyword whole route cyan
-+ keyword whole rpcgen cyan
-+ keyword whole rpcinfo cyan
-+ keyword whole rplay cyan
-+ keyword whole rplayd cyan
-+ keyword whole rplaydsp cyan
- keyword whole rpm cyan
-+ keyword whole rpm2cpio cyan
-+ keyword whole rptp cyan
-+ keyword whole rsh cyan
-+ keyword whole rstartd cyan
-+ keyword whole runlevel cyan
-+ keyword whole run-mailcap cyan
-+ keyword whole run-parts cyan
-+ keyword whole savelog cyan
-+ keyword whole scanimage cyan
-+ keyword whole scanpci cyan
-+ keyword whole screendump cyan
-+ keyword whole script cyan
-+ keyword whole scriptreplay cyan
-+ keyword whole sdiff cyan
- keyword whole sed cyan
-+ keyword whole see cyan
-+ keyword whole sendmail cyan
-+ keyword whole seq cyan
- keyword whole set cyan
-+ keyword whole setfdprm cyan
-+ keyword whole setkeycodes cyan
-+ keyword whole setleds cyan
-+ keyword whole setlogcons cyan
-+ keyword whole setmetamode cyan
-+ keyword whole setpci cyan
- keyword whole setserial cyan
-+ keyword whole setsid cyan
-+ keyword whole setterm cyan
-+ keyword whole setvesablank cyan
-+ keyword whole setxkbmap cyan
-+ keyword whole sfdisk cyan
-+ keyword whole sftp cyan
-+ keyword whole sg cyan
- keyword whole sh cyan
-+ keyword whole sha1sum cyan
-+ keyword whole shadowconfig cyan
-+ keyword whole showcfont cyan
-+ keyword whole showkey cyan
-+ keyword whole showmount cyan
-+ keyword whole shred cyan
-+ keyword whole shutdown cyan
-+ keyword whole size cyan
-+ keyword whole skill cyan
-+ keyword whole slabtop cyan
-+ keyword whole slattach cyan
- keyword whole sleep cyan
-+ keyword whole slogin cyan
-+ keyword whole smime_keys cyan
-+ keyword whole snice cyan
-+ keyword whole soelim cyan
- keyword whole sort cyan
-+ keyword whole sa-learn cyan
-+ keyword whole spamassassin cyan
-+ keyword whole spamc cyan
-+ keyword whole spamd cyan
-+ keyword whole splain cyan
-+ keyword whole split cyan
-+ keyword whole ssh-add cyan
-+ keyword whole ssh-copy-id cyan
-+ keyword whole ssh-keygen cyan
-+ keyword whole ssh-keyscan cyan
-+ keyword whole ssmtp cyan
-+ keyword whole start-stop-daemon cyan
-+ keyword whole stat cyan
-+ keyword whole strace cyan
-+ keyword whole strings cyan
-+ keyword whole strip cyan
- keyword whole stty cyan
- keyword whole su cyan
-+ keyword whole sulogin cyan
-+ keyword whole sum cyan
-+ keyword whole superformat cyan
-+ keyword whole su-to-root cyan
-+ keyword whole svlc cyan
-+ keyword whole swapoff cyan
-+ keyword whole swapon cyan
- keyword whole sync cyan
-+ keyword whole sysctl cyan
-+ keyword whole syslogd cyan
-+ keyword whole syslogd-listfiles cyan
-+ keyword whole syslog-facility cyan
-+ keyword whole tac cyan
-+ keyword whole tack cyan
-+ keyword whole tail cyan
- keyword whole taper cyan
- keyword whole tar cyan
-+ keyword whole tbl cyan
-+ keyword whole tcpdchk cyan
-+ keyword whole tcpdump cyan
-+ keyword whole tclsh cyan
- keyword whole tcsh cyan
-+ keyword whole tdbox cyan
-+ keyword whole tdcheckserver cyan
-+ keyword whole tddebidate cyan
-+ keyword whole tdfileview cyan
-+ keyword whole tdfmlogstrip cyan
-+ keyword whole tdformail cyan
-+ keyword whole tdlinuxcounter cyan
-+ keyword whole tdlinuxlogo cyan
-+ keyword whole tdmailblacklist cyan
-+ keyword whole tdmailbody cyan
-+ keyword whole tdmailcopy cyan
-+ keyword whole tdmaildirmake cyan
-+ keyword whole tdmailsubject cyan
-+ keyword whole tdmailwhitelist cyan
-+ keyword whole tdnewmsg cyan
-+ keyword whole tdsysbackup cyan
-+ keyword whole tee cyan
-+ keyword whole telinit cyan
-+ keyword whole telnet cyan
- keyword whole test cyan
-+ keyword whole tempfile cyan
-+ keyword whole tic cyan
- keyword whole time cyan
-+ keyword whole tload cyan
-+ keyword whole tnef cyan
-+ keyword whole toe cyan
-+ keyword whole toolame cyan
-+ keyword whole top cyan
- keyword whole touch cyan
-+ keyword whole tput cyan
-+ keyword whole tr cyan
-+ keyword whole troff cyan
- keyword whole true cyan
-+ keyword whole tset cyan
-+ keyword whole tsort cyan
-+ keyword whole tty cyan
-+ keyword whole tunctl cyan
-+ keyword whole tune2fs cyan
-+ keyword whole tunelp cyan
-+ keyword whole tzconfig cyan
-+ keyword whole tzselect cyan
-+ keyword whole tzsetup cyan
-+ keyword whole ucf cyan
-+ keyword whole ul cyan
- keyword whole umount cyan
- keyword whole uname cyan
-+ keyword whole unarj cyan
-+ keyword whole uncompress cyan
-+ keyword whole unexpand cyan
-+ keyword whole unicode_start cyan
-+ keyword whole unicode_stop cyan
-+ keyword whole unix_chkpwd cyan
-+ keyword whole uniq cyan
-+ keyword whole unlink cyan
-+ keyword whole unzip cyan
-+ keyword whole unzipsfx cyan
-+ keyword whole updatedb cyan
-+ keyword whole update-menus cyan
-+ keyword whole update-modules cyan
-+ keyword whole update-pciids cyan
-+ keyword whole uprecords cyan
-+ keyword whole uptime cyan
-+ keyword whole urlview cyan
-+ keyword whole usbmodules cyan
-+ keyword whole uscan cyan
-+ keyword whole useradd cyan
- keyword whole userconf cyan
-+ keyword whole userdel cyan
-+ keyword whole usermod cyan
-+ keyword whole users cyan
- keyword whole usleep cyan
-+ keyword whole uufilter cyan
-+ keyword whole uuidgen cyan
-+ keyword whole vacuumdb cyan
-+ keyword whole validlocale cyan
-+ keyword whole vcstime cyan
-+ keyword whole vcut cyan
-+ keyword whole vdir cyan
- keyword whole vi cyan
-+ keyword whole vidmode cyan
- keyword whole view cyan
-+ keyword whole vigr cyan
- keyword whole vim cyan
-+ keyword whole vipw cyan
-+ keyword whole vlc cyan
-+ keyword whole vmstat cyan
-+ keyword whole volname cyan
-+ keyword whole vorbiscomment cyan
-+ keyword whole vt-is-UTF8 cyan
-+ keyword whole w cyan
-+ keyword whole wall cyan
-+ keyword whole watch cyan
-+ keyword whole wc cyan
-+ keyword whole wget cyan
-+ keyword whole whatis cyan
-+ keyword whole whereis cyan
-+ keyword whole which cyan
-+ keyword whole whiptail cyan
-+ keyword whole who cyan
-+ keyword whole whoami cyan
-+ keyword whole whois cyan
-+ keyword whole wish cyan
-+ keyword whole write cyan
-+ keyword whole writevt cyan
-+ keyword whole wvWare cyan
-+ keyword whole wxvlc cyan
-+ keyword whole xargs cyan
-+ keyword whole xbmbrowser cyan
-+ keyword whole xbindkeys cyan
- keyword whole xconf cyan
-+ keyword whole xdfcopy cyan
-+ keyword whole xdfformat cyan
-+ keyword whole Xdialog cyan
-+ keyword whole xgettext cyan
-+ keyword whole xloadimage cyan
-+ keyword whole xmessage cyan
-+ keyword whole xmodmap cyan
-+ keyword whole xmms cyan
-+ keyword whole xpmroot cyan
-+ keyword whole xrdb cyan
-+ keyword whole xset cyan
-+ keyword whole xsetbg cyan
-+ keyword whole xsetmode cyan
-+ keyword whole xsetpointer cyan
-+ keyword whole xsetroot cyan
-+ keyword whole xterm cyan
-+ keyword whole xview cyan
-+ keyword whole xwd cyan
-+ keyword whole xwud cyan
-+ keyword whole xzgv cyan
-+ keyword whole yes cyan
- keyword whole ypdomainname cyan
-+ keyword whole yydecode cyan
- keyword whole zcat cyan
-+ keyword whole zcmp cyan
-+ keyword whole zdiff cyan
-+ keyword whole zdump cyan
-+ keyword whole zegrep cyan
-+ keyword whole zfgrep cyan
-+ keyword whole zforce cyan
-+ keyword whole zgrep cyan
-+ keyword whole zgv cyan
-+ keyword whole zic cyan
-+ keyword whole zip cyan
-+ keyword whole zipcloak cyan
-+ keyword whole zipgrep cyan
-+ keyword whole zipinfo cyan
-+ keyword whole zipnote cyan
-+ keyword whole zipsplit cyan
-+ keyword whole zless cyan
-+ keyword whole zmore cyan
-+ keyword whole znew cyan
-+ keyword whole zoo cyan
- keyword whole zsh cyan
-+ keyword whole zsoelim cyan
-+ keyword whole zxpdf cyan
-+
-+ keyword whole pamcut cyan
-+ keyword whole pamdeinterlace cyan
-+ keyword whole pamdice cyan
-+ keyword whole pamfile cyan
-+ keyword whole pamoil cyan
-+ keyword whole pamstack cyan
-+ keyword whole pamstretch cyan
-+ keyword whole pamstretch-gen cyan
-+
-+ keyword whole pbmclean cyan
-+ keyword whole pbmlife cyan
-+ keyword whole pbmmake cyan
-+ keyword whole pbmmask cyan
-+ keyword whole pbmpage cyan
-+ keyword whole pbmpscale cyan
-+ keyword whole pbmreduce cyan
-+ keyword whole pbmtext cyan
-+ keyword whole pbmtextps cyan
-+ keyword whole pbmupc cyan
-+
-+ keyword whole pbmtoascii cyan
-+ keyword whole pbmtoepsi cyan
-+ keyword whole pbmtog3 cyan
-+ keyword whole pbmtoicon cyan
-+ keyword whole pbmtolj cyan
-+ keyword whole pbmtomacp cyan
-+ keyword whole pbmtonokia cyan
-+ keyword whole pbmtopgm cyan
-+ keyword whole pbmtoplot cyan
-+ keyword whole pbmtoppa cyan
-+ keyword whole pbmtopsg3 cyan
-+ keyword whole pbmtowbmp cyan
-+ keyword whole pbmtoxbm cyan
-+
-+ keyword whole g3topbm cyan
-+ keyword whole thinkjettopbm cyan
-+ keyword whole wbmptopbm cyan
-+ keyword whole xbmtopbm cyan
-+
-+ keyword whole pgmbentley cyan
-+ keyword whole pgmcrater cyan
-+ keyword whole pgmedge cyan
-+ keyword whole pgmenhance cyan
-+ keyword whole pgmhist cyan
-+ keyword whole pgmkernel cyan
-+ keyword whole pgmnoise cyan
-+ keyword whole pgmnorm cyan
-+ keyword whole pgmoil cyan
-+ keyword whole pgmramp cyan
-+ keyword whole pgmslice cyan
-+ keyword whole pgmtexture cyan
-+
-+ keyword whole pgmtopbm cyan
-+ keyword whole pgmtoppm cyan
-+
-+ keyword whole asciitopgm cyan
-+ keyword whole bioradtopgm cyan
-+ keyword whole icontopgm cyan
-+ keyword whole jpegtopgm cyan
-+ keyword whole macptopgm cyan
-+ keyword whole rawtopgm cyan
-+
-+ keyword whole pnmalias cyan
-+ keyword whole pnmarith cyan
-+ keyword whole pnmcat cyan
-+ keyword whole pnmcolormap cyan
-+ keyword whole pnmcomp cyan
-+ keyword whole pnmconvol cyan
-+ keyword whole pnmcrop cyan
-+ keyword whole pnmcut cyan
-+ keyword whole pnmdepth cyan
-+ keyword whole pnmenlarge cyan
-+ keyword whole pnmfile cyan
-+ keyword whole pnmflip cyan
-+ keyword whole pnmgamma cyan
-+ keyword whole pnmhisteq cyan
-+ keyword whole pnmhistmap cyan
-+ keyword whole pnmindex cyan
-+ keyword whole pnminterp cyan
-+ keyword whole pnminterp-gen cyan
-+ keyword whole pnminvert cyan
-+ keyword whole pnmmargin cyan
-+ keyword whole pnmmontage cyan
-+ keyword whole pnmnlfilt cyan
-+ keyword whole pnmnoraw cyan
-+ keyword whole pnmnorm cyan
-+ keyword whole pnmpad cyan
-+ keyword whole pnmpaste cyan
-+ keyword whole pnmpsnr cyan
-+ keyword whole pnmquant cyan
-+ keyword whole pnmremap cyan
-+ keyword whole pnmrotate cyan
-+ keyword whole pnmscale cyan
-+ keyword whole pnmscalefixed cyan
-+ keyword whole pnmshear cyan
-+ keyword whole pnmsmooth cyan
-+ keyword whole pnmsplit cyan
-+ keyword whole pnmtile cyan
-+
-+ keyword whole pnmtofits cyan
-+ keyword whole pnmtojpeg cyan
-+ keyword whole pnmtopalm cyan
-+ keyword whole pnmtoplainpnm cyan
-+ keyword whole pnmtopng cyan
-+ keyword whole pnmtops cyan
-+ keyword whole pnmtorle cyan
-+ keyword whole pnmtotiff cyan
-+ keyword whole pnmtoxwd cyan
-+
-+ keyword whole bpmtopnm cyan
-+ keyword whole giftopnm cyan
-+ keyword whole palmtopnm cyan
-+ keyword whole pngtopnm cyan
-+ keyword whole pstopnm cyan
-+ keyword whole rletopnm cyan
-+ keyword whole tifftopnm cyan
-+ keyword whole xwdtopnm cyan
-+
-+ keyword whole ppm3d cyan
-+ keyword whole ppmbrighten cyan
-+ keyword whole ppmchange cyan
-+ keyword whole ppmcie cyan
-+ keyword whole ppmcolormask cyan
-+ keyword whole ppmcolors cyan
-+ keyword whole ppmdim cyan
-+ keyword whole ppmdist cyan
-+ keyword whole ppmdither cyan
-+ keyword whole ppmfade cyan
-+ keyword whole ppmflash cyan
-+ keyword whole ppmforge cyan
-+ keyword whole ppmhist cyan
-+ keyword whole ppmlabel cyan
-+ keyword whole ppmmake cyan
-+ keyword whole ppmmix cyan
-+ keyword whole ppmnorm cyan
-+ keyword whole ppmntsc cyan
-+ keyword whole ppmpat cyan
-+ keyword whole ppmquant cyan
-+ keyword whole ppmquantall cyan
-+ keyword whole ppmqvgq cyan
-+ keyword whole ppmrainbow cyan
-+ keyword whole ppmrelief cyan
-+ keyword whole ppmshadow cyan
-+ keyword whole ppmshift cyan
-+ keyword whole ppmspread cyan
-+ keyword whole ppmtv cyan
-+
-+ keyword whole ppmtoacad cyan
-+ keyword whole ppmtobmp cyan
-+ keyword whole ppmtogif cyan
-+ keyword whole ppmtojpeg cyan
-+ keyword whole ppmtolj cyan
-+ keyword whole ppmtomap cyan
-+ keyword whole ppmtompeg cyan
-+ keyword whole ppmtopcx cyan
-+ keyword whole ppmtopgm cyan
-+ keyword whole ppmtorgb3 cyan
-+ keyword whole ppmtowinicon cyan
-+ keyword whole ppmtoxpm cyan
-+
-+ keyword whole bpmtoppm cyan
-+ keyword whole pcxtoppm cyan
-+ keyword whole pdftoppm cyan
-+ keyword whole pjtoppm cyan
-+ keyword whole rawtoppm cyan
-+ keyword whole rgb3toppm cyan
-+ keyword whole winicontoppm cyan
-+ keyword whole xpmtoppm cyan
-+ keyword whole xvminitoppm cyan
-+
-+ keyword whole gpg red
-+ keyword whole md5sum red
-+ keyword whole openssl red
-+ keyword whole ssh red
-+ keyword whole scp red
-+
-+ keyword whole gettext.sh magenta
-+ keyword whole TEXTDOMAINDIR magenta
-+ keyword whole TEXTDOMAIN magenta
-+ keyword whole VERSION magenta
-+
-+ keyword whole /dev/audio brightblue
-+ keyword whole /dev/dsp brightblue
-+ keyword whole /dev/null brightblue
-+ keyword whole /dev/mixed brightblue
-+ keyword whole /dev/stdin brightblue
-+ keyword whole /dev/stdout brightblue
-+ keyword whole /dev/stderr brightblue
-+ keyword whole /dev/zero brightblue
Deleted: trunk/debian/patches/13_mc-ctype.patch
===================================================================
--- trunk/debian/patches/13_mc-ctype.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/13_mc-ctype.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,10 +0,0 @@
---- ./edit/editcmd.c.orig 2007-05-02 13:22:01.000000000 +0200
-+++ ./edit/editcmd.c 2008-01-25 07:44:38.000000000 +0100
-@@ -26,7 +26,6 @@
- #include <config.h>
-
- #include <assert.h>
--#include <ctype.h>
-
- #include <stdio.h>
- #include <stdarg.h>
Copied: trunk/debian/patches/13_syntax.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/13_syntax.patch)
===================================================================
--- trunk/debian/patches/13_syntax.patch (rev 0)
+++ trunk/debian/patches/13_syntax.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,15 @@
+diff -Nurwd mc-4.6.2~pre1/syntax/Syntax mc-4.6.2~pre1.patched/syntax/Syntax
+--- mc-4.6.2~pre1/syntax/Syntax 2007-08-27 08:56:47.000000000 +0200
++++ mc-4.6.2~pre1.patched/syntax/Syntax 2008-01-24 23:52:28.000000000 +0100
+@@ -46,9 +46,10 @@
+ file ..\*\\.(rb|RB)$ Ruby\sProgram ^#!.\*([\s/]ruby|@RUBY@)
+ include ruby.syntax
+
+-file ..\*\\.(man|[0-9n]|[0-9]x)$ NROFF\sSource
++file ..\*\\.(man|[0-9n]|[0-9](x|ncurses|ssl|p|pm|menu|form|vga|t|td))$ NROFF\sSource
+ include nroff.syntax
+
++
+ file ..\*\\.(htm|html|HTM|HTML)$ HTML\sFile
+ include html.syntax
+
Copied: trunk/debian/patches/14_cxx.syntax.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/14_cxx.syntax.patch)
===================================================================
--- trunk/debian/patches/14_cxx.syntax.patch (rev 0)
+++ trunk/debian/patches/14_cxx.syntax.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,143 @@
+diff -Nurwd mc-4.6.2~pre1/syntax/cxx.syntax mc-4.6.2~pre1.patched/syntax/cxx.syntax
+--- mc-4.6.2~pre1/syntax/cxx.syntax 1970-01-01 00:00:00.000000000 +0000
++++ mc-4.6.2~pre1/syntax/cxx.syntax 2008-01-24 23:57:05.000000000 +0100
+@@ -0,0 +1,128 @@
++context default
++ keyword whole auto yellow
++ keyword whole break yellow
++ keyword whole case yellow
++ keyword whole char yellow
++ keyword whole const yellow
++ keyword whole continue yellow
++ keyword whole default yellow
++ keyword whole do yellow
++ keyword whole double yellow
++ keyword whole else yellow
++ keyword whole enum yellow
++ keyword whole extern yellow
++ keyword whole float yellow
++ keyword whole for yellow
++ keyword whole goto yellow
++ keyword whole if yellow
++ keyword whole int yellow
++ keyword whole long yellow
++ keyword whole register yellow
++ keyword whole return yellow
++ keyword whole short yellow
++ keyword whole signed yellow
++ keyword whole sizeof yellow
++ keyword whole static yellow
++ keyword whole struct yellow
++ keyword whole switch yellow
++ keyword whole typedef yellow
++ keyword whole union yellow
++ keyword whole unsigned yellow
++ keyword whole void yellow
++ keyword whole volatile yellow
++ keyword whole while yellow
++ keyword whole asm yellow
++ keyword whole catch yellow
++ keyword whole class yellow
++ keyword whole friend yellow
++ keyword whole delete yellow
++ keyword whole inline yellow
++ keyword whole new yellow
++ keyword whole operator yellow
++ keyword whole private yellow
++ keyword whole protected yellow
++ keyword whole public yellow
++ keyword whole this yellow
++ keyword whole throw yellow
++ keyword whole template yellow
++ keyword whole try yellow
++ keyword whole virtual yellow
++ keyword whole bool yellow
++ keyword whole const_cast yellow
++ keyword whole dynamic_cast yellow
++ keyword whole explicit yellow
++ keyword whole false yellow
++ keyword whole mutable yellow
++ keyword whole namespace yellow
++ keyword whole reinterpret_cast yellow
++ keyword whole static_cast yellow
++ keyword whole true yellow
++ keyword whole typeid yellow
++ keyword whole typename yellow
++ keyword whole using yellow
++ keyword whole wchar_t yellow
++ keyword whole ... yellow
++ keyword whole linestart \{\s\t\}\[\s\t\]#*\n brightmagenta
++
++ keyword /\* brown
++ keyword \*/ brown
++ keyword // brown
++
++ keyword '\\\{"abtnvfr\}' brightgreen
++ keyword '\\\{0123\}\{01234567\}\{01234567\}' brightgreen
++ keyword '\\'' brightgreen
++ keyword '\\\\' brightgreen
++ keyword '\\0' brightgreen
++ keyword '\{\s!"#$%&()\*\+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~ ¡¢£¤¥¦§¨©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ\}' brightgreen
++
++ keyword > yellow
++ keyword < yellow
++ keyword \+ yellow
++ keyword - yellow
++ keyword \* yellow
++ keyword / yellow
++ keyword % yellow
++ keyword = yellow
++ keyword != yellow
++ keyword == yellow
++ keyword { brightcyan
++ keyword } brightcyan
++ keyword ( brightcyan
++ keyword ) brightcyan
++ keyword [ brightcyan
++ keyword ] brightcyan
++ keyword , brightcyan
++ keyword : brightcyan
++ keyword ? brightcyan
++ keyword ; brightmagenta
++
++context exclusive /\* \*/ brown
++ spellcheck
++
++context exclusive // \n brown
++ spellcheck
++
++context linestart # \n brightred
++ keyword \\\n yellow
++ keyword /\**\*/ brown
++ keyword //*\n brown
++ keyword "+" red
++ keyword <+> red
++
++context " " green
++ spellcheck
++ keyword \\" brightgreen
++ keyword %% brightgreen
++ keyword %\[#0\s-\+,\]\[0123456789\*\]\[.\]\[0123456789\*\]\[L\]\{eEfgGoxX\} brightgreen
++ keyword %\[0\s-\+,\]\[0123456789\*\]\[.\]\[0123456789\*\]\[hl\]\{diuxX\} brightgreen
++ keyword %\[hl\]n brightgreen
++ keyword %\[-\]\[0123456789\*\]\[.\]\[0123456789\*\]s brightgreen
++ keyword %[*] brightgreen
++ keyword %c brightgreen
++ keyword %p brightgreen
++ keyword \\\{0123\}\{01234567\}\{01234567\} brightgreen
++ keyword \\\\ brightgreen
++ keyword \\' brightgreen
++ keyword \\\{abtnvfr\} brightgreen
++
++
+diff -Nurwd mc-4.6.2~pre1/syntax/Makefile.in mc-4.6.2~pre1.patched/syntax/Makefile.in
+--- mc-4.6.2~pre1/syntax/Makefile.in 2007-09-11 16:33:39.000000000 +0200
++++ mc-4.6.2~pre1/syntax/Makefile.in 2008-01-24 23:58:04.000000000 +0100
+@@ -240,6 +240,7 @@
+ aspx.syntax \
+ assembler.syntax \
+ c.syntax \
++ cxx.syntax \
+ changelog.syntax \
+ cs.syntax \
+ css.syntax \
Deleted: trunk/debian/patches/14_mc-dontrewrite.patch
===================================================================
--- trunk/debian/patches/14_mc-dontrewrite.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/14_mc-dontrewrite.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,12 +0,0 @@
-diff -Nurwd ./mc-4.6.2~pre1/edit/editcmd.c ./mc-4.6.2~pre1.patched/edit/editcmd.c
---- ./mc-4.6.2~pre1/edit/editcmd.c 2008-02-12 19:58:24.000000000 +0100
-+++ ./mc-4.6.2~pre1.patched/edit/editcmd.c 2008-02-12 19:57:11.000000000 +0100
-@@ -243,7 +243,7 @@
- this_save_mode = option_save_mode;
- if (this_save_mode != EDIT_QUICK_SAVE) {
- if (!vfs_file_is_local (filename) ||
-- (fd = mc_open (filename, O_WRONLY | O_BINARY)) == -1) {
-+ (fd = mc_open (filename, O_RDONLY | O_BINARY)) == -1) {
- /*
- * The file does not exists yet, so no safe save or
- * backup are necessary.
Deleted: trunk/debian/patches/15_c-vs-cxx.patch
===================================================================
--- trunk/debian/patches/15_c-vs-cxx.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/15_c-vs-cxx.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,66 +0,0 @@
-diff -Nurwd mc-4.6.2~pre1/syntax/c.syntax mc-4.6.2~pre1.patched/syntax/c.syntax
---- mc-4.6.2~pre1/syntax/c.syntax 2006-06-22 14:49:24.000000000 +0200
-+++ mc-4.6.2~pre1/syntax/c.syntax 2008-01-25 08:19:52.000000000 +0100
-@@ -33,34 +33,7 @@
- keyword whole volatile yellow
- keyword whole while yellow
- keyword whole asm yellow
-- keyword whole catch yellow
-- keyword whole class yellow
-- keyword whole friend yellow
-- keyword whole delete yellow
- keyword whole inline yellow
-- keyword whole new yellow
-- keyword whole operator yellow
-- keyword whole private yellow
-- keyword whole protected yellow
-- keyword whole public yellow
-- keyword whole this yellow
-- keyword whole throw yellow
-- keyword whole template yellow
-- keyword whole try yellow
-- keyword whole virtual yellow
-- keyword whole bool yellow
-- keyword whole const_cast yellow
-- keyword whole dynamic_cast yellow
-- keyword whole explicit yellow
-- keyword whole false yellow
-- keyword whole mutable yellow
-- keyword whole namespace yellow
-- keyword whole reinterpret_cast yellow
-- keyword whole static_cast yellow
-- keyword whole true yellow
-- keyword whole typeid yellow
-- keyword whole typename yellow
-- keyword whole using yellow
- keyword whole wchar_t yellow
- keyword whole ... yellow
- keyword whole linestart \{\s\t\}\[\s\t\]#*\n brightmagenta
-diff -Nurwd mc-4.6.2~pre1/syntax/Makefile.am mc-4.6.2~pre1.patched/syntax/Makefile.am
---- mc-4.6.2~pre1/syntax/Makefile.am 2007-08-27 08:56:47.000000000 +0200
-+++ mc-4.6.2~pre1/syntax/Makefile.am 2008-01-25 08:19:52.000000000 +0100
-@@ -3,6 +3,7 @@
- ada95.syntax \
- aspx.syntax \
- assembler.syntax \
-+ cxx.syntax \
- c.syntax \
- changelog.syntax \
- cs.syntax \
-diff -Nurwd mc-4.6.2~pre1/syntax/Syntax mc-4.6.2~pre1.patched/syntax/Syntax
---- mc-4.6.2~pre1/syntax/Syntax 2007-08-27 08:56:47.000000000 +0200
-+++ mc-4.6.2~pre1/syntax/Syntax 2008-01-25 08:19:52.000000000 +0100
-@@ -76,9 +76,12 @@
- file ..\*\.(texi|texinfo|TEXI|TEXINFO)$ Texinfo\sDocument
- include texinfo.syntax
-
--file ..\*\\.([chC]|CC|cxx|cc|cpp|CPP|CXX|hxx|h\.in)$ C/C\+\+\sProgram
-+file ..\*\\.c$ C\sProgram
- include c.syntax
-
-+file ..\*\\.([hC]|CC|cxx|cc|cpp|CPP|CXX|hxx|h\.in)$ C/C\+\+\sProgram
-+include cxx.syntax
-+
- file ..\*\\.d$ D\sProgram
- include d.syntax
-
Deleted: trunk/debian/patches/16_ftpfs_symlink2.patch
===================================================================
--- trunk/debian/patches/16_ftpfs_symlink2.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/16_ftpfs_symlink2.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,32 +0,0 @@
---- vfs/direntry.c 22 Feb 2005 18:35:23 -0000 1.116
-+++ vfs/direntry.c 6 Apr 2005 14:04:54 -0000
-@@ -251,7 +251,13 @@ vfs_s_find_entry_tree (struct vfs_class
- char * const pathref = g_strdup (a_path);
- char *path = pathref;
-
-- canonicalize_pathname (path);
-+ if (strncmp(me->name, "ftpfs", 5) != 0)
-+ canonicalize_pathname (path);
-+ else {
-+ char *p = path + strlen (path) - 1;
-+ while (p > path && *p == PATH_SEP)
-+ *p-- = 0;
-+ }
-
- while (root) {
- while (*path == PATH_SEP) /* Strip leading '/' */
-@@ -324,7 +330,13 @@ vfs_s_find_entry_linear (struct vfs_clas
- if (root->super->root != root)
- vfs_die ("We have to use _real_ root. Always. Sorry.");
-
-- canonicalize_pathname (path);
-+ if (strncmp (me->name, "ftpfs", 5) != 0)
-+ canonicalize_pathname (path);
-+ else {
-+ char *p = path + strlen (path) - 1;
-+ while (p > path && *p == PATH_SEP)
-+ *p-- = 0;
-+ }
-
- if (!(flags & FL_DIR)) {
- char *dirname, *name, *save;
Deleted: trunk/debian/patches/17_autogen_sh.patch
===================================================================
--- trunk/debian/patches/17_autogen_sh.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/17_autogen_sh.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,73 +0,0 @@
-diff -Nurwd mc-4.6.2~pre1.orig/autogen.sh mc-4.6.2~pre1/autogen.sh
---- ./autogen.sh 1970-01-01 00:00:00.000000000 +0000
-+++ ./autogen.sh 2008-02-26 18:15:30.000000000 +0100
-@@ -0,0 +1,69 @@
-+#!/bin/sh
-+#
-+# autogen.sh glue for hplip
-+#
-+# HPLIP used to have five or so different autotools trees. Upstream
-+# has reduced it to two. Still, this script is capable of cleaning
-+# just about any possible mess of autoconf files.
-+#
-+# BE CAREFUL with trees that are not completely automake-generated,
-+# this script deletes all Makefile.in files it can find.
-+#
-+# Requires: automake 1.9, autoconf 2.57+
-+# Conflicts: autoconf 2.13
-+set -e
-+
-+# Refresh GNU autotools toolchain.
-+echo Cleaning autotools files...
-+find -type d -name autom4te.cache -print0 | xargs -0 rm -rf \;
-+find -type f \( -name missing -o -name install-sh -o -name mkinstalldirs \
-+ -o -name depcomp -o -name ltmain.sh -o -name configure \
-+ -o -name config.sub -o -name config.guess \
-+ -o -name Makefile.in \) -print0 | xargs -0 rm -f
-+
-+echo Running autoreconf...
-+autoreconf --force --install
-+
-+# For the Debian package build
-+test -d debian && {
-+ # link these in Debian builds
-+ rm -f config.sub config.guess
-+ ln -s /usr/share/misc/config.sub .
-+ ln -s /usr/share/misc/config.guess .
-+
-+ # refresh list of executable scripts, to avoid possible breakage if
-+ # upstream tarball does not include the file or if it is mispackaged
-+ # for whatever reason.
-+ [ "$1" == "updateexec" ] && {
-+ echo Generating list of executable files...
-+ rm -f debian/executable.files
-+ find -type f -perm +111 ! -name '.*' -fprint debian/executable.files
-+ }
-+
-+ # Remove any files in upstream tarball that we don't have in the Debian
-+ # package (because diff cannot remove files)
-+ version=`dpkg-parsechangelog | awk '/Version:/ { print $2 }' | sed -e 's/-[^-]\+$//'`
-+ source=`dpkg-parsechangelog | awk '/Source:/ { print $2 }' | tr -d ' '`
-+ if test -r ../${source}_${version}.orig.tar.gz ; then
-+ echo Generating list of files that should be removed...
-+ rm -f debian/deletable.files
-+ touch debian/deletable.files
-+ [ -e debian/tmp ] && rm -rf debian/tmp
-+ mkdir debian/tmp
-+ ( cd debian/tmp ; tar -zxf ../../../${source}_${version}.orig.tar.gz )
-+ find debian/tmp/ -type f ! -name '.*' -print0 | xargs -0 -ri echo '{}' | \
-+ while read -r i ; do
-+ if test -e "${i}" ; then
-+ filename=$(echo "${i}" | sed -e 's#.*debian/tmp/[^/]\+/##')
-+ test -e "${filename}" || echo "${filename}" >>debian/deletable.files
-+ fi
-+ done
-+ rm -fr debian/tmp
-+ else
-+ echo Emptying list of files that should be deleted...
-+ rm -f debian/deletable.files
-+ touch debian/deletable.files
-+ fi
-+}
-+
-+exit 0
Deleted: trunk/debian/patches/18_mc.menu.patch
===================================================================
--- trunk/debian/patches/18_mc.menu.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/18_mc.menu.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,32 +0,0 @@
-diff -Nurwd mc-4.6.2~pre1/lib/mc.menu mc-4.6.2~pre1.patched/lib/mc.menu
---- mc-4.6.2~pre1/lib/mc.menu 2005-09-06 08:01:07.000000000 +0200
-+++ mc-4.6.2~pre1.patched/lib/mc.menu 2008-01-25 10:06:19.000000000 +0100
-@@ -15,7 +15,7 @@
-
- 0 Edit a bug report and send it to root
- I=`mktemp ${MC_TMPDIR:-/tmp}/mail.XXXXXX` || exit 1
-- ${EDITOR-vi} $I
-+ ${EDITOR-editor} $I
- test -r $I && mail root < $I
- rm -f $I
-
-@@ -330,3 +330,7 @@
- o Open next a free console
- open -s -- sh
-
-+=+ f \.dsc$ & t r
-+x Extract the contents of a Debian source package
-+ dpkg-source -x %f
-+
-diff -Nurwd mc-4.6.2~pre1/src/util.h mc-4.6.2~pre1.patched/src/util.h
---- mc-4.6.2~pre1/src/util.h 2006-02-03 18:04:17.000000000 +0100
-+++ mc-4.6.2~pre1.patched/src/util.h 2008-01-25 10:06:19.000000000 +0100
-@@ -222,7 +222,7 @@
- #define PATH_ENV_SEP ':'
- #define TMPDIR_DEFAULT "/tmp"
- #define SCRIPT_SUFFIX ""
--#define get_default_editor() "vi"
-+#define get_default_editor() "editor"
- #define OS_SORT_CASE_SENSITIVE_DEFAULT 1
- #define STRCOMP strcmp
- #define STRNCOMP strncmp
Copied: trunk/debian/patches/18_sh_syntax.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/18_sh_syntax.patch)
===================================================================
--- trunk/debian/patches/18_sh_syntax.patch (rev 0)
+++ trunk/debian/patches/18_sh_syntax.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,2144 @@
+diff -Nurwd mc-4.6.2~pre1.orig/syntax/sh.syntax mc-4.6.2~pre1/syntax/sh.syntax
+--- mc-4.6.2~pre1.orig/syntax/sh.syntax 2008-02-16 13:55:35.000000000 +0100
++++ mc-4.6.2~pre1/syntax/sh.syntax 2008-02-16 13:57:21.000000000 +0100
+@@ -1,3 +1,8 @@
++# Since I regulary update ths file, please send any comments
++# to: Michelle Konzack <linux4michelle at freenet.de>
++# Last Update: Thu, 01 Jun 2006 22:10:07 +0200
++
++
+ context default
+ keyword ;; brightred
+ keyword \\@ brightred
+@@ -8,13 +13,13 @@
+ keyword \\` brightred
+ keyword ` brightred
+ keyword ; brightcyan
+- keyword $( brightcyan
+- keyword ( brightcyan
+- keyword ) brightcyan
++ keyword $(*) brightgreen
+ keyword ${*} brightgreen
+ keyword { brightcyan
+ keyword } brightcyan
+
++ keyword whole linestart #!\[\s\]*\n brightcyan black
++
+ keyword $\* brightred
+ keyword $@ brightred
+ keyword $# brightred
+@@ -22,7 +27,12 @@
+ keyword $- brightred
+ keyword $$ brightred
+ keyword $! brightred
+- keyword whole $_ brightred
++ keyword $_ brightred
++
++ keyword whole 2>&1 brightred
++ keyword whole 1>&2 brightred
++ keyword whole 2> brightred
++ keyword whole 1> brightred
+
+ keyword wholeright $\[0123456789\] brightred
+
+@@ -36,134 +46,1042 @@
+
+ wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._
+
+- keyword whole alias yellow
+- keyword whole bg yellow
+ keyword whole break yellow
+ keyword whole case yellow
++ keyword whole clear yellow
+ keyword whole continue yellow
++ keyword whole declare yellow
+ keyword whole done yellow
+ keyword whole do yellow
+ keyword whole elif yellow
+ keyword whole else yellow
+ keyword whole esac yellow
+- keyword whole eval yellow
+- keyword whole exec yellow
+ keyword whole exit yellow
+- keyword whole export yellow
+- keyword whole fg yellow
+ keyword whole fi yellow
+ keyword whole for yellow
++ keyword whole getopts yellow
+ keyword whole if yellow
+ keyword whole in yellow
+- keyword whole read yellow
+ keyword whole return yellow
+ keyword whole select yellow
+- keyword whole set yellow
+ keyword whole shift yellow
++ keyword whole source yellow
+ keyword whole then yellow
+ keyword whole trap yellow
+- keyword whole umask yellow
+- keyword whole unset yellow
+ keyword whole until yellow
+ keyword whole wait yellow
+ keyword whole while yellow
+
++ keyword whole accept cyan
++ keyword whole accessdb cyan
++ keyword whole activate cyan
++ keyword whole addgroup cyan
++ keyword whole add-shell cyan
++ keyword whole adduser cyan
++ keyword whole anytopnm cyan
++ keyword whole apropos cyan
++ keyword whole apt-cache cyan
++ keyword whole apt-cdrom cyan
++ keyword whole apt-config cyan
++ keyword whole apt-file cyan
++ keyword whole apt-ftparchive cyan
++ keyword whole apt-get cyan
++ keyword whole aptitude cyan
++ keyword whole apt-sortpkgs cyan
++ keyword whole apt-source cyan
++ keyword whole ar cyan
+ keyword whole arch cyan
++ keyword whole arp cyan
++ keyword whole as cyan
+ keyword whole ash cyan
++ keyword whole at cyan
++ keyword whole atd cyan
++ keyword whole atrun cyan
++ keyword whole atq cyan
++ keyword whole autoconf cyan
++ keyword whole autoheader cyan
++ keyword whole automake cyan
++ keyword whole autopoint cyan
++ keyword whole autoscan cyan
+ keyword whole awk cyan
++ keyword whole badblocks cyan
++ keyword whole base64-decode cyan
++ keyword whole base64-encode cyan
+ keyword whole basename cyan
+ keyword whole bash cyan
++ keyword whole batch cyan
++ keyword whole bc cyan
+ keyword whole bg_backup cyan
+ keyword whole bg_restore cyan
++ keyword whole blockdev cyan
++ keyword whole bootlogd cyan
++ keyword whole bsd-write cyan
+ keyword whole bsh cyan
++ keyword whole bunzip2 cyan
++ keyword whole bzcat cyan
++ keyword whole bzcmp cyan
++ keyword whole bzdiff cyan
++ keyword whole bzegrep cyan
++ keyword whole bzexe cyan
++ keyword whole bzfgrep cyan
++ keyword whole bzgrep cyan
++ keyword whole bzip cyan
++ keyword whole bzip2 cyan
++ keyword whole bzip2recover cyan
++ keyword whole bzless cyan
++ keyword whole bzmore cyan
++ keyword whole cabextract cyan
++ keyword whole cal cyan
++ keyword whole calendar cyan
++ keyword whole cam cyan
++ keyword whole cancel cyan
++ keyword whole captoinfo cyan
+ keyword whole cat cyan
++ keyword whole catchsegv cyan
++ keyword whole catman cyan
+ keyword whole cd cyan
++ keyword whole cdda2ogg cyan
++ keyword whole cdda2mp3 cyan
++ keyword whole cdda2wav cyan
++ keyword whole cdrecord cyan
++ keyword whole cfdisk cyan
++ keyword whole chage cyan
++ keyword whole charset cyan
++ keyword whole chattr cyan
++ keyword whole checkbashisms cyan
++ keyword whole chfn cyan
+ keyword whole chgrp cyan
++ keyword whole chkdupexe cyan
+ keyword whole chmod cyan
+ keyword whole chown cyan
++ keyword whole chpasswd cyan
++ keyword whole chroot cyan
++ keyword whole chsh cyan
++ keyword whole chvt cyan
++ keyword whole cksum cyan
++ keyword whole clear cyan
++ keyword whole cmp cyan
++ keyword whole codepage cyan
++ keyword whole col cyan
++ keyword whole colcrt cyan
++ keyword whole colrm cyan
++ keyword whole column cyan
++ keyword whole comm cyan
++ keyword whole compose cyan
++ keyword whole compress cyan
++ keyword whole consolechars cyan
+ keyword whole cp cyan
++ keyword whole cpan cyan
++ keyword whole cpgr cyan
+ keyword whole cpio cyan
++ keyword whole cpp cyan
++ keyword whole cramfsck cyan
++ keyword whole createdb cyan
++ keyword whole createlang cyan
++ keyword whole createuser cyan
++ keyword whole c_rehash cyan
++ keyword whole crontab cyan
+ keyword whole csh cyan
++ keyword whole csplit cyan
++ keyword whole cupsaccept cyan
++ keyword whole cupsaddsmb cyan
++ keyword whole cupsd cyan
++ keyword whole cupsreject cyan
++ keyword whole curl cyan
++ keyword whole cut cyan
+ keyword whole date cyan
++ keyword whole dash cyan
++ keyword whole dch cyan
+ keyword whole dd cyan
++ keyword whole deallocvt cyan
++ keyword whole debugfs cyan
++ keyword whole delgroup cyan
++ keyword whole deluser cyan
++ keyword whole depmod cyan
++ keyword whole devdump cyan
+ keyword whole df cyan
++ keyword whole dialog cyan
++ keyword whole diff cyan
++ keyword whole diff3 cyan
++ keyword whole dir cyan
++ keyword whole dircolors cyan
++ keyword whole directomatic cyan
++ keyword whole dirname cyan
++ keyword whole dirsplit cyan
++ keyword whole disable cyan
++ keyword whole diskd cyan
++ keyword whole diskseekd cyan
++ keyword whole disown cyan
+ keyword whole dmesg cyan
+ keyword whole dnsdomainname cyan
+ keyword whole doexec cyan
+ keyword whole domainname cyan
++ keyword whole dosfsck cyan
++ keyword whole dotextwrap cyan
++ keyword whole dotlockfile cyan
++ keyword whole dpasswd cyan
++ keyword whole dpkg cyan
++ keyword whole dpkg-architekture cyan
++ keyword whole dpkg-buildpackage cyan
++ keyword whole dpkg-deb cyan
++ keyword whole dpkg-name cyan
++ keyword whole dpkg-query cyan
++ keyword whole dpkg-reconfigure cyan
++ keyword whole dpkg-scanpackages cyan
++ keyword whole dpkg-scansources cyan
++ keyword whole dpkg-split cyan
++ keyword whole dpkg-source cyan
++ keyword whole dropdb cyan
++ keyword whole droplang cyan
++ keyword whole dropuser cyan
++ keyword whole dscverify cyan
++ keyword whole du cyan
++ keyword whole dumpe2fs cyan
++ keyword whole dumpkeys cyan
++ keyword whole dvipdf cyan
++ keyword whole e2fsck cyan
++ keyword whole e2image cyan
++ keyword whole e2label cyan
+ keyword whole echo cyan
+ keyword whole ed cyan
++ keyword whole edit cyan
++ keyword whole editor cyan
+ keyword whole egrep cyan
++ keyword whole eject cyan
++ keyword whole enable cyan
++ keyword whole env cyan
++ keyword whole envsubst cyan
++ keyword whole eqn cyan
++ keyword whole eval_gettext cyan
+ keyword whole ex cyan
++ keyword whole expand cyan
++ keyword whole expiry cyan
++ keyword whole expr cyan
++ keyword whole factor cyan
++ keyword whole fakeroot cyan
++ keyword whole faillog cyan
+ keyword whole false cyan
++ keyword whole fbset cyan
++ keyword whole fc-cache cyan
++ keyword whole fc-list cyan
++ keyword whole fc-match cyan
++ keyword whole fdformat cyan
++ keyword whole fdisk cyan
++ keyword whole fdlist cyan
++ keyword whole fdmount cyan
++ keyword whole fdmountd cyan
++ keyword whole fdrawcmd cyan
++ keyword whole fdumount cyan
++ keyword whole fetchmail cyan
++ keyword whole fgconsole cyan
+ keyword whole fgrep cyan
++ keyword whole file cyan
++ keyword whole filefrag cyan
+ keyword whole find cyan
++ keyword whole find2perl cyan
++ keyword whole findfs cyan
++ keyword whole fitstopnm cyan
++ keyword whole floppycontrol cyan
++ keyword whole floppymeter cyan
++ keyword whole fmt cyan
++ keyword whole fold cyan
++ keyword whole font2psf cyan
++ keyword whole formail cyan
++ keyword whole fping cyan
++ keyword whole fping6 cyan
++ keyword whole free cyan
++ keyword whole freeze cyan
++ keyword whole fribidi cyan
++ keyword whole from cyan
++ keyword whole fsck cyan
++ keyword whole fsck.cramfs cyan
++ keyword whole fsck.ext2 cyan
++ keyword whole fsck.ext3 cyan
++ keyword whole fsck.minix cyan
++ keyword whole fsck.msdos cyan
++ keyword whole fsck.nfs cyan
++ keyword whole fsck.vfat cyan
+ keyword whole fsconf cyan
++ keyword whole funzip cyan
++ keyword whole fuser cyan
++ keyword whole fvwm cyan
+ keyword whole gawk cyan
++ keyword whole gdb cyan
++ keyword whole gdbtui cyan
++ keyword whole gcc cyan
++ keyword whole gcov cyan
++ keyword whole genksyms cyan
++ keyword whole getconf cyan
++ keyword whole getent cyan
++ keyword whole getfdprm cyan
++ keyword whole getkeycodes cyan
++ keyword whole getopt cyan
++ keyword whole gettext cyan
++ keyword whole gettextize cyan
++ keyword whole getty cyan
++ keyword whole gpasswd cyan
++ keyword whole gpgsplit cyan
++ keyword whole gpgv cyan
++ keyword whole gprof cyan
+ keyword whole grep cyan
++ keyword whole groff cyan
++ keyword whole groupadd cyan
++ keyword whole groupdel cyan
++ keyword whole groupmod cyan
++ keyword whole groups cyan
++ keyword whole grpck cyan
++ keyword whole grpconv cyan
++ keyword whole grpunconv cyan
++ keyword whole gs cyan
++ keyword whole gsbj cyan
++ keyword whole gsdj cyan
++ keyword whole gsdj500 cyan
++ keyword whole gs-gpl cyan
++ keyword whole gslj cyan
++ keyword whole gslp cyan
++ keyword whole gsmctl cyan
++ keyword whole gsmpb cyan
++ keyword whole gsmsendsms cyan
++ keyword whole gsmsiectl cyan
++ keyword whole gsmsiexfer cyan
++ keyword whole gsmsmsd cyan
++ keyword whole gsmsmsstore cyan
++ keyword whole gsnd cyan
+ keyword whole gunzip cyan
++ keyword whole gzexe cyan
+ keyword whole gzip cyan
++ keyword whole ha cyan
++ keyword whole halt cyan
++ keyword whole hd cyan
++ keyword whole hdparm cyan
++ keyword whole hddtemp cyan
++ keyword whole head cyan
++ keyword whole hexdump cyan
++ keyword whole hman cyan
++ keyword whole host cyan
++ keyword whole hostid cyan
+ keyword whole hostname cyan
++ keyword whole hotkeys cyan
++ keyword whole html2text cyan
++ keyword whole hwclock cyan
++ keyword whole iconv cyan
++ keyword whole iconvconfig cyan
++ keyword whole id cyan
++ keyword whole ifconfig cyan
++ keyword whole ifdown cyan
++ keyword whole ifnames cyan
++ keyword whole ifup cyan
+ keyword whole igawk cyan
++ keyword whole info cyan
++ keyword whole infobrowser cyan
++ keyword whole infocmp cyan
++ keyword whole infokey cyan
++ keyword whole infotocap cyan
++ keyword whole init cyan
++ keyword whole insmod cyan
++ keyword whole install cyan
++ keyword whole installkernel cyan
++ keyword whole install-menu cyan
+ keyword whole ipcalc cyan
++ keyword whole ipcs cyan
++ keyword whole ipmaddr cyan
++ keyword whole ippool cyan
++ keyword whole iptables cyan
++ keyword whole iptunnel cyan
++ keyword whole isoinfo cyan
++ keyword whole join cyan
++ keyword whole kallsyms cyan
++ keyword whole kbdconfig cyan
++ keyword whole kbd_mode cyan
++ keyword whole kbdrate cyan
++ keyword whole klogd cyan
++ keyword whole kernelversion cyan
+ keyword whole kill cyan
++ keyword whole killall cyan
+ keyword whole ksh cyan
++ keyword whole ksyms cyan
++ keyword whole lame cyan
++ keyword whole last cyan
++ keyword whole lastb cyan
++ keyword whole lastlog cyan
++ keyword whole ld cyan
++ keyword whole ldconfig cyan
++ keyword whole ldd cyan
++ keyword whole less cyan
++ keyword whole lessecho cyan
++ keyword whole lessfile cyan
++ keyword whole lesskey cyan
++ keyword whole lesspipe cyan
++ keyword whole lharc cyan
++ keyword whole libtool cyan
++ keyword whole lilo cyan
++ keyword whole line cyan
++ keyword whole link cyan
++ keyword whole links2 cyan
++ keyword whole linux_logo cyan
+ keyword whole linuxconf cyan
++ keyword whole list_audio_tracks cyan
+ keyword whole ln cyan
++ keyword whole loadkeys cyan
++ keyword whole locale cyan
++ keyword whole localedef cyan
++ keyword whole locale-gen cyan
++ keyword whole locate cyan
++ keyword whole lockfile cyan
++ keyword whole logger cyan
+ keyword whole login cyan
++ keyword whole logname cyan
++ keyword whole logrotate cyan
++ keyword whole logsave cyan
++ keyword whole look cyan
++ keyword whole lorder cyan
++ keyword whole losetup cyan
++ keyword whole lp cyan
++ keyword whole lpadmin cyan
++ keyword whole lpc cyan
+ keyword whole lpdconf cyan
++ keyword whole lpdomatic cyan
++ keyword whole lpinfo cyan
++ keyword whole lpmove cyan
++ keyword whole lpoptions cyan
++ keyword whole lppasswd cyan
++ keyword whole lpq cyan
++ keyword whole lpr cyan
++ keyword whole lprm cyan
++ keyword whole lprsetup cyan
++ keyword whole lpstat cyan
+ keyword whole ls cyan
++ keyword whole lsattr cyan
++ keyword whole lsmod cyan
++ keyword whole lspci cyan
++ keyword whole lsusb cyan
++ keyword whole lynx cyan
++ keyword whole MAKEDEV cyan
++ keyword whole MAKEFLOPPIES cyan
+ keyword whole mail cyan
++ keyword whole mailq cyan
++ keyword whole mailstat cyan
++ keyword whole mailx cyan
++ keyword whole make cyan
++ keyword whole make-kpkg cyan
++ keyword whole man cyan
++ keyword whole man2html cyan
++ keyword whole manpath cyan
++ keyword whole mawk cyan
++ keyword whole mc cyan
++ keyword whole mcedit cyan
++ keyword whole mcookie cyan
++ keyword whole mcview cyan
++ keyword whole mcmfmt cyan
++ keyword whole memstat cyan
++ keyword whole mergechanges cyan
++ keyword whole mesg cyan
++ keyword whole mev cyan
++ keyword whole mkboot cyan
++ keyword whole mkfifo cyan
++ keyword whole mkhybrid cyan
++ keyword whole mkisofs cyan
++ keyword whole mk_modmap cyan
++ keyword whole mkpasswd cyan
++ keyword whole mii-tool cyan
++ keyword whole mimedecode cyan
++ keyword whole mkcramfs cyan
+ keyword whole mkdir cyan
++ keyword whole mkdirhier cyan
++ keyword whole mkfs cyan
++ keyword whole mkfs.cramfs cyan
++ keyword whole mkfs.ext2 cyan
++ keyword whole mkfs.ext3 cyan
++ keyword whole mkfs.minix cyan
++ keyword whole mkfs.msdos cyan
++ keyword whole mkfs.vfat cyan
++ keyword whole mke2fs cyan
++ keyword whole mkdosfs cyan
++ keyword whole mkinitrd cyan
+ keyword whole mknod cyan
++ keyword whole mkrescue cyan
++ keyword whole mkswap cyan
+ keyword whole mktemp cyan
++ keyword whole modconf cyan
++ keyword whole modinfo cyan
++ keyword whole modprobe cyan
+ keyword whole more cyan
+ keyword whole mount cyan
++ keyword whole mountpoint cyan
++ keyword whole mozilla cyan
++ keyword whole mp3info cyan
++ keyword whole mpexpand cyan
++ keyword whole munpack cyan
++ keyword whole msgattrib cyan
++ keyword whole msgcat cyan
++ keyword whole msgcmp cyan
++ keyword whole msgcomm cyan
++ keyword whole msgconv cyan
++ keyword whole msgen cyan
++ keyword whole msgexec cyan
++ keyword whole msgfilter cyan
++ keyword whole msgfmt cyan
++ keyword whole msggrep cyan
++ keyword whole msginit cyan
++ keyword whole msgmerge cyan
++ keyword whole msgunfmt cyan
++ keyword whole msguniq cyan
++ keyword whole msmtp cyan
+ keyword whole mt cyan
++ keyword whole mt-gnu cyan
++ keyword whole mtrace cyan
++ keyword whole mute cyan
++ keyword whole mutt cyan
+ keyword whole mv cyan
++ keyword whole nameif cyan
++ keyword whole namei cyan
++ keyword whole nano cyan
++ keyword whole nawk cyan
++ keyword whole ncal cyan
++ keyword whole neqn cyan
+ keyword whole netconf cyan
+ keyword whole netstat cyan
++ keyword whole newaliases cyan
++ keyword whole newgrp cyan
++ keyword whole newusers cyan
++ keyword whole nex cyan
++ keyword whole nfsstat cyan
++ keyword whole ngettext cyan
+ keyword whole nice cyan
+ keyword whole nisdomainname cyan
++ keyword whole nl cyan
++ keyword whole nm cyan
++ keyword whole nohup cyan
++ keyword whole nroff cyan
++ keyword whole nsmod cyan
++ keyword whole nvi cyan
++ keyword whole nview cyan
++ keyword whole objcopy cyan
++ keyword whole objdump cyan
++ keyword whole od cyan
++ keyword whole ogg123 cyan
++ keyword whole oggdec cyan
++ keyword whole oggenc cyan
++ keyword whole ogginfo cyan
++ keyword whole open cyan
++ keyword whole openvt cyan
++ keyword whole pager cyan
++ keyword whole pam_getenv cyan
++ keyword whole paperconf cyan
++ keyword whole par cyan
++ keyword whole passwd cyan
++ keyword whole paste cyan
++ keyword whole patch cyan
++ keyword whole pathchk cyan
++ keyword whole pcimodules cyan
++ keyword whole pcretest cyan
++ keyword whole pdfinfo cyan
++ keyword whole perl cyan
++ keyword whole perldoc cyan
++ keyword whole pg cyan
++ keyword whole pgrep cyan
++ keyword whole pic cyan
++ keyword whole pico cyan
++ keyword whole piconv cyan
++ keyword whole pidof cyan
++ keyword whole pinfo cyan
+ keyword whole ping cyan
++ keyword whole pkill cyan
++ keyword whole pmap cyan
++ keyword whole portmap cyan
++ keyword whole poweroff cyan
++ keyword whole pr cyan
++ keyword whole print cyan
++ keyword whole printenv cyan
++ keyword whole printf cyan
++ keyword whole procmail cyan
++ keyword whole prove cyan
+ keyword whole ps cyan
++ keyword whole psed cyan
++ keyword whole psql cyan
++ keyword whole pstree cyan
++ keyword whole pstruct cyan
++ keyword whole ptx cyan
++ keyword whole pwconv cyan
++ keyword whole pwck cyan
+ keyword whole pwd cyan
++ keyword whole pwunconv cyan
++ keyword whole ramsize cyan
++ keyword whole ranlib cyan
++ keyword whole rar cyan
++ keyword whole rarp cyan
++ keyword whole raw cyan
++ keyword whole rbash cyan
++ keyword whole rcp cyan
++ keyword whole rdev cyan
++ keyword whole readcd cyan
++ keyword whole readelf cyan
++ keyword whole readlink cyan
++ keyword whole readprofile cyan
++ keyword whole reboot cyan
+ keyword whole red cyan
++ keyword whole regcomp cyan
++ keyword whole reject cyan
+ keyword whole remadmin cyan
++ keyword whole remove-shell cyan
++ keyword whole rename cyan
++ keyword whole renice cyan
++ keyword whole reset cyan
++ keyword whole resize2fs cyan
++ keyword whole rev cyan
++ keyword whole revpath cyan
++ keyword whole rgrep cyan
++ keyword whole rlogin cyan
+ keyword whole rm cyan
+ keyword whole rmdir cyan
++ keyword whole rmmod cyan
++ keyword whole rmt cyan
++ keyword whole route cyan
++ keyword whole rpcgen cyan
++ keyword whole rpcinfo cyan
++ keyword whole rplay cyan
++ keyword whole rplayd cyan
++ keyword whole rplaydsp cyan
+ keyword whole rpm cyan
++ keyword whole rpm2cpio cyan
++ keyword whole rptp cyan
++ keyword whole rsh cyan
++ keyword whole rstartd cyan
++ keyword whole runlevel cyan
++ keyword whole run-mailcap cyan
++ keyword whole run-parts cyan
++ keyword whole savelog cyan
++ keyword whole scanimage cyan
++ keyword whole scanpci cyan
++ keyword whole screendump cyan
++ keyword whole script cyan
++ keyword whole scriptreplay cyan
++ keyword whole sdiff cyan
+ keyword whole sed cyan
++ keyword whole see cyan
++ keyword whole sendmail cyan
++ keyword whole seq cyan
+ keyword whole set cyan
++ keyword whole setfdprm cyan
++ keyword whole setkeycodes cyan
++ keyword whole setleds cyan
++ keyword whole setlogcons cyan
++ keyword whole setmetamode cyan
++ keyword whole setpci cyan
+ keyword whole setserial cyan
++ keyword whole setsid cyan
++ keyword whole setterm cyan
++ keyword whole setvesablank cyan
++ keyword whole setxkbmap cyan
++ keyword whole sfdisk cyan
++ keyword whole sftp cyan
++ keyword whole sg cyan
+ keyword whole sh cyan
++ keyword whole sha1sum cyan
++ keyword whole shadowconfig cyan
++ keyword whole showcfont cyan
++ keyword whole showkey cyan
++ keyword whole showmount cyan
++ keyword whole shred cyan
++ keyword whole shutdown cyan
++ keyword whole size cyan
++ keyword whole skill cyan
++ keyword whole slabtop cyan
++ keyword whole slattach cyan
+ keyword whole sleep cyan
++ keyword whole slogin cyan
++ keyword whole smime_keys cyan
++ keyword whole snice cyan
++ keyword whole soelim cyan
+ keyword whole sort cyan
++ keyword whole sa-learn cyan
++ keyword whole spamassassin cyan
++ keyword whole spamc cyan
++ keyword whole spamd cyan
++ keyword whole splain cyan
++ keyword whole split cyan
++ keyword whole ssh-add cyan
++ keyword whole ssh-copy-id cyan
++ keyword whole ssh-keygen cyan
++ keyword whole ssh-keyscan cyan
++ keyword whole ssmtp cyan
++ keyword whole start-stop-daemon cyan
++ keyword whole stat cyan
++ keyword whole strace cyan
++ keyword whole strings cyan
++ keyword whole strip cyan
+ keyword whole stty cyan
+ keyword whole su cyan
++ keyword whole sulogin cyan
++ keyword whole sum cyan
++ keyword whole superformat cyan
++ keyword whole su-to-root cyan
++ keyword whole svlc cyan
++ keyword whole swapoff cyan
++ keyword whole swapon cyan
+ keyword whole sync cyan
++ keyword whole sysctl cyan
++ keyword whole syslogd cyan
++ keyword whole syslogd-listfiles cyan
++ keyword whole syslog-facility cyan
++ keyword whole tac cyan
++ keyword whole tack cyan
++ keyword whole tail cyan
+ keyword whole taper cyan
+ keyword whole tar cyan
++ keyword whole tbl cyan
++ keyword whole tcpdchk cyan
++ keyword whole tcpdump cyan
++ keyword whole tclsh cyan
+ keyword whole tcsh cyan
++ keyword whole tdbox cyan
++ keyword whole tdcheckserver cyan
++ keyword whole tddebidate cyan
++ keyword whole tdfileview cyan
++ keyword whole tdfmlogstrip cyan
++ keyword whole tdformail cyan
++ keyword whole tdlinuxcounter cyan
++ keyword whole tdlinuxlogo cyan
++ keyword whole tdmailblacklist cyan
++ keyword whole tdmailbody cyan
++ keyword whole tdmailcopy cyan
++ keyword whole tdmaildirmake cyan
++ keyword whole tdmailsubject cyan
++ keyword whole tdmailwhitelist cyan
++ keyword whole tdnewmsg cyan
++ keyword whole tdsysbackup cyan
++ keyword whole tee cyan
++ keyword whole telinit cyan
++ keyword whole telnet cyan
+ keyword whole test cyan
++ keyword whole tempfile cyan
++ keyword whole tic cyan
+ keyword whole time cyan
++ keyword whole tload cyan
++ keyword whole tnef cyan
++ keyword whole toe cyan
++ keyword whole toolame cyan
++ keyword whole top cyan
+ keyword whole touch cyan
++ keyword whole tput cyan
++ keyword whole tr cyan
++ keyword whole troff cyan
+ keyword whole true cyan
++ keyword whole tset cyan
++ keyword whole tsort cyan
++ keyword whole tty cyan
++ keyword whole tunctl cyan
++ keyword whole tune2fs cyan
++ keyword whole tunelp cyan
++ keyword whole tzconfig cyan
++ keyword whole tzselect cyan
++ keyword whole tzsetup cyan
++ keyword whole ucf cyan
++ keyword whole ul cyan
+ keyword whole umount cyan
+ keyword whole uname cyan
++ keyword whole unarj cyan
++ keyword whole uncompress cyan
++ keyword whole unexpand cyan
++ keyword whole unicode_start cyan
++ keyword whole unicode_stop cyan
++ keyword whole unix_chkpwd cyan
++ keyword whole uniq cyan
++ keyword whole unlink cyan
++ keyword whole unzip cyan
++ keyword whole unzipsfx cyan
++ keyword whole updatedb cyan
++ keyword whole update-menus cyan
++ keyword whole update-modules cyan
++ keyword whole update-pciids cyan
++ keyword whole uprecords cyan
++ keyword whole uptime cyan
++ keyword whole urlview cyan
++ keyword whole usbmodules cyan
++ keyword whole uscan cyan
++ keyword whole useradd cyan
+ keyword whole userconf cyan
++ keyword whole userdel cyan
++ keyword whole usermod cyan
++ keyword whole users cyan
+ keyword whole usleep cyan
++ keyword whole uufilter cyan
++ keyword whole uuidgen cyan
++ keyword whole vacuumdb cyan
++ keyword whole validlocale cyan
++ keyword whole vcstime cyan
++ keyword whole vcut cyan
++ keyword whole vdir cyan
+ keyword whole vi cyan
++ keyword whole vidmode cyan
+ keyword whole view cyan
++ keyword whole vigr cyan
+ keyword whole vim cyan
++ keyword whole vipw cyan
++ keyword whole vlc cyan
++ keyword whole vmstat cyan
++ keyword whole volname cyan
++ keyword whole vorbiscomment cyan
++ keyword whole vt-is-UTF8 cyan
++ keyword whole w cyan
++ keyword whole wall cyan
++ keyword whole watch cyan
++ keyword whole wc cyan
++ keyword whole wget cyan
++ keyword whole whatis cyan
++ keyword whole whereis cyan
++ keyword whole which cyan
++ keyword whole whiptail cyan
++ keyword whole who cyan
++ keyword whole whoami cyan
++ keyword whole whois cyan
++ keyword whole wish cyan
++ keyword whole write cyan
++ keyword whole writevt cyan
++ keyword whole wvWare cyan
++ keyword whole wxvlc cyan
++ keyword whole xargs cyan
++ keyword whole xbmbrowser cyan
++ keyword whole xbindkeys cyan
+ keyword whole xconf cyan
++ keyword whole xdfcopy cyan
++ keyword whole xdfformat cyan
++ keyword whole Xdialog cyan
++ keyword whole xgettext cyan
++ keyword whole xloadimage cyan
++ keyword whole xmessage cyan
++ keyword whole xmodmap cyan
++ keyword whole xmms cyan
++ keyword whole xpmroot cyan
++ keyword whole xrdb cyan
++ keyword whole xset cyan
++ keyword whole xsetbg cyan
++ keyword whole xsetmode cyan
++ keyword whole xsetpointer cyan
++ keyword whole xsetroot cyan
++ keyword whole xterm cyan
++ keyword whole xview cyan
++ keyword whole xwd cyan
++ keyword whole xwud cyan
++ keyword whole xzgv cyan
++ keyword whole yes cyan
+ keyword whole ypdomainname cyan
++ keyword whole yydecode cyan
+ keyword whole zcat cyan
++ keyword whole zcmp cyan
++ keyword whole zdiff cyan
++ keyword whole zdump cyan
++ keyword whole zegrep cyan
++ keyword whole zfgrep cyan
++ keyword whole zforce cyan
++ keyword whole zgrep cyan
++ keyword whole zgv cyan
++ keyword whole zic cyan
++ keyword whole zip cyan
++ keyword whole zipcloak cyan
++ keyword whole zipgrep cyan
++ keyword whole zipinfo cyan
++ keyword whole zipnote cyan
++ keyword whole zipsplit cyan
++ keyword whole zless cyan
++ keyword whole zmore cyan
++ keyword whole znew cyan
++ keyword whole zoo cyan
+ keyword whole zsh cyan
++ keyword whole zsoelim cyan
++ keyword whole zxpdf cyan
+
+-wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_
++ keyword whole pamcut cyan
++ keyword whole pamdeinterlace cyan
++ keyword whole pamdice cyan
++ keyword whole pamfile cyan
++ keyword whole pamoil cyan
++ keyword whole pamstack cyan
++ keyword whole pamstretch cyan
++ keyword whole pamstretch-gen cyan
+
+-context linestart #! \n brightcyan black
++ keyword whole pbmclean cyan
++ keyword whole pbmlife cyan
++ keyword whole pbmmake cyan
++ keyword whole pbmmask cyan
++ keyword whole pbmpage cyan
++ keyword whole pbmpscale cyan
++ keyword whole pbmreduce cyan
++ keyword whole pbmtext cyan
++ keyword whole pbmtextps cyan
++ keyword whole pbmupc cyan
++
++ keyword whole pbmtoascii cyan
++ keyword whole pbmtoepsi cyan
++ keyword whole pbmtog3 cyan
++ keyword whole pbmtoicon cyan
++ keyword whole pbmtolj cyan
++ keyword whole pbmtomacp cyan
++ keyword whole pbmtonokia cyan
++ keyword whole pbmtopgm cyan
++ keyword whole pbmtoplot cyan
++ keyword whole pbmtoppa cyan
++ keyword whole pbmtopsg3 cyan
++ keyword whole pbmtowbmp cyan
++ keyword whole pbmtoxbm cyan
++
++ keyword whole g3topbm cyan
++ keyword whole thinkjettopbm cyan
++ keyword whole wbmptopbm cyan
++ keyword whole xbmtopbm cyan
++
++ keyword whole pgmbentley cyan
++ keyword whole pgmcrater cyan
++ keyword whole pgmedge cyan
++ keyword whole pgmenhance cyan
++ keyword whole pgmhist cyan
++ keyword whole pgmkernel cyan
++ keyword whole pgmnoise cyan
++ keyword whole pgmnorm cyan
++ keyword whole pgmoil cyan
++ keyword whole pgmramp cyan
++ keyword whole pgmslice cyan
++ keyword whole pgmtexture cyan
++
++ keyword whole pgmtopbm cyan
++ keyword whole pgmtoppm cyan
++
++ keyword whole asciitopgm cyan
++ keyword whole bioradtopgm cyan
++ keyword whole icontopgm cyan
++ keyword whole jpegtopgm cyan
++ keyword whole macptopgm cyan
++ keyword whole rawtopgm cyan
++
++ keyword whole pnmalias cyan
++ keyword whole pnmarith cyan
++ keyword whole pnmcat cyan
++ keyword whole pnmcolormap cyan
++ keyword whole pnmcomp cyan
++ keyword whole pnmconvol cyan
++ keyword whole pnmcrop cyan
++ keyword whole pnmcut cyan
++ keyword whole pnmdepth cyan
++ keyword whole pnmenlarge cyan
++ keyword whole pnmfile cyan
++ keyword whole pnmflip cyan
++ keyword whole pnmgamma cyan
++ keyword whole pnmhisteq cyan
++ keyword whole pnmhistmap cyan
++ keyword whole pnmindex cyan
++ keyword whole pnminterp cyan
++ keyword whole pnminterp-gen cyan
++ keyword whole pnminvert cyan
++ keyword whole pnmmargin cyan
++ keyword whole pnmmontage cyan
++ keyword whole pnmnlfilt cyan
++ keyword whole pnmnoraw cyan
++ keyword whole pnmnorm cyan
++ keyword whole pnmpad cyan
++ keyword whole pnmpaste cyan
++ keyword whole pnmpsnr cyan
++ keyword whole pnmquant cyan
++ keyword whole pnmremap cyan
++ keyword whole pnmrotate cyan
++ keyword whole pnmscale cyan
++ keyword whole pnmscalefixed cyan
++ keyword whole pnmshear cyan
++ keyword whole pnmsmooth cyan
++ keyword whole pnmsplit cyan
++ keyword whole pnmtile cyan
++
++ keyword whole pnmtofits cyan
++ keyword whole pnmtojpeg cyan
++ keyword whole pnmtopalm cyan
++ keyword whole pnmtoplainpnm cyan
++ keyword whole pnmtopng cyan
++ keyword whole pnmtops cyan
++ keyword whole pnmtorle cyan
++ keyword whole pnmtotiff cyan
++ keyword whole pnmtoxwd cyan
++
++ keyword whole bpmtopnm cyan
++ keyword whole giftopnm cyan
++ keyword whole palmtopnm cyan
++ keyword whole pngtopnm cyan
++ keyword whole pstopnm cyan
++ keyword whole rletopnm cyan
++ keyword whole tifftopnm cyan
++ keyword whole xwdtopnm cyan
++
++ keyword whole ppm3d cyan
++ keyword whole ppmbrighten cyan
++ keyword whole ppmchange cyan
++ keyword whole ppmcie cyan
++ keyword whole ppmcolormask cyan
++ keyword whole ppmcolors cyan
++ keyword whole ppmdim cyan
++ keyword whole ppmdist cyan
++ keyword whole ppmdither cyan
++ keyword whole ppmfade cyan
++ keyword whole ppmflash cyan
++ keyword whole ppmforge cyan
++ keyword whole ppmhist cyan
++ keyword whole ppmlabel cyan
++ keyword whole ppmmake cyan
++ keyword whole ppmmix cyan
++ keyword whole ppmnorm cyan
++ keyword whole ppmntsc cyan
++ keyword whole ppmpat cyan
++ keyword whole ppmquant cyan
++ keyword whole ppmquantall cyan
++ keyword whole ppmqvgq cyan
++ keyword whole ppmrainbow cyan
++ keyword whole ppmrelief cyan
++ keyword whole ppmshadow cyan
++ keyword whole ppmshift cyan
++ keyword whole ppmspread cyan
++ keyword whole ppmtv cyan
++
++ keyword whole ppmtoacad cyan
++ keyword whole ppmtobmp cyan
++ keyword whole ppmtogif cyan
++ keyword whole ppmtojpeg cyan
++ keyword whole ppmtolj cyan
++ keyword whole ppmtomap cyan
++ keyword whole ppmtompeg cyan
++ keyword whole ppmtopcx cyan
++ keyword whole ppmtopgm cyan
++ keyword whole ppmtorgb3 cyan
++ keyword whole ppmtowinicon cyan
++ keyword whole ppmtoxpm cyan
++
++ keyword whole bpmtoppm cyan
++ keyword whole pcxtoppm cyan
++ keyword whole pdftoppm cyan
++ keyword whole pjtoppm cyan
++ keyword whole rawtoppm cyan
++ keyword whole rgb3toppm cyan
++ keyword whole winicontoppm cyan
++ keyword whole xpmtoppm cyan
++ keyword whole xvminitoppm cyan
++
++ keyword whole gpg red
++ keyword whole md5sum red
++ keyword whole openssl red
++ keyword whole ssh red
++ keyword whole scp red
++
++ keyword whole gettext.sh magenta
++ keyword whole TEXTDOMAINDIR magenta
++ keyword whole TEXTDOMAIN magenta
++ keyword whole VERSION magenta
++
++ keyword whole /dev/audio brightblue
++ keyword whole /dev/dsp brightblue
++ keyword whole /dev/null brightblue
++ keyword whole /dev/mixed brightblue
++ keyword whole /dev/stdin brightblue
++ keyword whole /dev/stdout brightblue
++ keyword whole /dev/stderr brightblue
++ keyword whole /dev/zero brightblue
++
++wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_
+
+ context # \n brown
+ spellcheck
+@@ -215,6 +1133,10 @@
+ keyword $! brightred
+ keyword $_ brightred
+
++ keyword whole 2>&1 brightred
++ keyword whole 2> brightred
++ keyword whole 1> brightred
++
+ keyword wholeright $\[0123456789\] brightred
+
+ keyword wholeright $+ brightgreen
+@@ -225,7 +1147,9 @@
+
+ keyword whole break yellow
+ keyword whole case yellow
++ keyword whole clear yellow
+ keyword whole continue yellow
++ keyword whole declare yellow
+ keyword whole done yellow
+ keyword whole do yellow
+ keyword whole elif yellow
+@@ -234,105 +1158,1024 @@
+ keyword whole exit yellow
+ keyword whole fi yellow
+ keyword whole for yellow
++ keyword whole getopts yellow
+ keyword whole if yellow
+ keyword whole in yellow
+ keyword whole return yellow
+ keyword whole select yellow
+ keyword whole shift yellow
++ keyword whole source yellow
+ keyword whole then yellow
+ keyword whole trap yellow
+ keyword whole until yellow
++ keyword whole wait yellow
+ keyword whole while yellow
+
++ keyword whole accept cyan
++ keyword whole accessdb cyan
++ keyword whole activate cyan
++ keyword whole addgroup cyan
++ keyword whole add-shell cyan
++ keyword whole adduser cyan
++ keyword whole anytopnm cyan
++ keyword whole apropos cyan
++ keyword whole apt-cache cyan
++ keyword whole apt-cdrom cyan
++ keyword whole apt-config cyan
++ keyword whole apt-file cyan
++ keyword whole apt-ftparchive cyan
++ keyword whole apt-get cyan
++ keyword whole aptitude cyan
++ keyword whole apt-sortpkgs cyan
++ keyword whole apt-source cyan
++ keyword whole ar cyan
+ keyword whole arch cyan
++ keyword whole arp cyan
++ keyword whole as cyan
+ keyword whole ash cyan
++ keyword whole at cyan
++ keyword whole atd cyan
++ keyword whole atrun cyan
++ keyword whole atq cyan
++ keyword whole autoconf cyan
++ keyword whole autoheader cyan
++ keyword whole automake cyan
++ keyword whole autopoint cyan
++ keyword whole autoscan cyan
+ keyword whole awk cyan
++ keyword whole badblocks cyan
++ keyword whole base64-decode cyan
++ keyword whole base64-encode cyan
+ keyword whole basename cyan
+ keyword whole bash cyan
++ keyword whole batch cyan
++ keyword whole bc cyan
+ keyword whole bg_backup cyan
+ keyword whole bg_restore cyan
++ keyword whole blockdev cyan
++ keyword whole bootlogd cyan
++ keyword whole bsd-write cyan
+ keyword whole bsh cyan
++ keyword whole bunzip2 cyan
++ keyword whole bzcat cyan
++ keyword whole bzcmp cyan
++ keyword whole bzdiff cyan
++ keyword whole bzegrep cyan
++ keyword whole bzexe cyan
++ keyword whole bzfgrep cyan
++ keyword whole bzgrep cyan
++ keyword whole bzip cyan
++ keyword whole bzip2 cyan
++ keyword whole bzip2recover cyan
++ keyword whole bzless cyan
++ keyword whole bzmore cyan
++ keyword whole cabextract cyan
++ keyword whole cal cyan
++ keyword whole calendar cyan
++ keyword whole cam cyan
++ keyword whole cancel cyan
++ keyword whole captoinfo cyan
+ keyword whole cat cyan
++ keyword whole catchsegv cyan
++ keyword whole catman cyan
+ keyword whole cd cyan
++ keyword whole cdda2ogg cyan
++ keyword whole cdda2mp3 cyan
++ keyword whole cdda2wav cyan
++ keyword whole cdrecord cyan
++ keyword whole cfdisk cyan
++ keyword whole chage cyan
++ keyword whole charset cyan
++ keyword whole chattr cyan
++ keyword whole checkbashisms cyan
++ keyword whole chfn cyan
+ keyword whole chgrp cyan
++ keyword whole chkdupexe cyan
+ keyword whole chmod cyan
+ keyword whole chown cyan
++ keyword whole chpasswd cyan
++ keyword whole chroot cyan
++ keyword whole chsh cyan
++ keyword whole chvt cyan
++ keyword whole cksum cyan
++ keyword whole clear cyan
++ keyword whole cmp cyan
++ keyword whole codepage cyan
++ keyword whole col cyan
++ keyword whole colcrt cyan
++ keyword whole colrm cyan
++ keyword whole column cyan
++ keyword whole comm cyan
++ keyword whole compose cyan
++ keyword whole compress cyan
++ keyword whole consolechars cyan
+ keyword whole cp cyan
++ keyword whole cpan cyan
++ keyword whole cpgr cyan
+ keyword whole cpio cyan
++ keyword whole cpp cyan
++ keyword whole cramfsck cyan
++ keyword whole createdb cyan
++ keyword whole createlang cyan
++ keyword whole createuser cyan
++ keyword whole c_rehash cyan
++ keyword whole crontab cyan
+ keyword whole csh cyan
++ keyword whole csplit cyan
++ keyword whole cupsaccept cyan
++ keyword whole cupsaddsmb cyan
++ keyword whole cupsd cyan
++ keyword whole cupsreject cyan
++ keyword whole curl cyan
++ keyword whole cut cyan
+ keyword whole date cyan
++ keyword whole dash cyan
++ keyword whole dch cyan
+ keyword whole dd cyan
++ keyword whole deallocvt cyan
++ keyword whole debugfs cyan
++ keyword whole delgroup cyan
++ keyword whole deluser cyan
++ keyword whole depmod cyan
++ keyword whole devdump cyan
+ keyword whole df cyan
++ keyword whole dialog cyan
++ keyword whole diff cyan
++ keyword whole diff3 cyan
++ keyword whole dir cyan
++ keyword whole dircolors cyan
++ keyword whole directomatic cyan
++ keyword whole dirname cyan
++ keyword whole dirsplit cyan
++ keyword whole disable cyan
++ keyword whole diskd cyan
++ keyword whole diskseekd cyan
++ keyword whole disown cyan
+ keyword whole dmesg cyan
+ keyword whole dnsdomainname cyan
+ keyword whole doexec cyan
+ keyword whole domainname cyan
++ keyword whole dosfsck cyan
++ keyword whole dotextwrap cyan
++ keyword whole dotlockfile cyan
++ keyword whole dpasswd cyan
++ keyword whole dpkg cyan
++ keyword whole dpkg-architekture cyan
++ keyword whole dpkg-buildpackage cyan
++ keyword whole dpkg-deb cyan
++ keyword whole dpkg-name cyan
++ keyword whole dpkg-query cyan
++ keyword whole dpkg-reconfigure cyan
++ keyword whole dpkg-scanpackages cyan
++ keyword whole dpkg-scansources cyan
++ keyword whole dpkg-split cyan
++ keyword whole dpkg-source cyan
++ keyword whole dropdb cyan
++ keyword whole droplang cyan
++ keyword whole dropuser cyan
++ keyword whole dscverify cyan
++ keyword whole du cyan
++ keyword whole dumpe2fs cyan
++ keyword whole dumpkeys cyan
++ keyword whole dvipdf cyan
++ keyword whole e2fsck cyan
++ keyword whole e2image cyan
++ keyword whole e2label cyan
+ keyword whole echo cyan
+ keyword whole ed cyan
++ keyword whole edit cyan
++ keyword whole editor cyan
+ keyword whole egrep cyan
++ keyword whole eject cyan
++ keyword whole enable cyan
++ keyword whole env cyan
++ keyword whole envsubst cyan
++ keyword whole eqn cyan
++ keyword whole eval_gettext cyan
+ keyword whole ex cyan
++ keyword whole expand cyan
++ keyword whole expiry cyan
++ keyword whole expr cyan
++ keyword whole factor cyan
++ keyword whole fakeroot cyan
++ keyword whole faillog cyan
+ keyword whole false cyan
++ keyword whole fbset cyan
++ keyword whole fc-cache cyan
++ keyword whole fc-list cyan
++ keyword whole fc-match cyan
++ keyword whole fdformat cyan
++ keyword whole fdisk cyan
++ keyword whole fdlist cyan
++ keyword whole fdmount cyan
++ keyword whole fdmountd cyan
++ keyword whole fdrawcmd cyan
++ keyword whole fdumount cyan
++ keyword whole fetchmail cyan
++ keyword whole fgconsole cyan
+ keyword whole fgrep cyan
++ keyword whole file cyan
++ keyword whole filefrag cyan
+ keyword whole find cyan
++ keyword whole find2perl cyan
++ keyword whole findfs cyan
++ keyword whole fitstopnm cyan
++ keyword whole floppycontrol cyan
++ keyword whole floppymeter cyan
++ keyword whole fmt cyan
++ keyword whole fold cyan
++ keyword whole font2psf cyan
++ keyword whole formail cyan
++ keyword whole fping cyan
++ keyword whole fping6 cyan
++ keyword whole free cyan
++ keyword whole freeze cyan
++ keyword whole fribidi cyan
++ keyword whole from cyan
++ keyword whole fsck cyan
++ keyword whole fsck.cramfs cyan
++ keyword whole fsck.ext2 cyan
++ keyword whole fsck.ext3 cyan
++ keyword whole fsck.minix cyan
++ keyword whole fsck.msdos cyan
++ keyword whole fsck.nfs cyan
++ keyword whole fsck.vfat cyan
+ keyword whole fsconf cyan
++ keyword whole funzip cyan
++ keyword whole fuser cyan
++ keyword whole fvwm cyan
+ keyword whole gawk cyan
++ keyword whole gdb cyan
++ keyword whole gdbtui cyan
++ keyword whole gcc cyan
++ keyword whole gcov cyan
++ keyword whole genksyms cyan
++ keyword whole getconf cyan
++ keyword whole getent cyan
++ keyword whole getfdprm cyan
++ keyword whole getkeycodes cyan
++ keyword whole getopt cyan
++ keyword whole gettext cyan
++ keyword whole gettextize cyan
++ keyword whole getty cyan
++ keyword whole gpasswd cyan
++ keyword whole gpgsplit cyan
++ keyword whole gpgv cyan
++ keyword whole gprof cyan
+ keyword whole grep cyan
++ keyword whole groff cyan
++ keyword whole groupadd cyan
++ keyword whole groupdel cyan
++ keyword whole groupmod cyan
++ keyword whole groups cyan
++ keyword whole grpck cyan
++ keyword whole grpconv cyan
++ keyword whole grpunconv cyan
++ keyword whole gs cyan
++ keyword whole gsbj cyan
++ keyword whole gsdj cyan
++ keyword whole gsdj500 cyan
++ keyword whole gs-gpl cyan
++ keyword whole gslj cyan
++ keyword whole gslp cyan
++ keyword whole gsmctl cyan
++ keyword whole gsmpb cyan
++ keyword whole gsmsendsms cyan
++ keyword whole gsmsiectl cyan
++ keyword whole gsmsiexfer cyan
++ keyword whole gsmsmsd cyan
++ keyword whole gsmsmsstore cyan
++ keyword whole gsnd cyan
+ keyword whole gunzip cyan
++ keyword whole gzexe cyan
+ keyword whole gzip cyan
++ keyword whole ha cyan
++ keyword whole halt cyan
++ keyword whole hd cyan
++ keyword whole hdparm cyan
++ keyword whole hddtemp cyan
++ keyword whole head cyan
++ keyword whole hexdump cyan
++ keyword whole hman cyan
++ keyword whole host cyan
++ keyword whole hostid cyan
+ keyword whole hostname cyan
++ keyword whole hotkeys cyan
++ keyword whole html2text cyan
++ keyword whole hwclock cyan
++ keyword whole iconv cyan
++ keyword whole iconvconfig cyan
++ keyword whole id cyan
++ keyword whole ifconfig cyan
++ keyword whole ifdown cyan
++ keyword whole ifnames cyan
++ keyword whole ifup cyan
+ keyword whole igawk cyan
++ keyword whole info cyan
++ keyword whole infobrowser cyan
++ keyword whole infocmp cyan
++ keyword whole infokey cyan
++ keyword whole infotocap cyan
++ keyword whole init cyan
++ keyword whole insmod cyan
++ keyword whole install cyan
++ keyword whole installkernel cyan
++ keyword whole install-menu cyan
+ keyword whole ipcalc cyan
++ keyword whole ipcs cyan
++ keyword whole ipmaddr cyan
++ keyword whole ippool cyan
++ keyword whole iptables cyan
++ keyword whole iptunnel cyan
++ keyword whole isoinfo cyan
++ keyword whole join cyan
++ keyword whole kallsyms cyan
++ keyword whole kbdconfig cyan
++ keyword whole kbd_mode cyan
++ keyword whole kbdrate cyan
++ keyword whole klogd cyan
++ keyword whole kernelversion cyan
+ keyword whole kill cyan
++ keyword whole killall cyan
+ keyword whole ksh cyan
++ keyword whole ksyms cyan
++ keyword whole lame cyan
++ keyword whole last cyan
++ keyword whole lastb cyan
++ keyword whole lastlog cyan
++ keyword whole ld cyan
++ keyword whole ldconfig cyan
++ keyword whole ldd cyan
++ keyword whole less cyan
++ keyword whole lessecho cyan
++ keyword whole lessfile cyan
++ keyword whole lesskey cyan
++ keyword whole lesspipe cyan
++ keyword whole lharc cyan
++ keyword whole libtool cyan
++ keyword whole lilo cyan
++ keyword whole line cyan
++ keyword whole link cyan
++ keyword whole links2 cyan
++ keyword whole linux_logo cyan
+ keyword whole linuxconf cyan
++ keyword whole list_audio_tracks cyan
+ keyword whole ln cyan
++ keyword whole loadkeys cyan
++ keyword whole locale cyan
++ keyword whole localedef cyan
++ keyword whole locale-gen cyan
++ keyword whole locate cyan
++ keyword whole lockfile cyan
++ keyword whole logger cyan
+ keyword whole login cyan
++ keyword whole logname cyan
++ keyword whole logrotate cyan
++ keyword whole logsave cyan
++ keyword whole look cyan
++ keyword whole lorder cyan
++ keyword whole losetup cyan
++ keyword whole lp cyan
++ keyword whole lpadmin cyan
++ keyword whole lpc cyan
+ keyword whole lpdconf cyan
++ keyword whole lpdomatic cyan
++ keyword whole lpinfo cyan
++ keyword whole lpmove cyan
++ keyword whole lpoptions cyan
++ keyword whole lppasswd cyan
++ keyword whole lpq cyan
++ keyword whole lpr cyan
++ keyword whole lprm cyan
++ keyword whole lprsetup cyan
++ keyword whole lpstat cyan
+ keyword whole ls cyan
++ keyword whole lsattr cyan
++ keyword whole lsmod cyan
++ keyword whole lspci cyan
++ keyword whole lsusb cyan
++ keyword whole lynx cyan
++ keyword whole MAKEDEV cyan
++ keyword whole MAKEFLOPPIES cyan
+ keyword whole mail cyan
++ keyword whole mailq cyan
++ keyword whole mailstat cyan
++ keyword whole mailx cyan
++ keyword whole make cyan
++ keyword whole make-kpkg cyan
++ keyword whole man cyan
++ keyword whole man2html cyan
++ keyword whole manpath cyan
++ keyword whole mawk cyan
++ keyword whole mc cyan
++ keyword whole mcedit cyan
++ keyword whole mcookie cyan
++ keyword whole mcview cyan
++ keyword whole mcmfmt cyan
++ keyword whole memstat cyan
++ keyword whole mergechanges cyan
++ keyword whole mesg cyan
++ keyword whole mev cyan
++ keyword whole mkboot cyan
++ keyword whole mkfifo cyan
++ keyword whole mkhybrid cyan
++ keyword whole mkisofs cyan
++ keyword whole mk_modmap cyan
++ keyword whole mkpasswd cyan
++ keyword whole mii-tool cyan
++ keyword whole mimedecode cyan
++ keyword whole mkcramfs cyan
+ keyword whole mkdir cyan
++ keyword whole mkdirhier cyan
++ keyword whole mkfs cyan
++ keyword whole mkfs.cramfs cyan
++ keyword whole mkfs.ext2 cyan
++ keyword whole mkfs.ext3 cyan
++ keyword whole mkfs.minix cyan
++ keyword whole mkfs.msdos cyan
++ keyword whole mkfs.vfat cyan
++ keyword whole mke2fs cyan
++ keyword whole mkdosfs cyan
++ keyword whole mkinitrd cyan
+ keyword whole mknod cyan
++ keyword whole mkrescue cyan
++ keyword whole mkswap cyan
+ keyword whole mktemp cyan
++ keyword whole modconf cyan
++ keyword whole modinfo cyan
++ keyword whole modprobe cyan
+ keyword whole more cyan
+ keyword whole mount cyan
++ keyword whole mountpoint cyan
++ keyword whole mozilla cyan
++ keyword whole mp3info cyan
++ keyword whole mpexpand cyan
++ keyword whole munpack cyan
++ keyword whole msgattrib cyan
++ keyword whole msgcat cyan
++ keyword whole msgcmp cyan
++ keyword whole msgcomm cyan
++ keyword whole msgconv cyan
++ keyword whole msgen cyan
++ keyword whole msgexec cyan
++ keyword whole msgfilter cyan
++ keyword whole msgfmt cyan
++ keyword whole msggrep cyan
++ keyword whole msginit cyan
++ keyword whole msgmerge cyan
++ keyword whole msgunfmt cyan
++ keyword whole msguniq cyan
++ keyword whole msmtp cyan
+ keyword whole mt cyan
++ keyword whole mt-gnu cyan
++ keyword whole mtrace cyan
++ keyword whole mute cyan
++ keyword whole mutt cyan
+ keyword whole mv cyan
++ keyword whole nameif cyan
++ keyword whole namei cyan
++ keyword whole nano cyan
++ keyword whole nawk cyan
++ keyword whole ncal cyan
++ keyword whole neqn cyan
+ keyword whole netconf cyan
+ keyword whole netstat cyan
++ keyword whole newaliases cyan
++ keyword whole newgrp cyan
++ keyword whole newusers cyan
++ keyword whole nex cyan
++ keyword whole nfsstat cyan
++ keyword whole ngettext cyan
+ keyword whole nice cyan
+ keyword whole nisdomainname cyan
++ keyword whole nl cyan
++ keyword whole nm cyan
++ keyword whole nohup cyan
++ keyword whole nroff cyan
++ keyword whole nsmod cyan
++ keyword whole nvi cyan
++ keyword whole nview cyan
++ keyword whole objcopy cyan
++ keyword whole objdump cyan
++ keyword whole od cyan
++ keyword whole ogg123 cyan
++ keyword whole oggdec cyan
++ keyword whole oggenc cyan
++ keyword whole ogginfo cyan
++ keyword whole open cyan
++ keyword whole openvt cyan
++ keyword whole pager cyan
++ keyword whole pam_getenv cyan
++ keyword whole paperconf cyan
++ keyword whole par cyan
++ keyword whole passwd cyan
++ keyword whole paste cyan
++ keyword whole patch cyan
++ keyword whole pathchk cyan
++ keyword whole pcimodules cyan
++ keyword whole pcretest cyan
++ keyword whole pdfinfo cyan
++ keyword whole perl cyan
++ keyword whole perldoc cyan
++ keyword whole pg cyan
++ keyword whole pgrep cyan
++ keyword whole pic cyan
++ keyword whole pico cyan
++ keyword whole piconv cyan
++ keyword whole pidof cyan
++ keyword whole pinfo cyan
+ keyword whole ping cyan
++ keyword whole pkill cyan
++ keyword whole pmap cyan
++ keyword whole portmap cyan
++ keyword whole poweroff cyan
++ keyword whole pr cyan
++ keyword whole print cyan
++ keyword whole printenv cyan
++ keyword whole printf cyan
++ keyword whole procmail cyan
++ keyword whole prove cyan
+ keyword whole ps cyan
++ keyword whole psed cyan
++ keyword whole psql cyan
++ keyword whole pstree cyan
++ keyword whole pstruct cyan
++ keyword whole ptx cyan
++ keyword whole pwconv cyan
++ keyword whole pwck cyan
+ keyword whole pwd cyan
++ keyword whole pwunconv cyan
++ keyword whole ramsize cyan
++ keyword whole ranlib cyan
++ keyword whole rar cyan
++ keyword whole rarp cyan
++ keyword whole raw cyan
++ keyword whole rbash cyan
++ keyword whole rcp cyan
++ keyword whole rdev cyan
++ keyword whole readcd cyan
++ keyword whole readelf cyan
++ keyword whole readlink cyan
++ keyword whole readprofile cyan
++ keyword whole reboot cyan
+ keyword whole red cyan
++ keyword whole regcomp cyan
++ keyword whole reject cyan
+ keyword whole remadmin cyan
++ keyword whole remove-shell cyan
++ keyword whole rename cyan
++ keyword whole renice cyan
++ keyword whole reset cyan
++ keyword whole resize2fs cyan
++ keyword whole rev cyan
++ keyword whole revpath cyan
++ keyword whole rgrep cyan
++ keyword whole rlogin cyan
+ keyword whole rm cyan
+ keyword whole rmdir cyan
++ keyword whole rmmod cyan
++ keyword whole rmt cyan
++ keyword whole route cyan
++ keyword whole rpcgen cyan
++ keyword whole rpcinfo cyan
++ keyword whole rplay cyan
++ keyword whole rplayd cyan
++ keyword whole rplaydsp cyan
+ keyword whole rpm cyan
++ keyword whole rpm2cpio cyan
++ keyword whole rptp cyan
++ keyword whole rsh cyan
++ keyword whole rstartd cyan
++ keyword whole runlevel cyan
++ keyword whole run-mailcap cyan
++ keyword whole run-parts cyan
++ keyword whole savelog cyan
++ keyword whole scanimage cyan
++ keyword whole scanpci cyan
++ keyword whole screendump cyan
++ keyword whole script cyan
++ keyword whole scriptreplay cyan
++ keyword whole sdiff cyan
+ keyword whole sed cyan
++ keyword whole see cyan
++ keyword whole sendmail cyan
++ keyword whole seq cyan
+ keyword whole set cyan
++ keyword whole setfdprm cyan
++ keyword whole setkeycodes cyan
++ keyword whole setleds cyan
++ keyword whole setlogcons cyan
++ keyword whole setmetamode cyan
++ keyword whole setpci cyan
+ keyword whole setserial cyan
++ keyword whole setsid cyan
++ keyword whole setterm cyan
++ keyword whole setvesablank cyan
++ keyword whole setxkbmap cyan
++ keyword whole sfdisk cyan
++ keyword whole sftp cyan
++ keyword whole sg cyan
+ keyword whole sh cyan
++ keyword whole sha1sum cyan
++ keyword whole shadowconfig cyan
++ keyword whole showcfont cyan
++ keyword whole showkey cyan
++ keyword whole showmount cyan
++ keyword whole shred cyan
++ keyword whole shutdown cyan
++ keyword whole size cyan
++ keyword whole skill cyan
++ keyword whole slabtop cyan
++ keyword whole slattach cyan
+ keyword whole sleep cyan
++ keyword whole slogin cyan
++ keyword whole smime_keys cyan
++ keyword whole snice cyan
++ keyword whole soelim cyan
+ keyword whole sort cyan
++ keyword whole sa-learn cyan
++ keyword whole spamassassin cyan
++ keyword whole spamc cyan
++ keyword whole spamd cyan
++ keyword whole splain cyan
++ keyword whole split cyan
++ keyword whole ssh-add cyan
++ keyword whole ssh-copy-id cyan
++ keyword whole ssh-keygen cyan
++ keyword whole ssh-keyscan cyan
++ keyword whole ssmtp cyan
++ keyword whole start-stop-daemon cyan
++ keyword whole stat cyan
++ keyword whole strace cyan
++ keyword whole strings cyan
++ keyword whole strip cyan
+ keyword whole stty cyan
+ keyword whole su cyan
++ keyword whole sulogin cyan
++ keyword whole sum cyan
++ keyword whole superformat cyan
++ keyword whole su-to-root cyan
++ keyword whole svlc cyan
++ keyword whole swapoff cyan
++ keyword whole swapon cyan
+ keyword whole sync cyan
++ keyword whole sysctl cyan
++ keyword whole syslogd cyan
++ keyword whole syslogd-listfiles cyan
++ keyword whole syslog-facility cyan
++ keyword whole tac cyan
++ keyword whole tack cyan
++ keyword whole tail cyan
+ keyword whole taper cyan
+ keyword whole tar cyan
++ keyword whole tbl cyan
++ keyword whole tcpdchk cyan
++ keyword whole tcpdump cyan
++ keyword whole tclsh cyan
+ keyword whole tcsh cyan
++ keyword whole tdbox cyan
++ keyword whole tdcheckserver cyan
++ keyword whole tddebidate cyan
++ keyword whole tdfileview cyan
++ keyword whole tdfmlogstrip cyan
++ keyword whole tdformail cyan
++ keyword whole tdlinuxcounter cyan
++ keyword whole tdlinuxlogo cyan
++ keyword whole tdmailblacklist cyan
++ keyword whole tdmailbody cyan
++ keyword whole tdmailcopy cyan
++ keyword whole tdmaildirmake cyan
++ keyword whole tdmailsubject cyan
++ keyword whole tdmailwhitelist cyan
++ keyword whole tdnewmsg cyan
++ keyword whole tdsysbackup cyan
++ keyword whole tee cyan
++ keyword whole telinit cyan
++ keyword whole telnet cyan
+ keyword whole test cyan
++ keyword whole tempfile cyan
++ keyword whole tic cyan
+ keyword whole time cyan
++ keyword whole tload cyan
++ keyword whole tnef cyan
++ keyword whole toe cyan
++ keyword whole toolame cyan
++ keyword whole top cyan
+ keyword whole touch cyan
++ keyword whole tput cyan
++ keyword whole tr cyan
++ keyword whole troff cyan
+ keyword whole true cyan
++ keyword whole tset cyan
++ keyword whole tsort cyan
++ keyword whole tty cyan
++ keyword whole tunctl cyan
++ keyword whole tune2fs cyan
++ keyword whole tunelp cyan
++ keyword whole tzconfig cyan
++ keyword whole tzselect cyan
++ keyword whole tzsetup cyan
++ keyword whole ucf cyan
++ keyword whole ul cyan
+ keyword whole umount cyan
+ keyword whole uname cyan
++ keyword whole unarj cyan
++ keyword whole uncompress cyan
++ keyword whole unexpand cyan
++ keyword whole unicode_start cyan
++ keyword whole unicode_stop cyan
++ keyword whole unix_chkpwd cyan
++ keyword whole uniq cyan
++ keyword whole unlink cyan
++ keyword whole unzip cyan
++ keyword whole unzipsfx cyan
++ keyword whole updatedb cyan
++ keyword whole update-menus cyan
++ keyword whole update-modules cyan
++ keyword whole update-pciids cyan
++ keyword whole uprecords cyan
++ keyword whole uptime cyan
++ keyword whole urlview cyan
++ keyword whole usbmodules cyan
++ keyword whole uscan cyan
++ keyword whole useradd cyan
+ keyword whole userconf cyan
++ keyword whole userdel cyan
++ keyword whole usermod cyan
++ keyword whole users cyan
+ keyword whole usleep cyan
++ keyword whole uufilter cyan
++ keyword whole uuidgen cyan
++ keyword whole vacuumdb cyan
++ keyword whole validlocale cyan
++ keyword whole vcstime cyan
++ keyword whole vcut cyan
++ keyword whole vdir cyan
+ keyword whole vi cyan
++ keyword whole vidmode cyan
+ keyword whole view cyan
++ keyword whole vigr cyan
+ keyword whole vim cyan
++ keyword whole vipw cyan
++ keyword whole vlc cyan
++ keyword whole vmstat cyan
++ keyword whole volname cyan
++ keyword whole vorbiscomment cyan
++ keyword whole vt-is-UTF8 cyan
++ keyword whole w cyan
++ keyword whole wall cyan
++ keyword whole watch cyan
++ keyword whole wc cyan
++ keyword whole wget cyan
++ keyword whole whatis cyan
++ keyword whole whereis cyan
++ keyword whole which cyan
++ keyword whole whiptail cyan
++ keyword whole who cyan
++ keyword whole whoami cyan
++ keyword whole whois cyan
++ keyword whole wish cyan
++ keyword whole write cyan
++ keyword whole writevt cyan
++ keyword whole wvWare cyan
++ keyword whole wxvlc cyan
++ keyword whole xargs cyan
++ keyword whole xbmbrowser cyan
++ keyword whole xbindkeys cyan
+ keyword whole xconf cyan
++ keyword whole xdfcopy cyan
++ keyword whole xdfformat cyan
++ keyword whole Xdialog cyan
++ keyword whole xgettext cyan
++ keyword whole xloadimage cyan
++ keyword whole xmessage cyan
++ keyword whole xmodmap cyan
++ keyword whole xmms cyan
++ keyword whole xpmroot cyan
++ keyword whole xrdb cyan
++ keyword whole xset cyan
++ keyword whole xsetbg cyan
++ keyword whole xsetmode cyan
++ keyword whole xsetpointer cyan
++ keyword whole xsetroot cyan
++ keyword whole xterm cyan
++ keyword whole xview cyan
++ keyword whole xwd cyan
++ keyword whole xwud cyan
++ keyword whole xzgv cyan
++ keyword whole yes cyan
+ keyword whole ypdomainname cyan
++ keyword whole yydecode cyan
+ keyword whole zcat cyan
++ keyword whole zcmp cyan
++ keyword whole zdiff cyan
++ keyword whole zdump cyan
++ keyword whole zegrep cyan
++ keyword whole zfgrep cyan
++ keyword whole zforce cyan
++ keyword whole zgrep cyan
++ keyword whole zgv cyan
++ keyword whole zic cyan
++ keyword whole zip cyan
++ keyword whole zipcloak cyan
++ keyword whole zipgrep cyan
++ keyword whole zipinfo cyan
++ keyword whole zipnote cyan
++ keyword whole zipsplit cyan
++ keyword whole zless cyan
++ keyword whole zmore cyan
++ keyword whole znew cyan
++ keyword whole zoo cyan
+ keyword whole zsh cyan
++ keyword whole zsoelim cyan
++ keyword whole zxpdf cyan
++
++ keyword whole pamcut cyan
++ keyword whole pamdeinterlace cyan
++ keyword whole pamdice cyan
++ keyword whole pamfile cyan
++ keyword whole pamoil cyan
++ keyword whole pamstack cyan
++ keyword whole pamstretch cyan
++ keyword whole pamstretch-gen cyan
++
++ keyword whole pbmclean cyan
++ keyword whole pbmlife cyan
++ keyword whole pbmmake cyan
++ keyword whole pbmmask cyan
++ keyword whole pbmpage cyan
++ keyword whole pbmpscale cyan
++ keyword whole pbmreduce cyan
++ keyword whole pbmtext cyan
++ keyword whole pbmtextps cyan
++ keyword whole pbmupc cyan
++
++ keyword whole pbmtoascii cyan
++ keyword whole pbmtoepsi cyan
++ keyword whole pbmtog3 cyan
++ keyword whole pbmtoicon cyan
++ keyword whole pbmtolj cyan
++ keyword whole pbmtomacp cyan
++ keyword whole pbmtonokia cyan
++ keyword whole pbmtopgm cyan
++ keyword whole pbmtoplot cyan
++ keyword whole pbmtoppa cyan
++ keyword whole pbmtopsg3 cyan
++ keyword whole pbmtowbmp cyan
++ keyword whole pbmtoxbm cyan
++
++ keyword whole g3topbm cyan
++ keyword whole thinkjettopbm cyan
++ keyword whole wbmptopbm cyan
++ keyword whole xbmtopbm cyan
++
++ keyword whole pgmbentley cyan
++ keyword whole pgmcrater cyan
++ keyword whole pgmedge cyan
++ keyword whole pgmenhance cyan
++ keyword whole pgmhist cyan
++ keyword whole pgmkernel cyan
++ keyword whole pgmnoise cyan
++ keyword whole pgmnorm cyan
++ keyword whole pgmoil cyan
++ keyword whole pgmramp cyan
++ keyword whole pgmslice cyan
++ keyword whole pgmtexture cyan
++
++ keyword whole pgmtopbm cyan
++ keyword whole pgmtoppm cyan
++
++ keyword whole asciitopgm cyan
++ keyword whole bioradtopgm cyan
++ keyword whole icontopgm cyan
++ keyword whole jpegtopgm cyan
++ keyword whole macptopgm cyan
++ keyword whole rawtopgm cyan
++
++ keyword whole pnmalias cyan
++ keyword whole pnmarith cyan
++ keyword whole pnmcat cyan
++ keyword whole pnmcolormap cyan
++ keyword whole pnmcomp cyan
++ keyword whole pnmconvol cyan
++ keyword whole pnmcrop cyan
++ keyword whole pnmcut cyan
++ keyword whole pnmdepth cyan
++ keyword whole pnmenlarge cyan
++ keyword whole pnmfile cyan
++ keyword whole pnmflip cyan
++ keyword whole pnmgamma cyan
++ keyword whole pnmhisteq cyan
++ keyword whole pnmhistmap cyan
++ keyword whole pnmindex cyan
++ keyword whole pnminterp cyan
++ keyword whole pnminterp-gen cyan
++ keyword whole pnminvert cyan
++ keyword whole pnmmargin cyan
++ keyword whole pnmmontage cyan
++ keyword whole pnmnlfilt cyan
++ keyword whole pnmnoraw cyan
++ keyword whole pnmnorm cyan
++ keyword whole pnmpad cyan
++ keyword whole pnmpaste cyan
++ keyword whole pnmpsnr cyan
++ keyword whole pnmquant cyan
++ keyword whole pnmremap cyan
++ keyword whole pnmrotate cyan
++ keyword whole pnmscale cyan
++ keyword whole pnmscalefixed cyan
++ keyword whole pnmshear cyan
++ keyword whole pnmsmooth cyan
++ keyword whole pnmsplit cyan
++ keyword whole pnmtile cyan
++
++ keyword whole pnmtofits cyan
++ keyword whole pnmtojpeg cyan
++ keyword whole pnmtopalm cyan
++ keyword whole pnmtoplainpnm cyan
++ keyword whole pnmtopng cyan
++ keyword whole pnmtops cyan
++ keyword whole pnmtorle cyan
++ keyword whole pnmtotiff cyan
++ keyword whole pnmtoxwd cyan
++
++ keyword whole bpmtopnm cyan
++ keyword whole giftopnm cyan
++ keyword whole palmtopnm cyan
++ keyword whole pngtopnm cyan
++ keyword whole pstopnm cyan
++ keyword whole rletopnm cyan
++ keyword whole tifftopnm cyan
++ keyword whole xwdtopnm cyan
++
++ keyword whole ppm3d cyan
++ keyword whole ppmbrighten cyan
++ keyword whole ppmchange cyan
++ keyword whole ppmcie cyan
++ keyword whole ppmcolormask cyan
++ keyword whole ppmcolors cyan
++ keyword whole ppmdim cyan
++ keyword whole ppmdist cyan
++ keyword whole ppmdither cyan
++ keyword whole ppmfade cyan
++ keyword whole ppmflash cyan
++ keyword whole ppmforge cyan
++ keyword whole ppmhist cyan
++ keyword whole ppmlabel cyan
++ keyword whole ppmmake cyan
++ keyword whole ppmmix cyan
++ keyword whole ppmnorm cyan
++ keyword whole ppmntsc cyan
++ keyword whole ppmpat cyan
++ keyword whole ppmquant cyan
++ keyword whole ppmquantall cyan
++ keyword whole ppmqvgq cyan
++ keyword whole ppmrainbow cyan
++ keyword whole ppmrelief cyan
++ keyword whole ppmshadow cyan
++ keyword whole ppmshift cyan
++ keyword whole ppmspread cyan
++ keyword whole ppmtv cyan
++
++ keyword whole ppmtoacad cyan
++ keyword whole ppmtobmp cyan
++ keyword whole ppmtogif cyan
++ keyword whole ppmtojpeg cyan
++ keyword whole ppmtolj cyan
++ keyword whole ppmtomap cyan
++ keyword whole ppmtompeg cyan
++ keyword whole ppmtopcx cyan
++ keyword whole ppmtopgm cyan
++ keyword whole ppmtorgb3 cyan
++ keyword whole ppmtowinicon cyan
++ keyword whole ppmtoxpm cyan
++
++ keyword whole bpmtoppm cyan
++ keyword whole pcxtoppm cyan
++ keyword whole pdftoppm cyan
++ keyword whole pjtoppm cyan
++ keyword whole rawtoppm cyan
++ keyword whole rgb3toppm cyan
++ keyword whole winicontoppm cyan
++ keyword whole xpmtoppm cyan
++ keyword whole xvminitoppm cyan
++
++ keyword whole gpg red
++ keyword whole md5sum red
++ keyword whole openssl red
++ keyword whole ssh red
++ keyword whole scp red
++
++ keyword whole gettext.sh magenta
++ keyword whole TEXTDOMAINDIR magenta
++ keyword whole TEXTDOMAIN magenta
++ keyword whole VERSION magenta
++
++ keyword whole /dev/audio brightblue
++ keyword whole /dev/dsp brightblue
++ keyword whole /dev/null brightblue
++ keyword whole /dev/mixed brightblue
++ keyword whole /dev/stdin brightblue
++ keyword whole /dev/stdout brightblue
++ keyword whole /dev/stderr brightblue
++ keyword whole /dev/zero brightblue
Deleted: trunk/debian/patches/19_64bit.patch
===================================================================
--- trunk/debian/patches/19_64bit.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/19_64bit.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,54 +0,0 @@
---- mc-4.6.1a/src/mountlist.c.64bit 2005-02-08 23:33:52.000000000 +0100
-+++ mc-4.6.1a/src/mountlist.c 2005-05-10 17:09:24.122853504 +0200
-@@ -131,11 +131,19 @@ struct mount_entry
-
- struct fs_usage
- {
-+#ifndef HAVE_SYS_STATVFS_H
- long fsu_blocks; /* Total blocks. */
- long fsu_bfree; /* Free blocks available to superuser. */
- long fsu_bavail; /* Free blocks available to non-superuser. */
- long fsu_files; /* Total file nodes. */
- long fsu_ffree; /* Free file nodes. */
-+#else /* We have sys/statvfs.h, use proper data types when _FILE_OFFSET_BITS=64 */
-+ fsblkcnt_t fsu_blocks;
-+ fsblkcnt_t fsu_bfree;
-+ fsblkcnt_t fsu_bavail;
-+ fsblkcnt_t fsu_files;
-+ fsblkcnt_t fsu_ffree;
-+#endif /* HAVE_SYS_STATVFS_H */
- };
-
- static int get_fs_usage (char *path, struct fs_usage *fsp);
-@@ -665,6 +673,7 @@ my_statfs (struct my_statfs *myfs_stats,
- BLOCKS FROMSIZE-byte blocks, rounding away from zero.
- TOSIZE must be positive. Return -1 if FROMSIZE is not positive. */
-
-+#if !defined(HAVE_SYS_STATFS_H) || !defined(STAT_STATVFS)
- static long
- fs_adjust_blocks (long blocks, int fromsize, int tosize)
- {
-@@ -672,13 +681,21 @@ fs_adjust_blocks (long blocks, int froms
- abort ();
- if (fromsize <= 0)
- return -1;
--
-+#else
-+static fsblkcnt_t
-+fs_adjust_blocks (fsblkcnt_t blocks, unsigned long fromsize, unsigned long tosize)
-+{
-+ if (!tosize)
-+ abort ();
-+ if (!fromsize)
-+ return -1;
-+#endif
- if (fromsize == tosize) /* E.g., from 512 to 512. */
- return blocks;
- else if (fromsize > tosize) /* E.g., from 2048 to 512. */
- return blocks * (fromsize / tosize);
- else /* E.g., from 256 to 512. */
-- return (blocks + (blocks < 0 ? -1 : 1)) / (tosize / fromsize);
-+ return (blocks + 1) / (tosize / fromsize);
- }
-
- #if defined(_AIX) && defined(_I386)
Deleted: trunk/debian/patches/20_ignore_ftp_chmod_error.patch
===================================================================
--- trunk/debian/patches/20_ignore_ftp_chmod_error.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/20_ignore_ftp_chmod_error.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,12 +0,0 @@
-diff -Nurwd mc-4.6.2~pre1.orig/vfs/ftpfs.c mc-4.6.2~pre1/vfs/ftpfs.c
---- mc-4.6.2~pre1.orig/vfs/ftpfs.c 2008-02-13 16:10:32.000000000 +0100
-+++ mc-4.6.2~pre1/vfs/ftpfs.c 2008-02-13 16:54:31.000000000 +0100
-@@ -1525,7 +1525,7 @@
- char buf[BUF_SMALL];
-
- g_snprintf(buf, sizeof(buf), "SITE CHMOD %4.4o /%%s", mode & 07777);
-- return ftpfs_send_command(me, path, buf, OPT_FLUSH);
-+ return ftpfs_send_command(me, path, buf, OPT_FLUSH | OPT_IGNORE_ERROR);
- }
-
- static int ftpfs_chown (struct vfs_class *me, const char *path, int owner, int group)
Deleted: trunk/debian/patches/21_html-syntax.patch
===================================================================
--- trunk/debian/patches/21_html-syntax.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/21_html-syntax.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,1278 +0,0 @@
-diff -Nurwd mc-4.6.2~pre1.orig/syntax/html.syntax mc-4.6.2~pre1/syntax/html.syntax
---- mc-4.6.2~pre1.orig/syntax/html.syntax 2008-02-16 13:49:01.000000000 +0100
-+++ mc-4.6.2~pre1/syntax/html.syntax 2008-02-16 13:49:08.000000000 +0100
-@@ -1,20 +1,1264 @@
--# Syntax rules for the HyperText Markup Language
-+
-+# html highlighting with tags in caps always. if you want everything in lowercase
-+# use tr
-+
-+# i got upto IMG in the netscape comprehensive tags reference. thereafter will get
-+# done later - paul
-
- context default
-- keyword &\[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\]; brightgreen
-- keyword &#\{xX\}\[0123456789abcdefABCDEF\]; brightgreen
-- keyword &#\[0123456789\]; brightgreen
-+ keyword whole &*; brightgreen/16
- spellcheck
-
--context <!-- --> brown
-+ keyword </A> brightcyan/17
-+ keyword </ADDRESS> brightcyan/17
-+ keyword </APPLET> brightcyan/17
-+ keyword </AREA> brightcyan/17
-+ keyword </B> brightcyan/17
-+ keyword </BASE> brightcyan/17
-+ keyword </BASEFONT> brightcyan/17
-+ keyword </BIG> brightcyan/17
-+ keyword </BLOCKQUOTE> brightcyan/17
-+ keyword </BODY> brightcyan/17
-+ keyword </BR> brightcyan/17
-+ keyword </BUTTON> brightcyan/17
-+ keyword </CAPTION> brightcyan/17
-+ keyword </CENTER> brightcyan/17
-+ keyword </CITE> brightcyan/17
-+ keyword </CODE> brightcyan/17
-+ keyword </DD> brightcyan/17
-+ keyword </DIR> brightcyan/17
-+ keyword </DIV> brightcyan/17
-+ keyword </DL> brightcyan/17
-+ keyword </DT> brightcyan/17
-+ keyword </EM> brightcyan/17
-+ keyword </FONT> brightcyan/17
-+ keyword </FORM> brightcyan/17
-+ keyword </FRAME> brightcyan/17
-+ keyword </FRAMESET> brightcyan/17
-+ keyword </H1> brightcyan/17
-+ keyword </H2> brightcyan/17
-+ keyword </H3> brightcyan/17
-+ keyword </H4> brightcyan/17
-+ keyword </H5> brightcyan/17
-+ keyword </H6> brightcyan/17
-+ keyword </HEAD> brightcyan/17
-+ keyword </HR> brightcyan/17
-+ keyword </HTML> brightcyan/17
-+ keyword </I> brightcyan/17
-+ keyword </IMG> brightcyan/17
-+ keyword </PRE> brightcyan/17
-+ keyword </SMALL> brightcyan/17
-+ keyword </SCRIPT> brightcyan/17
-+ keyword </META> brightcyan/17
-+ keyword </P> brightcyan/17
-+ keyword </TABLE> brightcyan/17
-+ keyword </TD> brightcyan/17
-+ keyword </TITLE> brightcyan/17
-+ keyword </TR> brightcyan/17
-+ keyword </TT> brightcyan/17
-+ keyword </U> brightcyan/17
-+
-+
-+context <A > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword "http:*" magenta/22
-+ keyword "ftp:*" magenta/22
-+ keyword "news:*" magenta/22
-+ keyword "mailto:*" magenta/22
-+ keyword "gopher:*" magenta/22
-+ keyword "telnet:*" magenta/22
-+ keyword "file:*" magenta/22
-+ keyword "javascript:*" magenta/22
-+
-+ keyword "Alternate" magenta/22
-+ keyword "Stylesheet" magenta/22
-+ keyword "Start" magenta/22
-+ keyword "Next" magenta/22
-+ keyword "Prev" magenta/22
-+ keyword "Contents" magenta/22
-+ keyword "Index" magenta/22
-+ keyword "Glossary" magenta/22
-+ keyword "Copyright" magenta/22
-+ keyword "Chapter" magenta/22
-+ keyword "Section" magenta/22
-+ keyword "Subsection" magenta/22
-+ keyword "Appendix" magenta/22
-+ keyword "Help" magenta/22
-+ keyword "Bookmark" magenta/22
-+
-+ keyword "_blank" magenta/22
-+ keyword "_self" magenta/22
-+ keyword "_parent" magenta/22
-+ keyword "_top" magenta/22
-+
-+ keyword "*" cyan/5
-+
-+# keyword whole charset yellow/24
-+# keyword whole type yellow/24
-+ keyword whole name yellow/24
-+ keyword whole href yellow/24
-+# keyword whole hreflang yellow/24
-+# keyword whole rel yellow/24
-+# keyword whole rev yellow/24
-+ keyword whole shape yellow/24
-+ keyword whole coords yellow/24
-+# keyword whole tabindex yellow/24
-+# keyword whole selected yellow/24
-+ keyword whole target yellow/24
-+ keyword whole onblur yellow/24
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onfocus yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+
-+
-+context <ADDRESS > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole dir yellow/24
-+ keyword whole title yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onblur yellow/24
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onfocus yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+ keyword "*" cyan/5
-+
-+context <APPLET > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole align yellow/24
-+ keyword whole alt yellow/24
-+ keyword whole archive yellow/24
-+ keyword whole code yellow/24
-+ keyword whole codebase yellow/24
-+ keyword whole height yellow/24
-+ keyword whole hspace yellow/24
-+ keyword whole mayscript yellow/24
-+ keyword whole name yellow/24
-+ keyword whole object yellow/24
-+ keyword whole vspace yellow/24
-+ keyword whole width yellow/24
-+
-+ keyword "http:*" magenta/22
-+ keyword "ftp:*" magenta/22
-+ keyword "news:*" magenta/22
-+ keyword "mailto:*" magenta/22
-+ keyword "gopher:*" magenta/22
-+ keyword "telnet:*" magenta/22
-+ keyword "file:*" magenta/22
-+ keyword "javascript:*" magenta/22
-+ keyword "*.class" magenta/22
-+ keyword "*" cyan/5
-+
-+context <AREA > brightcyan/17
-+ keyword = brightred/18
-+
-+# keyword whole accesskey yellow/24
-+# keyword whole alt yellow/24
-+ keyword whole coords yellow/24
-+ keyword whole href yellow/24
-+ keyword whole nohref yellow/24
-+ keyword whole shape yellow/24
-+# keyword whole onfocus yellow/24
-+# keyword whole onblur yellow/24
-+ keyword whole target magenta/22
-+ keyword "_blank" magenta/22
-+ keyword "_self" magenta/22
-+ keyword "_parent" magenta/22
-+ keyword "_top" magenta/22
-+
-+ keyword "DEFAULT" magenta/22
-+ keyword "CIRCLE" magenta/22
-+ keyword "POLY" magenta/22
-+ keyword "POLYGON" magenta/22
-+ keyword "RECT" magenta/22
-+ keyword "RECTANGLE" magenta/22
-+
-+ keyword "http:*" magenta/22
-+ keyword "ftp:*" magenta/22
-+ keyword "news:*" magenta/22
-+ keyword "gopher:*" magenta/22
-+ keyword "telnet:*" magenta/22
-+ keyword "*" cyan/5
-+
-+context <B > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+ keyword "*" cyan/5
-+
-+context <BASE > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole href yellow/24
-+ keyword whole target yellow/24
-+ keyword "_blank" magenta/22
-+ keyword "_self" magenta/22
-+ keyword "_parent" magenta/22
-+ keyword "_top" magenta/22
-+
-+ keyword "http:*" magenta/22
-+ keyword "ftp:*" magenta/22
-+ keyword "*" cyan/5
-+
-+context <BASEFONT > brightcyan/17
-+ keyword = brightred/18
-+ keyword " magenta/22
-+
-+ keyword whole id yellow/24
-+ keyword whole size yellow/24
-+ keyword whole color yellow/24
-+ keyword whole face yellow/24
-+ keyword "*" cyan/5
-+
-+context <BIG > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+ keyword "*" cyan/5
-+
-+
-+context <BLOCKQUOTE > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+
-+ keyword whole cite yellow/24
-+ keyword "*" cyan/5
-+
-+
-+context <BODY > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+
-+ keyword whole onload yellow/24
-+ keyword whole onunload yellow/24
-+
-+ keyword whole alink yellow/24
-+ keyword whole background yellow/24
-+
-+ keyword "*.gif" brightred/19
-+ keyword "*.jpg" brightred/19
-+ keyword "*.png" brightred/19
-+ keyword "*" cyan/5
-+
-+ keyword whole bgcolor yellow/24
-+ keyword whole link yellow/24
-+ keyword whole text yellow/24
-+ keyword whole vlink yellow/24
-+
-+context <BR > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+ keyword "*" cyan/5
-+
-+
-+context <BUTTON > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+ keyword "*" cyan/5
-+
-+context <CAPTION > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+
-+ keyword whole align yellow/24
-+ keyword whole valign yellow/24
-+ keyword whole onmouseup yellow/24
-+ keyword "*" cyan/5
-+
-+context <CENTER > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+ keyword "*" cyan/5
-+
-+
-+context <CITE > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+ keyword "*" cyan/5
-+
-+
-+context <CODE > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+ keyword "*" cyan/5
-+
-+context <DD > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+ keyword "*" cyan/5
-+
-+context <DIR > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+ keyword "*" cyan/5
-+
-+
-+context <DIV > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+
-+ keyword whole align yellow/24
-+ keyword whole "center" magenta/22
-+ keyword whole "justify" magenta/22
-+ keyword whole "left" magenta/22
-+ keyword whole "right" magenta/22
-+ keyword "*" cyan/5
-+
-+
-+context <DL > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+ keyword "*" cyan/5
-+
-+context <DT > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+ keyword "*" cyan/5
-+
-+context <EM > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+ keyword "*" cyan/5
-+
-+
-+context <DT > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+ keyword "*" cyan/5
-+
-+context <FONT > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+
-+ keyword whole size yellow/24
-+ keyword whole color yellow/24
-+ keyword whole face yellow/24
-+ keyword "*" cyan/5
-+
-+context <FORM > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+
-+ keyword whole action yellow/24
-+ keyword whole enctype yellow/24
-+ keyword whole method yellow/24
-+ keyword "GET" magenta/22
-+ keyword "POST" magenta/22
-+ keyword whole onreset yellow/24
-+ keyword whole onsubmit yellow/24
-+ keyword whole target yellow/24
-+ keyword "_blank" magenta/22
-+ keyword "_self" magenta/22
-+ keyword "_parent" magenta/22
-+ keyword "_top" magenta/22
-+ keyword "*" cyan/5
-+
-+
-+context <FRAME > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole frameborder yellow/24
-+ keyword whole marginheight yellow/24
-+ keyword whole marginwidth yellow/24
-+ keyword whole name yellow/24
-+ keyword whole noresize yellow/24
-+ keyword whole scrolling yellow/24
-+ keyword "YES" magenta/22
-+ keyword "NO" magenta/22
-+ keyword "AUTO" magenta/22
-+ keyword whole src yellow/24
-+ keyword "*" cyan/5
-+
-+
-+context <FRAMESET > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole border yellow/24
-+ keyword whole bordercolor yellow/24
-+ keyword whole cols yellow/24
-+ keyword whole onload yellow/24
-+ keyword whole onunload yellow/24
-+ keyword whole rows yellow/24
-+
-+
-+context <H1 > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+
-+ keyword whole align yellow/24
-+ keyword "CENTRE" magenta/22
-+ keyword "LEFT" magenta/22
-+ keyword "RIGHT" magenta/22
-+ keyword "*" cyan/5
-+
-+
-+context <H2 > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+
-+ keyword whole align yellow/24
-+ keyword "CENTRE" magenta/22
-+ keyword "LEFT" magenta/22
-+ keyword "RIGHT" magenta/22
-+ keyword "*" cyan/5
-+
-+
-+context <H3 > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+
-+ keyword whole align yellow/24
-+ keyword "CENTRE" magenta/22
-+ keyword "LEFT" magenta/22
-+ keyword "RIGHT" magenta/22
-+ keyword "*" cyan/5
-+
-+
-+context <H4 > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+
-+ keyword whole align yellow/24
-+ keyword "CENTRE" magenta/22
-+ keyword "LEFT" magenta/22
-+ keyword "RIGHT" magenta/22
-+ keyword "*" cyan/5
-+
-+
-+context <H5 > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+
-+ keyword whole align yellow/24
-+ keyword "centre" magenta/22
-+ keyword "left" magenta/22
-+ keyword "right" magenta/22
-+ keyword "*" cyan/5
-+
-+
-+context <H6 > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+
-+ keyword whole align yellow/24
-+ keyword "centre" magenta/22
-+ keyword "left" magenta/22
-+ keyword "right" magenta/22
-+ keyword "*" cyan/5
-+
-+
-+context <HEAD > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+ keyword "*" cyan/5
-+
-+
-+context <HR > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+ keyword whole color yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+
-+ keyword whole align yellow/24
-+ keyword "centre" magenta/22
-+ keyword "left" magenta/22
-+ keyword "right" magenta/22
-+ keyword whole align yellow/24
-+ keyword whole noshade yellow/24
-+ keyword whole size yellow/24
-+ keyword whole width yellow/24
-+ keyword "*" cyan/5
-+
-+
-+context <HTML > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+ keyword "*" cyan/5
-+
-+
-+context <IMG > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+
-+ keyword whole alt yellow/24
-+ keyword whole border yellow/24
-+ keyword whole height yellow/24
-+ keyword whole hspace yellow/24
-+ keyword whole ismap yellow/24
-+ keyword whole src yellow/24
-+ keyword "*.gif" brightred/19
-+ keyword "*.jpg" brightred/19
-+ keyword "*.png" brightred/19
-+ keyword "*" cyan/5
-+ keyword whole usemap yellow/24
-+ keyword whole vspace yellow/24
-+ keyword whole width yellow/24
-+ keyword "*" cyan/5
-+
-+context <I > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+ keyword "*" cyan/5
-+
-+
-+context <LINK > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+
-+ keyword whole type yellow/24
-+
-+ keyword "text/css" magenta/22
-+ keyword "text/javascript" magenta/22
-+ keyword "*" cyan/5
-+
-+
-+context <META > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole content yellow/24
-+ keyword whole http-equiv yellow/24
-+ keyword whole name yellow/24
-+ keyword "*" cyan/5
-+
-+context <P > brightcyan/17
-+
-+
-+context <TITLE > brightcyan/17
-+ keyword = brightred/18
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+ keyword "*" cyan/5
-+
-+context <SCRIPT > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole language yellow/24
-+ keyword whole src yellow/24
-+
-+ keyword "JavaScript" magenta/22
-+ keyword "JavaScript1.2" magenta/22
-+ keyword "JavaScript1.1" magenta/22
-+ keyword "*" cyan/5
-+
-+context <TABLE > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+
-+ keyword whole align yellow/24
-+ keyword whole bgcolor yellow/24
-+ keyword whole border yellow/24
-+ keyword whole width yellow/24
-+ keyword whole cellspacing yellow/24
-+ keyword whole cellpadding yellow/24
-+ keyword "right" magenta/22
-+ keyword "left" magenta/22
-+ keyword "*" cyan/5
-+
-+
-+context <SMALL > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+ keyword "*" cyan/5
-+
-+context <TD > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+
-+ keyword whole colspan yellow/24
-+ keyword whole rowspan yellow/24
-+ keyword whole align yellow/24
-+ keyword "centre" magenta/22
-+ keyword "char" magenta/22
-+ keyword "justify" magenta/22
-+ keyword "left" magenta/22
-+ keyword "right" magenta/22
-+ keyword whole bgcolor yellow/24
-+ keyword whole valign yellow/24
-+ keyword "baseline" magenta/22
-+ keyword "bottom" magenta/22
-+ keyword "middle" magenta/22
-+ keyword "top" magenta/22
-+ keyword whole colorspan yellow/24
-+ keyword whole height yellow/24
-+ keyword whole nowrap yellow/24
-+ keyword whole rowspan yellow/24
-+ keyword whole width yellow/24
-+
-+ keyword "*" cyan/5
-+
-+
-+context <TR > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+ keyword whole onclick yellow/24
-+ keyword whole ondblclick yellow/24
-+ keyword whole onkeydown yellow/24
-+ keyword whole onkeypress yellow/24
-+ keyword whole onkeyup yellow/24
-+ keyword whole onmousedown yellow/24
-+ keyword whole onmousemove yellow/24
-+ keyword whole onmouseout yellow/24
-+ keyword whole onmouseover yellow/24
-+ keyword whole onmouseup yellow/24
-+
-+ keyword whole align yellow/24
-+ keyword "centre" magenta/22
-+ keyword "char" magenta/22
-+ keyword "justify" magenta/22
-+ keyword "left" magenta/22
-+ keyword "right" magenta/22
-+
-+ keyword whole bgcolor yellow/24
-+ keyword whole valign yellow/24
-+ keyword "baseline" magenta/22
-+ keyword "bottom" magenta/22
-+ keyword "middle" magenta/22
-+ keyword "top" magenta/22
-+
-+ keyword "*" cyan/5
-+
-+context <TT > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+context <U > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+context <PRE > brightcyan/17
-+ keyword = brightred/18
-+
-+ keyword whole class yellow/24
-+ keyword whole id yellow/24
-+ keyword whole style yellow/24
-+ keyword whole title yellow/24
-+
-+ keyword whole dir yellow/24
-+ keyword whole lang yellow/24
-+
-+context <!-- --> brown/22
- spellcheck
-
- context <! > brightred/orange
- spellcheck
-
--context </ > brightcyan
-+context < > cyan/15
-
--context < > brightcyan
-- keyword "*" green
-- keyword '*' green
-- keyword = yellow
Deleted: trunk/debian/patches/22_debian_dsc.patch
===================================================================
--- trunk/debian/patches/22_debian_dsc.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/22_debian_dsc.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,42 +0,0 @@
-diff -Nurwd mc-4.6.2~pre1.orig/syntax/debian-description.syntax mc-4.6.2~pre1/syntax/debian-description.syntax
---- mc-4.6.2~pre1.orig/syntax/debian-description.syntax 1970-01-01 00:00:00.000000000 +0000
-+++ mc-4.6.2~pre1/syntax/debian-description.syntax 2008-02-19 22:16:42.000000000 +0100
-@@ -0,0 +1,15 @@
-+context default
-+ keyword linestart Format green
-+ keyword linestart Source brightmagenta
-+ keyword linestart Version yellow
-+ keyword linestart Binary brightgreen
-+ keyword linestart Maintainer brightmagenta
-+ keyword <*@*> brightred
-+ keyword linestart Architecture cyan
-+ keyword linestart Standards-Version brightmagenta
-+ keyword linestart Build-Depends green
-+ keyword linestart Files green
-+
-+context --- \n brightred
-+ spellcheck
-+
-diff -Nurwd mc-4.6.2~pre1.orig/syntax/Makefile.in mc-4.6.2~pre1/syntax/Makefile.in
---- mc-4.6.2~pre1.orig/syntax/Makefile.in 2008-02-19 22:16:07.000000000 +0100
-+++ mc-4.6.2~pre1/syntax/Makefile.in 2008-02-19 22:17:19.000000000 +0100
-@@ -244,6 +244,7 @@
- cs.syntax \
- css.syntax \
- d.syntax \
-+ debian-description.syntax \
- diff.syntax \
- dos.syntax \
- eiffel.syntax \
-diff -Nurwd mc-4.6.2~pre1.orig/syntax/Syntax mc-4.6.2~pre1/syntax/Syntax
---- mc-4.6.2~pre1.orig/syntax/Syntax 2008-02-19 22:16:07.000000000 +0100
-+++ mc-4.6.2~pre1/syntax/Syntax 2008-02-19 22:16:42.000000000 +0100
-@@ -148,5 +148,8 @@
- file Don_t_match_me Mail\sfolder ^From\s
- include mail.syntax
-
-+file .\*\\.dsc$ Debian\sdescriptiom\sfile
-+include debian-description.syntax
-+
- file .\* unknown
- include unknown.syntax
Copied: trunk/debian/patches/22_main.c.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/22_main.c.patch)
===================================================================
--- trunk/debian/patches/22_main.c.patch (rev 0)
+++ trunk/debian/patches/22_main.c.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,50 @@
+diff -Nurwd mc-4.6.2~pre1/src/main.c mc-4.6.2~pre1.patched/src/main.c
+--- mc-4.6.2~pre1/src/main.c 2006-09-22 17:14:58.000000000 +0200
++++ mc-4.6.2~pre1/src/main.c 2008-01-25 00:20:36.000000000 +0100
+@@ -1601,21 +1601,43 @@
+ }
+ }
+
+-/* Show current directory in the xterm title */
++/* Show hostname and current directory in the xterm title */
+ void
+ update_xterm_title_path (void)
+ {
+ char *p, *s;
++ char *pvp;
++ size_t pvlen;
++ int pvresult;
+
+ if (xterm_flag && xterm_title) {
++ //current path
+ p = s = g_strdup (strip_home_and_password (current_panel->cwd));
++ // hostname
++ pvlen = strlen(p);
++ pvp = g_malloc (pvlen + 64); //approach - max hostname length
++ pvresult = gethostname(pvp, 63);
++ if (pvresult) { // print just current path
++ g_free (pvp);
++ pvp = p;
++ } else {
++ s = pvp;
++ do { // merge hostname with path
++ if (!is_printable (*s))
++ *s = '?';
++ } while (*++s!=0x00);
++ *s++=':';
++ strcpy (s, p);
++ g_free (p);
++ }
+ do {
+ if (!is_printable ((unsigned char) *s))
+ *s = '?';
+ } while (*++s);
+- fprintf (stdout, "\33]0;mc - %s\7", p);
++// fprintf (stdout, "\33]0;mc - %s\7", p);
++ fprintf (stdout, "\33]0;mc - %s\7", pvp);
+ fflush (stdout);
+- g_free (p);
++ g_free (pvp);
+ }
+ }
+
Deleted: trunk/debian/patches/23_strace_syntax.patch
===================================================================
--- trunk/debian/patches/23_strace_syntax.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/23_strace_syntax.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,70 +0,0 @@
-diff -Nurwd mc-4.6.2~pre1.orig/syntax/Makefile.in mc-4.6.2~pre1/syntax/Makefile.in
---- mc-4.6.2~pre1.orig/syntax/Makefile.in 2008-02-19 22:19:14.000000000 +0100
-+++ mc-4.6.2~pre1/syntax/Makefile.in 2008-02-19 22:20:28.000000000 +0100
-@@ -275,6 +275,7 @@
- slang.syntax \
- spec.syntax \
- sql.syntax \
-+ strace.syntax \
- swig.syntax \
- syntax.syntax \
- tcl.syntax \
-diff -Nurwd mc-4.6.2~pre1.orig/syntax/strace.syntax mc-4.6.2~pre1/syntax/strace.syntax
---- mc-4.6.2~pre1.orig/syntax/strace.syntax 1970-01-01 00:00:00.000000000 +0000
-+++ mc-4.6.2~pre1/syntax/strace.syntax 2008-02-19 22:19:50.000000000 +0100
-@@ -0,0 +1,43 @@
-+context default
-+ keyword access(*) green
-+ keyword execve(*) brightgreen
-+ keyword uname(*) brightblue
-+
-+ keyword open(*) cyan
-+ keyword close(*) cyan
-+
-+ keyword read(*) magenta
-+ keyword select(*) magenta
-+ keyword write(*) magenta
-+
-+ keyword readv(*) brightmagenta
-+ keyword writev(*) brightmagenta
-+
-+ keyword fcntl64(*) white
-+ keyword fstat64(*) white
-+ keyword stat64(*) white
-+
-+ keyword old_mmap(*) red
-+ keyword mmap2(*) red
-+ keyword munmap(*) red
-+
-+ keyword exit_group(*) brightred
-+ keyword kill(*) brightred
-+ keyword wait4(*) brightred
-+ keyword statfs(*) brightred
-+ keyword ioctl(*) brightred
-+ keyword rt_sigaction(*) brightred
-+ keyword rt_sigprocmask(*) brightred
-+ keyword alarm(*) brightred
-+ keyword brk(*) brightred
-+
-+ keyword chown32(*) yellow
-+ keyword chmod(*) yellow
-+ keyword geteuid32(*) yellow
-+ keyword getegid32(*) yellow
-+ keyword getuid32(*) yellow
-+ keyword getgid32(*) yellow
-+ keyword setresuid32(*) yellow
-+ keyword setresgid32(*) yellow
-+ keyword gettimeofday(*) yellow
-+
-diff -Nurwd mc-4.6.2~pre1.orig/syntax/Syntax mc-4.6.2~pre1/syntax/Syntax
---- mc-4.6.2~pre1.orig/syntax/Syntax 2008-02-19 22:19:14.000000000 +0100
-+++ mc-4.6.2~pre1/syntax/Syntax 2008-02-19 22:19:50.000000000 +0100
-@@ -151,5 +151,8 @@
- file .\*\\.dsc$ Debian\sdescriptiom\sfile
- include debian-description.syntax
-
-+file .\*\\.strace$ Strace\sdebug\soutput
-+include strace.syntax
-+
- file .\* unknown
- include unknown.syntax
Deleted: trunk/debian/patches/24_named_syntax.patch
===================================================================
--- trunk/debian/patches/24_named_syntax.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/24_named_syntax.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,205 +0,0 @@
-diff -Nurwd mc-4.6.2~pre1.orig/syntax/Makefile.in mc-4.6.2~pre1/syntax/Makefile.in
---- mc-4.6.2~pre1.orig/syntax/Makefile.in 2008-02-19 22:22:14.000000000 +0100
-+++ mc-4.6.2~pre1/syntax/Makefile.in 2008-02-19 22:23:07.000000000 +0100
-@@ -261,6 +261,7 @@
- mail.syntax \
- makefile.syntax \
- ml.syntax \
-+ named.syntax \
- nroff.syntax \
- octave.syntax \
- pascal.syntax \
-diff -Nurwd mc-4.6.2~pre1.orig/syntax/named.syntax mc-4.6.2~pre1/syntax/named.syntax
---- mc-4.6.2~pre1.orig/syntax/named.syntax 1970-01-01 00:00:00.000000000 +0000
-+++ mc-4.6.2~pre1/syntax/named.syntax 2008-02-19 22:21:59.000000000 +0100
-@@ -0,0 +1,178 @@
-+wholechars abcdefghijklmnopqrstuvwxyz0123456789-
-+
-+context default
-+ keyword whole acl yellow
-+ keyword whole additional-from-auth yellow
-+ keyword whole additional-from-cache yellow
-+ keyword whole algorithm yellow
-+ keyword whole allow-notify yellow
-+ keyword whole allow-query yellow
-+ keyword whole allow-recursion yellow
-+ keyword whole allow-transfer yellow
-+ keyword whole allow-update-forwarding yellow
-+ keyword whole allow-v6-synthesis yellow
-+ keyword whole allow yellow
-+ keyword whole also-notify yellow
-+ keyword whole auth-nxdomain yellow
-+ keyword whole blackhole yellow
-+ keyword whole bogus yellow
-+ keyword whole cache-file yellow
-+ keyword whole category yellow
-+ keyword whole channel yellow
-+ keyword whole check-names yellow
-+ keyword whole class yellow
-+ keyword whole cleaning-interval yellow
-+ keyword whole controls yellow
-+ keyword whole coresize yellow
-+ keyword whole database yellow
-+ keyword whole datasize yellow
-+ keyword whole deallocate-on-exit yellow
-+ keyword whole delegation-only yellow
-+ keyword whole deny yellow
-+ keyword whole dialup yellow
-+ keyword whole directory yellow
-+ keyword whole dump-file yellow
-+ keyword whole edns yellow
-+ keyword whole exclude yellow
-+ keyword whole fake-iquery yellow
-+ keyword whole fetch-glue yellow
-+ keyword whole files yellow
-+ keyword whole file yellow
-+ keyword whole forwarders yellow
-+ keyword whole forward yellow
-+ keyword whole grant yellow
-+ keyword whole has-old-clients yellow
-+ keyword whole heartbeat-interval yellow
-+ keyword whole host-statistics yellow
-+ keyword whole inet yellow
-+ keyword whole interface-interval yellow
-+ keyword whole keys yellow
-+ keyword whole key yellow
-+ keyword whole lame-ttl yellow
-+ keyword whole listen-on-v6 yellow
-+ keyword whole listen-on yellow
-+ keyword whole logging yellow
-+ keyword whole lwres yellow
-+ keyword whole maintain-ixfr-base yellow
-+ keyword whole masters yellow
-+ keyword whole match-clients yellow
-+ keyword whole match-destinations yellow
-+ keyword whole match-mapped-addresses yellow
-+ keyword whole match-recursive-only yellow
-+ keyword whole max-cache-size yellow
-+ keyword whole max-cache-ttl yellow
-+ keyword whole max-ixfr-log-size yellow
-+ keyword whole max-ncache-ttl yellow
-+ keyword whole max-refresh-time yellow
-+ keyword whole max-retry-time yellow
-+ keyword whole max-transfer-idle-in yellow
-+ keyword whole max-transfer-idle-out yellow
-+ keyword whole max-transfer-time-in yellow
-+ keyword whole max-transfer-time-out yellow
-+ keyword whole memstatistics-file yellow
-+ keyword whole minimal-responses yellow
-+ keyword whole min-refresh-time yellow
-+ keyword whole min-retry-time yellow
-+ keyword whole min-roots yellow
-+ keyword whole multiple-cnames yellow
-+ keyword whole named-xfer yellow
-+ keyword whole name yellow
-+ keyword whole ndots yellow
-+ keyword whole notify-source-v6 yellow
-+ keyword whole notify-source yellow
-+ keyword whole notify yellow
-+ keyword whole options yellow
-+ keyword whole pid-file yellow
-+ keyword whole port yellow
-+ keyword whole print-category yellow
-+ keyword whole print-severity yellow
-+ keyword whole print-time yellow
-+ keyword whole provide-ixfr yellow
-+ keyword whole pubkey yellow
-+ keyword whole query-source-v6 yellow
-+ keyword whole query-source yellow
-+ keyword whole random-device yellow
-+ keyword whole recursion yellow
-+ keyword whole recursive-clients yellow
-+ keyword whole request-ixfr yellow
-+ keyword whole rfc2308-type1 yellow
-+ keyword whole root-delegation-only yellow
-+ keyword whole rrset-order yellow
-+ keyword whole search yellow
-+ keyword whole secret yellow
-+ keyword whole self yellow
-+ keyword whole serial-queries yellow
-+ keyword whole serial-query-rate yellow
-+ keyword whole server yellow
-+ keyword whole severity yellow
-+ keyword whole sig-validity-interval yellow
-+ keyword whole sortlist yellow
-+ keyword whole stacksize yellow
-+ keyword whole statistics-file yellow
-+ keyword whole statistics-interval yellow
-+ keyword whole subdomain yellow
-+ keyword whole support-ixfr yellow
-+ keyword whole suppress-initial-notify yellow
-+ keyword whole syslog yellow
-+ keyword whole tcp-clients yellow
-+ keyword whole tkey-dhkey yellow
-+ keyword whole tkey-domain yellow
-+ keyword whole tkey-gssapi-credential yellow
-+ keyword whole topology yellow
-+ keyword whole transfer-format yellow
-+ keyword whole transfers-in yellow
-+ keyword whole transfer-source-v6 yellow
-+ keyword whole transfer-source yellow
-+ keyword whole transfers-out yellow
-+ keyword whole transfers-per-ns yellow
-+ keyword whole transfers yellow
-+ keyword whole treat-cr-as-space yellow
-+ keyword whole trusted-keys yellow
-+ keyword whole type yellow
-+ keyword whole update-policy yellow
-+ keyword whole use-id-pool yellow
-+ keyword whole use-ixfr yellow
-+ keyword whole version yellow
-+ keyword whole view yellow
-+ keyword whole wildcard yellow
-+ keyword whole zone-statistics yellow
-+ keyword whole zone yellow
-+
-+ keyword whole any brightred
-+ keyword whole fail brightred
-+ keyword whole first brightred
-+ keyword whole hint brightred
-+ keyword whole ignore brightred
-+ keyword whole many-answers brightred
-+ keyword whole master brightred
-+ keyword whole none brightred
-+ keyword whole null brightred
-+ keyword whole one-answer brightred
-+ keyword whole only brightred
-+ keyword whole response brightred
-+ keyword whole slave brightred
-+ keyword whole stderr brightred
-+ keyword whole stub brightred
-+ keyword whole warn brightred
-+ keyword whole yes brightred
-+ keyword whole no brightred
-+
-+ keyword /\* brown
-+ keyword \*/ brown
-+ keyword // brown
-+ keyword # brown
-+ keyword { brightcyan
-+ keyword } brightcyan
-+ keyword ; brightmagenta
-+
-+context exclusive /\* \*/ brown
-+ spellcheck
-+
-+context exclusive // \n brown
-+ spellcheck
-+
-+context exclusive # \n brown
-+ spellcheck
-+
-+context " " green
-+ spellcheck
-diff -Nurwd mc-4.6.2~pre1.orig/syntax/Syntax mc-4.6.2~pre1/syntax/Syntax
---- mc-4.6.2~pre1.orig/syntax/Syntax 2008-02-19 22:22:14.000000000 +0100
-+++ mc-4.6.2~pre1/syntax/Syntax 2008-02-19 22:21:59.000000000 +0100
-@@ -154,5 +154,8 @@
- file .\*\\.strace$ Strace\sdebug\soutput
- include strace.syntax
-
-+file .\*named.conf$ Bind9\sconfiguration
-+include named.syntax
-+
- file .\* unknown
- include unknown.syntax
Deleted: trunk/debian/patches/25_19757string_regexp_search-match-eol.patch
===================================================================
--- trunk/debian/patches/25_19757string_regexp_search-match-eol.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/25_19757string_regexp_search-match-eol.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,16 +0,0 @@
-Index: edit/editcmd.c
-===================================================================
-RCS file: /sources/mc/mc/edit/editcmd.c,v
-retrieving revision 1.154
-diff -u -p -r1.154 editcmd.c
---- edit/editcmd.c 2 May 2007 11:22:01 -0000 1.154
-+++ edit/editcmd.c 2 May 2007 11:44:51 -0000
-@@ -1452,7 +1452,7 @@ string_regexp_search (char *pattern, cha
- g_free (old_pattern);
- old_pattern = 0;
- }
-- if (regcomp (&r, pattern, REG_EXTENDED | (icase ? REG_ICASE : 0))) {
-+ if (regcomp (&r, pattern, REG_EXTENDED | REG_NEWLINE | (icase ? REG_ICASE : 0))) {
- *found_len = 0;
- return -3;
- }
Deleted: trunk/debian/patches/26_21030copy_file_file_chmod.patch
===================================================================
--- trunk/debian/patches/26_21030copy_file_file_chmod.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/26_21030copy_file_file_chmod.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,50 +0,0 @@
-Index: src/file.c
-===================================================================
-RCS file: /cvsroot/mc/mc/src/file.c,v
-retrieving revision 1.149
-diff -u -p -r1.149 file.c
---- src/file.c 22 Feb 2007 14:29:11 -0000 1.149
-+++ src/file.c 13 Sep 2007 12:48:28 -0000
-@@ -474,6 +474,7 @@ copy_file_file (FileOpContext *ctx, cons
- int return_status, temp_status;
- struct timeval tv_transfer_start;
- int dst_status = DEST_NONE; /* 1 if the file is not fully copied */
-+ int open_flags;
-
- /* FIXME: We should not be using global variables! */
- ctx->do_reget = 0;
-@@ -606,12 +607,19 @@ copy_file_file (FileOpContext *ctx, cons
- utb.modtime = sb.st_mtime;
- file_size = sb.st_size;
-
-- /* Create the new regular file with small permissions initially,
-- do not create a security hole. FIXME: You have security hole
-- here, btw. Imagine copying to /tmp and symlink attack :-( */
--
-- while ((dest_desc = mc_open (dst_path, O_WRONLY | (ctx->do_append ?
-- O_APPEND : (O_CREAT | O_TRUNC)), 0600)) < 0) {
-+ open_flags = O_WRONLY;
-+ if (dst_exists != 0) {
-+ if (ctx->do_append != 0)
-+ open_flags |= O_APPEND;
-+ else
-+ open_flags |= O_CREAT | O_TRUNC;
-+ } else {
-+ open_flags |= O_CREAT | O_EXCL;
-+ }
-+ while ((dest_desc = mc_open (dst_path, open_flags, src_mode)) < 0) {
-+ if (errno == EEXIST) {
-+ goto ret;
-+ }
- return_status = file_error (
- _(" Cannot create target file \"%s\" \n %s "), dst_path);
- if (return_status == FILE_RETRY)
-@@ -790,7 +798,7 @@ copy_file_file (FileOpContext *ctx, cons
- }
- }
-
-- if (!appending) {
-+ if (!appending && ctx->preserve) {
- while (mc_chmod (dst_path, (src_mode & ctx->umask_kill))) {
- temp_status = file_error (
- _(" Cannot chmod target file \"%s\" \n %s "), dst_path);
Deleted: trunk/debian/patches/28_dont_ignore_returnval_localtime.patch
===================================================================
--- trunk/debian/patches/28_dont_ignore_returnval_localtime.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/28_dont_ignore_returnval_localtime.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,31 +0,0 @@
---- mc-4.6.2~pre1/src/util.c 2005/11/03 02:18:38 1.138
-+++ mc-4.6.2~pre1/src/util.c 2007/09/17 19:42:32 1.139
-@@ -731,6 +731,7 @@
- b = strftime (buf, sizeof(buf)-1, _("%b %e %Y"), localtime(&testtime));
-
- length = max (a, b);
-+ length = max (strlen (_("(invalid)")), length);
-
- /* Don't handle big differences. Use standard value (email bug, please) */
- if ( length > MAX_I18NTIMELENGTH || length < MIN_I18NTIMELENGTH )
-@@ -747,6 +748,7 @@
- static size_t i18n_timelength = 0;
- static const char *fmtyear, *fmttime;
- const char *fmt;
-+ struct tm *whentm;
-
- if (i18n_timelength == 0){
- i18n_timelength = i18n_checktimelength() + 1;
-@@ -770,7 +772,11 @@
- else
- fmt = fmttime;
-
-- strftime (timebuf, i18n_timelength, fmt, localtime(&when));
-+ whentm = localtime(&when);
-+ if (whentm == NULL)
-+ g_snprintf (timebuf, i18n_timelength, "%s", _("(invalid)"));
-+ else
-+ strftime (timebuf, i18n_timelength, fmt, whentm);
- return timebuf;
- }
-
Copied: trunk/debian/patches/28_mc-ctype.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/28_mc-ctype.patch)
===================================================================
--- trunk/debian/patches/28_mc-ctype.patch (rev 0)
+++ trunk/debian/patches/28_mc-ctype.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,10 @@
+--- ./edit/editcmd.c.orig 2007-05-02 13:22:01.000000000 +0200
++++ ./edit/editcmd.c 2008-01-25 07:44:38.000000000 +0100
+@@ -26,7 +26,6 @@
+ #include <config.h>
+
+ #include <assert.h>
+-#include <ctype.h>
+
+ #include <stdio.h>
+ #include <stdarg.h>
Copied: trunk/debian/patches/28_mc-dontrewrite.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/28_mc-dontrewrite.patch)
===================================================================
--- trunk/debian/patches/28_mc-dontrewrite.patch (rev 0)
+++ trunk/debian/patches/28_mc-dontrewrite.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,12 @@
+diff -Nurwd ./mc-4.6.2~pre1/edit/editcmd.c ./mc-4.6.2~pre1.patched/edit/editcmd.c
+--- ./mc-4.6.2~pre1/edit/editcmd.c 2008-02-12 19:58:24.000000000 +0100
++++ ./mc-4.6.2~pre1.patched/edit/editcmd.c 2008-02-12 19:57:11.000000000 +0100
+@@ -243,7 +243,7 @@
+ this_save_mode = option_save_mode;
+ if (this_save_mode != EDIT_QUICK_SAVE) {
+ if (!vfs_file_is_local (filename) ||
+- (fd = mc_open (filename, O_WRONLY | O_BINARY)) == -1) {
++ (fd = mc_open (filename, O_RDONLY | O_BINARY)) == -1) {
+ /*
+ * The file does not exists yet, so no safe save or
+ * backup are necessary.
Deleted: trunk/debian/patches/29_mc-00-slang.patch
===================================================================
--- trunk/debian/patches/29_mc-00-slang.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-00-slang.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,14 +0,0 @@
-diff -rupbB mc.orig/src/slint.c mc/src/slint.c
---- mc.orig/src/slint.c 2007-09-25 17:33:37.000000000 +0200
-+++ mc/src/slint.c 2007-11-14 11:56:19.000000000 +0100
-@@ -142,7 +142,9 @@ void
- slang_init (void)
- {
- SLtt_get_terminfo ();
--
-+#if SLANG_VERSION >= 20000
-+ SLutf8_enable (-1);
-+#endif
- /*
- * If the terminal in not in terminfo but begins with a well-known
- * string such as "linux" or "xterm" S-Lang will go on, but the
Deleted: trunk/debian/patches/29_mc-01-api.patch
===================================================================
--- trunk/debian/patches/29_mc-01-api.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-01-api.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,3972 +0,0 @@
-diff -rupbBN mc.orig/src/main.c mc/src/main.c
---- mc.orig/src/main.c 2007-11-23 17:23:36.000000000 +0100
-+++ mc/src/main.c 2007-12-06 18:20:45.000000000 +0100
-@@ -61,6 +61,7 @@
- #include "listmode.h"
- #include "execute.h"
- #include "ext.h" /* For flush_extension_file() */
-+#include "strutil.h"
-
- /* Listbox for the command history feature */
- #include "widget.h"
-@@ -2154,6 +2155,8 @@ main (int argc, char *argv[])
- home_dir = mc_home;
- }
-
-+ str_init_strings (NULL);
-+
- vfs_init ();
-
- #ifdef HAVE_SLANG
-@@ -2281,6 +2284,8 @@ main (int argc, char *argv[])
- #ifdef HAVE_CHARSET
- free_codepages_list ();
- #endif
-+ str_uninit_strings ();
-+
- g_free (this_dir);
- g_free (other_dir);
-
-diff -rupbBN mc.orig/src/Makefile.am mc/src/Makefile.am
---- mc.orig/src/Makefile.am 2007-11-23 17:23:36.000000000 +0100
-+++ mc/src/Makefile.am 2007-12-06 18:20:45.000000000 +0100
-@@ -63,7 +63,8 @@ SRCS = achown.c achown.h background.c ba
- tree.c tree.h treestore.c treestore.h tty.c tty.h user.c user.h \
- util.c util.h utilunix.c view.c view.h vfsdummy.h widget.c \
- widget.h win.c win.h wtools.c wtools.h unixcompat.h \
-- x11conn.h x11conn.c ecs.h ecs.c
-+ x11conn.h x11conn.c ecs.h ecs.c \
-+ strutil.h strutil.c strutilascii.c strutil8bit.c strutilutf8.c
-
- if CHARSET
- mc_SOURCES = $(SRCS) $(CHARSET_SRC)
-diff -rupbBN mc.orig/src/strutilascii.c mc/src/strutilascii.c
---- mc.orig/src/strutilascii.c 1970-01-01 01:00:00.000000000 +0100
-+++ mc/src/strutilascii.c 2007-12-06 18:20:45.000000000 +0100
-@@ -0,0 +1,657 @@
-+/* ASCII strings utilities
-+ Copyright (C) 2007 Free Software Foundation, Inc.
-+
-+ Written 2007 by:
-+ Rostislav Benes
-+
-+ The file_date routine is mostly from GNU's fileutils package,
-+ written by Richard Stallman and David MacKenzie.
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2 of the License, or
-+ (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ */
-+
-+#include <stdio.h>
-+#include <ctype.h>
-+#include <config.h>
-+#include <errno.h>
-+#include <iconv.h>
-+
-+#include "global.h"
-+#include "strutil.h"
-+
-+/* using g_ascii function from glib
-+ * on terminal are showed only ascii characters (lower then 0x80)
-+ */
-+
-+static const char replch = '?';
-+
-+static void
-+str_ascii_insert_replace_char (struct str_buffer *buffer)
-+{
-+ str_insert_char (replch, buffer);
-+}
-+
-+static int
-+str_ascii_is_valid_string (const char *text)
-+{
-+ return 1;
-+}
-+
-+static int
-+str_ascii_is_valid_char (const char *ch, size_t size)
-+{
-+ return 1;
-+}
-+
-+static void
-+str_ascii_cnext_char (const char **text)
-+{
-+ (*text)++;
-+}
-+
-+static void
-+str_ascii_cprev_char (const char **text)
-+{
-+ (*text)--;
-+}
-+
-+static int
-+str_ascii_cnext_noncomb_char (const char **text)
-+{
-+ if (*text[0] != '\0') {
-+ (*text)++;
-+ return 1;
-+ } else return 0;
-+}
-+
-+static int
-+str_ascii_cprev_noncomb_char (const char **text, const char *begin)
-+{
-+ if ((*text) != begin) {
-+ (*text)--;
-+ return 1;
-+ } else return 0;
-+}
-+
-+static int
-+str_ascii_isspace (const char *text)
-+{
-+ return g_ascii_isspace ((gchar) text[0]);
-+}
-+
-+static int
-+str_ascii_ispunct (const char *text)
-+{
-+ return g_ascii_ispunct ((gchar) text[0]);
-+}
-+
-+static int
-+str_ascii_isalnum (const char *text)
-+{
-+ return g_ascii_isalnum ((gchar) text[0]);
-+}
-+
-+static int
-+str_ascii_isdigit (const char *text)
-+{
-+ return g_ascii_isdigit ((gchar) text[0]);
-+}
-+
-+static int
-+str_ascii_isprint (const char *text)
-+{
-+ return g_ascii_isprint ((gchar) text[0]);
-+}
-+
-+static int
-+str_ascii_iscombiningmark (const char *text)
-+{
-+ return 0;
-+}
-+
-+static int
-+str_ascii_toupper (const char *text, char **out, size_t *remain)
-+{
-+ if (*remain <= 1) return 0;
-+ (*out)[0] = (char) g_ascii_toupper ((gchar) text[0]);
-+ (*out)++;
-+ (*remain)--;
-+ return 1;
-+}
-+
-+static int
-+str_ascii_tolower (const char *text, char **out, size_t *remain)
-+{
-+ if (*remain <= 1) return 0;
-+ (*out)[0] = (char) g_ascii_tolower ((gchar) text[0]);
-+ (*out)++;
-+ (*remain)--;
-+ return 1;
-+}
-+
-+static int
-+str_ascii_length (const char *text)
-+{
-+ return strlen (text);
-+}
-+
-+static int
-+str_ascii_length2 (const char *text, int size)
-+{
-+ return (size >= 0) ? min (strlen (text), size) : strlen (text);
-+}
-+
-+int
-+str_ascii_vfs_convert_to (str_conv_t coder, const char *string,
-+ int size, struct str_buffer *buffer)
-+{
-+ str_insert_string2 (string, size, buffer);
-+ return 0;
-+}
-+
-+
-+static const char *
-+str_ascii_term_form (const char *text)
-+{
-+ static char result[BUF_MEDIUM];
-+ char *actual;
-+ size_t remain;
-+ size_t length;
-+ size_t pos = 0;
-+
-+ actual = result;
-+ remain = sizeof (result);
-+ length = strlen (text);
-+
-+ /* go throw all characters and check, if they are ascii and printable */
-+ for (; pos < length && remain > 1; pos++, actual++, remain--) {
-+ actual[0] = isascii((unsigned char)text[pos]) ? text[pos] : '?';
-+ actual[0] = g_ascii_isprint ((gchar) actual[0]) ? actual[0] : '.';
-+ }
-+
-+ actual[0] = '\0';
-+ return result;
-+}
-+
-+static const char *
-+str_ascii_fit_to_term (const char *text, int width, int just_mode)
-+{
-+ static char result[BUF_MEDIUM];
-+ char *actual;
-+ size_t remain;
-+ int ident;
-+ size_t length;
-+ size_t pos = 0;
-+
-+ length = strlen (text);
-+ actual = result;
-+ remain = sizeof(result);
-+
-+ if (length <= width) {
-+ ident = 0;
-+ switch (HIDE_FIT (just_mode)) {
-+ case J_CENTER_LEFT:
-+ case J_CENTER:
-+ ident = (width - length) / 2;
-+ break;
-+ case J_RIGHT:
-+ ident = width - length;
-+ break;
-+ }
-+
-+ /* add space before text */
-+ if (remain <= ident) goto finally;
-+ memset (actual, ' ', ident);
-+ actual+= ident;
-+ remain-= ident;
-+
-+ /* copy all characters */
-+ for (; pos < length && remain > 1; pos++, actual++, remain--) {
-+ actual[0] = isascii((unsigned char)text[pos]) ? text[pos] : '?';
-+ actual[0] = g_ascii_isprint ((gchar) actual[0]) ? actual[0] : '.';
-+ }
-+
-+ /* add space after text */
-+ if (width - length - ident > 0) {
-+ if (remain <= width - length - ident) goto finally;
-+ memset (actual, ' ', width - length - ident);
-+ actual+= width - length - ident;
-+ remain-= width - length - ident;
-+ }
-+ } else {
-+ if (IS_FIT (just_mode)) {
-+ /* copy prefix of text, that is not wider than width / 2 */
-+ for (; pos + 1 <= width / 2 && remain > 1;
-+ actual++, pos++, remain--) {
-+ actual[0] = isascii((unsigned char)text[pos])
-+ ? text[pos] : '?';
-+ actual[0] = g_ascii_isprint ((gchar) actual[0])
-+ ? actual[0] : '.';
-+ }
-+
-+ if (remain <= 1) goto finally;
-+ actual[0] = '~';
-+ actual++;
-+ remain--;
-+
-+ pos+= length - width + 1;
-+
-+ /* copy suffix of text */
-+ for (; pos < length && remain > 1; pos++, actual++, remain--) {
-+ actual[0] = isascii((unsigned char)text[pos])
-+ ? text[pos] : '?';
-+ actual[0] = g_ascii_isprint ((gchar) actual[0])
-+ ? actual[0] : '.';
-+ }
-+ } else {
-+ ident = 0;
-+ switch (HIDE_FIT (just_mode)) {
-+ case J_CENTER:
-+ ident = (length - width) / 2;
-+ break;
-+ case J_RIGHT:
-+ ident = length - width;
-+ break;
-+ }
-+
-+ /* copy substring text, substring start from ident and take width
-+ * characters from text */
-+ pos+= ident;
-+ for (; pos < ident + width && remain > 1;
-+ pos++, actual++, remain--) {
-+ actual[0] = isascii((unsigned char)text[pos])
-+ ? text[pos] : '?';
-+ actual[0] = g_ascii_isprint ((gchar) actual[0])
-+ ? actual[0] : '.';
-+ }
-+
-+ }
-+ }
-+ finally:
-+ actual[0] = '\0';
-+ return result;
-+}
-+
-+static const char *
-+str_ascii_term_trim (const char *text, int width)
-+{
-+ static char result[BUF_MEDIUM];
-+ size_t remain;
-+ char *actual;
-+ size_t pos = 0;
-+ size_t length;
-+
-+ length = strlen (text);
-+ actual = result;
-+ remain = sizeof (result);
-+
-+ if (width < length) {
-+ if (width <= 3) {
-+ memset (actual, '.', width);
-+ actual+= width;
-+ remain-= width;
-+ } else {
-+ memset (actual, '.', 3);
-+ actual+= 3;
-+ remain-= 3;
-+
-+ pos+= length - width + 3;
-+
-+ /* copy suffix of text*/
-+ for (; pos < length && remain > 1; pos++, actual++, remain--) {
-+ actual[0] = isascii((unsigned char)text[pos])
-+ ? text[pos] : '?';
-+ actual[0] = g_ascii_isprint ((gchar) actual[0])
-+ ? actual[0] : '.';
-+ }
-+ }
-+ } else {
-+ /* copy all characters */
-+ for (; pos < length && remain > 1; pos++, actual++, remain--) {
-+ actual[0] = isascii((unsigned char)text[pos]) ? text[pos] : '?';
-+ actual[0] = g_ascii_isprint ((gchar) actual[0]) ? actual[0] : '.';
-+ }
-+ }
-+
-+ actual[0] = '\0';
-+ return result;
-+}
-+
-+static int
-+str_ascii_term_width2 (const char *text, size_t length)
-+{
-+ return (length != (size_t)(-1))
-+ ? min (strlen (text), length)
-+ : strlen (text);
-+}
-+
-+static int
-+str_ascii_term_width1 (const char *text)
-+{
-+ return str_ascii_term_width2 (text, (size_t)(-1));
-+}
-+
-+static int
-+str_ascii_term_char_width (const char *text)
-+{
-+ return 1;
-+}
-+
-+static void
-+str_ascii_msg_term_size (const char *text, int *lines, int *columns)
-+{
-+ (*lines) = 1;
-+ (*columns) = 0;
-+
-+ char *p, *tmp = g_strdup (text);
-+ char *q;
-+ char c = '\0';
-+ int width;
-+ p = tmp;
-+
-+ for (;;) {
-+ q = strchr (p, '\n');
-+ if (q != NULL) {
-+ c = q[0];
-+ q[0] = '\0';
-+ }
-+
-+ width = str_ascii_term_width1 (p);
-+ if (width > (*columns)) (*columns) = width;
-+
-+ if (q == NULL)
-+ break;
-+ q[0] = c;
-+ p = q + 1;
-+ (*lines)++;
-+ }
-+ g_free (tmp);
-+}
-+
-+static const char *
-+str_ascii_term_substring (const char *text, int start, int width)
-+{
-+ static char result[BUF_MEDIUM];
-+ size_t remain;
-+ char *actual;
-+ size_t pos = 0;
-+ size_t length;
-+
-+ actual = result;
-+ remain = sizeof (result);
-+ length = strlen (text);
-+
-+ if (start < length) {
-+ pos+= start;
-+ /* copy at most width characters from text from start */
-+ for (; pos < length && width > 0 && remain > 1;
-+ pos++, width--, actual++, remain--) {
-+
-+ actual[0] = isascii((unsigned char)text[pos]) ? text[pos] : '?';
-+ actual[0] = g_ascii_isprint ((gchar) actual[0]) ? actual[0] : '.';
-+ }
-+ }
-+
-+ /* if text is shorter then width, add space to the end */
-+ for (; width > 0 && remain > 1; actual++, remain--, width--) {
-+ actual[0] = ' ';
-+ }
-+
-+ actual[0] = '\0';
-+ return result;
-+}
-+
-+static const char *
-+str_ascii_trunc (const char *text, int width)
-+{
-+ static char result[MC_MAXPATHLEN];
-+ int remain;
-+ char *actual;
-+ size_t pos = 0;
-+ size_t length;
-+
-+ actual = result;
-+ remain = sizeof (result);
-+ length = strlen (text);
-+
-+ if (length > width) {
-+ /* copy prefix of text */
-+ for (; pos + 1 <= width / 2 && remain > 1; actual++, pos++, remain--) {
-+ actual[0] = isascii((unsigned char)text[pos]) ? text[pos] : '?';
-+ actual[0] = g_ascii_isprint ((gchar) actual[0]) ? actual[0] : '.';
-+ }
-+
-+ if (remain <= 1) goto finally;
-+ actual[0] = '~';
-+ actual++;
-+ remain--;
-+
-+ pos+= length - width + 1;
-+
-+ /* copy suffix of text */
-+ for (; pos < length && remain > 1; pos++, actual++, remain--) {
-+ actual[0] = isascii((unsigned char)text[pos]) ? text[pos] : '?';
-+ actual[0] = g_ascii_isprint ((gchar) actual[0]) ? actual[0] : '.';
-+ }
-+ } else {
-+ /* copy all characters */
-+ for (; pos < length && remain > 1; pos++, actual++, remain--) {
-+ actual[0] = isascii((unsigned char)text[pos]) ? text[pos] : '?';
-+ actual[0] = g_ascii_isprint ((gchar) actual[0]) ? actual[0] : '.';
-+ }
-+ }
-+
-+ finally:
-+ actual[0] = '\0';
-+ return result;
-+}
-+
-+static int
-+str_ascii_offset_to_pos (const char *text, size_t length)
-+{
-+ return (int)length;
-+}
-+
-+static int
-+str_ascii_column_to_pos (const char *text, size_t pos)
-+{
-+ return (int)pos;
-+}
-+
-+static char *
-+str_ascii_create_search_needle (const char *needle, int case_sen)
-+{
-+ return (char*) needle;
-+}
-+
-+static void
-+str_ascii_release_search_needle (char *needle, int case_sen)
-+{
-+}
-+
-+static const char *
-+str_ascii_search_first (const char *text, const char *search, int case_sen)
-+{
-+ char *fold_text;
-+ char *fold_search;
-+ const char *match;
-+ size_t offset;
-+
-+ fold_text = (case_sen) ? (char*) text : g_ascii_strdown (text, -1);
-+ fold_search = (case_sen) ? (char*) search : g_ascii_strdown (search, -1);
-+
-+ match = g_strstr_len (fold_text, -1, fold_search);
-+ if (match != NULL) {
-+ offset = match - fold_text;
-+ match = text + offset;
-+ }
-+
-+ if (!case_sen) {
-+ g_free (fold_text);
-+ g_free (fold_search);
-+ }
-+
-+ return match;
-+}
-+
-+static const char *
-+str_ascii_search_last (const char *text, const char *search, int case_sen)
-+{
-+ char *fold_text;
-+ char *fold_search;
-+ const char *match;
-+ size_t offset;
-+
-+ fold_text = (case_sen) ? (char*) text : g_ascii_strdown (text, -1);
-+ fold_search = (case_sen) ? (char*) search : g_ascii_strdown (search, -1);
-+
-+ match = g_strrstr_len (fold_text, -1, fold_search);
-+ if (match != NULL) {
-+ offset = match - fold_text;
-+ match = text + offset;
-+ }
-+
-+ if (!case_sen) {
-+ g_free (fold_text);
-+ g_free (fold_search);
-+ }
-+
-+ return match;
-+}
-+
-+static int
-+str_ascii_compare (const char *t1, const char *t2)
-+{
-+ return strcmp (t1, t2);
-+}
-+
-+static int
-+str_ascii_ncompare (const char *t1, const char *t2)
-+{
-+ return strncmp (t1, t2, min (strlen (t1), strlen(t2)));
-+}
-+
-+static int
-+str_ascii_casecmp (const char *t1, const char *t2)
-+{
-+ return g_ascii_strcasecmp (t1, t2);
-+}
-+
-+static int
-+str_ascii_ncasecmp (const char *t1, const char *t2)
-+{
-+ return g_ascii_strncasecmp (t1, t2, min (strlen (t1), strlen (t2)));
-+}
-+
-+static void
-+str_ascii_fix_string (char *text)
-+{
-+ for (; text[0] != '\0'; text++) {
-+ text[0] = ((unsigned char)text[0] < 128) ? text[0] : '?';
-+ }
-+}
-+
-+static char *
-+str_ascii_create_key (const char *text, int case_sen)
-+{
-+ return (char*)text;
-+}
-+
-+static int
-+str_ascii_key_collate (const char *t1, const char *t2, int case_sen)
-+{
-+ return (case_sen) ? strcmp (t1, t2) : g_ascii_strcasecmp (t1, t2);
-+}
-+
-+static void
-+str_ascii_release_key (char *key, int case_sen)
-+{
-+}
-+
-+static int
-+str_ascii_prefix (const char *text, const char *prefix)
-+{
-+ int result;
-+ for (result = 0; text[result] != '\0' && prefix[result] != '\0'
-+ && text[result] == prefix[result]; result++);
-+ return result;
-+}
-+
-+static int
-+str_ascii_caseprefix (const char *text, const char *prefix)
-+{
-+ int result;
-+ for (result = 0; text[result] != '\0' && prefix[result] != '\0'
-+ && g_ascii_toupper (text[result]) == g_ascii_toupper (prefix[result]);
-+ result++);
-+ return result;
-+}
-+
-+
-+struct str_class
-+str_ascii_init ()
-+{
-+ struct str_class result;
-+
-+ result.vfs_convert_to = str_ascii_vfs_convert_to;
-+ result.insert_replace_char = str_ascii_insert_replace_char;
-+ result.is_valid_string = str_ascii_is_valid_string;
-+ result.is_valid_char = str_ascii_is_valid_char;
-+ result.cnext_char = str_ascii_cnext_char;
-+ result.cprev_char = str_ascii_cprev_char;
-+ result.cnext_char_safe = str_ascii_cnext_char;
-+ result.cprev_char_safe = str_ascii_cprev_char;
-+ result.cnext_noncomb_char = str_ascii_cnext_noncomb_char;
-+ result.cprev_noncomb_char = str_ascii_cprev_noncomb_char;
-+ result.isspace = str_ascii_isspace;
-+ result.ispunct = str_ascii_ispunct;
-+ result.isalnum = str_ascii_isalnum;
-+ result.isdigit = str_ascii_isdigit;
-+ result.isprint = str_ascii_isprint;
-+ result.iscombiningmark = str_ascii_iscombiningmark;
-+ result.toupper = str_ascii_toupper;
-+ result.tolower = str_ascii_tolower;
-+ result.length = str_ascii_length;
-+ result.length2 = str_ascii_length2;
-+ result.length_noncomb = str_ascii_length;
-+ result.fix_string = str_ascii_fix_string;
-+ result.term_form = str_ascii_term_form;
-+ result.fit_to_term = str_ascii_fit_to_term;
-+ result.term_trim = str_ascii_term_trim;
-+ result.term_width2 = str_ascii_term_width2;
-+ result.term_width1 = str_ascii_term_width1;
-+ result.term_char_width = str_ascii_term_char_width;
-+ result.msg_term_size = str_ascii_msg_term_size;
-+ result.term_substring = str_ascii_term_substring;
-+ result.trunc = str_ascii_trunc;
-+ result.offset_to_pos = str_ascii_offset_to_pos;
-+ result.column_to_pos = str_ascii_column_to_pos;
-+ result.create_search_needle = str_ascii_create_search_needle;
-+ result.release_search_needle = str_ascii_release_search_needle;
-+ result.search_first = str_ascii_search_first;
-+ result.search_last = str_ascii_search_last;
-+ result.compare = str_ascii_compare;
-+ result.ncompare = str_ascii_ncompare;
-+ result.casecmp = str_ascii_casecmp;
-+ result.ncasecmp = str_ascii_ncasecmp;
-+ result.prefix = str_ascii_prefix;
-+ result.caseprefix = str_ascii_caseprefix;
-+ result.create_key = str_ascii_create_key;
-+ result.create_key_for_filename = str_ascii_create_key;
-+ result.key_collate = str_ascii_key_collate;
-+ result.release_key = str_ascii_release_key;
-+
-+ return result;
-+}
-diff -rupbBN mc.orig/src/strutil.c mc/src/strutil.c
---- mc.orig/src/strutil.c 1970-01-01 01:00:00.000000000 +0100
-+++ mc/src/strutil.c 2007-12-06 18:20:45.000000000 +0100
-@@ -0,0 +1,802 @@
-+/* common strings utilities
-+ Copyright (C) 2007 Free Software Foundation, Inc.
-+
-+ Written 2007 by:
-+ Rostislav Benes
-+
-+ The file_date routine is mostly from GNU's fileutils package,
-+ written by Richard Stallman and David MacKenzie.
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2 of the License, or
-+ (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ */
-+
-+#include <config.h>
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <iconv.h>
-+#include <glib.h>
-+#include <langinfo.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <stdarg.h>
-+
-+#include "global.h"
-+#include "strutil.h"
-+
-+//names, that are used for utf-8
-+static const char *str_utf8_encodings[] = {
-+ "utf-8",
-+ "utf8",
-+ NULL};
-+
-+// standard 8bit encodings, no wide or multibytes characters
-+static const char *str_8bit_encodings[] = {
-+ "iso-8859",
-+ "iso8859",
-+ NULL
-+};
-+
-+// terminal encoding
-+static char *codeset;
-+// function for encoding specific operations
-+static struct str_class used_class;
-+// linked list of string buffers
-+static struct str_buffer *buffer_list = NULL;
-+
-+iconv_t str_cnv_to_term;
-+iconv_t str_cnv_from_term;
-+iconv_t str_cnv_not_convert;
-+
-+// if enc is same encoding like on terminal
-+static int
-+str_test_not_convert (const char *enc)
-+{
-+ return g_ascii_strcasecmp (enc, codeset) == 0;
-+}
-+
-+str_conv_t
-+str_crt_conv_to (const char *to_enc)
-+{
-+ return (!str_test_not_convert (to_enc)) ? iconv_open (to_enc, codeset) :
-+ str_cnv_not_convert;
-+}
-+
-+str_conv_t
-+str_crt_conv_from (const char *from_enc)
-+{
-+ return (!str_test_not_convert (from_enc)) ? iconv_open (codeset, from_enc) :
-+ str_cnv_not_convert;
-+}
-+
-+void
-+str_close_conv (str_conv_t conv)
-+{
-+ if (conv != str_cnv_not_convert)
-+ iconv_close (conv);
-+}
-+
-+struct str_buffer *
-+str_get_buffer ()
-+{
-+ struct str_buffer *result;
-+
-+ result = buffer_list;
-+
-+ while (result != NULL) {
-+ if (!result->used) {
-+ str_reset_buffer (result);
-+ result->used = 1;
-+ return result;
-+ }
-+ result = result->next;
-+ }
-+
-+ result = g_new (struct str_buffer, 1);
-+ result->size = BUF_TINY;
-+ result->data = g_new0 (char, result->size);
-+ result->data[0] = '\0';
-+ result->actual = result->data;
-+ result->remain = result->size;
-+
-+ result->next = buffer_list;
-+ buffer_list = result;
-+
-+ result->used = 1;
-+
-+ return result;
-+}
-+
-+void
-+str_release_buffer (struct str_buffer *buffer)
-+{
-+ buffer->used = 0;
-+}
-+
-+void
-+str_incrase_buffer (struct str_buffer *buffer)
-+{
-+ size_t offset;
-+
-+ offset = buffer->actual - buffer->data;
-+ buffer->remain+= buffer->size;
-+ buffer->size*= 2;
-+ buffer->data = g_renew (char, buffer->data, buffer->size);
-+ buffer->actual = buffer->data + offset;
-+}
-+
-+void
-+str_reset_buffer (struct str_buffer *buffer)
-+{
-+ buffer->data[0] = '\0';
-+ buffer->actual = buffer->data;
-+ buffer->remain = buffer->size;
-+}
-+
-+static int
-+_str_convert (str_conv_t coder, char *string, struct str_buffer *buffer)
-+{
-+ int state;
-+ size_t left;
-+ size_t nconv;
-+
-+ errno = 0;
-+
-+ if (used_class.is_valid_string (string)) {
-+ state = 0;
-+
-+ left = strlen (string);
-+
-+ if (coder == (iconv_t) (-1)) return ESTR_FAILURE;
-+
-+ iconv(coder, NULL, NULL, NULL, NULL);
-+
-+ while (((int)left) > 0) {
-+ nconv = iconv(coder, &string, &left,
-+ &(buffer->actual), &(buffer->remain));
-+ if (nconv == (size_t) (-1)) {
-+ switch (errno) {
-+ case EINVAL:
-+ return ESTR_FAILURE;
-+ case EILSEQ:
-+ string++;
-+ left--;
-+ if (buffer->remain <= 0) {
-+ str_incrase_buffer (buffer);
-+ }
-+ buffer->actual[0] = '?';
-+ buffer->actual++;
-+ buffer->remain--;
-+ state = ESTR_PROBLEM;
-+ break;
-+ case E2BIG:
-+ str_incrase_buffer (buffer);
-+ break;
-+ }
-+ }
-+ };
-+
-+ return state;
-+ } else return ESTR_FAILURE;
-+}
-+
-+int
-+str_convert (str_conv_t coder, char *string, struct str_buffer *buffer)
-+{
-+ int result;
-+
-+ result = _str_convert (coder, string, buffer);
-+ buffer->actual[0] = '\0';
-+
-+ return result;
-+}
-+
-+static int
-+_str_vfs_convert_from (str_conv_t coder, char *string,
-+ struct str_buffer *buffer)
-+{
-+ size_t left;
-+ size_t nconv;
-+
-+ left = strlen (string);
-+
-+ if (coder == (iconv_t) (-1)) return ESTR_FAILURE;
-+
-+ iconv(coder, NULL, NULL, NULL, NULL);
-+
-+ do {
-+ nconv = iconv(coder, &string, &left,
-+ &(buffer->actual), &(buffer->remain));
-+ if (nconv == (size_t) (-1)) {
-+ switch (errno) {
-+ case EINVAL:
-+ return ESTR_FAILURE;
-+ case EILSEQ:
-+ return ESTR_FAILURE;
-+ case E2BIG:
-+ str_incrase_buffer (buffer);
-+ break;
-+ }
-+ }
-+ } while (left > 0);
-+
-+ return 0;
-+}
-+
-+int
-+str_vfs_convert_from (str_conv_t coder, char *string, struct str_buffer *buffer)
-+{
-+ int result;
-+
-+ if (coder == str_cnv_not_convert) {
-+ str_insert_string (string, buffer);
-+ result = 0;
-+ } else result = _str_vfs_convert_from (coder, string, buffer);
-+ buffer->actual[0] = '\0';
-+
-+ return result;
-+}
-+
-+int
-+str_vfs_convert_to (str_conv_t coder, const char *string,
-+ int size, struct str_buffer *buffer)
-+{
-+ return used_class.vfs_convert_to (coder, string, size, buffer);
-+}
-+
-+void
-+str_insert_string (const char *string, struct str_buffer *buffer)
-+{
-+ size_t s;
-+
-+ s = strlen (string);
-+ while (buffer->remain < s) str_incrase_buffer (buffer);
-+
-+ memcpy (buffer->actual, string, s);
-+ buffer->actual+= s;
-+ buffer->remain-= s;
-+ buffer->actual[0] = '\0';
-+}
-+
-+void
-+str_insert_string2 (const char *string, int size, struct str_buffer *buffer)
-+{
-+ size_t s;
-+
-+ s = (size >= 0) ? size : strlen (string);
-+ while (buffer->remain < s) str_incrase_buffer (buffer);
-+
-+ memcpy (buffer->actual, string, s);
-+ buffer->actual+= s;
-+ buffer->remain-= s;
-+ buffer->actual[0] = '\0';
-+}
-+
-+void
-+str_printf (struct str_buffer *buffer, const char *format, ...)
-+{
-+ int size;
-+ va_list ap;
-+
-+ va_start (ap, format);
-+ size = vsnprintf (buffer->actual, buffer->remain, format, ap);
-+ while (buffer->remain <= size) {
-+ str_incrase_buffer (buffer);
-+ size = vsnprintf (buffer->actual, buffer->remain, format, ap);
-+ }
-+ buffer->actual+= size;
-+ buffer->remain-= size;
-+ va_end (ap);
-+}
-+
-+void
-+str_insert_char (char ch, struct str_buffer *buffer)
-+{
-+ if (buffer->remain <= 1) str_incrase_buffer (buffer);
-+
-+ buffer->actual[0] = ch;
-+ buffer->actual++;
-+ buffer->remain--;
-+ buffer->actual[0] = '\0';
-+}
-+
-+void
-+str_insert_replace_char (struct str_buffer *buffer)
-+{
-+ used_class.insert_replace_char (buffer);
-+}
-+
-+void
-+str_backward_buffer (struct str_buffer *buffer, int count)
-+{
-+ char *prev;
-+
-+ while ((count > 0) && (buffer->actual > buffer->data)) {
-+ prev = str_get_prev_char (buffer->actual);
-+ buffer->remain+= buffer->actual - prev;
-+ buffer->actual = prev;
-+ buffer->actual[0] = '\0';
-+ count--;
-+ }
-+}
-+
-+
-+int
-+str_translate_char (str_conv_t conv, char *keys, size_t ch_size,
-+ char *output, size_t out_size)
-+{
-+ size_t left;
-+ size_t cnv;
-+
-+ iconv (conv, NULL, NULL, NULL, NULL);
-+
-+ left = (ch_size == (size_t)(-1)) ? strlen (keys) : ch_size;
-+
-+ cnv = iconv (conv, &keys, &left, &output, &out_size);
-+ if (cnv == (size_t)(-1)) {
-+ if (errno == EINVAL) return ESTR_PROBLEM; else return ESTR_FAILURE;
-+ } else {
-+ output[0] = '\0';
-+ return 0;
-+ }
-+}
-+
-+
-+static const char *
-+str_detect_termencoding ()
-+{
-+ return (nl_langinfo(CODESET));
-+}
-+
-+static int
-+str_test_encoding_class (const char *encoding, const char **table)
-+{
-+ int t;
-+ int result = 0;
-+
-+ for (t = 0; table[t] != NULL; t++) {
-+ result+= (g_ascii_strncasecmp (encoding, table[t],
-+ strlen (table[t])) == 0);
-+ }
-+
-+ return result;
-+}
-+
-+static void
-+str_choose_str_functions ()
-+{
-+ if (str_test_encoding_class (codeset, str_utf8_encodings)) {
-+ used_class = str_utf8_init ();
-+ } else if (str_test_encoding_class (codeset, str_8bit_encodings)) {
-+ used_class = str_8bit_init ();
-+ } else {
-+ used_class = str_ascii_init ();
-+ }
-+}
-+
-+void
-+str_init_strings (const char *termenc)
-+{
-+ codeset = g_strdup ((termenc != NULL)
-+ ? termenc
-+ : str_detect_termencoding ());
-+
-+ str_cnv_not_convert = iconv_open (codeset, codeset);
-+ if (str_cnv_not_convert == INVALID_CONV) {
-+ if (termenc != NULL) {
-+ g_free (codeset);
-+ codeset = g_strdup (str_detect_termencoding ());
-+ str_cnv_not_convert = iconv_open (codeset, codeset);
-+ }
-+
-+ if (str_cnv_not_convert == INVALID_CONV) {
-+ g_free (codeset);
-+ codeset = g_strdup ("ascii");
-+ str_cnv_not_convert = iconv_open (codeset, codeset);
-+ }
-+ }
-+
-+ str_cnv_to_term = str_cnv_not_convert;
-+ str_cnv_from_term = str_cnv_not_convert;
-+
-+ str_choose_str_functions ();
-+}
-+
-+static void
-+str_release_buffer_list ()
-+{
-+ struct str_buffer *buffer;
-+ struct str_buffer *next;
-+
-+ buffer = buffer_list;
-+ while (buffer != NULL) {
-+ next = buffer->next;
-+ g_free (buffer->data);
-+ g_free (buffer);
-+ buffer = next;
-+ }
-+}
-+
-+void
-+str_uninit_strings ()
-+{
-+ str_release_buffer_list ();
-+
-+ iconv_close (str_cnv_not_convert);
-+}
-+
-+const char *
-+str_term_form (const char *text)
-+{
-+ return used_class.term_form (text);
-+}
-+
-+const char *
-+str_fit_to_term (const char *text, int width, int just_mode)
-+{
-+ return used_class.fit_to_term (text, width, just_mode);
-+}
-+
-+const char *
-+str_term_trim (const char *text, int width)
-+{
-+ return used_class.term_trim (text, width);
-+}
-+
-+void
-+str_msg_term_size (const char *text, int *lines, int *columns)
-+{
-+ return used_class.msg_term_size (text, lines, columns);
-+}
-+
-+const char *
-+str_term_substring (const char *text, int start, int width)
-+{
-+ return used_class.term_substring (text, start, width);
-+}
-+
-+char *
-+str_get_next_char (char *text)
-+{
-+
-+ used_class.cnext_char ((const char **)&text);
-+ return text;
-+}
-+
-+const char *
-+str_cget_next_char (const char *text)
-+{
-+ used_class.cnext_char (&text);
-+ return text;
-+}
-+
-+void
-+str_next_char (char **text)
-+{
-+ used_class.cnext_char ((const char **) text);
-+}
-+
-+void
-+str_cnext_char (const char **text)
-+{
-+ used_class.cnext_char (text);
-+}
-+
-+char *
-+str_get_prev_char (char *text)
-+{
-+ used_class.cprev_char ((const char **) &text);
-+ return text;
-+}
-+
-+const char *
-+str_cget_prev_char (const char *text)
-+{
-+ used_class.cprev_char (&text);
-+ return text;
-+}
-+
-+void
-+str_prev_char (char **text)
-+{
-+ used_class.cprev_char ((const char **) text);
-+}
-+
-+void
-+str_cprev_char (const char **text)
-+{
-+ used_class.cprev_char (text);
-+}
-+
-+char *
-+str_get_next_char_safe (char *text)
-+{
-+ used_class.cnext_char_safe ((const char **) &text);
-+ return text;
-+}
-+
-+const char *
-+str_cget_next_char_safe (const char *text)
-+{
-+ used_class.cnext_char_safe (&text);
-+ return text;
-+}
-+
-+void
-+str_next_char_safe (char **text)
-+{
-+ used_class.cnext_char_safe ((const char **) text);
-+}
-+
-+void
-+str_cnext_char_safe (const char **text)
-+{
-+ used_class.cnext_char_safe (text);
-+}
-+
-+char *
-+str_get_prev_char_safe (char *text)
-+{
-+ used_class.cprev_char_safe ((const char **) &text);
-+ return text;
-+}
-+
-+const char *
-+str_cget_prev_char_safe (const char *text)
-+{
-+ used_class.cprev_char_safe (&text);
-+ return text;
-+}
-+
-+void
-+str_prev_char_safe (char **text)
-+{
-+ used_class.cprev_char_safe ((const char **) text);
-+}
-+
-+void
-+str_cprev_char_safe (const char **text)
-+{
-+ used_class.cprev_char_safe (text);
-+}
-+
-+int
-+str_next_noncomb_char (char **text)
-+{
-+ return used_class.cnext_noncomb_char ((const char **) text);
-+}
-+
-+int
-+str_cnext_noncomb_char (const char **text)
-+{
-+ return used_class.cnext_noncomb_char (text);
-+}
-+
-+int
-+str_prev_noncomb_char (char **text, const char *begin)
-+{
-+ return used_class.cprev_noncomb_char ((const char **) text, begin);
-+}
-+
-+int
-+str_cprev_noncomb_char (const char **text, const char *begin)
-+{
-+ return used_class.cprev_noncomb_char (text, begin);
-+}
-+
-+int
-+str_is_valid_char (const char *ch, size_t size)
-+{
-+ return used_class.is_valid_char (ch, size);
-+}
-+
-+int
-+str_term_width1 (const char *text)
-+{
-+ return used_class.term_width1 (text);
-+}
-+
-+int
-+str_term_width2 (const char *text, size_t length)
-+{
-+ return used_class.term_width2 (text, length);
-+}
-+
-+int
-+str_term_char_width (const char *text)
-+{
-+ return used_class.term_char_width (text);
-+}
-+
-+int
-+str_offset_to_pos (const char* text, size_t length)
-+{
-+ return used_class.offset_to_pos (text, length);
-+}
-+
-+int
-+str_length (const char* text)
-+{
-+ return used_class.length (text);
-+}
-+
-+int
-+str_length2 (const char* text, int size)
-+{
-+ return used_class.length2 (text, size);
-+}
-+
-+int
-+str_length_noncomb (const char* text)
-+{
-+ return used_class.length_noncomb (text);
-+}
-+
-+int
-+str_column_to_pos (const char *text, size_t pos)
-+{
-+ return used_class.column_to_pos (text, pos);
-+}
-+
-+int
-+str_isspace (const char *ch)
-+{
-+ return used_class.isspace (ch);
-+}
-+
-+int
-+str_ispunct (const char *ch)
-+{
-+ return used_class.ispunct (ch);
-+}
-+
-+int
-+str_isalnum (const char *ch)
-+{
-+ return used_class.isalnum (ch);
-+}
-+
-+int
-+str_isdigit (const char *ch)
-+{
-+ return used_class.isdigit (ch);
-+}
-+
-+int
-+str_toupper (const char *ch, char **out, size_t *remain)
-+{
-+ return used_class.toupper (ch, out, remain);
-+}
-+
-+int
-+str_tolower (const char *ch, char **out, size_t *remain)
-+{
-+ return used_class.tolower (ch, out, remain);
-+}
-+
-+int
-+str_isprint (const char *ch)
-+{
-+ return used_class.isprint (ch);
-+}
-+
-+int
-+str_iscombiningmark (const char *ch)
-+{
-+ return used_class.iscombiningmark (ch);
-+}
-+
-+const char *
-+str_trunc (const char *text, int width)
-+{
-+ return used_class.trunc (text, width);
-+}
-+
-+char *
-+str_create_search_needle (const char *needle, int case_sen)
-+{
-+ return used_class.create_search_needle (needle, case_sen);
-+}
-+
-+
-+void
-+str_release_search_needle (char *needle, int case_sen)
-+{
-+ used_class.release_search_needle (needle, case_sen);
-+}
-+
-+const char *
-+str_search_first (const char *text, const char *search, int case_sen)
-+{
-+ return used_class.search_first (text, search, case_sen);
-+}
-+
-+const char *
-+str_search_last (const char *text, const char *search, int case_sen)
-+{
-+ return used_class.search_last (text, search, case_sen);
-+}
-+
-+int
-+str_is_valid_string (const char *text)
-+{
-+ return used_class.is_valid_string (text);
-+}
-+
-+int
-+str_compare (const char *t1, const char *t2)
-+{
-+ return used_class.compare (t1, t2);
-+}
-+
-+int
-+str_ncompare (const char *t1, const char *t2)
-+{
-+ return used_class.ncompare (t1, t2);
-+}
-+
-+int
-+str_casecmp (const char *t1, const char *t2)
-+{
-+ return used_class.casecmp (t1, t2);
-+}
-+
-+int
-+str_ncasecmp (const char *t1, const char *t2)
-+{
-+ return used_class.ncasecmp (t1, t2);
-+}
-+
-+int
-+str_prefix (const char *text, const char *prefix)
-+{
-+ return used_class.prefix (text, prefix);
-+}
-+
-+int
-+str_caseprefix (const char *text, const char *prefix)
-+{
-+ return used_class.caseprefix (text, prefix);
-+}
-+
-+void
-+str_fix_string (char *text)
-+{
-+ used_class.fix_string (text);
-+}
-+
-+char *
-+str_create_key (const char *text, int case_sen)
-+{
-+ return used_class.create_key (text, case_sen);
-+}
-+
-+char *
-+str_create_key_for_filename (const char *text, int case_sen)
-+{
-+ return used_class.create_key_for_filename (text, case_sen);
-+}
-+
-+int
-+str_key_collate (const char *t1, const char *t2, int case_sen)
-+{
-+ return used_class.key_collate (t1, t2, case_sen);
-+}
-+
-+void
-+str_release_key (char *key, int case_sen)
-+{
-+ used_class.release_key (key, case_sen);
-+}
-+
-diff -rupbBN mc.orig/src/strutil.h mc/src/strutil.h
---- mc.orig/src/strutil.h 1970-01-01 01:00:00.000000000 +0100
-+++ mc/src/strutil.h 2007-12-06 18:20:45.000000000 +0100
-@@ -0,0 +1,537 @@
-+#ifndef MC_STRUTIL_H
-+#define MC_STRUTIL_H
-+
-+/* Header file for strutil.c, strutilascii.c, strutil8bit.c, strutilutf8.c.
-+ * There are two sort of functions:
-+ * 1. functions for working with growing strings and conversion strings between
-+ * different encodings.
-+ * (implemented directly in strutil.c)
-+ * 2. functions, that hide differences between encodings derived from ASCII.
-+ * (implemented separately in strutilascii.c, strutil8bit.c, strutilutf8.c)
-+ * documentation is made for UTF-8 version of functions.
-+ */
-+
-+/* invalid strings
-+ * function, that works with invalid strings are marked with "I"
-+ * in documentation
-+ * invalid bytes of string are handled as one byte characters with width 1, they
-+ * are displayed as questionmarks, I-maked comparing functions try to keep
-+ * the original value of these bytes.
-+ */
-+
-+/* combining characters
-+ * displaynig: all handled as zero with characters, expect combing character
-+ * at the begin of string, this character has with one (space add before),
-+ * so str_term_width is not good for computing width of singles characters
-+ * (never return zero, expect emtpy string)
-+ * for compatibility are strings composed before displaynig
-+ * comparing: comparing decompose all string before comparing, n-compare
-+ * functions do not work as is usual, because same strings do not have to be
-+ * same length in UTF-8. So they return 0 if one string is prefix of the other
-+ * one.
-+ * str_prefix is used to determine, how many characters from one string are
-+ * prefix in second string. However, str_prefix return number of characters in
-+ * decompose form. (used in do_search (screen.c))
-+ */
-+#include <iconv.h>
-+
-+/* errors for conversion function:
-+ * problem means, that not every characters was successfully converted (They are
-+ * replaced with questionmark). So is impossible convert string back.
-+ * failure means, that conversion is not possible (example: wrong encoding
-+ * of input string)
-+ */
-+#define ESTR_PROBLEM 1
-+#define ESTR_FAILURE 2
-+
-+/* constanst originally from screen.c
-+ * used for alignment strings on terminal
-+ */
-+#define J_LEFT 0x01
-+#define J_RIGHT 0x02
-+#define J_CENTER 0x03
-+// if there is enough space for string on terminal, string is centered
-+// otherwise is aligned to left
-+#define J_CENTER_LEFT 0x04
-+
-+#define IS_FIT(x) ((x) & 0x0010)
-+#define MAKE_FIT(x) ((x) | 0x0010)
-+#define HIDE_FIT(x) ((x) & 0x000f)
-+
-+// fit alignment, if string is to long, is truncated with '~'
-+#define J_LEFT_FIT 0x11
-+#define J_RIGHT_FIT 0x12
-+#define J_CENTER_FIT 0x13
-+#define J_CENTER_LEFT_FIT 0x14
-+
-+// redefinition of iconv_t, so is not needed include iconv.h in other files.
-+typedef iconv_t str_conv_t;
-+#define INVALID_CONV ((iconv_t) (-1))
-+
-+// standard convertors
-+extern str_conv_t str_cnv_to_term;
-+extern str_conv_t str_cnv_from_term;
-+// from terminal encoding to terminal encoding
-+extern str_conv_t str_cnv_not_convert;
-+
-+/* structure for growing strings
-+ * try to avoid set any members manually
-+ */
-+struct str_buffer {
-+ // all buffers are stored in linked list
-+ struct str_buffer *next;
-+ // if is buffer in use or not
-+ int used;
-+ // whole string
-+ char *data;
-+ // size of string
-+ size_t size;
-+ // end of string, actual[0] is always '\0'
-+ char *actual;
-+ // how many (chars)bytes remain after actual
-+ size_t remain;
-+};
-+
-+// all functions in str_class must be defined for every encoding
-+struct str_class {
-+ int (*vfs_convert_to) (str_conv_t coder, const char *string,
-+ int size, struct str_buffer *buffer); //I
-+ void (*insert_replace_char) (struct str_buffer *buffer);
-+ int (*is_valid_string) (const char *); //I
-+ int (*is_valid_char) (const char *, size_t); //I
-+ void (*cnext_char) (const char **);
-+ void (*cprev_char) (const char **);
-+ void (*cnext_char_safe) (const char **); //I
-+ void (*cprev_char_safe) (const char **); //I
-+ int (*cnext_noncomb_char) (const char **text); //I
-+ int (*cprev_noncomb_char) (const char **text, const char *begin); //I
-+ int (*isspace) (const char *); //I
-+ int (*ispunct) (const char *); //I
-+ int (*isalnum) (const char *); //I
-+ int (*isdigit) (const char *); //I
-+ int (*isprint) (const char *); //I
-+ int (*iscombiningmark) (const char *); //I
-+ int (*length) (const char *); //I
-+ int (*length2) (const char *, int); //I
-+ int (*length_noncomb) (const char *); //I
-+ int (*toupper) (const char *, char **, size_t *);
-+ int (*tolower) (const char *, char **, size_t *);
-+ void (*fix_string) (char *); //I
-+ const char *(*term_form) (const char *); //I
-+ const char *(*fit_to_term) (const char *, int, int); //I
-+ const char *(*term_trim) (const char *text, int width); //I
-+ void (*msg_term_size) (const char *, int *, int *); //I
-+ const char *(*term_substring) (const char *, int, int); //I
-+ int (*term_width1) (const char *); //I
-+ int (*term_width2) (const char *, size_t); //I
-+ int (*term_char_width) (const char *); //I
-+ const char *(*trunc) (const char *, int); //I
-+ int (*offset_to_pos) (const char *, size_t); //I
-+ int (*column_to_pos) (const char *, size_t); //I
-+ char *(*create_search_needle) (const char *, int);
-+ void (*release_search_needle) (char *, int);
-+ const char *(*search_first) (const char *, const char *, int);
-+ const char *(*search_last) (const char *, const char *, int);
-+ int (*compare) (const char *, const char *); //I
-+ int (*ncompare) (const char *, const char *); //I
-+ int (*casecmp) (const char *, const char *); //I
-+ int (*ncasecmp) (const char *, const char *); //I
-+ int (*prefix) (const char *, const char *); //I
-+ int (*caseprefix) (const char *, const char *); //I
-+ char *(*create_key) (const char *text, int case_sen); //I
-+ char *(*create_key_for_filename) (const char *text, int case_sen); //I
-+ int (*key_collate) (const char *t1, const char *t2, int case_sen); //I
-+ void (*release_key) (char *key, int case_sen); //I
-+};
-+
-+struct str_class str_utf8_init ();
-+struct str_class str_8bit_init ();
-+struct str_class str_ascii_init ();
-+
-+/* create convertor from "from_enc" to terminal encoding
-+ * if "from_enc" is not supported return INVALID_CONV
-+ */
-+str_conv_t str_crt_conv_from (const char *from_enc);
-+
-+/* create convertor from terminal encoding to "to_enc"
-+ * if "to_enc" is not supported return INVALID_CONV
-+ */
-+str_conv_t str_crt_conv_to (const char *to_enc);
-+
-+/* close convertor, do not close str_cnv_to_term, str_cnv_from_term,
-+ * str_cnv_not_convert
-+ */
-+void str_close_conv (str_conv_t conv);
-+
-+/* return on of not used buffers (.used == 0) or create new
-+ * returned buffer has set .used to 1
-+ */
-+struct str_buffer *str_get_buffer ();
-+
-+/* clear buffer, in .data is empty string, .actual = .data, .remain = .size
-+ * do not set .used
-+ */
-+void str_reset_buffer (struct str_buffer *buffer);
-+
-+/* set .used of buffer to 0, so can be returned by str_get_buffer again
-+ * data in buffer may stay valid after function return
-+ */
-+void str_release_buffer (struct str_buffer *buffer);
-+
-+/* incrase capacity of buffer
-+ */
-+void str_incrase_buffer (struct str_buffer *buffer);
-+
-+/* convert string using coder, result of conversion is appended at end of buffer
-+ * return 0 if there was no problem.
-+ * otherwise return ESTR_PROBLEM or ESTR_FAILURE
-+ */
-+int str_convert (str_conv_t coder, char *string,
-+ struct str_buffer *buffer);
-+
-+/* return only 0 or ESTR_FAILURE, because vfs must be able to convert result to
-+ * original string. (so no replace with questionmark)
-+ * if coder is str_cnv_from_term or str_cnv_not_convert, string is only copied,
-+ * so is possible to show file, that is not valid in terminal encoding
-+ */
-+int str_vfs_convert_from (str_conv_t coder, char *string,
-+ struct str_buffer *buffer);
-+
-+/* if coder is str_cnv_to_term or str_cnv_not_convert, string is only copied,
-+ * does replace with questionmark
-+ * I
-+ */
-+int str_vfs_convert_to (str_conv_t coder, const char *string,
-+ int size, struct str_buffer *buffer);
-+
-+/* append string at the end of buffer
-+ */
-+void str_insert_string (const char *string, struct str_buffer *buffer);
-+
-+/* append string at the end of buffer, limit to size
-+ */
-+void
-+str_insert_string2 (const char *string, int size, struct str_buffer *buffer);
-+
-+/* printf functin for str_buffer, append result of printf at the end of buffer
-+ */
-+void
-+str_printf (struct str_buffer *buffer, const char *format, ...);
-+
-+/* append char at the end of buffer
-+ */
-+void str_insert_char (char ch, struct str_buffer *buffer);
-+
-+/* add standard replacement character in terminal encoding
-+ */
-+void str_insert_replace_char (struct str_buffer *buffer);
-+
-+/* rewind "count" characters buffer back
-+ */
-+void str_backward_buffer (struct str_buffer *buffer, int count);
-+
-+/* init strings and set terminal encoding,
-+ * if is termenc NULL, detect terminal encoding
-+ * create all str_cnv_* and set functions for terminal encoding
-+ */
-+void str_init_strings (const char *termenc);
-+
-+/* free all str_buffer and all str_cnv_*
-+ */
-+void str_uninit_strings ();
-+
-+/* try convert characters in ch to output using conv
-+ * ch_size is size of ch, can by (size_t)(-1) (-1 only for ASCII
-+ * compatible encoding, for other must be set)
-+ * return 0 if conversion was successfully, ESTR_PROBLEM if ch contains only
-+ * part of characters, ESTR_FAILURE if conversion is not possible
-+ */
-+int str_translate_char (str_conv_t conv, char *ch, size_t ch_size,
-+ char *output, size_t out_size);
-+
-+/* test, if text is valid in terminal encoding
-+ * I
-+ */
-+int str_is_valid_string (const char *text);
-+
-+/* test, if first char of ch is valid
-+ * size, how many bytes characters occupied, could be (size_t)(-1)
-+ * return 1 if it is valid, -1 if it is invalid or -2 if it is only part of
-+ * multibyte character
-+ * I
-+ */
-+int str_is_valid_char (const char *ch, size_t size);
-+
-+/* return next characters after text, do not call on the end of string
-+ */
-+char *str_get_next_char (char *text);
-+const char *str_cget_next_char (const char *text);
-+
-+/* return previous characters before text, do not call on the start of strings
-+ */
-+char *str_get_prev_char (char *text);
-+const char *str_cget_prev_char (const char *text);
-+
-+/* set text to next characters, do not call on the end of string
-+ */
-+void str_next_char (char **text);
-+void str_cnext_char (const char **text);
-+
-+/* set text to previous characters, do not call on the start of strings
-+ */
-+void str_prev_char (char **text);
-+void str_cprev_char (const char **text);
-+
-+/* return next characters after text, do not call on the end of string
-+ * works with invalid string
-+ * I
-+ */
-+char *str_get_next_char_safe (char *text);
-+const char *str_cget_next_char_safe (const char *text);
-+
-+/* return previous characters before text, do not call on the start of strings
-+ * works with invalid string
-+ * I
-+ */
-+char *str_get_prev_char_safe (char *text);
-+const char *str_cget_prev_char_safe (const char *text);
-+
-+/* set text to next characters, do not call on the end of string
-+ * works with invalid string
-+ * I
-+ */
-+void str_next_char_safe (char **text);
-+void str_cnext_char_safe (const char **text);
-+
-+/* set text to previous characters, do not call on the start of strings
-+ * works with invalid string
-+ * I
-+ */
-+void str_prev_char_safe (char **text);
-+void str_cprev_char_safe (const char **text);
-+
-+/* set text to next noncombining characters, check the end of text
-+ * return how many characters was skipped
-+ * works with invalid string
-+ * I
-+ */
-+int str_next_noncomb_char (char **text);
-+int str_cnext_noncomb_char (const char **text);
-+
-+/* set text to previous noncombining characters, search stop at begin
-+ * return how many characters was skipped
-+ * works with invalid string
-+ * I
-+ */
-+int str_prev_noncomb_char (char **text, const char *begin);
-+int str_cprev_noncomb_char (const char **text, const char *begin);
-+
-+/* if first characters in ch is space, tabulator or new lines
-+ * I
-+ */
-+int str_isspace (const char *ch);
-+
-+/* if first characters in ch is punctuation or symbol
-+ * I
-+ */
-+int str_ispunct (const char *ch);
-+
-+/* if first characters in ch is alphanum
-+ * I
-+ */
-+int str_isalnum (const char *ch);
-+
-+/* if first characters in ch is digit
-+ * I
-+ */
-+int str_isdigit (const char *ch);
-+
-+/* if first characters in ch is printable
-+ * I
-+ */
-+int str_isprint (const char *ch);
-+
-+/* if first characters in ch is a combining mark (only in utf-8)
-+ * combining makrs are assumed to be zero width
-+ * I
-+ */
-+int str_iscombiningmark (const char *ch);
-+
-+/* write lower from of fisrt characters in ch into out
-+ * decrase remain by size of returned characters
-+ * if out is not big enough, do nothing
-+ */
-+int str_toupper (const char *ch, char **out, size_t *remain);
-+
-+/* write upper from of fisrt characters in ch into out
-+ * decrase remain by size of returned characters
-+ * if out is not big enough, do nothing
-+ */
-+int str_tolower (const char *ch, char **out, size_t *remain);
-+
-+/* return length of text in characters
-+ * I
-+ */
-+int str_length (const char* text);
-+
-+/* return length of text in characters, limit to size
-+ * I
-+ */
-+int str_length2 (const char* text, int size);
-+
-+/* return length of text in characters, count only noncombining characters
-+ * I
-+ */
-+int str_length_noncomb (const char* text);
-+
-+/* replace all invalid characters in text with questionmark
-+ * after return, text is valid string in terminal encoding
-+ * I
-+ */
-+void str_fix_string (char* text);
-+
-+/* replace all invalid characters in text with questionmark
-+ * replace all unprintable characters with '.'
-+ * return static allocated string, "text" is not changed
-+ * returned string do not need to be freed
-+ * I
-+ */
-+const char *str_term_form (const char *text);
-+
-+/* like str_term_form, but text can be alignment to width
-+ * alignment is specified in just_mode (J_LEFT, J_LEFT_FIT, ...)
-+ * result is completed with spaces to width
-+ * I
-+ */
-+const char *str_fit_to_term (const char *text, int width, int just_mode);
-+
-+/* like str_term_form, but when text is wider than width, three dots are
-+ * inserted at begin and result is completed with suffix of text
-+ * no additional spaces are inserted
-+ * I
-+ */
-+const char *str_term_trim (const char *text, int width);
-+
-+/* return how many lines and columns will text occupy on terminal
-+ * I
-+ */
-+void str_msg_term_size (const char *text, int *lines, int *columns);
-+
-+/* like str_term_form, but return only specified substring
-+ * start - column (position) on terminal, where substring begin
-+ * result is completed with spaces to width
-+ * I
-+ */
-+const char *str_term_substring (const char *text, int start, int width);
-+
-+/* return width, that will be text occupied on terminal
-+ * I
-+ */
-+int str_term_width1 (const char *text);
-+
-+/* return width, that will be text occupied on terminal
-+ * text is limited by length in characters
-+ * I
-+ */
-+int str_term_width2 (const char *text, size_t length);
-+
-+/* return width, that will be character occupied on terminal
-+ * combining characters are always zero width
-+ * I
-+ */
-+int str_term_char_width (const char *text);
-+
-+/* convert position in characters to position in bytes
-+ * I
-+ */
-+int str_offset_to_pos (const char* text, size_t length);
-+
-+/* convert position on terminal to position in characters
-+ * I
-+ */
-+int str_column_to_pos (const char *text, size_t pos);
-+
-+/* like str_fit_to_term width just_mode = J_LEFT_FIT,
-+ * but do not insert additional spaces
-+ * I
-+ */
-+const char *str_trunc (const char *text, int width);
-+
-+/* create needle, that will be searched in str_search_fist/last,
-+ * so needle can be reused
-+ * in UTF-8 return normalized form of needle
-+ */
-+char *str_create_search_needle (const char *needle, int case_sen);
-+
-+/* free needle returned by str_create_search_needle
-+ */
-+void str_release_search_needle (char *needle, int case_sen);
-+
-+/* search for first occurrence of search in text
-+ */
-+const char *str_search_first (const char *text, const char *needle, int case_sen);
-+
-+/* search for last occurrence of search in text
-+ */
-+const char *str_search_last (const char *text, const char *needle, int case_sen);
-+
-+/* case sensitive compare two strings
-+ * I
-+ */
-+int str_compare (const char *t1, const char *t2);
-+
-+/* case sensitive compare two strings
-+ * if one string is prefix of the other string, return 0
-+ * I
-+ */
-+int str_ncompare (const char *t1, const char *t2);
-+
-+/* case insensitive compare two strings
-+ * I
-+ */
-+int str_casecmp (const char *t1, const char *t2);
-+
-+/* case insensitive compare two strings
-+ * if one string is prefix of the other string, return 0
-+ * I
-+ */
-+int str_ncasecmp (const char *t1, const char *t2);
-+
-+/* return, how many bytes are are same from start in text and prefix
-+ * both strings are decomposed befor comapring and return value is counted
-+ * in decomposed form, too. caling with prefix, prefix, you get size in bytes
-+ * of prefix in decomposed form,
-+ * I
-+ */
-+int str_prefix (const char *text, const char *prefix);
-+
-+/* case insensitive version of str_prefix
-+ * I
-+ */
-+int str_caseprefix (const char *text, const char *prefix);
-+
-+/* create a key that is used by str_key_collate
-+ * I
-+ */
-+char *str_create_key (const char *text, int case_sen);
-+
-+/* create a key that is used by str_key_collate
-+ * should aware dot '.' in text
-+ * I
-+ */
-+char *str_create_key_for_filename (const char *text, int case_sen);
-+
-+/* compare two string using LC_COLLATE, if is possible
-+ * if case_sen is set, comparing is case sensitive,
-+ * case_sen must be same for str_create_key, str_key_collate and str_release_key
-+ * I
-+ */
-+int str_key_collate (const char *t1, const char *t2, int case_sen);
-+
-+/* release_key created by str_create_key, only rigth way to release key
-+ * I
-+ */
-+void str_release_key (char *key, int case_sen);
-+
-+#endif
-+
-diff -rupbBN mc.orig/src/strutilutf8.c mc/src/strutilutf8.c
---- mc.orig/src/strutilutf8.c 1970-01-01 01:00:00.000000000 +0100
-+++ mc/src/strutilutf8.c 2007-12-07 11:34:02.000000000 +0100
-@@ -0,0 +1,1241 @@
-+/* UTF-8 strings utilities
-+ Copyright (C) 2007 Free Software Foundation, Inc.
-+
-+ Written 2007 by:
-+ Rostislav Benes
-+
-+ The file_date routine is mostly from GNU's fileutils package,
-+ written by Richard Stallman and David MacKenzie.
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2 of the License, or
-+ (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ */
-+
-+#include <config.h>
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <errno.h>
-+#include <iconv.h>
-+#include <glib.h>
-+#include <langinfo.h>
-+#include <string.h>
-+
-+#include "global.h"
-+#include "strutil.h"
-+
-+/* using function for utf-8 from glib */
-+
-+static const char replch[] = "\xEF\xBF\xBD";
-+
-+static int
-+str_unichar_iscombiningmark (gunichar uni) {
-+ int type = g_unichar_type (uni);
-+ return (type == G_UNICODE_COMBINING_MARK)
-+ || (type == G_UNICODE_ENCLOSING_MARK)
-+ || (type == G_UNICODE_NON_SPACING_MARK);
-+}
-+
-+static void
-+str_utf8_insert_replace_char (struct str_buffer *buffer)
-+{
-+ str_insert_string (replch, buffer);
-+}
-+
-+static int
-+str_utf8_is_valid_string (const char *text)
-+{
-+ return g_utf8_validate (text, -1, NULL);
-+}
-+
-+static int
-+str_utf8_is_valid_char (const char *ch, size_t size)
-+{
-+ switch (g_utf8_get_char_validated (ch, size)) {
-+ case (gunichar)(-2): return -2;
-+ case (gunichar)(-1): return -1;
-+ default : return 1;
-+ }
-+}
-+
-+static void
-+str_utf8_cnext_char (const char **text)
-+{
-+ (*text) = g_utf8_next_char (*text);
-+}
-+
-+static void
-+str_utf8_cprev_char (const char **text)
-+{
-+ (*text) = g_utf8_prev_char (*text);
-+}
-+
-+static void
-+str_utf8_cnext_char_safe (const char **text)
-+{
-+ if (str_utf8_is_valid_char (*text, -1) == 1)
-+ (*text) = g_utf8_next_char (*text);
-+ else
-+ (*text)++;
-+}
-+
-+static void
-+str_utf8_cprev_char_safe (const char **text)
-+{
-+ const char *result = g_utf8_prev_char (*text);
-+ const char *t = result;
-+ str_utf8_cnext_char_safe (&t);
-+ if (t == *text)
-+ (*text) = result;
-+ else
-+ (*text)--;
-+}
-+
-+static void
-+str_utf8_fix_string (char *text)
-+{
-+ gunichar uni;
-+
-+ while (text[0] != '\0') {
-+ uni = g_utf8_get_char_validated (text, -1);
-+ if ((uni != (gunichar)(-1)) && (uni != (gunichar)(-2))) {
-+ text = g_utf8_next_char (text);
-+ } else {
-+ text[0] = '?';
-+ text++;
-+ }
-+ }
-+}
-+
-+static int
-+str_utf8_isspace (const char *text)
-+{
-+ gunichar uni = g_utf8_get_char_validated (text, -1);
-+ return g_unichar_isspace (uni);
-+}
-+
-+static int
-+str_utf8_ispunct (const char *text)
-+{
-+ gunichar uni = g_utf8_get_char_validated (text, -1);
-+ return g_unichar_ispunct (uni);
-+}
-+
-+static int
-+str_utf8_isalnum (const char *text)
-+{
-+ gunichar uni = g_utf8_get_char_validated (text, -1);
-+ return g_unichar_isalnum (uni);
-+}
-+
-+static int
-+str_utf8_isdigit (const char *text)
-+{
-+ gunichar uni = g_utf8_get_char_validated (text, -1);
-+ return g_unichar_isdigit (uni);
-+}
-+
-+static int
-+str_utf8_isprint (const char *ch)
-+{
-+ gunichar uni = g_utf8_get_char_validated (ch, -1);
-+ return g_unichar_isprint (uni);
-+}
-+
-+static int
-+str_utf8_iscombiningmark (const char *ch)
-+{
-+ gunichar uni = g_utf8_get_char_validated (ch, -1);
-+ return str_unichar_iscombiningmark (uni);
-+}
-+
-+static int
-+str_utf8_cnext_noncomb_char (const char **text)
-+{
-+ int count = 0;
-+ while ((*text)[0] != '\0') {
-+ str_utf8_cnext_char_safe (text);
-+ count++;
-+ if (!str_utf8_iscombiningmark (*text)) break;
-+ }
-+ return count;
-+}
-+
-+static int
-+str_utf8_cprev_noncomb_char (const char **text, const char *begin)
-+{
-+ int count = 0;
-+ while ((*text) != begin) {
-+ str_utf8_cprev_char_safe (text);
-+ count++;
-+ if (!str_utf8_iscombiningmark (*text)) break;
-+ }
-+ return count;
-+}
-+
-+static int
-+str_utf8_toupper (const char *text, char **out, size_t *remain)
-+{
-+ gunichar uni;
-+ size_t left;
-+
-+ uni = g_utf8_get_char_validated (text, -1);
-+ if (uni == (gunichar)(-1) || uni == (gunichar)(-2)) return 0;
-+
-+ uni = g_unichar_toupper (uni);
-+ left = g_unichar_to_utf8 (uni, NULL);
-+ if (left >= *remain) return 0;
-+
-+ left = g_unichar_to_utf8 (uni, *out);
-+ (*out)+= left;
-+ (*remain)-= left;
-+ return 1;
-+}
-+
-+static int
-+str_utf8_tolower (const char *text, char **out, size_t *remain)
-+{
-+ gunichar uni;
-+ size_t left;
-+
-+ uni = g_utf8_get_char_validated (text, -1);
-+ if (uni == (gunichar)(-1) || uni == (gunichar)(-2)) return 0;
-+
-+ uni = g_unichar_tolower (uni);
-+ left = g_unichar_to_utf8 (uni, NULL);
-+ if (left >= *remain) return 0;
-+
-+ left = g_unichar_to_utf8 (uni, *out);
-+ (*out)+= left;
-+ (*remain)-= left;
-+ return 1;
-+}
-+
-+static int
-+str_utf8_length (const char* text)
-+{
-+ int result = 0;
-+ const char *start;
-+ const char *end;
-+
-+ start = text;
-+ while (!g_utf8_validate (start, -1, &end) && start[0] != '\0') {
-+ if (start != end) {
-+ result+= g_utf8_strlen (start, end - start);
-+ }
-+ result++;
-+ start = end + 1;
-+ }
-+
-+ if (start == text) {
-+ result = g_utf8_strlen (text, -1);
-+ } else {
-+ if (start[0] != '\0' && start != end) {
-+ result+= g_utf8_strlen (start, end - start);
-+ }
-+ }
-+
-+ return result;
-+}
-+
-+static int
-+str_utf8_length2 (const char* text, int size)
-+{
-+ int result = 0;
-+ const char *start;
-+ const char *end;
-+
-+ start = text;
-+ while (!g_utf8_validate (start, -1, &end) && start[0] != '\0' && size > 0) {
-+ if (start != end) {
-+ result+= g_utf8_strlen (start, min (end - start, size));
-+ size-= end - start;
-+ }
-+ result+= (size > 0);
-+ size--;
-+ start = end + 1;
-+ }
-+
-+ if (start == text) {
-+ result = g_utf8_strlen (text, size);
-+ } else {
-+ if (start[0] != '\0' && start != end && size > 0) {
-+ result+= g_utf8_strlen (start, min (end - start, size));
-+ }
-+ }
-+
-+ return result;
-+}
-+
-+static int
-+str_utf8_length_noncomb (const char *text)
-+{
-+ int result = 0;
-+ const char *t = text;
-+
-+ while (t[0] != '\0') {
-+ str_utf8_cnext_noncomb_char (&t);
-+ result++;
-+ }
-+
-+ return result;
-+}
-+
-+static void
-+str_utf8_questmark_sustb (char **string, size_t *left, struct str_buffer *buffer)
-+{
-+ char *next = g_utf8_next_char (*string);
-+ (*left)-= next - (*string);
-+ (*string) = next;
-+ str_insert_char ('?', buffer);
-+}
-+
-+static int
-+_str_utf8_vfs_convert_to (str_conv_t coder, const char *string,
-+ int size, struct str_buffer *buffer)
-+{
-+ int state = 0;
-+ size_t left;
-+ size_t nconv;
-+ char *composed, *c;
-+ const char *start, *end;
-+
-+ errno = 0;
-+
-+ size = (size >= 0) ? size : strlen (string);
-+ if (coder == (iconv_t) (-1)) return ESTR_FAILURE;
-+ iconv(coder, NULL, NULL, NULL, NULL);
-+
-+ start = string;
-+ while (size > 0) {
-+ end = strchr (start, PATH_SEP);
-+ end = (end == NULL || end >= start + size) ? start + size : end + 1;
-+ if (g_utf8_validate (start, end - start, NULL)) {
-+ c = composed = g_utf8_normalize (start, end - start, G_NORMALIZE_DEFAULT_COMPOSE);
-+ left = strlen (composed);
-+ while (((int)left) > 0) {
-+ nconv = iconv(coder, &c, &left, &(buffer->actual), &(buffer->remain));
-+ if (nconv == (size_t) (-1)) {
-+ switch (errno) {
-+ case EINVAL:
-+ g_free (composed);
-+ return ESTR_FAILURE;
-+ case EILSEQ:
-+ str_utf8_questmark_sustb (&c, &left, buffer);
-+ state = ESTR_PROBLEM;
-+ break;
-+ case E2BIG:
-+ str_incrase_buffer (buffer);
-+ break;
-+ }
-+ }
-+ }
-+ g_free (composed);
-+ } else {
-+ str_insert_string2 (start, end - start, buffer);
-+ }
-+ size-= end - start;
-+ start = end;
-+ }
-+ return state;
-+}
-+
-+static int
-+str_utf8_vfs_convert_to (str_conv_t coder, const char *string,
-+ int size, struct str_buffer *buffer)
-+{
-+ int result;
-+
-+ if (coder == str_cnv_not_convert) {
-+ str_insert_string2 (string, size, buffer);
-+ result = 0;
-+ } else result = _str_utf8_vfs_convert_to (coder, string, size, buffer);
-+ buffer->actual[0] = '\0';
-+
-+return result;
-+}
-+
-+struct term_form {
-+ char text[BUF_MEDIUM * 6];
-+ size_t width;
-+ int compose;
-+};
-+
-+/* utiliti function, that make string valid in utf8 and all characters printable
-+ * return width of string too*/
-+static const struct term_form *
-+str_utf8_make_make_term_form (const char *text, size_t length)
-+{
-+ static struct term_form result;
-+ gunichar uni;
-+ size_t left;
-+ char *actual;
-+
-+ result.text[0] = '\0';
-+ result.width = 0;
-+ result.compose = 0;
-+ actual = result.text;
-+
-+ /* check if text start with combining character,
-+ * add space at begin in this case */
-+ if (length != 0 && text[0] != '\0') {
-+ uni = g_utf8_get_char_validated (text, -1);
-+ if ((uni != (gunichar)(-1)) && (uni != (gunichar)(-2))) {
-+ if (str_unichar_iscombiningmark (uni)) {
-+ actual[0] = ' ';
-+ actual++;
-+ result.width++;
-+ result.compose = 1;
-+ }
-+ }
-+ }
-+
-+ while (length != 0 && text[0] != '\0') {
-+ uni = g_utf8_get_char_validated (text, -1);
-+ if ((uni != (gunichar)(-1)) && (uni != (gunichar)(-2))) {
-+ if (g_unichar_isprint(uni)) {
-+ left = g_unichar_to_utf8 (uni, actual);
-+ actual+= left;
-+ if (!str_unichar_iscombiningmark (uni)) {
-+ result.width++;
-+ if (g_unichar_iswide(uni)) result.width++;
-+ } else result.compose = 1;
-+ } else {
-+ actual[0] = '.';
-+ actual++;
-+ result.width++;
-+ }
-+ text = g_utf8_next_char (text);
-+ } else {
-+ text++;
-+ //actual[0] = '?';
-+ memcpy (actual, replch, strlen (replch));
-+ actual+= strlen (replch);
-+ result.width++;
-+ }
-+ if (length != (size_t) (-1)) length--;
-+ }
-+ actual[0] = '\0';
-+
-+ return &result;
-+}
-+
-+static const char *
-+str_utf8_term_form (const char *text)
-+{
-+ static char result[BUF_MEDIUM * 6];
-+ const struct term_form *pre_form;
-+ char *composed;
-+
-+ pre_form = str_utf8_make_make_term_form (text, (size_t)(-1));
-+ if (pre_form->compose) {
-+ composed = g_utf8_normalize (pre_form->text, -1, G_NORMALIZE_DEFAULT_COMPOSE);
-+ g_strlcpy (result, composed, sizeof (result));
-+ g_free (composed);
-+ } else {
-+ g_strlcpy (result, pre_form->text, sizeof (result));
-+ }
-+ return result;
-+}
-+
-+struct utf8_tool {
-+ char *actual;
-+ size_t remain;
-+ const char *cheked;
-+ int ident;
-+ int compose;
-+};
-+
-+/* utiliti function, that copy all characters from cheked to actual */
-+static int
-+utf8_tool_copy_chars_to_end (struct utf8_tool *tool)
-+{
-+ size_t left;
-+ gunichar uni;
-+
-+ while (tool->cheked[0] != '\0') {
-+ uni = g_utf8_get_char (tool->cheked);
-+ tool->compose|= str_unichar_iscombiningmark (uni);
-+ left = g_unichar_to_utf8 (uni, NULL);
-+ if (tool->remain <= left) return 0;
-+ left = g_unichar_to_utf8 (uni, tool->actual);
-+ tool->actual+= left;
-+ tool->remain-= left;
-+ tool->cheked = g_utf8_next_char (tool->cheked);
-+ }
-+ return 1;
-+}
-+
-+/* utiliti function, that copy characters from cheked to actual until ident is
-+ * smaller than to_ident */
-+static int
-+utf8_tool_copy_chars_to (struct utf8_tool *tool, int to_ident)
-+{
-+ size_t left;
-+ gunichar uni;
-+ int w;
-+
-+ while (tool->cheked[0] != '\0') {
-+ uni = g_utf8_get_char (tool->cheked);
-+ if (!str_unichar_iscombiningmark (uni)) {
-+ w = 1;
-+ if (g_unichar_iswide (uni)) w++;
-+ if (tool->ident + w > to_ident) return 1;
-+ } else {
-+ w = 0;
-+ tool->compose = 1;
-+ }
-+
-+ left = g_unichar_to_utf8 (uni, NULL);
-+ if (tool->remain <= left) return 0;
-+ left = g_unichar_to_utf8 (uni, tool->actual);
-+ tool->actual+= left;
-+ tool->remain-= left;
-+ tool->cheked = g_utf8_next_char (tool->cheked);
-+ tool->ident+= w;
-+ }
-+ return 1;
-+}
-+
-+/* utiliti function, add count spaces to actual */
-+static int
-+utf8_tool_insert_space (struct utf8_tool *tool, int count)
-+{
-+ if (count <= 0) return 1;
-+ if (tool->remain <= count) return 0;
-+ memset (tool->actual, ' ', count);
-+ tool->actual+= count;
-+ tool->remain-= count;
-+ return 1;
-+}
-+
-+/* utiliti function, add one characters to actual */
-+static int
-+utf8_tool_insert_char (struct utf8_tool *tool, char ch)
-+{
-+ if (tool->remain <= 1) return 0;
-+ tool->actual[0] = ch;
-+ tool->actual++;
-+ tool->remain--;
-+ return 1;
-+}
-+
-+/* utiliti function, thah skip characters from cheked until ident is greater or
-+ * equal to to_ident */
-+static int
-+utf8_tool_skip_chars_to (struct utf8_tool *tool, int to_ident)
-+{
-+ gunichar uni;
-+
-+ while (to_ident > tool->ident && tool->cheked[0] != '\0') {
-+ uni = g_utf8_get_char (tool->cheked);
-+ if (!str_unichar_iscombiningmark (uni)) {
-+ tool->ident++;
-+ if (g_unichar_iswide (uni)) tool->ident++;
-+ }
-+ tool->cheked = g_utf8_next_char (tool->cheked);
-+ }
-+ uni = g_utf8_get_char (tool->cheked);
-+ while (str_unichar_iscombiningmark (uni)) {
-+ tool->cheked = g_utf8_next_char (tool->cheked);
-+ uni = g_utf8_get_char (tool->cheked);
-+ }
-+ return 1;
-+}
-+
-+static void
-+utf8_tool_compose (char *buffer, size_t size)
-+{
-+ char *composed = g_utf8_normalize (buffer, -1, G_NORMALIZE_DEFAULT_COMPOSE);
-+ g_strlcpy (buffer, composed, size);
-+ g_free (composed);
-+}
-+
-+
-+static const char *
-+str_utf8_fit_to_term (const char *text, int width, int just_mode)
-+{
-+ static char result[BUF_MEDIUM * 6];
-+ const struct term_form *pre_form;
-+ struct utf8_tool tool;
-+
-+ pre_form = str_utf8_make_make_term_form (text, (size_t)(-1));
-+ tool.cheked = pre_form->text;
-+ tool.actual = result;
-+ tool.remain = sizeof(result);
-+
-+ if (pre_form->width <= width) {
-+ tool.ident = 0;
-+ switch (HIDE_FIT (just_mode)) {
-+ case J_CENTER_LEFT:
-+ case J_CENTER:
-+ tool.ident = (width - pre_form->width) / 2;
-+ break;
-+ case J_RIGHT:
-+ tool.ident = width - pre_form->width;
-+ break;
-+ }
-+
-+ utf8_tool_insert_space (&tool, tool.ident);
-+ utf8_tool_copy_chars_to_end (&tool);
-+ utf8_tool_insert_space (&tool, width - pre_form->width - tool.ident);
-+ } else {
-+ if (IS_FIT (just_mode)) {
-+ tool.ident = 0;
-+ utf8_tool_copy_chars_to (&tool, width / 2);
-+ utf8_tool_insert_char (&tool, '~');
-+
-+ tool.ident = 0;
-+ utf8_tool_skip_chars_to (&tool, pre_form->width - width + 1);
-+ utf8_tool_copy_chars_to_end (&tool);
-+ utf8_tool_insert_space (&tool,
-+ width - (pre_form->width - tool.ident + 1));
-+ } else {
-+ tool.ident = 0;
-+ switch (HIDE_FIT (just_mode)) {
-+ case J_CENTER:
-+ tool.ident = (width - pre_form->width) / 2;
-+ break;
-+ case J_RIGHT:
-+ tool.ident = width - pre_form->width;
-+ break;
-+ }
-+
-+ utf8_tool_skip_chars_to (&tool, 0);
-+ utf8_tool_insert_space (&tool, tool.ident);
-+ utf8_tool_copy_chars_to (&tool, width);
-+ utf8_tool_insert_space (&tool, width - tool.ident);
-+ }
-+ }
-+
-+ tool.actual[0] = '\0';
-+ if (tool.compose) utf8_tool_compose (result, sizeof (result));
-+ return result;
-+}
-+
-+static const char *
-+str_utf8_term_trim (const char *text, int width)
-+{
-+ static char result[BUF_MEDIUM * 6];
-+ const struct term_form *pre_form;
-+ struct utf8_tool tool;
-+
-+ pre_form = str_utf8_make_make_term_form (text, (size_t)(-1));
-+
-+ tool.cheked = pre_form->text;
-+ tool.actual = result;
-+ tool.remain = sizeof(result);
-+
-+ if (width < pre_form->width) {
-+ if (width <= 3) {
-+ memset (tool.actual, '.', width);
-+ tool.actual+= width;
-+ tool.remain-= width;
-+ } else {
-+ memset (tool.actual, '.', 3);
-+ tool.actual+= 3;
-+ tool.remain-= 3;
-+
-+ tool.ident = 0;
-+ utf8_tool_skip_chars_to (&tool, pre_form->width - width + 3);
-+ utf8_tool_copy_chars_to_end (&tool);
-+ }
-+ } else {
-+ utf8_tool_copy_chars_to_end (&tool);
-+ }
-+
-+ tool.actual[0] = '\0';
-+ if (tool.compose) utf8_tool_compose (result, sizeof (result));
-+ return result;
-+}
-+
-+static int
-+str_utf8_term_width2 (const char *text, size_t length)
-+{
-+ const struct term_form *result;
-+
-+ result = str_utf8_make_make_term_form (text, length);
-+ return result->width;
-+}
-+
-+static int
-+str_utf8_term_width1 (const char *text)
-+{
-+ return str_utf8_term_width2 (text, (size_t)(-1));
-+}
-+
-+static int
-+str_utf8_term_char_width (const char *text)
-+{
-+ gunichar uni = g_utf8_get_char_validated (text, -1);
-+ return (str_unichar_iscombiningmark (uni)) ? 0
-+ : ((g_unichar_iswide (uni)) ? 2 : 1);
-+}
-+
-+static void
-+str_utf8_msg_term_size (const char *text, int *lines, int *columns)
-+{
-+ (*lines) = 1;
-+ (*columns) = 0;
-+
-+ char *p, *tmp = g_strdup (text);
-+ char *q;
-+ char c = '\0';
-+ int width;
-+
-+ p = tmp;
-+ for (;;) {
-+ q = strchr (p, '\n');
-+ if (q != NULL) {
-+ c = q[0];
-+ q[0] = '\0';
-+ }
-+
-+ width = str_utf8_term_width1 (p);
-+ if (width > (*columns)) (*columns) = width;
-+
-+ if (q == NULL)
-+ break;
-+ q[0] = c;
-+ p = q + 1;
-+ (*lines)++;
-+ }
-+ g_free (tmp);
-+}
-+
-+static const char *
-+str_utf8_term_substring (const char *text, int start, int width)
-+{
-+ static char result[BUF_MEDIUM * 6];
-+ const struct term_form *pre_form;
-+ struct utf8_tool tool;
-+
-+ pre_form = str_utf8_make_make_term_form (text, (size_t)(-1));
-+
-+ tool.cheked = pre_form->text;
-+ tool.actual = result;
-+ tool.remain = sizeof(result);
-+
-+ tool.ident = -start;
-+ utf8_tool_skip_chars_to (&tool, 0);
-+ if (tool.ident < 0) tool.ident = 0;
-+ utf8_tool_insert_space (&tool, tool.ident);
-+
-+ utf8_tool_copy_chars_to (&tool, width);
-+ utf8_tool_insert_space (&tool, width - tool.ident);
-+
-+ tool.actual[0] = '\0';
-+ if (tool.compose) utf8_tool_compose (result, sizeof (result));
-+ return result;
-+}
-+
-+static const char *
-+str_utf8_trunc (const char *text, int width)
-+{
-+ static char result[MC_MAXPATHLEN * 6 * 2];
-+ const struct term_form *pre_form;
-+ struct utf8_tool tool;
-+
-+ pre_form = str_utf8_make_make_term_form (text, (size_t)(-1));
-+
-+ tool.cheked = pre_form->text;
-+ tool.actual = result;
-+ tool.remain = sizeof(result);
-+
-+ if (pre_form->width > width) {
-+ tool.ident = 0;
-+ utf8_tool_copy_chars_to (&tool, width / 2);
-+ utf8_tool_insert_char (&tool, '~');
-+
-+ tool.ident = 0;
-+ utf8_tool_skip_chars_to (&tool, pre_form->width - width + 1);
-+ utf8_tool_copy_chars_to_end (&tool);
-+ } else {
-+ utf8_tool_copy_chars_to_end (&tool);
-+ }
-+
-+ tool.actual[0] = '\0';
-+ if (tool.compose) utf8_tool_compose (result, sizeof (result));
-+ return result;
-+}
-+
-+static int
-+str_utf8_offset_to_pos (const char *text, size_t length)
-+{
-+ if (str_utf8_is_valid_string (text))
-+ return g_utf8_offset_to_pointer (text, length) - text;
-+ else {
-+ int result;
-+ struct str_buffer *buffer = str_get_buffer ();
-+ str_insert_string (text, buffer);
-+ str_utf8_fix_string (buffer->data);
-+ result = g_utf8_offset_to_pointer (buffer->data, length) - buffer->data;
-+ str_release_buffer (buffer);
-+ return result;
-+ }
-+}
-+
-+static int
-+str_utf8_column_to_pos (const char *text, size_t pos)
-+{
-+ static int result;
-+ gunichar uni;
-+ int width;
-+
-+ width = 0;
-+ result = 0;
-+
-+ while (text[0] != '\0') {
-+ uni = g_utf8_get_char_validated (text, 6);
-+ if ((uni != (gunichar)(-1)) && (uni != (gunichar)(-2))) {
-+ if (g_unichar_isprint(uni)) {
-+ if (!str_unichar_iscombiningmark (uni)) {
-+ width++;
-+ if (g_unichar_iswide (uni)) width++;
-+ }
-+ } else {
-+ width++;
-+ }
-+ text = g_utf8_next_char (text);
-+ } else {
-+ text++;
-+ width++;
-+ }
-+ if (width > pos) return result;
-+
-+ result++;
-+ }
-+
-+ return result;
-+}
-+
-+static char *
-+str_utf8_create_search_needle (const char *needle, int case_sen)
-+{
-+ if (needle != NULL) {
-+ if (case_sen) {
-+ return g_utf8_normalize (needle, -1, G_NORMALIZE_ALL);
-+ } else {
-+ char *fold = g_utf8_casefold (needle, -1);
-+ char *result = g_utf8_normalize (fold, -1, G_NORMALIZE_ALL);
-+ g_free (fold);
-+ return result;
-+ }
-+ } else return NULL;
-+}
-+
-+static void
-+str_utf8_release_search_needle (char *needle, int case_sen)
-+{
-+ if (needle != NULL) g_free (needle);
-+}
-+
-+static const char *
-+str_utf8_search_first (const char *text, const char *search, int case_sen)
-+{
-+ char *fold_text;
-+ char *deco_text;
-+ const char *match;
-+ const char *result = NULL;
-+ const char *m;
-+
-+ fold_text = (case_sen) ? (char*)text : g_utf8_casefold (text, -1);
-+ deco_text = g_utf8_normalize (fold_text, -1, G_NORMALIZE_ALL);
-+
-+ match = deco_text;
-+ do {
-+ match = g_strstr_len (match, -1, search);
-+ if (match != NULL) {
-+ if ((!str_utf8_iscombiningmark (match) || (match == deco_text)) &&
-+ !str_utf8_iscombiningmark (match + strlen (search))) {
-+
-+ result = text;
-+ m = deco_text;
-+ while (m < match) {
-+ str_utf8_cnext_noncomb_char (&m);
-+ str_utf8_cnext_noncomb_char (&result);
-+ }
-+ } else {
-+ str_utf8_cnext_char (&match);
-+ }
-+ }
-+ } while (match != NULL && result == NULL);
-+
-+ g_free (deco_text);
-+ if (!case_sen) g_free (fold_text);
-+
-+ return result;
-+}
-+
-+static const char *
-+str_utf8_search_last (const char *text, const char *search, int case_sen)
-+{
-+ char *fold_text;
-+ char *deco_text;
-+ char *match;
-+ const char *result = NULL;
-+ const char *m;
-+
-+ fold_text = (case_sen) ? (char*)text : g_utf8_casefold (text, -1);
-+ deco_text = g_utf8_normalize (fold_text, -1, G_NORMALIZE_ALL);
-+
-+ do {
-+ match = g_strrstr_len (deco_text, -1, search);
-+ if (match != NULL) {
-+ if ((!str_utf8_iscombiningmark (match) || (match == deco_text)) &&
-+ !str_utf8_iscombiningmark (match + strlen (search))) {
-+
-+ result = text;
-+ m = deco_text;
-+ while (m < match) {
-+ str_utf8_cnext_noncomb_char (&m);
-+ str_utf8_cnext_noncomb_char (&result);
-+ }
-+ } else {
-+ match[0] = '\0';
-+ }
-+ }
-+ } while (match != NULL && result == NULL);
-+
-+ g_free (deco_text);
-+ if (!case_sen) g_free (fold_text);
-+
-+ return result;
-+}
-+
-+static char *
-+str_utf8_normalize (const char *text)
-+{
-+ struct str_buffer *fixed = str_get_buffer ();
-+ char *tmp;
-+ char *result;
-+ const char *start;
-+ const char *end;
-+
-+ start = text;
-+ while (!g_utf8_validate (start, -1, &end) && start[0] != '\0') {
-+ if (start != end) {
-+ tmp = g_utf8_normalize (start, end - start, G_NORMALIZE_ALL);
-+ str_insert_string (tmp, fixed);
-+ g_free (tmp);
-+ }
-+ str_insert_char (end[0], fixed);
-+ start = end + 1;
-+ }
-+
-+ if (start == text) {
-+ result = g_utf8_normalize (text, -1, G_NORMALIZE_ALL);
-+ } else {
-+ if (start[0] != '\0' && start != end) {
-+ tmp = g_utf8_normalize (start, end - start, G_NORMALIZE_ALL);
-+ str_insert_string (tmp, fixed);
-+ g_free (tmp);
-+ }
-+ result = g_strdup (fixed->data);
-+ }
-+
-+ str_release_buffer (fixed);
-+
-+ return result;
-+}
-+
-+static char *
-+str_utf8_casefold_normalize (const char *text)
-+{
-+ struct str_buffer *fixed = str_get_buffer ();
-+ char *tmp, *fold;
-+ char *result;
-+ const char *start;
-+ const char *end;
-+
-+ start = text;
-+ while (!g_utf8_validate (start, -1, &end) && start[0] != '\0') {
-+ if (start != end) {
-+ fold = g_utf8_casefold (start, end - start);
-+ tmp = g_utf8_normalize (fold, -1, G_NORMALIZE_ALL);
-+ str_insert_string (tmp, fixed);
-+ g_free (tmp);
-+ g_free (fold);
-+ }
-+ str_insert_char (end[0], fixed);
-+ start = end + 1;
-+ }
-+
-+ if (start == text) {
-+ fold = g_utf8_casefold (text, -1);
-+ result = g_utf8_normalize (fold, -1, G_NORMALIZE_ALL);
-+ g_free (fold);
-+ } else {
-+ if (start[0] != '\0' && start != end) {
-+ fold = g_utf8_casefold (start, end - start);
-+ tmp = g_utf8_normalize (fold, -1, G_NORMALIZE_ALL);
-+ str_insert_string (tmp, fixed);
-+ g_free (tmp);
-+ g_free (fold);
-+ }
-+ result = g_strdup (fixed->data);
-+ }
-+
-+ str_release_buffer (fixed);
-+
-+ return result;
-+}
-+
-+static int
-+str_utf8_compare (const char *t1, const char *t2)
-+{
-+ char *n1, *n2;
-+ int result;
-+
-+ n1 = str_utf8_normalize (t1);
-+ n2 = str_utf8_normalize (t2);
-+
-+ result = strcmp (n1, n2);
-+
-+ g_free (n1);
-+ g_free (n2);
-+
-+ return result;
-+}
-+
-+static int
-+str_utf8_ncompare (const char *t1, const char *t2)
-+{
-+ char *n1, *n2;
-+ int result;
-+
-+ n1 = str_utf8_normalize (t1);
-+ n2 = str_utf8_normalize (t2);
-+
-+ result = strncmp (n1, n2, min (strlen (n1), strlen (n2)));
-+
-+ g_free (n1);
-+ g_free (n2);
-+
-+ return result;
-+}
-+
-+static int
-+str_utf8_casecmp (const char *t1, const char *t2)
-+{
-+ char *n1, *n2;
-+ int result;
-+
-+ n1 = str_utf8_casefold_normalize (t1);
-+ n2 = str_utf8_casefold_normalize (t2);
-+
-+ result = strcmp (n1, n2);
-+
-+ g_free (n1);
-+ g_free (n2);
-+
-+ return result;
-+}
-+
-+static int
-+str_utf8_ncasecmp (const char *t1, const char *t2)
-+{
-+ char *n1, *n2;
-+ int result;
-+
-+ n1 = str_utf8_casefold_normalize (t1);
-+ n2 = str_utf8_casefold_normalize (t2);
-+
-+ result = strncmp (n1, n2, min (strlen (n1), strlen (n2)));
-+
-+ g_free (n1);
-+ g_free (n2);
-+
-+ return result;
-+}
-+
-+static int
-+str_utf8_prefix (const char *text, const char *prefix)
-+{
-+ char *t = str_utf8_normalize (text);
-+ char *p = str_utf8_normalize (prefix);
-+ const char *nt = t;
-+ const char *np = p;
-+ const char *nnt = t;
-+ const char *nnp = p;
-+ int result;
-+
-+ while (nt[0] != '\0' && np[0] != '\0') {
-+ str_utf8_cnext_char_safe (&nnt);
-+ str_utf8_cnext_char_safe (&nnp);
-+ if (nnt - nt != nnp - np) break;
-+ if (strncmp (nt, np, nnt - nt) != 0) break;
-+ nt = nnt;
-+ np = nnp;
-+ }
-+
-+ result = np - p;
-+
-+ g_free (t);
-+ g_free (p);
-+
-+ return result;
-+}
-+
-+static int
-+str_utf8_caseprefix (const char *text, const char *prefix)
-+{
-+ char *t = str_utf8_casefold_normalize (text);
-+ char *p = str_utf8_casefold_normalize (prefix);
-+ const char *nt = t;
-+ const char *np = p;
-+ const char *nnt = t;
-+ const char *nnp = p;
-+ int result;
-+
-+ while (nt[0] != '\0' && np[0] != '\0') {
-+ str_utf8_cnext_char_safe (&nnt);
-+ str_utf8_cnext_char_safe (&nnp);
-+ if (nnt - nt != nnp - np) break;
-+ if (strncmp (nt, np, nnt - nt) != 0) break;
-+ nt = nnt;
-+ np = nnp;
-+ }
-+
-+ result = np - p;
-+
-+ g_free (t);
-+ g_free (p);
-+
-+ return result;
-+}
-+
-+static char *
-+str_utf8_create_key_gen (const char *text, int case_sen,
-+ gchar *(*keygen) (const gchar *, gssize size))
-+{
-+ char *result;
-+
-+ if (case_sen) {
-+ result = str_utf8_normalize (text);
-+ } else {
-+ const char *start, *end;
-+ char *fold, *key;
-+ struct str_buffer *fixed = str_get_buffer ();
-+
-+ start = text;
-+ while (!g_utf8_validate (start, -1, &end) && start[0] != '\0') {
-+ if (start != end) {
-+ fold = g_utf8_casefold (start, end - start);
-+ key = keygen (fold, -1);
-+ str_insert_string (key, fixed);
-+ g_free (key);
-+ g_free (fold);
-+ }
-+ str_insert_char (end[0], fixed);
-+ start = end + 1;
-+ }
-+
-+ if (start == text) {
-+ fold = g_utf8_casefold (text, -1);
-+ result = keygen (fold, -1);
-+ g_free (fold);
-+ } else {
-+ if (start[0] != '\0' && start != end) {
-+ fold = g_utf8_casefold (start, end - start);
-+ key = keygen (fold, -1);
-+ str_insert_string (key, fixed);
-+ g_free (key);
-+ g_free (fold);
-+ }
-+ result = g_strdup (fixed->data);
-+ }
-+ str_release_buffer (fixed);
-+ }
-+ return result;
-+}
-+
-+static char *
-+str_utf8_create_key (const char *text, int case_sen)
-+{
-+ return str_utf8_create_key_gen (text, case_sen, g_utf8_collate_key);
-+}
-+
-+static char *
-+str_utf8_create_key_for_filename (const char *text, int case_sen)
-+{
-+ return str_utf8_create_key_gen (text, case_sen, g_utf8_collate_key_for_filename);
-+}
-+
-+static int
-+str_utf8_key_collate (const char *t1, const char *t2, int case_sen)
-+{
-+ return strcmp (t1, t2);
-+}
-+
-+static void
-+str_utf8_release_key (char *key, int case_sen)
-+{
-+ g_free (key);
-+}
-+
-+struct str_class
-+str_utf8_init ()
-+{
-+ struct str_class result;
-+
-+ result.vfs_convert_to = str_utf8_vfs_convert_to;
-+ result.insert_replace_char = str_utf8_insert_replace_char;
-+ result.is_valid_string = str_utf8_is_valid_string;
-+ result.is_valid_char = str_utf8_is_valid_char;
-+ result.cnext_char = str_utf8_cnext_char;
-+ result.cprev_char = str_utf8_cprev_char;
-+ result.cnext_char_safe = str_utf8_cnext_char_safe;
-+ result.cprev_char_safe = str_utf8_cprev_char_safe;
-+ result.cnext_noncomb_char = str_utf8_cnext_noncomb_char;
-+ result.cprev_noncomb_char = str_utf8_cprev_noncomb_char;
-+ result.isspace = str_utf8_isspace;
-+ result.ispunct = str_utf8_ispunct;
-+ result.isalnum = str_utf8_isalnum;
-+ result.isdigit = str_utf8_isdigit;
-+ result.isprint = str_utf8_isprint;
-+ result.iscombiningmark = str_utf8_iscombiningmark;
-+ result.toupper = str_utf8_toupper;
-+ result.tolower = str_utf8_tolower;
-+ result.length = str_utf8_length;
-+ result.length2 = str_utf8_length2;
-+ result.length_noncomb = str_utf8_length_noncomb;
-+ result.fix_string = str_utf8_fix_string;
-+ result.term_form = str_utf8_term_form;
-+ result.fit_to_term = str_utf8_fit_to_term;
-+ result.term_trim = str_utf8_term_trim;
-+ result.term_width2 = str_utf8_term_width2;
-+ result.term_width1 = str_utf8_term_width1;
-+ result.term_char_width = str_utf8_term_char_width;
-+ result.msg_term_size = str_utf8_msg_term_size;
-+ result.term_substring = str_utf8_term_substring;
-+ result.trunc = str_utf8_trunc;
-+ result.offset_to_pos = str_utf8_offset_to_pos;
-+ result.column_to_pos = str_utf8_column_to_pos;
-+ result.create_search_needle = str_utf8_create_search_needle;
-+ result.release_search_needle = str_utf8_release_search_needle;
-+ result.search_first = str_utf8_search_first;
-+ result.search_last = str_utf8_search_last;
-+ result.compare = str_utf8_compare;
-+ result.ncompare = str_utf8_ncompare;
-+ result.casecmp = str_utf8_casecmp;
-+ result.ncasecmp = str_utf8_ncasecmp;
-+ result.prefix = str_utf8_prefix;
-+ result.caseprefix = str_utf8_caseprefix;
-+ result.create_key = str_utf8_create_key;
-+ result.create_key_for_filename = str_utf8_create_key_for_filename;
-+ result.key_collate = str_utf8_key_collate;
-+ result.release_key = str_utf8_release_key;
-+
-+ return result;
-+}
-diff -rupbBN mc.orig/src/strutil8bit.c mc/src/strutil8bit.c
---- mc.orig/src/strutil8bit.c 1970-01-01 01:00:00.000000000 +0100
-+++ mc/src/strutil8bit.c 2007-12-06 18:20:45.000000000 +0100
-@@ -0,0 +1,673 @@
-+/* 8bit strings utilities
-+ Copyright (C) 2007 Free Software Foundation, Inc.
-+
-+ Written 2007 by:
-+ Rostislav Benes
-+
-+ The file_date routine is mostly from GNU's fileutils package,
-+ written by Richard Stallman and David MacKenzie.
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2 of the License, or
-+ (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ */
-+
-+#include <config.h>
-+#include <stdio.h>
-+#include <ctype.h>
-+#include <errno.h>
-+#include <iconv.h>
-+
-+#include "global.h"
-+#include "strutil.h"
-+
-+/* functions for singlebyte encodings, all characters have width 1
-+ * using standard system functions
-+ * there are only small differences between functions in strutil8bit.c
-+ * and strutilascii.c
-+ */
-+
-+static const char replch = '?';
-+
-+static void
-+str_8bit_insert_replace_char (struct str_buffer *buffer)
-+{
-+ str_insert_char (replch, buffer);
-+}
-+
-+static int
-+str_8bit_is_valid_string (const char *text)
-+{
-+ return 1;
-+}
-+
-+static int
-+str_8bit_is_valid_char (const char *ch, size_t size)
-+{
-+ return 1;
-+}
-+
-+static void
-+str_8bit_cnext_char (const char **text)
-+{
-+ (*text)++;
-+}
-+
-+static void
-+str_8bit_cprev_char (const char **text)
-+{
-+ (*text)--;
-+}
-+
-+static int
-+str_8bit_cnext_noncomb_char (const char **text)
-+{
-+ if (*text[0] != '\0') {
-+ (*text)++;
-+ return 1;
-+ } else return 0;
-+}
-+
-+static int
-+str_8bit_cprev_noncomb_char (const char **text, const char *begin)
-+{
-+ if ((*text) != begin) {
-+ (*text)--;
-+ return 1;
-+ } else return 0;
-+}
-+
-+static int
-+str_8bit_isspace (const char *text)
-+{
-+ return isspace (text[0]);
-+}
-+
-+static int
-+str_8bit_ispunct (const char *text)
-+{
-+ return ispunct (text[0]);
-+}
-+
-+static int
-+str_8bit_isalnum (const char *text)
-+{
-+ return isalnum (text[0]);
-+}
-+
-+static int
-+str_8bit_isdigit (const char *text)
-+{
-+ return isdigit (text[0]);
-+}
-+
-+static int
-+str_8bit_isprint (const char *text)
-+{
-+ return isprint (text[0]);
-+}
-+
-+static int
-+str_8bit_iscombiningmark (const char *text)
-+{
-+ return 0;
-+}
-+
-+static int
-+str_8bit_toupper (const char *text, char **out, size_t *remain)
-+{
-+ if (*remain <= 1) return 0;
-+ (*out)[0] = toupper ((unsigned char) text[0]);
-+ (*out)++;
-+ (*remain)--;
-+ return 1;
-+}
-+
-+static int
-+str_8bit_tolower (const char *text, char **out, size_t *remain)
-+{
-+ if (*remain <= 1) return 0;
-+ (*out)[0] = tolower ((unsigned char) text[0]);
-+ (*out)++;
-+ (*remain)--;
-+ return 1;
-+}
-+
-+static int
-+str_8bit_length (const char *text)
-+{
-+ return strlen (text);
-+}
-+
-+static int
-+str_8bit_length2 (const char *text, int size)
-+{
-+ return (size >= 0) ? min (strlen (text), size) : strlen (text);
-+}
-+
-+static int
-+_str_8bit_vfs_convert_to (str_conv_t coder, char *string,
-+ int size, struct str_buffer *buffer)
-+{
-+ int state;
-+ size_t left;
-+ size_t nconv;
-+
-+ errno = 0;
-+
-+ state = 0;
-+
-+ left = (size >= 0) ? size : strlen (string);
-+
-+ if (coder == (iconv_t) (-1)) return ESTR_FAILURE;
-+
-+ iconv(coder, NULL, NULL, NULL, NULL);
-+
-+ while (((int)left) > 0) {
-+ nconv = iconv(coder, &string, &left,
-+ &(buffer->actual), &(buffer->remain));
-+ if (nconv == (size_t) (-1)) {
-+ switch (errno) {
-+ case EINVAL:
-+ return ESTR_FAILURE;
-+ case EILSEQ:
-+ string++;
-+ left--;
-+ str_insert_char ('?', buffer);
-+ state = ESTR_PROBLEM;
-+ break;
-+ case E2BIG:
-+ str_incrase_buffer (buffer);
-+ break;
-+ }
-+ }
-+ }
-+ return state;
-+}
-+
-+int
-+str_8bit_vfs_convert_to (str_conv_t coder, const char *string,
-+ int size, struct str_buffer *buffer)
-+{
-+ int result;
-+
-+ if (coder == str_cnv_not_convert) {
-+ str_insert_string2 (string, size, buffer);
-+ result = 0;
-+ } else result = _str_8bit_vfs_convert_to (coder, (char*)string, size, buffer);
-+ buffer->actual[0] = '\0';
-+
-+ return result;
-+}
-+
-+
-+static const char *
-+str_8bit_term_form (const char *text)
-+{
-+ static char result[BUF_MEDIUM];
-+ char *actual;
-+ size_t remain;
-+ size_t length;
-+ size_t pos = 0;
-+
-+ actual = result;
-+ remain = sizeof (result);
-+ length = strlen (text);
-+
-+ for (; pos < length && remain > 1; pos++, actual++, remain--) {
-+ actual[0] = isprint (text[pos]) ? text[pos] : '.';
-+ }
-+
-+ actual[0] = '\0';
-+ return result;
-+}
-+
-+static const char *
-+str_8bit_fit_to_term (const char *text, int width, int just_mode)
-+{
-+ static char result[BUF_MEDIUM];
-+ char *actual;
-+ size_t remain;
-+ int ident;
-+ size_t length;
-+ size_t pos = 0;
-+
-+ length = strlen (text);
-+ actual = result;
-+ remain = sizeof(result);
-+
-+ if (length <= width) {
-+ ident = 0;
-+ switch (HIDE_FIT (just_mode)) {
-+ case J_CENTER_LEFT:
-+ case J_CENTER:
-+ ident = (width - length) / 2;
-+ break;
-+ case J_RIGHT:
-+ ident = width - length;
-+ break;
-+ }
-+
-+ if (remain <= ident) goto finally;
-+ memset (actual, ' ', ident);
-+ actual+= ident;
-+ remain-= ident;
-+
-+ for (; pos < length && remain > 1; pos++, actual++, remain--) {
-+ actual[0] = isprint (text[pos]) ? text[pos] : '.';
-+ }
-+ if (width - length - ident > 0) {
-+ if (remain <= width - length - ident) goto finally;
-+ memset (actual, ' ', width - length - ident);
-+ actual+= width - length - ident;
-+ remain-= width - length - ident;
-+ }
-+ } else {
-+ if (IS_FIT (just_mode)) {
-+ for (; pos + 1 <= width / 2 && remain > 1;
-+ actual++, pos++, remain--) {
-+
-+ actual[0] = isprint (text[pos]) ? text[pos] : '.';
-+ }
-+
-+ if (remain <= 1) goto finally;
-+ actual[0] = '~';
-+ actual++;
-+ remain--;
-+
-+ pos+= length - width + 1;
-+
-+ for (; pos < length && remain > 1; pos++, actual++, remain--) {
-+ actual[0] = isprint (text[pos]) ? text[pos] : '.';
-+ }
-+ } else {
-+ ident = 0;
-+ switch (HIDE_FIT (just_mode)) {
-+ case J_CENTER:
-+ ident = (length - width) / 2;
-+ break;
-+ case J_RIGHT:
-+ ident = length - width;
-+ break;
-+ }
-+
-+ pos+= ident;
-+ for (; pos < ident + width && remain > 1;
-+ pos++, actual++, remain--) {
-+
-+ actual[0] = isprint (text[pos]) ? text[pos] : '.';
-+ }
-+
-+ }
-+ }
-+ finally:
-+ actual[0] = '\0';
-+ return result;
-+}
-+
-+static const char *
-+str_8bit_term_trim (const char *text, int width)
-+{
-+ static char result[BUF_MEDIUM];
-+ size_t remain;
-+ char *actual;
-+ size_t pos = 0;
-+ size_t length;
-+
-+ length = strlen (text);
-+ actual = result;
-+ remain = sizeof (result);
-+
-+ if (width < length) {
-+ if (width <= 3) {
-+ memset (actual, '.', width);
-+ actual+= width;
-+ remain-= width;
-+ } else {
-+ memset (actual, '.', 3);
-+ actual+= 3;
-+ remain-= 3;
-+
-+ pos+= length - width + 3;
-+
-+ for (; pos < length && remain > 1; pos++, actual++, remain--) {
-+ actual[0] = isprint (text[pos]) ? text[pos] : '.';
-+ }
-+ }
-+ } else {
-+ for (; pos < length && remain > 1; pos++, actual++, remain--) {
-+ actual[0] = isprint (text[pos]) ? text[pos] : '.';
-+ }
-+ }
-+
-+ actual[0] = '\0';
-+ return result;
-+}
-+
-+static int
-+str_8bit_term_width2 (const char *text, size_t length)
-+{
-+ return (length != (size_t)(-1))
-+ ? min (strlen (text), length)
-+ : strlen (text);
-+}
-+
-+static int
-+str_8bit_term_width1 (const char *text)
-+{
-+ return str_8bit_term_width2 (text, (size_t)(-1));
-+}
-+
-+static int
-+str_8bit_term_char_width (const char *text)
-+{
-+ return 1;
-+}
-+
-+static void
-+str_8bit_msg_term_size (const char *text, int *lines, int *columns)
-+{
-+ (*lines) = 1;
-+ (*columns) = 0;
-+
-+ char *p, *tmp = g_strdup (text);
-+ char *q;
-+ char c = '\0';
-+ int width;
-+ p = tmp;
-+
-+ for (;;) {
-+ q = strchr (p, '\n');
-+ if (q != NULL) {
-+ c = q[0];
-+ q[0] = '\0';
-+ }
-+
-+ width = str_8bit_term_width1 (p);
-+ if (width > (*columns)) (*columns) = width;
-+
-+ if (q == NULL)
-+ break;
-+ q[0] = c;
-+ p = q + 1;
-+ (*lines)++;
-+ }
-+ g_free (tmp);
-+}
-+
-+static const char *
-+str_8bit_term_substring (const char *text, int start, int width)
-+{
-+ static char result[BUF_MEDIUM];
-+ size_t remain;
-+ char *actual;
-+ size_t pos = 0;
-+ size_t length;
-+
-+ actual = result;
-+ remain = sizeof (result);
-+ length = strlen (text);
-+
-+ if (start < length) {
-+ pos+= start;
-+ for (; pos < length && width > 0 && remain > 1;
-+ pos++, width--, actual++, remain--) {
-+
-+ actual[0] = isprint (text[pos]) ? text[pos] : '.';
-+ }
-+ }
-+
-+ for (; width > 0 && remain > 1; actual++, remain--, width--) {
-+ actual[0] = ' ';
-+ }
-+
-+ actual[0] = '\0';
-+ return result;
-+}
-+
-+static const char *
-+str_8bit_trunc (const char *text, int width)
-+{
-+ static char result[MC_MAXPATHLEN];
-+ int remain;
-+ char *actual;
-+ size_t pos = 0;
-+ size_t length;
-+
-+ actual = result;
-+ remain = sizeof (result);
-+ length = strlen (text);
-+
-+ if (length > width) {
-+ for (; pos + 1 <= width / 2 && remain > 1; actual++, pos++, remain--) {
-+ actual[0] = isprint (text[pos]) ? text[pos] : '.';
-+ }
-+
-+ if (remain <= 1) goto finally;
-+ actual[0] = '~';
-+ actual++;
-+ remain--;
-+
-+ pos+= length - width + 1;
-+
-+ for (; pos < length && remain > 1; pos++, actual++, remain--) {
-+ actual[0] = isprint (text[pos]) ? text[pos] : '.';
-+ }
-+ } else {
-+ for (; pos < length && remain > 1; pos++, actual++, remain--) {
-+ actual[0] = isprint (text[pos]) ? text[pos] : '.';
-+ }
-+ }
-+
-+ finally:
-+ actual[0] = '\0';
-+ return result;
-+}
-+
-+static int
-+str_8bit_offset_to_pos (const char *text, size_t length)
-+{
-+ return (int)length;
-+}
-+
-+static int
-+str_8bit_column_to_pos (const char *text, size_t pos)
-+{
-+ return (int)pos;
-+}
-+
-+static char *
-+str_8bit_create_search_needle (const char *needle, int case_sen)
-+{
-+ return (char*) needle;
-+}
-+
-+static void
-+str_8bit_release_search_needle (char *needle, int case_sen)
-+{
-+}
-+
-+static const char *
-+str_8bit_search_first (const char *text, const char *search, int case_sen)
-+{
-+ char *fold_text;
-+ char *fold_search;
-+ const char *match;
-+ size_t offsset;
-+
-+ fold_text = (case_sen) ? (char*) text : g_strdown (g_strdup (text));
-+ fold_search = (case_sen) ? (char*) text : g_strdown (g_strdup (search));
-+
-+ match = g_strstr_len (fold_text, -1, fold_search);
-+ if (match != NULL) {
-+ offsset = match - fold_text;
-+ match = text + offsset;
-+ }
-+
-+ if (!case_sen) {
-+ g_free (fold_text);
-+ g_free (fold_search);
-+ }
-+
-+ return match;
-+}
-+
-+static const char *
-+str_8bit_search_last (const char *text, const char *search, int case_sen)
-+{
-+ char *fold_text;
-+ char *fold_search;
-+ const char *match;
-+ size_t offsset;
-+
-+ fold_text = (case_sen) ? (char*) text : g_strdown (g_strdup (text));
-+ fold_search = (case_sen) ? (char*) text : g_strdown (g_strdup (search));
-+
-+ match = g_strrstr_len (fold_text, -1, fold_search);
-+ if (match != NULL) {
-+ offsset = match - fold_text;
-+ match = text + offsset;
-+ }
-+
-+ if (!case_sen) {
-+ g_free (fold_text);
-+ g_free (fold_search);
-+ }
-+
-+ return match;
-+}
-+
-+static int
-+str_8bit_compare (const char *t1, const char *t2)
-+{
-+ return strcmp (t1, t2);
-+}
-+
-+static int
-+str_8bit_ncompare (const char *t1, const char *t2)
-+{
-+ return strncmp (t1, t2, min (strlen (t1), strlen (t2)));
-+}
-+
-+static int
-+str_8bit_casecmp (const char *t1, const char *t2)
-+{
-+ return g_strcasecmp (t1, t2);
-+}
-+
-+static int
-+str_8bit_ncasecmp (const char *t1, const char *t2)
-+{
-+ return g_strncasecmp (t1, t2, min (strlen (t1), strlen (t2)));
-+}
-+
-+static int
-+str_8bit_prefix (const char *text, const char *prefix)
-+{
-+ int result;
-+ for (result = 0; text[result] != '\0' && prefix[result] != '\0'
-+ && text[result] == prefix[result]; result++);
-+ return result;
-+}
-+
-+static int
-+str_8bit_caseprefix (const char *text, const char *prefix)
-+{
-+ int result;
-+ for (result = 0; text[result] != '\0' && prefix[result] != '\0'
-+ && toupper (text[result]) == toupper (prefix[result]);
-+ result++);
-+ return result;
-+}
-+
-+
-+
-+static void
-+str_8bit_fix_string (char *text)
-+{
-+}
-+
-+static char *
-+str_8bit_create_key (const char *text, int case_sen)
-+{
-+ return (case_sen) ? (char*)text : g_strdown (g_strdup (text));
-+}
-+
-+static int
-+str_8bit_key_collate (const char *t1, const char *t2, int case_sen)
-+{
-+ if (case_sen) return strcmp (t1, t2);
-+ else return strcoll (t1, t2);
-+}
-+
-+static void
-+str_8bit_release_key (char *key, int case_sen)
-+{
-+ if (!case_sen) g_free (key);
-+}
-+
-+struct str_class
-+str_8bit_init ()
-+{
-+ struct str_class result;
-+
-+ result.vfs_convert_to = str_8bit_vfs_convert_to;
-+ result.insert_replace_char = str_8bit_insert_replace_char;
-+ result.is_valid_string = str_8bit_is_valid_string;
-+ result.is_valid_char = str_8bit_is_valid_char;
-+ result.cnext_char = str_8bit_cnext_char;
-+ result.cprev_char = str_8bit_cprev_char;
-+ result.cnext_char_safe = str_8bit_cnext_char;
-+ result.cprev_char_safe = str_8bit_cprev_char;
-+ result.cnext_noncomb_char = str_8bit_cnext_noncomb_char;
-+ result.cprev_noncomb_char = str_8bit_cprev_noncomb_char;
-+ result.isspace = str_8bit_isspace;
-+ result.ispunct = str_8bit_ispunct;
-+ result.isalnum = str_8bit_isalnum;
-+ result.isdigit = str_8bit_isdigit;
-+ result.isprint = str_8bit_isprint;
-+ result.iscombiningmark = str_8bit_iscombiningmark;
-+ result.toupper = str_8bit_toupper;
-+ result.tolower = str_8bit_tolower;
-+ result.length = str_8bit_length;
-+ result.length2 = str_8bit_length2;
-+ result.length_noncomb = str_8bit_length;
-+ result.fix_string = str_8bit_fix_string;
-+ result.term_form = str_8bit_term_form;
-+ result.fit_to_term = str_8bit_fit_to_term;
-+ result.term_trim = str_8bit_term_trim;
-+ result.term_width2 = str_8bit_term_width2;
-+ result.term_width1 = str_8bit_term_width1;
-+ result.term_char_width = str_8bit_term_char_width;
-+ result.msg_term_size = str_8bit_msg_term_size;
-+ result.term_substring = str_8bit_term_substring;
-+ result.trunc = str_8bit_trunc;
-+ result.offset_to_pos = str_8bit_offset_to_pos;
-+ result.column_to_pos = str_8bit_column_to_pos;
-+ result.create_search_needle = str_8bit_create_search_needle;
-+ result.release_search_needle = str_8bit_release_search_needle;
-+ result.search_first = str_8bit_search_first;
-+ result.search_last = str_8bit_search_last;
-+ result.compare = str_8bit_compare;
-+ result.ncompare = str_8bit_ncompare;
-+ result.casecmp = str_8bit_casecmp;
-+ result.ncasecmp = str_8bit_ncasecmp;
-+ result.prefix = str_8bit_prefix;
-+ result.caseprefix = str_8bit_caseprefix;
-+ result.create_key = str_8bit_create_key;
-+ result.create_key_for_filename = str_8bit_create_key;
-+ result.key_collate = str_8bit_key_collate;
-+ result.release_key = str_8bit_release_key;
-+
-+ return result;
-+}
Deleted: trunk/debian/patches/29_mc-02-hotkey.patch
===================================================================
--- trunk/debian/patches/29_mc-02-hotkey.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-02-hotkey.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,93 +0,0 @@
-diff -rupbBN mc.orig/src/widget.c mc/src/widget.c
---- mc.orig/src/widget.c 2007-12-01 01:21:10.000000000 +0100
-+++ mc/src/widget.c 2007-12-01 01:24:27.000000000 +0100
-@@ -47,6 +47,7 @@
- #include "profile.h" /* for history loading and saving */
- #include "wtools.h" /* For common_dialog_repaint() */
- #include "main.h" /* for `slow_terminal' */
-+#include "strutil.h"
-
- #define HISTORY_FILE_NAME ".mc/history"
-
-@@ -64,6 +65,51 @@ struct WButtonBar {
- } labels [10];
- };
-
-+struct hotkey_t
-+parse_hotkey (const char *text)
-+{
-+ struct hotkey_t result;
-+ const char *cp, *p;
-+
-+ /* search for '&', that is not on the of text */
-+ cp = strchr (text, '&');
-+ if (cp != NULL && cp[1] != '\0') {
-+ result.start = g_strndup (text, cp - text);
-+
-+ /* skip '&' */
-+ cp++;
-+ p = str_cget_next_char (cp);
-+ result.hotkey = g_strndup (cp, p - cp);
-+
-+ cp = p;
-+ result.end = g_strdup (cp);
-+ } else {
-+ result.start = g_strdup (text);
-+ result.hotkey = NULL;
-+ result.end = NULL;
-+ }
-+
-+ return result;
-+}
-+void
-+release_hotkey (const struct hotkey_t hotkey)
-+{
-+ g_free (hotkey.start);
-+ g_free (hotkey.hotkey);
-+ g_free (hotkey.end);
-+}
-+
-+int
-+hotkey_width (const struct hotkey_t hotkey)
-+{
-+ int result;
-+
-+ result = str_term_width1 (hotkey.start);
-+ result+= (hotkey.hotkey != NULL) ? str_term_width1 (hotkey.hotkey) : 0;
-+ result+= (hotkey.end != NULL) ? str_term_width1 (hotkey.end) : 0;
-+ return result;
-+}
-+
- static int button_event (Gpm_Event *event, void *);
-
- int quote = 0;
-diff -rupbBN mc.orig/src/widget.h mc/src/widget.h
---- mc.orig/src/widget.h 2007-12-01 01:21:10.000000000 +0100
-+++ mc/src/widget.h 2007-12-01 01:21:11.000000000 +0100
-@@ -9,6 +9,26 @@
- /* button callback */
- typedef int (*bcback) (int);
-
-+/* structure for label (caption) with hotkey, if original text does not contain
-+ * hotkey, only start is valid and is equal to original text
-+ * hotkey is defined as char*, but mc support only singlebyte hotkey
-+ */
-+struct hotkey_t {
-+ char *start;
-+ char *hotkey;
-+ char *end;
-+};
-+
-+/* used in static definition of menu entries */
-+#define NULL_HOTKEY {NULL, NULL, NULL}
-+
-+/* create hotkey from text */
-+struct hotkey_t parse_hotkey (const char *text);
-+/* release hotkey, free all mebers of hotkey_t */
-+void release_hotkey (const struct hotkey_t hotkey);
-+/* return width on terminal of hotkey */
-+int hotkey_width (const struct hotkey_t hotkey);
-+
- typedef struct WButton {
- Widget widget;
- int action; /* what to do when pressed */
Deleted: trunk/debian/patches/29_mc-03-button.patch
===================================================================
--- trunk/debian/patches/29_mc-03-button.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-03-button.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,227 +0,0 @@
-diff -rupBb mc-02-hotkey/src/achown.c mc/src/achown.c
---- mc-02-hotkey/src/achown.c 2007-09-26 12:22:25.000000000 +0200
-+++ mc/src/achown.c 2007-11-04 17:01:37.000000000 +0100
-@@ -139,9 +139,9 @@ static void set_perm_by_flags (char *s,
-
- static void update_permissions (void)
- {
-- set_perm_by_flags (b_att[0]->text, 0);
-- set_perm_by_flags (b_att[1]->text, 3);
-- set_perm_by_flags (b_att[2]->text, 6);
-+ set_perm_by_flags (b_att[0]->text.start, 0);
-+ set_perm_by_flags (b_att[1]->text.start, 3);
-+ set_perm_by_flags (b_att[2]->text.start, 6);
- }
-
- static mode_t get_perm (char *s, int base)
-@@ -484,7 +484,7 @@ advanced_chown_callback (Dlg_head *h, dl
- if (f_pos > 2)
- break;
- flag_pos = f_pos * 3 + i; /* (strchr(ch_perm,parm)-ch_perm); */
-- if (((WButton *) h->current)->text[(flag_pos % 3)] ==
-+ if (((WButton *) h->current)->text.start[(flag_pos % 3)] ==
- '-')
- ch_flags[flag_pos] = '+';
- else
-diff -rupBb mc-02-hotkey/src/widget.c mc/src/widget.c
---- mc-02-hotkey/src/widget.c 2007-11-04 16:31:16.000000000 +0100
-+++ mc/src/widget.c 2007-11-04 17:05:38.000000000 +0100
-@@ -132,7 +132,6 @@ static cb_ret_t
- button_callback (Widget *w, widget_msg_t msg, int parm)
- {
- WButton *b = (WButton *) w;
-- char buf[BUF_SMALL];
- int stop = 0;
- int off = 0;
- Dlg_head *h = b->widget.parent;
-@@ -155,11 +154,14 @@ button_callback (Widget *w, widget_msg_t
- return MSG_HANDLED;
- }
-
-- if (b->hotkey == tolower (parm)) {
-+ if (b->text.hotkey != NULL) {
-+ if (g_ascii_tolower ((gchar)b->text.hotkey[0]) ==
-+ g_ascii_tolower ((gchar)parm)) {
-+
- button_callback (w, WIDGET_KEY, ' ');
- return MSG_HANDLED;
- }
--
-+ }
- return MSG_NOT_HANDLED;
-
- case WIDGET_KEY:
-@@ -201,40 +203,52 @@ button_callback (Widget *w, widget_msg_t
- else if (msg == WIDGET_FOCUS)
- b->selected = 1;
-
-+ widget_selectcolor (w, b->selected, FALSE);
-+ widget_move (w, 0, 0);
-+
- switch (b->flags) {
- case DEFPUSH_BUTTON:
-- g_snprintf (buf, sizeof (buf), "[< %s >]", b->text);
-- off = 3;
-+ addstr ("[< ");
- break;
- case NORMAL_BUTTON:
-- g_snprintf (buf, sizeof (buf), "[ %s ]", b->text);
-- off = 2;
-+ addstr ("[ ");
- break;
- case NARROW_BUTTON:
-- g_snprintf (buf, sizeof (buf), "[%s]", b->text);
-- off = 1;
-+ addstr ("[");
- break;
- case HIDDEN_BUTTON:
- default:
-- buf[0] = '\0';
-- off = 0;
-- break;
-+ return MSG_HANDLED;
- }
-
-+ addstr (str_term_form (b->text.start));
-+
-+ if (b->text.hotkey != NULL) {
-+ widget_selectcolor (w, b->selected, TRUE);
-+ addstr (str_term_form (b->text.hotkey));
- widget_selectcolor (w, b->selected, FALSE);
-- widget_move (w, 0, 0);
-+ }
-
-- addstr (buf);
-+ if (b->text.end != NULL) {
-+ addstr (str_term_form (b->text.end));
-+ }
-
-- if (b->hotpos >= 0) {
-- widget_selectcolor (w, b->selected, TRUE);
-- widget_move (w, 0, b->hotpos + off);
-- addch ((unsigned char) b->text[b->hotpos]);
-+ switch (b->flags) {
-+ case DEFPUSH_BUTTON:
-+ addstr (" >]");
-+ break;
-+ case NORMAL_BUTTON:
-+ addstr (" ]");
-+ break;
-+ case NARROW_BUTTON:
-+ addstr ("]");
-+ break;
- }
-+
- return MSG_HANDLED;
-
- case WIDGET_DESTROY:
-- g_free (b->text);
-+ release_hotkey (b->text);
- return MSG_HANDLED;
-
- default:
-@@ -260,10 +274,10 @@ button_event (Gpm_Event *event, void *da
- }
-
- static int
--button_len (const char *text, unsigned int flags)
-+button_len (const struct hotkey_t text, unsigned int flags)
- {
-- int ret = strlen (text);
-- switch (flags){
-+ int ret = hotkey_width (text);
-+ switch (flags) {
- case DEFPUSH_BUTTON:
- ret += 6;
- break;
-@@ -280,57 +294,43 @@ button_len (const char *text, unsigned i
- return ret;
- }
-
--/*
-- * Locate the hotkey and remove it from the button text. Assuming that
-- * the button text is g_malloc()ed, we can safely change and shorten it.
-- */
--static void
--button_scan_hotkey (WButton *b)
--{
-- char *cp = strchr (b->text, '&');
--
-- if (cp != NULL && cp[1] != '\0') {
-- g_strlcpy (cp, cp + 1, strlen (cp));
-- b->hotkey = tolower ((unsigned char) *cp);
-- b->hotpos = cp - b->text;
-- }
--}
--
- WButton *
- button_new (int y, int x, int action, int flags, const char *text,
- bcback callback)
- {
- WButton *b = g_new (WButton, 1);
-
-- init_widget (&b->widget, y, x, 1, button_len (text, flags),
-+ b->text = parse_hotkey (text);
-+
-+ init_widget (&b->widget, y, x, 1, button_len (b->text, flags),
- button_callback, button_event);
-
- b->action = action;
- b->flags = flags;
- b->selected = 0;
-- b->text = g_strdup (text);
- b->callback = callback;
- widget_want_hotkey (b->widget, 1);
-- b->hotkey = 0;
-- b->hotpos = -1;
-+ b->hotpos = (b->text.hotkey != NULL) ? str_term_width1 (b->text.start) : -1;
-
-- button_scan_hotkey(b);
- return b;
- }
-
- const char *
- button_get_text (WButton *b)
- {
-- return b->text;
-+ if (b->text.hotkey != NULL)
-+ return g_strconcat (b->text.start, "&", b->text.hotkey,
-+ b->text.end, NULL);
-+ else
-+ return g_strdup (b->text.start);
- }
-
- void
- button_set_text (WButton *b, const char *text)
- {
-- g_free (b->text);
-- b->text = g_strdup (text);
-- b->widget.cols = button_len (text, b->flags);
-- button_scan_hotkey(b);
-+ release_hotkey (b->text);
-+ b->text = parse_hotkey (text);
-+ b->widget.cols = button_len (b->text, b->flags);
- dlg_redraw (b->widget.parent);
- }
-
-diff -rupBb mc-02-hotkey/src/widget.h mc/src/widget.h
---- mc-02-hotkey/src/widget.h 2007-11-04 16:13:52.000000000 +0100
-+++ mc/src/widget.h 2007-11-04 17:21:30.000000000 +0100
-@@ -39,8 +39,7 @@ typedef struct WButton {
- #define NORMAL_BUTTON 2
- #define DEFPUSH_BUTTON 3
- unsigned int flags; /* button flags */
-- char *text; /* text of button */
-- int hotkey; /* hot KEY */
-+ struct hotkey_t text; /* text of button, contain hotkey too */
- int hotpos; /* offset hot KEY char in text */
- bcback callback; /* Callback function */
- } WButton;
-@@ -177,6 +176,7 @@ void gauge_set_value (WGauge *g, int max
- void gauge_show (WGauge *g, int shown);
-
- /* Buttons */
-+/* return copy of button text */
- const char *button_get_text (WButton *b);
- void button_set_text (WButton *b, const char *text);
-
Deleted: trunk/debian/patches/29_mc-04-radio.patch
===================================================================
--- trunk/debian/patches/29_mc-04-radio.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-04-radio.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,111 +0,0 @@
-diff -rupBb mc.orig/src/widget.c mc/src/widget.c
---- mc.orig/src/widget.c 2007-11-04 17:29:47.000000000 +0100
-+++ mc/src/widget.c 2007-11-04 17:40:59.000000000 +0100
-@@ -348,13 +348,11 @@ radio_callback (Widget *w, widget_msg_t
- switch (msg) {
- case WIDGET_HOTKEY:
- {
-- int i, lp = tolower (parm);
-- const char *cp;
-+ int i, lp = g_ascii_tolower ((gchar)parm);
-
- for (i = 0; i < r->count; i++) {
-- cp = strchr (r->texts[i], '&');
-- if (cp != NULL && cp[1] != '\0') {
-- int c = tolower ((unsigned char) cp[1]);
-+ if (r->texts[i].hotkey != NULL) {
-+ int c = g_ascii_tolower ((gchar)r->texts[i].hotkey[0]);
-
- if (c != lp)
- continue;
-@@ -403,23 +401,32 @@ radio_callback (Widget *w, widget_msg_t
- case WIDGET_FOCUS:
- case WIDGET_DRAW:
- for (i = 0; i < r->count; i++) {
-- register const char *cp;
- const gboolean focused = (i == r->pos && msg == WIDGET_FOCUS);
- widget_selectcolor (w, focused, FALSE);
- widget_move (&r->widget, i, 0);
-
-- tty_printf ("(%c) ", (r->sel == i) ? '*' : ' ');
-- for (cp = r->texts[i]; *cp; cp++) {
-- if (*cp == '&') {
-+ addstr ((r->sel == i) ? "(*) " : "( ) ");
-+
-+ addstr (str_term_form (r->texts[i].start));
-+
-+ if (r->texts[i].hotkey != NULL) {
- widget_selectcolor (w, focused, TRUE);
-- addch (*++cp);
-+ addstr (str_term_form (r->texts[i].hotkey));
- widget_selectcolor (w, focused, FALSE);
-- } else
-- addch (*cp);
-+ }
-+ if (r->texts[i].end != NULL) {
-+ addstr (str_term_form (r->texts[i].end));
- }
- }
- return MSG_HANDLED;
-
-+ case WIDGET_DESTROY:
-+ for (i = 0; i < r->count; i++) {
-+ release_hotkey (r->texts[i]);
-+ }
-+ g_free (r->texts);
-+ return MSG_HANDLED;
-+
- default:
- return default_proc (msg, parm);
- }
-@@ -449,26 +456,28 @@ radio_event (Gpm_Event *event, void *dat
- WRadio *
- radio_new (int y, int x, int count, const char **texts)
- {
-- WRadio *r = g_new (WRadio, 1);
-+ WRadio *result = g_new (WRadio, 1);
- int i, max, m;
-
- /* Compute the longest string */
-+ result->texts = g_new (struct hotkey_t, count);
-+
- max = 0;
- for (i = 0; i < count; i++){
-- m = strlen (texts [i]);
-+ result->texts[i] = parse_hotkey (texts[i]);
-+ m = hotkey_width (result->texts[i]);
- if (m > max)
- max = m;
- }
-
-- init_widget (&r->widget, y, x, count, max, radio_callback, radio_event);
-- r->state = 1;
-- r->pos = 0;
-- r->sel = 0;
-- r->count = count;
-- r->texts = texts;
-- widget_want_hotkey (r->widget, 1);
-+ init_widget (&result->widget, y, x, count, max, radio_callback, radio_event);
-+ result->state = 1;
-+ result->pos = 0;
-+ result->sel = 0;
-+ result->count = count;
-+ widget_want_hotkey (result->widget, 1);
-
-- return r;
-+ return result;
- }
-
-
-diff -rupBb mc.orig/src/widget.h mc/src/widget.h
---- mc.orig/src/widget.h 2007-11-04 17:29:47.000000000 +0100
-+++ mc/src/widget.h 2007-11-04 17:31:21.000000000 +0100
-@@ -49,7 +49,7 @@ typedef struct WRadio {
- unsigned int state; /* radio button state */
- int pos, sel;
- int count; /* number of members */
-- const char **texts; /* texts of labels */
-+ struct hotkey_t *texts; /* texts of labels */
- } WRadio;
-
- typedef struct WCheck {
Deleted: trunk/debian/patches/29_mc-05-check.patch
===================================================================
--- trunk/debian/patches/29_mc-05-check.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-05-check.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,99 +0,0 @@
-diff -rupBb mc.orig/src/widget.c mc/src/widget.c
---- mc.orig/src/widget.c 2007-11-04 17:40:59.000000000 +0100
-+++ mc/src/widget.c 2007-11-04 18:11:22.000000000 +0100
-@@ -493,12 +493,14 @@ check_callback (Widget *w, widget_msg_t
-
- switch (msg) {
- case WIDGET_HOTKEY:
-- if (c->hotkey == parm
-- || (c->hotkey >= 'a' && c->hotkey <= 'z'
-- && c->hotkey - 32 == parm)) {
-+ if (c->text.hotkey != NULL) {
-+ if (g_ascii_tolower ((gchar)c->text.hotkey[0]) ==
-+ g_ascii_tolower ((gchar)parm)) {
-+
- check_callback (w, WIDGET_KEY, ' '); /* make action */
- return MSG_HANDLED;
- }
-+ }
- return MSG_NOT_HANDLED;
-
- case WIDGET_KEY:
-@@ -519,17 +521,23 @@ check_callback (Widget *w, widget_msg_t
- case WIDGET_DRAW:
- widget_selectcolor (w, msg == WIDGET_FOCUS, FALSE);
- widget_move (&c->widget, 0, 0);
-- tty_printf ("[%c] %s", (c->state & C_BOOL) ? 'x' : ' ', c->text);
-+ addstr ((c->state & C_BOOL) ? "[x] " : "[ ] ");
-+
-+ addstr (str_term_form (c->text.start));
-
-- if (c->hotpos >= 0) {
-+ if (c->text.hotkey != NULL) {
- widget_selectcolor (w, msg == WIDGET_FOCUS, TRUE);
-- widget_move (&c->widget, 0, +c->hotpos + 4);
-- addch ((unsigned char) c->text[c->hotpos]);
-+ addstr (str_term_form (c->text.hotkey));
-+ widget_selectcolor (w, msg == WIDGET_FOCUS, FALSE);
-+ }
-+
-+ if (c->text.end != NULL) {
-+ addstr (str_term_form (c->text.end));
- }
- return MSG_HANDLED;
-
- case WIDGET_DESTROY:
-- g_free (c->text);
-+ release_hotkey (c->text);
- return MSG_HANDLED;
-
- default:
-@@ -561,31 +569,14 @@ WCheck *
- check_new (int y, int x, int state, const char *text)
- {
- WCheck *c = g_new (WCheck, 1);
-- const char *s;
-- char *t;
-
-- init_widget (&c->widget, y, x, 1, strlen (text),
-+ c->text = parse_hotkey (text);
-+
-+ init_widget (&c->widget, y, x, 1, hotkey_width (c->text),
- check_callback, check_event);
- c->state = state ? C_BOOL : 0;
-- c->text = g_strdup (text);
-- c->hotkey = 0;
-- c->hotpos = -1;
- widget_want_hotkey (c->widget, 1);
-
-- /* Scan for the hotkey */
-- for (s = text, t = c->text; *s; s++, t++){
-- if (*s != '&'){
-- *t = *s;
-- continue;
-- }
-- s++;
-- if (*s){
-- c->hotkey = tolower ((unsigned char) *s);
-- c->hotpos = t - c->text;
-- }
-- *t = *s;
-- }
-- *t = 0;
- return c;
- }
-
-diff -rupBb mc.orig/src/widget.h mc/src/widget.h
---- mc.orig/src/widget.h 2007-11-04 17:31:21.000000000 +0100
-+++ mc/src/widget.h 2007-11-04 18:21:50.000000000 +0100
-@@ -58,9 +58,7 @@ typedef struct WCheck {
- #define C_BOOL 0x0001
- #define C_CHANGE 0x0002
- unsigned int state; /* check button state */
-- char *text; /* text of check button */
-- int hotkey; /* hot KEY */
-- int hotpos; /* offset hot KEY char in text */
-+ struct hotkey_t text; /* text of check button */
- } WCheck;
-
- typedef struct WGauge {
Deleted: trunk/debian/patches/29_mc-06-input.patch
===================================================================
--- trunk/debian/patches/29_mc-06-input.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-06-input.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,1095 +0,0 @@
-diff -rupbBN mc.orig/src/complete.c mc/src/complete.c
---- mc.orig/src/complete.c 2007-12-01 01:27:03.000000000 +0100
-+++ mc/src/complete.c 2007-11-30 22:51:41.000000000 +0100
-@@ -41,6 +41,7 @@
- #include "complete.h"
- #include "main.h"
- #include "key.h" /* XCTRL and ALT macros */
-+#include "strutil.h"
-
- typedef char *CompletionFunction (char *, int);
-
-@@ -97,6 +98,8 @@ filename_completion_function (char *text
- /* Now that we have some state, we can read the directory. */
-
- while (directory && (entry = mc_readdir (directory))){
-+ if (!str_is_valid_string (entry->d_name)) continue;
-+
- /* Special case for no filename.
- All entries except "." and ".." match. */
- if (!filename_len){
-@@ -273,20 +276,24 @@ static void fetch_hosts (const char *fil
- {
- FILE *file = fopen (filename, "r");
- char buffer[256], *name;
-- register int i, start;
-+ char *start;
-+ char *bi;
-
- if (!file)
- return;
-
- while (fgets (buffer, 255, file) != NULL){
- /* Skip to first character. */
-- for (i = 0; buffer[i] && cr_whitespace (buffer[i]); i++);
-+ for (bi = buffer;
-+ bi[0] != '\0' && str_isspace (bi);
-+ str_next_char (&bi));
-+
- /* Ignore comments... */
-- if (buffer[i] == '#')
-+ if (bi[0] == '#')
- continue;
- /* Handle $include. */
-- if (!strncmp (buffer + i, "$include ", 9)){
-- char *includefile = buffer + i + 9;
-+ if (!strncmp (bi, "$include ", 9)){
-+ char *includefile = bi + 9;
- char *t;
-
- /* Find start of filename. */
-@@ -295,8 +302,8 @@ static void fetch_hosts (const char *fil
- t = includefile;
-
- /* Find end of filename. */
-- while (*t && !cr_whitespace (*t))
-- t++;
-+ while (t[0] != '\0' && !str_isspace (t))
-+ str_next_char (&t);
- *t = '\0';
-
- fetch_hosts (includefile);
-@@ -304,19 +311,22 @@ static void fetch_hosts (const char *fil
- }
-
- /* Skip IP #s. */
-- while (buffer[i] && !cr_whitespace (buffer[i]))
-- i++;
-+ while (bi[0] != '\0' && !str_isspace (bi))
-+ str_next_char (&bi);
-
- /* Get the host names separated by white space. */
-- while (buffer[i] && buffer[i] != '#'){
-- while (buffer[i] && cr_whitespace (buffer[i]))
-- i++;
-- if (buffer[i] == '#')
-+ while (bi[0] != '\0' && bi[0] != '#'){
-+ while (bi[0] != '\0' && str_isspace (bi))
-+ str_next_char (&bi);
-+ if (bi[0] == '#')
- continue;
-- for (start = i; buffer[i] && !cr_whitespace (buffer[i]); i++);
-- if (i - start == 0)
-- continue;
-- name = g_strndup (buffer + start, i - start);
-+ for (start = bi;
-+ bi[0] != '\0' && !str_isspace (bi);
-+ str_next_char (&bi));
-+
-+ if (bi - start == 0) continue;
-+
-+ name = g_strndup (start, bi - start);
- {
- char **host_p;
-
-@@ -566,19 +576,30 @@ completion_matches (char *text, Completi
- j = i + 1;
- while (j < matches + 1)
- {
-- register int c1, c2, si;
-+ char *si, *sj;
-+ char *ni, *nj;
-+
-+ for (si = match_list[i], sj = match_list[j];
-+ si[0] && sj[0];) {
-+
-+ ni = str_get_next_char (si);
-+ nj = str_get_next_char (sj);
-+
-+ if (ni - si != nj - sj) break;
-+ if (strncmp (si, sj, ni - si) != 0) break;
-
-- for (si = 0;(c1 = match_list [i][si]) && (c2 = match_list [j][si]); si++)
-- if (c1 != c2) break;
-+ si = ni;
-+ sj = nj;
-+ }
-
-- if (!c1 && !match_list [j][si]){ /* Two equal strings */
-+ if (si[0] == '\0' && sj[0] == '\0'){ /* Two equal strings */
- g_free (match_list [j]);
- j++;
- if (j > matches)
- break;
- continue; /* Look for a run of equal strings */
- } else
-- if (low > si) low = si;
-+ if (low > si - match_list[i]) low = si - match_list[i];
- if (i + 1 != j) /* So there's some gap */
- match_list [i + 1] = match_list [j];
- i++; j++;
-@@ -598,7 +619,8 @@ completion_matches (char *text, Completi
- static int
- check_is_cd (const char *text, int start, int flags)
- {
-- const char *p, *q;
-+ char *p, *q;
-+ int test = 0;
-
- if (flags & INPUT_COMPLETE_CD)
- return 1;
-@@ -607,14 +629,18 @@ check_is_cd (const char *text, int start
- return 0;
-
- /* Skip initial spaces */
-- p = text;
-- q = text + start;
-- while (p < q && *p && isspace ((unsigned char) *p))
-- p++;
-+ p = (char*)text;
-+ q = (char*)text + start;
-+ while (p < q && p[0] != '\0' && str_isspace (p))
-+ str_next_char (&p);
-
- /* Check if the command is "cd" and the cursor is after it */
-- if (p[0] == 'c' && p[1] == 'd' && isspace ((unsigned char) p[2])
-- && (p + 2 < q))
-+ text+= p[0] == 'c';
-+ str_next_char (&p);
-+ text+= p[0] == 'd';
-+ str_next_char (&p);
-+ text+= str_isspace (p);
-+ if (test == 3 && (p < q))
- return 1;
-
- return 0;
-@@ -624,44 +650,44 @@ check_is_cd (const char *text, int start
- static char **
- try_complete (char *text, int *start, int *end, int flags)
- {
-- int in_command_position = 0, i;
-- char *word, c;
-+ int in_command_position = 0;
-+ char *word;
- char **matches = NULL;
- const char *command_separator_chars = ";|&{(`";
- char *p = NULL, *q = NULL, *r = NULL;
- int is_cd = check_is_cd (text, *start, flags);
-+ char *ti;
-
- ignore_filenames = 0;
-- c = text [*end];
-- text [*end] = 0;
-- word = g_strdup (text + *start);
-- text [*end] = c;
-+ word = g_strndup (text + *start, *end - *start);
-
- /* Determine if this could be a command word. It is if it appears at
- the start of the line (ignoring preceding whitespace), or if it
- appears after a character that separates commands. And we have to
- be in a INPUT_COMPLETE_COMMANDS flagged Input line. */
- if (!is_cd && (flags & INPUT_COMPLETE_COMMANDS)){
-- i = *start - 1;
-- while (i > -1 && (text[i] == ' ' || text[i] == '\t'))
-- i--;
-- if (i < 0)
-+ ti = str_get_prev_char (&text[*start]);
-+ while (ti > text && (ti[0] == ' ' || ti[0] == '\t'))
-+ str_prev_char (&ti);
-+
-+ if (ti <= text&& (ti[0] == ' ' || ti[0] == '\t'))
- in_command_position++;
-- else if (strchr (command_separator_chars, text[i])){
-+ else if (strchr (command_separator_chars, ti[0])){
- register int this_char, prev_char;
-
- in_command_position++;
-
-- if (i){
-+ if (ti > text){
- /* Handle the two character tokens `>&', `<&', and `>|'.
- We are not in a command position after one of these. */
-- this_char = text[i];
-- prev_char = text[i - 1];
-+ this_char = ti[0];
-+ prev_char = str_get_prev_char (ti)[0];
-
- if ((this_char == '&' && (prev_char == '<' || prev_char == '>')) ||
- (this_char == '|' && prev_char == '>'))
- in_command_position = 0;
-- else if (i > 0 && text [i-1] == '\\') /* Quoted */
-+
-+ else if (ti > text && str_get_prev_char (ti)[0] == '\\') /* Quoted */
- in_command_position = 0;
- }
- }
-@@ -675,15 +701,15 @@ try_complete (char *text, int *start, in
- r = strrchr (word, '@');
- if (q && q [1] == '(' && INPUT_COMPLETE_COMMANDS){
- if (q > p)
-- p = q + 1;
-+ p = str_get_next_char (q);
- q = NULL;
- }
-
- /* Command substitution? */
- if (p > q && p > r){
-- matches = completion_matches (p + 1, command_completion_function);
-+ matches = completion_matches (str_get_next_char (p), command_completion_function);
- if (matches)
-- *start += p + 1 - word;
-+ *start += str_get_next_char (p) - word;
- }
-
- /* Variable name? */
-@@ -721,9 +747,9 @@ try_complete (char *text, int *start, in
- if (!matches && is_cd && *word != PATH_SEP && *word != '~'){
- char *p, *q = text + *start;
-
-- for (p = text; *p && p < q && (*p == ' ' || *p == '\t'); p++);
-+ for (p = text; *p && p < q && (*p == ' ' || *p == '\t'); str_next_char (&p));
- if (!strncmp (p, "cd", 2))
-- for (p += 2; *p && p < q && (*p == ' ' || *p == '\t'); p++);
-+ for (p += 2; *p && p < q && (*p == ' ' || *p == '\t'); str_next_char (&p));
- if (p == q){
- char * const cdpath_ref = g_strdup (getenv ("CDPATH"));
- char *cdpath = cdpath_ref;
-@@ -747,7 +773,7 @@ try_complete (char *text, int *start, in
- g_free (r);
- }
- *s = c;
-- cdpath = s + 1;
-+ cdpath = str_get_next_char (s);
- }
- g_free (cdpath_ref);
- }
-@@ -776,49 +802,57 @@ static WInput *input;
- static int min_end;
- static int start, end;
-
--static int insert_text (WInput *in, char *text, ssize_t len)
-+static int insert_text (WInput *in, char *text, ssize_t size)
- {
-- len = min (len, (ssize_t) strlen (text)) + start - end;
-- if (strlen (in->buffer) + len >= (size_t) in->current_max_len){
-+ int buff_len = str_length (in->buffer);
-+
-+ size = min (size, (ssize_t) strlen (text)) + start - end;
-+ if (strlen (in->buffer) + size >= (size_t) in->current_max_size){
- /* Expand the buffer */
-- char *narea = g_realloc (in->buffer, in->current_max_len + len + in->field_len);
-+ char *narea = g_realloc (in->buffer, in->current_max_size
-+ + size + in->field_width);
- if (narea){
- in->buffer = narea;
-- in->current_max_len += len + in->field_len;
-+ in->current_max_size += size + in->field_width;
- }
- }
-- if (strlen (in->buffer)+1 < (size_t) in->current_max_len){
-- if (len > 0){
-+ if (strlen (in->buffer)+1 < (size_t) in->current_max_size){
-+ if (size > 0){
- int i = strlen (&in->buffer [end]);
- for (; i >= 0; i--)
-- in->buffer [end + len + i] = in->buffer [end + i];
-- } else if (len < 0){
-- char *p = in->buffer + end + len, *q = in->buffer + end;
-+ in->buffer [end + size + i] = in->buffer [end + i];
-+ } else if (size < 0){
-+ char *p = in->buffer + end + size, *q = in->buffer + end;
- while (*q)
- *(p++) = *(q++);
- *p = 0;
- }
-- memcpy (in->buffer + start, text, len - start + end);
-- in->point += len;
-+ memcpy (in->buffer + start, text, size - start + end);
-+ in->point+= str_length (in->buffer) - buff_len;
- update_input (in, 1);
-- end += len;
-+ end+= size;
- }
-- return len != 0;
-+ return size != 0;
- }
-
- static cb_ret_t
- query_callback (Dlg_head *h, dlg_msg_t msg, int parm)
- {
-+ static char buff[MB_LEN_MAX] = "";
-+ static int bl = 0;
-+
- switch (msg) {
- case DLG_KEY:
- switch (parm) {
- case KEY_LEFT:
- case KEY_RIGHT:
-+ bl = 0;
- h->ret_value = 0;
- dlg_stop (h);
- return MSG_HANDLED;
-
- case KEY_BACKSPACE:
-+ bl = 0;
- if (end == min_end) {
- h->ret_value = 0;
- dlg_stop (h);
-@@ -828,13 +862,13 @@ query_callback (Dlg_head *h, dlg_msg_t m
-
- e1 = e = ((WListbox *) (h->current))->list;
- do {
-- if (!strncmp
-- (input->buffer + start, e1->text,
-- end - start - 1)) {
-- listbox_select_entry ((WListbox *) (h->current),
-- e1);
-+ if (!strncmp (input->buffer + start,
-+ e1->text, end - start - 1)) {
-+
-+ listbox_select_entry ((WListbox *) (h->current), e1);
-+ end = str_get_prev_char (&(input->buffer[end]))
-+ - input->buffer;
- handle_char (input, parm);
-- end--;
- send_message (h->current, WIDGET_DRAW, 0);
- break;
- }
-@@ -844,7 +878,8 @@ query_callback (Dlg_head *h, dlg_msg_t m
- return MSG_HANDLED;
-
- default:
-- if (parm > 0xff || !is_printable (parm)) {
-+ if (parm < 32 || parm > 256) {
-+ bl = 0;
- if (is_in_input_map (input, parm) == 2) {
- if (end == min_end)
- return MSG_HANDLED;
-@@ -860,21 +895,43 @@ query_callback (Dlg_head *h, dlg_msg_t m
- int low = 4096;
- char *last_text = NULL;
-
-+ buff[bl] = (char) parm;
-+ bl++;
-+ buff[bl] = '\0';
-+ switch (str_is_valid_char (buff, bl)) {
-+ case -1:
-+ bl = 0;
-+ case -2:
-+ return MSG_HANDLED;
-+ }
-+
- e1 = e = ((WListbox *) (h->current))->list;
- do {
-- if (!strncmp
-- (input->buffer + start, e1->text, end - start)) {
-- if (e1->text[end - start] == parm) {
-+ if (!strncmp (input->buffer + start,
-+ e1->text, end - start)) {
-+
-+ if (strncmp (&e1->text[end - start], buff, bl) == 0) {
- if (need_redraw) {
-- register int c1, c2, si;
-+ char *si, *sl;
-+ char *ni, *nl;
-+ si = &(e1->text[end - start]);
-+ sl = &(last_text[end - start]);
-+
-+ for (; si[0] != '\0' && sl[0] != '\0';) {
-+
-+ ni = str_get_next_char (si);
-+ nl = str_get_next_char (sl);
-+
-+ if (ni - si != nl - sl) break;
-+ if (strncmp (si, sl, ni - si) != 0) break;
-+
-+ si = ni;
-+ sl = nl;
-+ }
-+
-+ if (low > si - &e1->text[start])
-+ low = si - &e1->text[start];
-
-- for (si = end - start + 1;
-- (c1 = last_text[si])
-- && (c2 = e1->text[si]); si++)
-- if (c1 != c2)
-- break;
-- if (low > si)
-- low = si;
- last_text = e1->text;
- need_redraw = 2;
- } else {
-@@ -895,6 +952,7 @@ query_callback (Dlg_head *h, dlg_msg_t m
- h->ret_value = B_ENTER;
- dlg_stop (h);
- }
-+ bl = 0;
- }
- return MSG_HANDLED;
- }
-@@ -911,15 +969,19 @@ query_callback (Dlg_head *h, dlg_msg_t m
- static int
- complete_engine (WInput *in, int what_to_do)
- {
-- if (in->completions && in->point != end)
-+ int s;
-+
-+ if (in->completions && (str_offset_to_pos (in->buffer, in->point)) != end)
- free_completions (in);
- if (!in->completions){
-- end = in->point;
-- for (start = end ? end - 1 : 0; start > -1; start--)
-- if (strchr (" \t;|<>", in->buffer [start]))
-+ end = str_offset_to_pos (in->buffer, in->point);
-+ for (s = in->point ? in->point - 1 : 0; s >= 0; s--) {
-+ start = str_offset_to_pos (in->buffer, s);
-+ if (strchr (" \t;|<>", in->buffer [start])) {
-+ if (start < end) start = str_offset_to_pos (in->buffer, s + 1);
- break;
-- if (start < end)
-- start++;
-+ }
-+ }
- in->completions = try_complete (in->buffer, &start, &end, in->completion_flags);
- }
- if (in->completions){
-@@ -941,7 +1003,7 @@ complete_engine (WInput *in, int what_to
- WListbox *query_list;
-
- for (p=in->completions + 1; *p; count++, p++)
-- if ((i = strlen (*p)) > maxlen)
-+ if ((i = str_term_width1 (*p)) > maxlen)
- maxlen = i;
- start_x = in->widget.x;
- start_y = in->widget.y;
-@@ -957,7 +1019,7 @@ complete_engine (WInput *in, int what_to
- h = LINES - start_y - 1;
- }
- }
-- x = start - in->first_shown - 2 + start_x;
-+ x = start - in->term_first_shown - 2 + start_x;
- w = maxlen + 4;
- if (x + w > COLS)
- x = COLS - w;
-@@ -999,6 +1061,8 @@ void complete (WInput *in)
- {
- int engine_flags;
-
-+ if (!str_is_valid_string (in->buffer)) return;
-+
- if (in->completions)
- engine_flags = DO_QUERY;
- else
-diff -rupbBN mc.orig/src/widget.c mc/src/widget.c
---- mc.orig/src/widget.c 2007-12-01 01:27:03.000000000 +0100
-+++ mc/src/widget.c 2007-12-01 01:39:42.000000000 +0100
-@@ -789,27 +789,21 @@ gauge_new (int y, int x, int shown, int
- #endif
-
- #define should_show_history_button(in) \
-- (in->history && in->field_len > HISTORY_BUTTON_WIDTH * 2 + 1 && in->widget.parent)
-+(in->history && in->field_width > HISTORY_BUTTON_WIDTH * 2 + 1 && in->widget.parent)
-
- static void draw_history_button (WInput * in)
- {
- char c;
- c = in->history->next ? (in->history->prev ? '|' : 'v') : '^';
-- widget_move (&in->widget, 0, in->field_len - HISTORY_BUTTON_WIDTH);
-+ widget_move (&in->widget, 0, in->field_width - HISTORY_BUTTON_WIDTH);
- #ifdef LARGE_HISTORY_BUTTON
- {
- Dlg_head *h;
- h = in->widget.parent;
--#if 0
-- attrset (NORMALC); /* button has the same color as other buttons */
-- addstr ("[ ]");
-- attrset (HOT_NORMALC);
--#else
- attrset (NORMAL_COLOR);
- addstr ("[ ]");
- /* Too distracting: attrset (MARKED_COLOR); */
--#endif
-- widget_move (&in->widget, 0, in->field_len - HISTORY_BUTTON_WIDTH + 1);
-+ widget_move (&in->widget, 0, in->field_width - HISTORY_BUTTON_WIDTH + 1);
- addch (c);
- }
- #else
-@@ -829,9 +823,10 @@ void
- update_input (WInput *in, int clear_first)
- {
- int has_history = 0;
-- int i, j;
-- unsigned char c;
-- int buf_len = strlen (in->buffer);
-+ int i;
-+ int buf_len = str_length (in->buffer);
-+ const char *cp;
-+ int pw;
-
- if (should_show_history_button (in))
- has_history = HISTORY_BUTTON_WIDTH;
-@@ -839,12 +834,15 @@ update_input (WInput *in, int clear_firs
- if (in->disable_update)
- return;
-
-+ pw = str_term_width2 (in->buffer, in->point);
-+
- /* Make the point visible */
-- if ((in->point < in->first_shown) ||
-- (in->point >= in->first_shown+in->field_len - has_history)){
-- in->first_shown = in->point - (in->field_len / 3);
-- if (in->first_shown < 0)
-- in->first_shown = 0;
-+ if ((pw < in->term_first_shown) ||
-+ (pw >= in->term_first_shown + in->field_width - has_history)) {
-+
-+ in->term_first_shown = pw - (in->field_width / 3);
-+ if (in->term_first_shown < 0)
-+ in->term_first_shown = 0;
- }
-
- /* Adjust the mark */
-@@ -857,28 +855,29 @@ update_input (WInput *in, int clear_firs
- attrset (in->color);
-
- widget_move (&in->widget, 0, 0);
-- for (i = 0; i < in->field_len - has_history; i++)
-- addch (' ');
-- widget_move (&in->widget, 0, 0);
-
-- for (i = 0, j = in->first_shown; i < in->field_len - has_history && in->buffer [j]; i++){
-- c = in->buffer [j++];
-- c = is_printable (c) ? c : '.';
-- if (in->is_password)
-- c = '*';
-- addch (c);
-+ if (!in->is_password) {
-+ addstr (str_term_substring (in->buffer, in->term_first_shown,
-+ in->field_width - has_history));
-+ } else {
-+ cp = in->buffer;
-+ for (i = -in->term_first_shown; i < in->field_width - has_history; i++){
-+ if (i >= 0) {
-+ addch ((cp[0] != '\0') ? '*' : ' ');
-+ }
-+ if (cp[0] != '\0') str_cnext_char (&cp);
-+ }
- }
-- widget_move (&in->widget, 0, in->point - in->first_shown);
-
- if (clear_first)
- in->first = 0;
- }
-
- void
--winput_set_origin (WInput *in, int x, int field_len)
-+winput_set_origin (WInput *in, int x, int field_width)
- {
- in->widget.x = x;
-- in->field_len = in->widget.cols = field_len;
-+ in->field_width = in->widget.cols = field_width;
- update_input (in, 0);
- }
-
-@@ -997,11 +996,7 @@ history_put (const char *input_name, GLi
- static const char *
- i18n_htitle (void)
- {
-- static const char *history_title = NULL;
--
-- if (history_title == NULL)
-- history_title = _(" History ");
-- return history_title;
-+ return _(" History ");
- }
-
- static WLEntry *listbox_select_pos (WListbox *l, WLEntry *base, int
-@@ -1021,7 +1016,7 @@ char *
- show_hist (GList *history, int widget_x, int widget_y)
- {
- GList *hi, *z;
-- size_t maxlen = strlen (i18n_htitle ()), i, count = 0;
-+ size_t maxlen = str_term_width1 (i18n_htitle ()), i, count = 0;
- int x, y, w, h;
- char *q, *r = 0;
- Dlg_head *query_dlg;
-@@ -1034,7 +1029,7 @@ show_hist (GList *history, int widget_x,
- z = g_list_first (history);
- hi = z;
- while (hi) {
-- if ((i = strlen ((char *) hi->data)) > maxlen)
-+ if ((i = str_term_width1 ((char *) hi->data)) > maxlen)
- maxlen = i;
- count++;
- hi = g_list_next (hi);
-@@ -1202,37 +1197,75 @@ new_input (WInput *in)
- if (in->buffer)
- push_history (in, in->buffer);
- in->need_push = 1;
-- in->buffer [0] = 0;
-+ in->buffer[0] = '\0';
- in->point = 0;
-+ in->charpoint = 0;
- in->mark = 0;
- free_completions (in);
- update_input (in, 0);
- }
-
-+static void
-+move_buffer_backward (WInput *in, int start, int end)
-+{
-+ int i, pos, len;
-+ int str_len = str_length (in->buffer);
-+ if (start >= str_len || end > str_len + 1) return;
-+
-+ pos = str_offset_to_pos (in->buffer, start);
-+ len = str_offset_to_pos (in->buffer, end) - pos;
-+
-+ for (i = pos; in->buffer[i + len - 1]; i++)
-+ in->buffer[i] = in->buffer[i + len];
-+}
-+
- static cb_ret_t
- insert_char (WInput *in, int c_code)
- {
- size_t i;
-+ int res;
-
- if (c_code == -1)
- return MSG_NOT_HANDLED;
-
-+ if (in->charpoint >= MB_LEN_MAX) return 1;
-+
-+ in->charbuf[in->charpoint] = c_code;
-+ in->charpoint++;
-+
-+ res = str_is_valid_char (in->charbuf, in->charpoint);
-+ if (res < 0) {
-+ if (res != -2) in->charpoint = 0; /* broken multibyte char, skip */
-+ return 1;
-+ }
-+
- in->need_push = 1;
-- if (strlen (in->buffer)+1 == (size_t) in->current_max_len){
-+ if (strlen (in->buffer) + 1 + in->charpoint >= in->current_max_size){
- /* Expand the buffer */
-- char *narea = g_realloc (in->buffer, in->current_max_len + in->field_len);
-+ size_t new_length = in->current_max_size +
-+ in->field_width + in->charpoint;
-+ char *narea = g_try_renew (char, in->buffer, new_length);
- if (narea){
- in->buffer = narea;
-- in->current_max_len += in->field_len;
-+ in->current_max_size = new_length;
- }
- }
-- if (strlen (in->buffer)+1 < (size_t) in->current_max_len){
-- size_t l = strlen (&in->buffer [in->point]);
-- for (i = l+1; i > 0; i--)
-- in->buffer [in->point+i] = in->buffer [in->point+i-1];
-- in->buffer [in->point] = c_code;
-+
-+ if (strlen (in->buffer) + in->charpoint < in->current_max_size) {
-+ /* bytes from begin */
-+ size_t ins_point = str_offset_to_pos (in->buffer, in->point);
-+ /* move chars */
-+ size_t rest_bytes = strlen (in->buffer + ins_point);
-+
-+ for (i = rest_bytes + 1; i > 0; i--)
-+ in->buffer[ins_point + i + in->charpoint - 1] =
-+ in->buffer[ins_point + i - 1];
-+
-+ memcpy(in->buffer + ins_point, in->charbuf, in->charpoint);
- in->point++;
- }
-+
-+ in->charpoint = 0;
- return MSG_HANDLED;
- }
-
-@@ -1240,54 +1273,70 @@ static void
- beginning_of_line (WInput *in)
- {
- in->point = 0;
-+ in->charpoint = 0;
- }
-
- static void
- end_of_line (WInput *in)
- {
-- in->point = strlen (in->buffer);
-+ in->point = str_length (in->buffer);
-+ in->charpoint = 0;
- }
-
- static void
- backward_char (WInput *in)
- {
-- if (in->point)
-- in->point--;
-+ const char *act = in->buffer + str_offset_to_pos (in->buffer, in->point);
-+
-+ if (in->point > 0) {
-+ in->point-= str_cprev_noncomb_char (&act, in->buffer);
-+ }
-+ in->charpoint = 0;
- }
-
- static void
- forward_char (WInput *in)
- {
-- if (in->buffer [in->point])
-- in->point++;
-+ const char *act = in->buffer + str_offset_to_pos (in->buffer, in->point);
-+ if (act[0] != '\0') {
-+ in->point+= str_cnext_noncomb_char (&act);
-+ }
-+ in->charpoint = 0;
- }
-
- static void
- forward_word (WInput * in)
- {
-- char *p = in->buffer + in->point;
-+ const char *p = in->buffer + str_offset_to_pos (in->buffer, in->point);
-
-- while (*p
-- && (isspace ((unsigned char) *p)
-- || ispunct ((unsigned char) *p)))
-- p++;
-- while (*p && isalnum ((unsigned char) *p))
-- p++;
-- in->point = p - in->buffer;
-+ while (p[0] != '\0' && (str_isspace (p) || str_ispunct (p))) {
-+ str_cnext_char (&p);
-+ in->point++;
-+ }
-+ while (p[0] != '\0' && !str_isspace (p) && !str_ispunct (p)) {
-+ str_cnext_char (&p);
-+ in->point++;
-+ }
- }
-
- static void
- backward_word (WInput *in)
- {
-- char *p = in->buffer + in->point;
-+ const char *p = in->buffer + str_offset_to_pos (in->buffer, in->point);
-
-- while (p - 1 > in->buffer - 1 && (isspace ((unsigned char) *(p - 1))
-- || ispunct ((unsigned char)
-- *(p - 1))))
-- p--;
-- while (p - 1 > in->buffer - 1 && isalnum ((unsigned char) *(p - 1)))
-+ while ((p != in->buffer) && (p[0] == '\0')) {
- p--;
-- in->point = p - in->buffer;
-+ in->point--;
-+ }
-+
-+ while ((p != in->buffer) && (str_isspace (p) || str_ispunct (p))) {
-+ str_cprev_char (&p);
-+ in->point--;
-+ }
-+ while ((p != in->buffer) && !str_isspace (p) && !str_ispunct (p)) {
-+ str_cprev_char (&p);
-+ in->point--;
-+ }
- }
-
- static void
-@@ -1316,23 +1365,29 @@ key_ctrl_right (WInput *in)
- static void
- backward_delete (WInput *in)
- {
-- int i;
-+ const char *act = in->buffer + str_offset_to_pos (in->buffer, in->point);
-+ int start;
-
-- if (!in->point)
-+ if (in->point == 0)
- return;
-- for (i = in->point; in->buffer [i-1]; i++)
-- in->buffer [i-1] = in->buffer [i];
-+
-+ start = in->point - str_cprev_noncomb_char (&act, in->buffer);
-+ move_buffer_backward(in, start, in->point);
-+ in->charpoint = 0;
- in->need_push = 1;
-- in->point--;
-+ in->point = start;
- }
-
- static void
- delete_char (WInput *in)
- {
-- int i;
-+ const char *act = in->buffer + str_offset_to_pos (in->buffer, in->point);
-+ int end = in->point;
-+
-+ end+= str_cnext_noncomb_char (&act);
-
-- for (i = in->point; in->buffer [i]; i++)
-- in->buffer [i] = in->buffer [i+1];
-+ move_buffer_backward(in, in->point, end);
-+ in->charpoint = 0;
- in->need_push = 1;
- }
-
-@@ -1347,7 +1402,10 @@ copy_region (WInput *in, int x_first, in
-
- g_free (kill_buffer);
-
-- kill_buffer = g_strndup(in->buffer+first,last-first);
-+ first = str_offset_to_pos (in->buffer, first);
-+ last = str_offset_to_pos (in->buffer, last);
-+
-+ kill_buffer = g_strndup(in->buffer + first, last - first);
- }
-
- static void
-@@ -1355,11 +1413,15 @@ delete_region (WInput *in, int x_first,
- {
- int first = min (x_first, x_last);
- int last = max (x_first, x_last);
-- size_t len = strlen (&in->buffer [last]) + 1;
-+ size_t len;
-
- in->point = first;
- in->mark = first;
-- memmove (&in->buffer [first], &in->buffer [last], len);
-+ last = str_offset_to_pos (in->buffer, last);
-+ first = str_offset_to_pos (in->buffer, first);
-+ len = strlen (&in->buffer[last]) + 1;
-+ memmove (&in->buffer[first], &in->buffer[last], len);
-+ in->charpoint = 0;
- in->need_push = 1;
- }
-
-@@ -1376,6 +1438,8 @@ kill_word (WInput *in)
- copy_region (in, old_point, new_point);
- delete_region (in, old_point, new_point);
- in->need_push = 1;
-+ in->charpoint = 0;
-+ in->charpoint = 0;
- }
-
- static void
-@@ -1419,16 +1483,20 @@ yank (WInput *in)
-
- if (!kill_buffer)
- return;
-+ in->charpoint = 0;
- for (p = kill_buffer; *p; p++)
- insert_char (in, *p);
-+ in->charpoint = 0;
- }
-
- static void
- kill_line (WInput *in)
- {
-+ int chp = str_offset_to_pos (in->buffer, in->point);
- g_free (kill_buffer);
-- kill_buffer = g_strdup (&in->buffer [in->point]);
-- in->buffer [in->point] = 0;
-+ kill_buffer = g_strdup (&in->buffer[chp]);
-+ in->buffer[chp] = '\0';
-+ in->charpoint = 0;
- }
-
- void
-@@ -1437,10 +1505,11 @@ assign_text (WInput *in, const char *tex
- free_completions (in);
- g_free (in->buffer);
- in->buffer = g_strdup (text); /* was in->buffer->text */
-- in->current_max_len = strlen (in->buffer) + 1;
-- in->point = strlen (in->buffer);
-+ in->current_max_size = strlen (in->buffer) + 1;
-+ in->point = str_length (in->buffer);
- in->mark = 0;
- in->need_push = 1;
-+ in->charpoint = 0;
- }
-
- static void
-@@ -1564,9 +1633,10 @@ is_in_input_map (WInput *in, int c_code)
- static void
- port_region_marked_for_delete (WInput *in)
- {
-- *in->buffer = 0;
-+ in->buffer[0] = '\0';
- in->point = 0;
- in->first = 0;
-+ in->charpoint = 0;
- }
-
- cb_ret_t
-@@ -1595,7 +1665,7 @@ handle_char (WInput *in, int c_code)
- }
- }
- if (!input_map [i].fn){
-- if (c_code > 255 || !is_printable (c_code))
-+ if (c_code > 255)
- return MSG_NOT_HANDLED;
- if (in->first){
- port_region_marked_for_delete (in);
-@@ -1623,11 +1693,14 @@ stuff (WInput *in, const char *text, int
- void
- input_set_point (WInput *in, int pos)
- {
-- if (pos > in->current_max_len)
-- pos = in->current_max_len;
-+ int max_pos = str_length (in->buffer);
-+
-+ if (pos > max_pos)
-+ pos = max_pos;
- if (pos != in->point)
- free_completions (in);
- in->point = pos;
-+ in->charpoint = 0;
- update_input (in, 1);
- }
-
-@@ -1668,7 +1741,8 @@ input_callback (Widget *w, widget_msg_t
- return MSG_HANDLED;
-
- case WIDGET_CURSOR:
-- widget_move (&in->widget, 0, in->point - in->first_shown);
-+ widget_move (&in->widget, 0, str_term_width2 (in->buffer, in->point)
-+ - in->term_first_shown);
- return MSG_HANDLED;
-
- case WIDGET_DESTROY:
-@@ -1688,15 +1762,17 @@ input_event (Gpm_Event * event, void *da
- if (event->type & (GPM_DOWN | GPM_DRAG)) {
- dlg_select_widget (in);
-
-- if (event->x >= in->field_len - HISTORY_BUTTON_WIDTH + 1
-+ if (event->x >= in->field_width - HISTORY_BUTTON_WIDTH + 1
- && should_show_history_button (in)) {
- do_show_hist (in);
- } else {
-- in->point = strlen (in->buffer);
-- if (event->x - in->first_shown - 1 < in->point)
-- in->point = event->x - in->first_shown - 1;
-- if (in->point < 0)
-- in->point = 0;
-+ in->point = str_length (in->buffer);
-+ if (event->x + in->term_first_shown - 1 <
-+ str_term_width1 (in->buffer))
-+
-+ in->point = str_column_to_pos (in->buffer, event->x
-+ + in->term_first_shown - 1);
-+
- }
- update_input (in, 1);
- }
-@@ -1704,13 +1780,13 @@ input_event (Gpm_Event * event, void *da
- }
-
- WInput *
--input_new (int y, int x, int color, int len, const char *def_text,
-+input_new (int y, int x, int color, int width, const char *def_text,
- const char *histname)
- {
- WInput *in = g_new (WInput, 1);
- int initial_buffer_len;
-
-- init_widget (&in->widget, y, x, 1, len, input_callback, input_event);
-+ init_widget (&in->widget, y, x, 1, width, input_callback, input_event);
-
- /* history setup */
- in->history = NULL;
-@@ -1722,7 +1798,7 @@ input_new (int y, int x, int color, int
- }
- }
-
-- if (!def_text)
-+ if (def_text == NULL)
- def_text = "";
-
- if (def_text == INPUT_LAST_TEXT) {
-@@ -1731,29 +1807,29 @@ input_new (int y, int x, int color, int
- if (in->history->data)
- def_text = (char *) in->history->data;
- }
-- initial_buffer_len = 1 + max ((size_t) len, strlen (def_text));
-+ initial_buffer_len = 1 + max ((size_t) width, strlen (def_text));
- in->widget.options |= W_IS_INPUT;
- in->completions = NULL;
- in->completion_flags =
- INPUT_COMPLETE_FILENAMES | INPUT_COMPLETE_HOSTNAMES |
- INPUT_COMPLETE_VARIABLES | INPUT_COMPLETE_USERNAMES;
-- in->current_max_len = initial_buffer_len;
-- in->buffer = g_malloc (initial_buffer_len);
-+ in->current_max_size = initial_buffer_len;
-+ in->buffer = g_new (char, initial_buffer_len);
- in->color = color;
-- in->field_len = len;
-+ in->field_width = width;
- in->first = 1;
-- in->first_shown = 0;
-+ in->term_first_shown = 0;
- in->disable_update = 0;
- in->mark = 0;
- in->need_push = 1;
- in->is_password = 0;
-
- strcpy (in->buffer, def_text);
-- in->point = strlen (in->buffer);
-+ in->point = str_length (in->buffer);
-+ in->charpoint = 0;
- return in;
- }
-
--
- /* Listbox widget */
-
- /* Should draw the scrollbar, but currently draws only
-diff -rupbBN mc.orig/src/widget.h mc/src/widget.h
---- mc.orig/src/widget.h 2007-12-01 01:27:03.000000000 +0100
-+++ mc/src/widget.h 2007-12-01 01:39:42.000000000 +0100
-@@ -74,11 +74,11 @@ char *show_hist (GList *history, int wid
-
- typedef struct {
- Widget widget;
-- int point; /* cursor position in the input line */
-- int mark; /* The mark position */
-- int first_shown; /* Index of the first shown character */
-- int current_max_len; /* Maximum length of input line */
-- int field_len; /* Length of the editing field */
-+ int point; /* cursor position in the input line in characters */
-+ int mark; /* The mark position in characters */
-+ int term_first_shown; /* column of the first shown character */
-+ size_t current_max_size; /* Maximum length of input line (bytes) */
-+ int field_width; /* width of the editing field */
- int color; /* color used */
- int first; /* Is first keystroke? */
- int disable_update; /* Do we want to skip updates? */
-@@ -89,6 +89,8 @@ typedef struct {
- char **completions; /* Possible completions array */
- int completion_flags; /* INPUT_COMPLETE* bitwise flags(complete.h) */
- char *history_name; /* name of history for loading and saving */
-+ char charbuf[MB_LEN_MAX]; /* buffer for multibytes characters */
-+ size_t charpoint; /* point to end of mulibyte sequence in charbuf */
- } WInput;
-
- /* For history load-save functions */
-@@ -144,14 +146,14 @@ WButton *button_new (int y, int x, int
- bcback callback);
- WRadio *radio_new (int y, int x, int count, const char **text);
- WCheck *check_new (int y, int x, int state, const char *text);
--WInput *input_new (int y, int x, int color, int len, const char *text, const char *histname);
-+WInput *input_new (int y, int x, int color, int width, const char *text, const char *histname);
- WLabel *label_new (int y, int x, const char *text);
- WGauge *gauge_new (int y, int x, int shown, int max, int current);
- WListbox *listbox_new (int x, int y, int width, int height, lcback callback);
- WGroupbox *groupbox_new (int x, int y, int width, int height, const char *title);
-
- /* Input lines */
--void winput_set_origin (WInput *i, int x, int field_len);
-+void winput_set_origin (WInput *i, int x, int field_width);
- cb_ret_t handle_char (WInput *in, int c_code);
- int is_in_input_map (WInput *in, int c_code);
- void update_input (WInput *in, int clear_first);
Deleted: trunk/debian/patches/29_mc-07-label.patch
===================================================================
--- trunk/debian/patches/29_mc-07-label.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-07-label.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,87 +0,0 @@
-diff -rupBb mc.orig/src/widget.c mc/src/widget.c
---- mc.orig/src/widget.c 2007-11-04 23:14:05.000000000 +0100
-+++ mc/src/widget.c 2007-11-04 23:24:14.000000000 +0100
-@@ -609,22 +609,20 @@ label_callback (Widget *w, widget_msg_t
- attrset (DEFAULT_COLOR);
- else
- attrset (DLG_NORMALC (h));
-- for (;;) {
-- int xlen;
-
-+ for (;;) {
- q = strchr (p, '\n');
-- if (q) {
-- c = *q;
-- *q = 0;
-+ if (q != NULL) {
-+ c = q[0];
-+ q[0] = '\0';
- }
-+
- widget_move (&l->widget, y, 0);
-- tty_printf ("%s", p);
-- xlen = l->widget.cols - strlen (p);
-- if (xlen > 0)
-- tty_printf ("%*s", xlen, " ");
-- if (!q)
-+ addstr (str_fit_to_term (p, l->widget.cols, J_LEFT));
-+
-+ if (q == NULL)
- break;
-- *q = c;
-+ q[0] = c;
- p = q + 1;
- y++;
- }
-@@ -644,21 +642,23 @@ void
- label_set_text (WLabel *label, const char *text)
- {
- int newcols = label->widget.cols;
-+ int newlines;
-
- if (label->text && text && !strcmp (label->text, text))
- return; /* Flickering is not nice */
-
- g_free (label->text);
-
-- if (text){
-+ if (text != NULL) {
- label->text = g_strdup (text);
- if (label->auto_adjust_cols) {
-- newcols = strlen (text);
-+ str_msg_term_size (text, &newlines, &newcols);
- if (newcols > label->widget.cols)
- label->widget.cols = newcols;
-+ if (newlines > label->widget.lines)
-+ label->widget.lines = newlines;
- }
-- } else
-- label->text = 0;
-+ } else label->text = NULL;
-
- if (label->widget.parent)
- label_callback ((Widget *) label, WIDGET_DRAW, 0);
-@@ -671,17 +671,15 @@ WLabel *
- label_new (int y, int x, const char *text)
- {
- WLabel *l;
-- int width;
-+ int cols = 1;
-+ int lines = 1;
-
-- /* Multiline labels are immutable - no need to compute their sizes */
-- if (!text || strchr(text, '\n'))
-- width = 1;
-- else
-- width = strlen (text);
-+ if (text != NULL)
-+ str_msg_term_size (text, &lines, &cols);
-
- l = g_new (WLabel, 1);
-- init_widget (&l->widget, y, x, 1, width, label_callback, NULL);
-- l->text = text ? g_strdup (text) : 0;
-+ init_widget (&l->widget, y, x, lines, cols, label_callback, NULL);
-+ l->text = (text != NULL) ? g_strdup (text) : NULL;
- l->auto_adjust_cols = 1;
- l->transparent = 0;
- widget_want_cursor (l->widget, 0);
Deleted: trunk/debian/patches/29_mc-08-listbox.patch
===================================================================
--- trunk/debian/patches/29_mc-08-listbox.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-08-listbox.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,12 +0,0 @@
-diff -rupbBN mc.orig/src/widget.c mc/src/widget.c
---- mc.orig/src/widget.c 2007-12-01 01:43:13.000000000 +0100
-+++ mc/src/widget.c 2007-12-01 01:43:13.000000000 +0100
-@@ -1907,7 +1907,7 @@ listbox_draw (WListbox *l, int focused)
- text = e->text;
- e = e->next;
- }
-- tty_printf (" %-*s ", l->width-2, name_trunc (text, l->width-2));
-+ addstr (str_fit_to_term (text, l->width - 2, J_LEFT_FIT));
- }
- l->cursor_y = sel_line;
- if (!l->scrollbar)
Deleted: trunk/debian/patches/29_mc-09-groupbox.patch
===================================================================
--- trunk/debian/patches/29_mc-09-groupbox.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-09-groupbox.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,12 +0,0 @@
-diff -rupbBN mc.orig/src/widget.c mc/src/widget.c
---- mc.orig/src/widget.c 2007-12-01 01:47:11.000000000 +0100
-+++ mc/src/widget.c 2007-12-01 01:47:11.000000000 +0100
-@@ -2600,7 +2600,7 @@ groupbox_callback (Widget *w, widget_msg
- attrset (COLOR_HOT_NORMAL);
- dlg_move (g->widget.parent, g->widget.y - g->widget.parent->y,
- g->widget.x - g->widget.parent->x + 1);
-- addstr (g->title);
-+ addstr (str_term_form (g->title));
- return MSG_HANDLED;
-
- case WIDGET_DESTROY:
Deleted: trunk/debian/patches/29_mc-10-buttonbar.patch
===================================================================
--- trunk/debian/patches/29_mc-10-buttonbar.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-10-buttonbar.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,82 +0,0 @@
-diff -rupbBN mc.orig/src/widget.c mc/src/widget.c
---- mc.orig/src/widget.c 2007-12-01 01:49:26.000000000 +0100
-+++ mc/src/widget.c 2007-12-01 01:49:26.000000000 +0100
-@@ -54,6 +54,7 @@
- struct WButtonBar {
- Widget widget;
- int visible; /* Is it visible? */
-+ int btn_width; /* width of one button */
- struct {
- char *text;
- enum { BBFUNC_NONE, BBFUNC_VOID, BBFUNC_PTR } tag;
-@@ -2420,12 +2421,21 @@ buttonbar_call (WButtonBar *bb, int i)
- return FALSE;
- }
-
-+/* calculate width of one button, width is never lesser than 7 */
-+static int
-+buttonbat_get_button_width ()
-+{
-+ int result = COLS / 10;
-+ return (result >= 7) ? result : 7;
-+}
-+
-
- static cb_ret_t
- buttonbar_callback (Widget *w, widget_msg_t msg, int parm)
- {
- WButtonBar *bb = (WButtonBar *) w;
- int i;
-+ char *text;
-
- switch (msg) {
- case WIDGET_FOCUS:
-@@ -2443,14 +2453,15 @@ buttonbar_callback (Widget *w, widget_ms
- return MSG_HANDLED;
- widget_move (&bb->widget, 0, 0);
- attrset (DEFAULT_COLOR);
-+ bb->btn_width = buttonbat_get_button_width ();
- tty_printf ("%-*s", bb->widget.cols, "");
-- for (i = 0; i < COLS / 8 && i < 10; i++) {
-- widget_move (&bb->widget, 0, i * 8);
-+ for (i = 0; i < COLS / bb->btn_width && i < 10; i++) {
-+ widget_move (&bb->widget, 0, i * bb->btn_width);
- attrset (DEFAULT_COLOR);
-- tty_printf ("%d", i + 1);
-+ tty_printf ("%2d", i + 1);
- attrset (SELECTED_COLOR);
-- tty_printf ("%-*s", ((i + 1) * 8 == COLS ? 5 : 6),
-- bb->labels[i].text ? bb->labels[i].text : "");
-+ text = (bb->labels[i].text != NULL) ? bb->labels[i].text : "";
-+ addstr (str_fit_to_term (text, bb->btn_width - 2, J_CENTER_LEFT));
- attrset (DEFAULT_COLOR);
- }
- attrset (SELECTED_COLOR);
-@@ -2476,7 +2487,7 @@ buttonbar_event (Gpm_Event *event, void
- return MOU_NORMAL;
- if (event->y == 2)
- return MOU_NORMAL;
-- button = event->x / 8;
-+ button = (event->x - 1) / bb->btn_width;
- if (button < 10)
- buttonbar_call (bb, button);
- return MOU_NORMAL;
-@@ -2498,6 +2509,7 @@ buttonbar_new (int visible)
- }
- widget_want_hotkey (bb->widget, 1);
- widget_want_cursor (bb->widget, 0);
-+ bb->btn_width = buttonbat_get_button_width ();
-
- return bb;
- }
-@@ -2533,8 +2545,8 @@ buttonbar_clear_label (Dlg_head *h, int
- }
-
- void
--buttonbar_set_label_data (Dlg_head *h, int idx, const char *text, buttonbarfn cback,
-- void *data)
-+buttonbar_set_label_data (Dlg_head *h, int idx, const char *text,
-+ buttonbarfn cback, void *data)
- {
- WButtonBar *bb = find_buttonbar (h);
-
Deleted: trunk/debian/patches/29_mc-11-panels.patch
===================================================================
--- trunk/debian/patches/29_mc-11-panels.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-11-panels.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,461 +0,0 @@
-diff -rupbBN mc.orig/src/panel.h mc/src/panel.h
---- mc.orig/src/panel.h 2007-12-01 01:51:44.000000000 +0100
-+++ mc/src/panel.h 2007-12-01 01:51:44.000000000 +0100
-@@ -71,6 +71,8 @@ typedef struct WPanel {
-
- int searching;
- char search_buffer [256];
-+ char search_char [MB_LEN_MAX]; /*buffer for multibytes characters*/
-+ int search_chpoint; /*point after last characters in search_char*/
- } WPanel;
-
- WPanel *panel_new (const char *panel_name);
-diff -rupbBN mc.orig/src/screen.c mc/src/screen.c
---- mc.orig/src/screen.c 2007-12-01 01:51:44.000000000 +0100
-+++ mc/src/screen.c 2007-11-30 23:54:59.000000000 +0100
-@@ -50,21 +50,10 @@
- #define WANT_WIDGETS
- #include "main.h" /* the_menubar */
- #include "unixcompat.h"
-+#include "strutil.h"
-
- #define ELEMENTS(arr) ( sizeof(arr) / sizeof((arr)[0]) )
-
--#define J_LEFT 1
--#define J_RIGHT 2
--#define J_CENTER 3
--
--#define IS_FIT(x) ((x) & 0x0004)
--#define MAKE_FIT(x) ((x) | 0x0004)
--#define HIDE_FIT(x) ((x) & 0x0003)
--
--#define J_LEFT_FIT 5
--#define J_RIGHT_FIT 6
--#define J_CENTER_FIT 7
--
- #define NORMAL 0
- #define SELECTED 1
- #define MARKED 2
-@@ -172,24 +161,8 @@ add_permission_string (char *dest, int w
- static const char *
- string_file_name (file_entry *fe, int len)
- {
-- static char buffer [MC_MAXPATHLEN + 1];
-- size_t i;
--
-- for (i = 0; i < sizeof(buffer) - 1; i++) {
-- char c;
--
-- c = fe->fname[i];
--
-- if (!c)
-- break;
--
-- if (!is_printable(c))
-- c = '?';
--
-- buffer[i] = c;
-- }
--
-- buffer[i] = 0;
-+ static char buffer [MC_MAXPATHLEN * MB_LEN_MAX + 1];
-+ g_strlcpy (buffer, fe->fname, sizeof(buffer));
- return buffer;
- }
-
-@@ -451,42 +424,6 @@ static struct {
- { "dot", 1, 0, J_RIGHT, " ", 0, string_dot, NULL },
- };
-
--static char *
--to_buffer (char *dest, int just_mode, int len, const char *txt)
--{
-- int txtlen = strlen (txt);
-- int still, over;
--
-- /* Fill buffer with spaces */
-- memset (dest, ' ', len);
--
-- still = (over=(txtlen > len)) ? (txtlen - len) : (len - txtlen);
--
-- switch (HIDE_FIT(just_mode)){
-- case J_LEFT:
-- still = 0;
-- break;
-- case J_CENTER:
-- still /= 2;
-- break;
-- case J_RIGHT:
-- default:
-- break;
-- }
--
-- if (over){
-- if (IS_FIT(just_mode))
-- strcpy (dest, name_trunc(txt, len));
-- else
-- strncpy (dest, txt+still, len);
-- } else
-- strncpy (dest+still, txt, txtlen);
--
-- dest[len] = '\0';
--
-- return (dest + len);
--}
--
- static int
- file_compute_color (int attr, file_entry *fe)
- {
-@@ -544,8 +481,6 @@ format_file (char *dest, int limit, WPan
- {
- int color, length, empty_line;
- const char *txt;
-- char *old_pos;
-- char *cdest = dest;
- format_e *format, *home;
- file_entry *fe;
-
-@@ -565,34 +500,38 @@ format_file (char *dest, int limit, WPan
- break;
-
- if (format->string_fn){
-- int len;
-+ int len, perm;
-+ char *preperad_text;
-
- if (empty_line)
- txt = " ";
- else
- txt = (*format->string_fn)(fe, format->field_len);
-
-- old_pos = cdest;
--
- len = format->field_len;
- if (len + length > width)
- len = width - length;
-- if (len + (cdest - dest) > limit)
-- len = limit - (cdest - dest);
- if (len <= 0)
- break;
-- cdest = to_buffer (cdest, format->just_mode, len, txt);
-- length += len;
-+
-+ perm = 0;
-+ if (permission_mode) {
-+ if (!strcmp(format->id, "perm"))
-+ perm = 1;
-+ else if (!strcmp(format->id, "mode"))
-+ perm = 2;
-+ }
-
- attrset (color);
-
-- if (permission_mode && !strcmp(format->id, "perm"))
-- add_permission_string (old_pos, format->field_len, fe, attr, color, 0);
-- else if (permission_mode && !strcmp(format->id, "mode"))
-- add_permission_string (old_pos, format->field_len, fe, attr, color, 1);
-+ preperad_text = (char*) str_fit_to_term(txt, len, format->just_mode);
-+ if (perm)
-+ add_permission_string (preperad_text, format->field_len, fe,
-+ attr, color, perm - 1);
- else
-- addstr (old_pos);
-+ addstr (preperad_text);
-
-+ length+= len;
- } else {
- if (attr == SELECTED || attr == MARKED_SELECTED)
- attrset (SELECTED_COLOR);
-@@ -666,7 +605,9 @@ display_mini_info (WPanel *panel)
-
- if (panel->searching){
- attrset (INPUT_COLOR);
-- tty_printf ("/%-*s", panel->widget.cols-3, panel->search_buffer);
-+ addstr ("/");
-+ addstr (str_fit_to_term (panel->search_buffer,
-+ panel->widget.cols - 3, J_LEFT));
- attrset (NORMAL_COLOR);
- return;
- }
-@@ -674,12 +615,10 @@ display_mini_info (WPanel *panel)
- /* Status displays total marked size */
- if (panel->marked){
- char buffer[BUF_SMALL], b_bytes[BUF_SMALL];
-- const char *p = " %-*s";
-- int cols = panel->widget.cols-2;
-+ int cols = panel->widget.cols - 2;
-
- attrset (MARKED_COLOR);
-- tty_printf ("%*s", cols, " ");
-- widget_move (&panel->widget, llines (panel)+3, 1);
-+ widget_move (&panel->widget, llines (panel) + 3, 1);
-
- /*
- * This is a trick to use two ngettext() calls in one sentence.
-@@ -693,12 +632,11 @@ display_mini_info (WPanel *panel)
- ngettext("%s in %d file", "%s in %d files", panel->marked),
- b_bytes, panel->marked);
-
-- if ((int) strlen (buffer) > cols-2){
-- buffer [cols] = 0;
-- p += 2;
-- } else
-- cols -= 2;
-- tty_printf (p, cols, buffer);
-+ if (str_term_width1 (buffer) <= cols - 2){
-+ addstr (" ");
-+ cols-= 2;
-+ }
-+ addstr (str_fit_to_term (buffer, cols, J_LEFT));
- return;
- }
-
-@@ -714,10 +652,12 @@ display_mini_info (WPanel *panel)
- g_free (link);
- if (len > 0){
- link_target[len] = 0;
-- tty_printf ("-> %-*s", panel->widget.cols - 5,
-- name_trunc (link_target, panel->widget.cols - 5));
-+ addstr ("-> ");
-+ addstr (str_fit_to_term (link_target, panel->widget.cols - 5,
-+ J_LEFT_FIT));
- } else
-- tty_printf ("%-*s", panel->widget.cols - 2, _("<readlink failed>"));
-+ addstr (str_fit_to_term (_("<readlink failed>"),
-+ panel->widget.cols - 2, J_LEFT));
- return;
- }
-
-@@ -767,7 +707,7 @@ mini_info_separator (WPanel *panel)
- static void
- show_dir (WPanel *panel)
- {
-- char *tmp;
-+ int len;
-
- set_colors (panel);
- draw_double_box (panel->widget.parent,
-@@ -788,17 +728,12 @@ show_dir (WPanel *panel)
- attrset (REVERSE_COLOR);
-
- widget_move (&panel->widget, 0, 3);
-- addch (' ');
--
-- tmp = g_malloc (panel->widget.cols + 1);
-- tmp[panel->widget.cols] = '\0';
--
-- trim (strip_home_and_password (panel->cwd), tmp,
-- max (panel->widget.cols - 9, 0));
-- addstr (tmp);
-- g_free (tmp);
-
- addch (' ');
-+ len = min (max (panel->widget.cols - 9, 0), panel->widget.cols);
-+ addstr (str_term_trim (strip_home_and_password (panel->cwd), len));
-+ addch (' ');
-+
- widget_move (&panel->widget, 0, 1);
- addstr ("<");
- widget_move (&panel->widget, 0, panel->widget.cols - 2);
-@@ -1101,7 +1036,6 @@ static void
- paint_frame (WPanel *panel)
- {
- int header_len;
-- int spaces, extra;
- int side, width;
-
- const char *txt;
-@@ -1134,11 +1068,8 @@ paint_frame (WPanel *panel)
- header_len = format->field_len;
-
- attrset (MARKED_COLOR);
-- spaces = (format->field_len - header_len) / 2;
-- extra = (format->field_len - header_len) % 2;
-- tty_printf ("%*s%.*s%*s", spaces, "",
-- header_len, txt, spaces+extra, "");
-- width -= 2 * spaces + extra + header_len;
-+ addstr (str_fit_to_term (txt, format->field_len, J_CENTER_LEFT));
-+ width -= format->field_len;
- } else {
- attrset (NORMAL_COLOR);
- one_vline ();
-@@ -1891,24 +1822,49 @@ mark_file (WPanel *panel)
- static void
- do_search (WPanel *panel, int c_code)
- {
-- size_t l;
-- int i;
-+ size_t l, max, buf_max;
-+ int i, sel;
- int wrapped = 0;
-- int found;
-+ char *act;
-
- l = strlen (panel->search_buffer);
- if (c_code == KEY_BACKSPACE) {
-- if (l)
-- panel->search_buffer[--l] = '\0';
-+ if (l != 0) {
-+ act = panel->search_buffer + l;
-+ str_prev_noncomb_char (&act, panel->search_buffer);
-+ act[0] = '\0';
-+ }
-+ panel->search_chpoint = 0;
- } else {
-- if (c_code && l < sizeof (panel->search_buffer)) {
-- panel->search_buffer[l] = c_code;
-- panel->search_buffer[l + 1] = 0;
-- l++;
-+ if (c_code && panel->search_chpoint < sizeof (panel->search_char)) {
-+ panel->search_char[panel->search_chpoint] = c_code;
-+ panel->search_chpoint++;
-+ }
-+
-+ if (panel->search_chpoint > 0) {
-+ switch (str_is_valid_char (panel->search_char, panel->search_chpoint)) {
-+ case -2:
-+ return;
-+ case -1:
-+ panel->search_chpoint = 0;
-+ return;
-+ default:
-+ if (l + panel->search_chpoint < sizeof (panel->search_buffer)) {
-+ memcpy (panel->search_buffer + l, panel->search_char,
-+ panel->search_chpoint);
-+ l+= panel->search_chpoint;
-+ (panel->search_buffer + l)[0] = '\0';
-+ panel->search_chpoint = 0;
-+ }
-+ }
- }
- }
-
-- found = 0;
-+ buf_max = panel->case_sensitive ?
-+ str_prefix (panel->search_buffer, panel->search_buffer) :
-+ str_caseprefix (panel->search_buffer, panel->search_buffer);
-+ max = 0;
-+ sel = panel->selected;
- for (i = panel->selected; !wrapped || i != panel->selected; i++) {
- if (i >= panel->count) {
- i = 0;
-@@ -1916,20 +1872,28 @@ do_search (WPanel *panel, int c_code)
- break;
- wrapped = 1;
- }
-- if (panel->
-- case_sensitive
-- ? (strncmp (panel->dir.list[i].fname, panel->search_buffer, l)
-- == 0) : (g_strncasecmp (panel->dir.list[i].fname,
-- panel->search_buffer, l) == 0)) {
-+ l = panel->case_sensitive ?
-+ str_prefix (panel->dir.list[i].fname, panel->search_buffer) :
-+ str_caseprefix (panel->dir.list[i].fname, panel->search_buffer);
-+ if (l > max) {
-+ max = l;
-+ sel = i;
-+ if (max == buf_max) break;
-+ }
-+ }
-+
- unselect_item (panel);
-- panel->selected = i;
-+ panel->selected = sel;
- select_item (panel);
-- found = 1;
-- break;
-- }
-+
-+ act = panel->search_buffer + strlen (panel->search_buffer);
-+ while (max < buf_max) {
-+ str_prev_char_safe (&act);
-+ act[0] = '\0';
-+ buf_max = panel->case_sensitive ?
-+ str_prefix (panel->search_buffer, panel->search_buffer) :
-+ str_caseprefix (panel->search_buffer, panel->search_buffer);
- }
-- if (!found)
-- panel->search_buffer[--l] = 0;
-
- paint_panel (panel);
- }
-@@ -1945,7 +1909,9 @@ start_search (WPanel *panel)
- do_search (panel, 0);
- } else {
- panel->searching = 1;
-- panel->search_buffer [0] = 0;
-+ panel->search_buffer[0] = '\0';
-+ panel->search_char[0] = '\0';
-+ panel->search_chpoint = 0;
- display_mini_info (panel);
- mc_refresh ();
- }
-diff -rupbBN mc.orig/src/util.c mc/src/util.c
---- mc.orig/src/util.c 2007-12-01 01:51:44.000000000 +0100
-+++ mc/src/util.c 2007-12-01 01:51:44.000000000 +0100
-@@ -41,6 +41,7 @@
- #include "cmd.h" /* guess_message_value */
- #include "mountlist.h"
- #include "win.h" /* xterm_flag */
-+#include "strutil.h"
-
- #ifdef HAVE_CHARSET
- #include "charsets.h"
-@@ -725,14 +726,16 @@ size_t
- i18n_checktimelength (void)
- {
- size_t length, a, b;
-- char buf [MAX_I18NTIMELENGTH + 1];
-+ char buf [MB_LEN_MAX * MAX_I18NTIMELENGTH + 1];
- time_t testtime = time (NULL);
-
-- a = strftime (buf, sizeof(buf)-1, _("%b %e %H:%M"), localtime(&testtime));
-- b = strftime (buf, sizeof(buf)-1, _("%b %e %Y"), localtime(&testtime));
-+ strftime (buf, sizeof(buf) - 1, _("%b %e %H:%M"), localtime(&testtime));
-+ a = str_term_width1 (buf);
-+ strftime (buf, sizeof(buf) - 1, _("%b %e %Y"), localtime(&testtime));
-+ b = str_term_width1 (buf);
-
- length = max (a, b);
-- length = max (strlen (_("(invalid)")), length);
-+ length = max (str_term_width1 (_("(invalid)")), length);
-
- /* Don't handle big differences. Use standard value (email bug, please) */
- if ( length > MAX_I18NTIMELENGTH || length < MIN_I18NTIMELENGTH )
-@@ -744,20 +747,19 @@ i18n_checktimelength (void)
- const char *
- file_date (time_t when)
- {
-- static char timebuf [MAX_I18NTIMELENGTH + 1];
-+ static char timebuf [MB_LEN_MAX * MAX_I18NTIMELENGTH + 1];
- time_t current_time = time ((time_t) 0);
-- static size_t i18n_timelength = 0;
-+ static int i18n = 0;
- static const char *fmtyear, *fmttime;
- const char *fmt;
- struct tm *whentm;
-
-- if (i18n_timelength == 0){
-- i18n_timelength = i18n_checktimelength() + 1;
--
-+ if (!i18n){
- /* strftime() format string for old dates */
- fmtyear = _("%b %e %Y");
- /* strftime() format string for recent dates */
- fmttime = _("%b %e %H:%M");
-+ i18n = 1;
- }
-
- if (current_time > when + 6L * 30L * 24L * 60L * 60L /* Old. */
-@@ -775,9 +777,9 @@ file_date (time_t when)
-
- whentm = localtime(&when);
- if (whentm == NULL)
-- g_snprintf (timebuf, i18n_timelength, "%s", _("(invalid)"));
-+ g_snprintf (timebuf, sizeof (timebuf) - 1, "%s", _("(invalid)"));
- else
-- strftime (timebuf, i18n_timelength, fmt, whentm);
-+ strftime (timebuf, sizeof (timebuf) - 1, fmt, whentm);
- return timebuf;
- }
-
Deleted: trunk/debian/patches/29_mc-12-menu.patch
===================================================================
--- trunk/debian/patches/29_mc-12-menu.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-12-menu.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,705 +0,0 @@
-diff -urpBb mc.orig/edit/editmenu.c mc/edit/editmenu.c
---- mc.orig/edit/editmenu.c 2007-09-25 17:33:36.000000000 +0200
-+++ mc/edit/editmenu.c 2007-11-05 13:24:49.000000000 +0100
-@@ -297,124 +297,124 @@ menu_user_menu_cmd (void)
-
- static menu_entry FileMenu[] =
- {
-- {' ', N_("&Open file..."), 'O', menu_load_cmd},
-- {' ', N_("&New C-n"), 'N', menu_new_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("&Save F2"), 'S', menu_save_cmd},
-- {' ', N_("Save &as... F12"), 'A', menu_save_as_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("&Insert file... F15"), 'I', menu_insert_file_cmd},
-- {' ', N_("Copy to &file... C-f"), 'F', menu_cut_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("&User menu... F11"), 'U', menu_user_menu_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("A&bout... "), 'B', edit_about_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("&Quit F10"), 'Q', menu_quit_cmd}
-+ {' ', N_("&Open file..."), NULL_HOTKEY, menu_load_cmd},
-+ {' ', N_("&New C-n"), NULL_HOTKEY, menu_new_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("&Save F2"), NULL_HOTKEY, menu_save_cmd},
-+ {' ', N_("Save &as... F12"), NULL_HOTKEY, menu_save_as_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("&Insert file... F15"), NULL_HOTKEY, menu_insert_file_cmd},
-+ {' ', N_("Copy to &file... C-f"), NULL_HOTKEY, menu_cut_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("&User menu... F11"), NULL_HOTKEY, menu_user_menu_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("A&bout... "), NULL_HOTKEY, edit_about_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("&Quit F10"), NULL_HOTKEY, menu_quit_cmd}
- };
-
- static menu_entry FileMenuEmacs[] =
- {
-- {' ', N_("&Open file..."), 'O', menu_load_cmd},
-- {' ', N_("&New C-x k"), 'N', menu_new_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("&Save F2"), 'S', menu_save_cmd},
-- {' ', N_("Save &as... F12"), 'A', menu_save_as_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("&Insert file... F15"), 'I', menu_insert_file_cmd},
-- {' ', N_("Copy to &file... "), 'F', menu_cut_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("&User menu... F11"), 'U', menu_user_menu_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("A&bout... "), 'B', edit_about_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("&Quit F10"), 'Q', menu_quit_cmd}
-+ {' ', N_("&Open file..."), NULL_HOTKEY, menu_load_cmd},
-+ {' ', N_("&New C-x k"), NULL_HOTKEY, menu_new_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("&Save F2"), NULL_HOTKEY, menu_save_cmd},
-+ {' ', N_("Save &as... F12"), NULL_HOTKEY, menu_save_as_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("&Insert file... F15"), NULL_HOTKEY, menu_insert_file_cmd},
-+ {' ', N_("Copy to &file... "), NULL_HOTKEY, menu_cut_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("&User menu... F11"), NULL_HOTKEY, menu_user_menu_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("A&bout... "), NULL_HOTKEY, edit_about_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("&Quit F10"), NULL_HOTKEY, menu_quit_cmd}
- };
-
- static menu_entry EditMenu[] =
- {
-- {' ', N_("&Toggle Mark F3"), 'T', menu_mark_cmd},
-- {' ', N_("&Mark Columns S-F3"), 'T', menu_markcol_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("Toggle &ins/overw Ins"), 'I', menu_ins_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("&Copy F5"), 'C', menu_copy_cmd},
-- {' ', N_("&Move F6"), 'M', menu_move_cmd},
-- {' ', N_("&Delete F8"), 'D', menu_delete_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("&Undo C-u"), 'U', menu_undo_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("&Beginning C-PgUp"), 'B', menu_beginning_cmd},
-- {' ', N_("&End C-PgDn"), 'E', menu_end_cmd}
-+ {' ', N_("&Toggle Mark F3"), NULL_HOTKEY, menu_mark_cmd},
-+ {' ', N_("&Mark Columns S-F3"), NULL_HOTKEY, menu_markcol_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("Toggle &ins/overw Ins"), NULL_HOTKEY, menu_ins_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("&Copy F5"), NULL_HOTKEY, menu_copy_cmd},
-+ {' ', N_("&Move F6"), NULL_HOTKEY, menu_move_cmd},
-+ {' ', N_("&Delete F8"), NULL_HOTKEY, menu_delete_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("&Undo C-u"), NULL_HOTKEY, menu_undo_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("&Beginning C-PgUp"), NULL_HOTKEY, menu_beginning_cmd},
-+ {' ', N_("&End C-PgDn"), NULL_HOTKEY, menu_end_cmd}
- };
-
- #define EditMenuEmacs EditMenu
-
- static menu_entry SearReplMenu[] =
- {
-- {' ', N_("&Search... F7"), 'S', menu_search_cmd},
-- {' ', N_("Search &again F17"), 'A', menu_search_again_cmd},
-- {' ', N_("&Replace... F4"), 'R', menu_replace_cmd}
-+ {' ', N_("&Search... F7"), NULL_HOTKEY, menu_search_cmd},
-+ {' ', N_("Search &again F17"), NULL_HOTKEY, menu_search_again_cmd},
-+ {' ', N_("&Replace... F4"), NULL_HOTKEY, menu_replace_cmd}
- };
-
- #define SearReplMenuEmacs SearReplMenu
-
- static menu_entry CmdMenu[] =
- {
-- {' ', N_("&Go to line... M-l"), 'G', menu_goto_line},
-- {' ', N_("Go to matching &bracket M-b"), 'B', menu_goto_bracket},
-- {' ', "", ' ', 0},
-- {' ', N_("Insert &literal... C-q"), 'L', menu_lit_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("&Refresh screen C-l"), 'R', menu_refresh_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("&Start record macro C-r"), 'S', menu_begin_record_cmd},
-- {' ', N_("&Finish record macro... C-r"), 'F', menu_end_record_cmd},
-- {' ', N_("&Execute macro... C-a, KEY"), 'E', menu_exec_macro_cmd},
-- {' ', N_("Delete macr&o... "), 'O', menu_exec_macro_delete_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("Insert &date/time "), 'D', menu_date_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("Format p&aragraph M-p"), 'A', menu_format_paragraph},
-- {' ', N_("'ispell' s&pell check C-p"), 'P', menu_ispell_cmd},
-- {' ', N_("Sor&t... M-t"), 'T', menu_sort_cmd},
-- {' ', N_("Paste o&utput of... M-u"), 'U', menu_ext_cmd},
-- {' ', N_("E&xternal Formatter F19"), 'C', menu_c_form_cmd},
-- {' ', N_("&Mail... "), 'M', menu_mail_cmd}
-+ {' ', N_("&Go to line... M-l"), NULL_HOTKEY, menu_goto_line},
-+ {' ', N_("Go to matching &bracket M-b"), NULL_HOTKEY, menu_goto_bracket},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("Insert &literal... C-q"), NULL_HOTKEY, menu_lit_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("&Refresh screen C-l"), NULL_HOTKEY, menu_refresh_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("&Start record macro C-r"), NULL_HOTKEY, menu_begin_record_cmd},
-+ {' ', N_("&Finish record macro... C-r"), NULL_HOTKEY, menu_end_record_cmd},
-+ {' ', N_("&Execute macro... C-a, KEY"), NULL_HOTKEY, menu_exec_macro_cmd},
-+ {' ', N_("Delete macr&o... "), NULL_HOTKEY, menu_exec_macro_delete_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("Insert &date/time "), NULL_HOTKEY, menu_date_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("Format p&aragraph M-p"), NULL_HOTKEY, menu_format_paragraph},
-+ {' ', N_("'ispell' s&pell check C-p"), NULL_HOTKEY, menu_ispell_cmd},
-+ {' ', N_("Sor&t... M-t"), NULL_HOTKEY, menu_sort_cmd},
-+ {' ', N_("Paste o&utput of... M-u"), NULL_HOTKEY, menu_ext_cmd},
-+ {' ', N_("E&xternal Formatter F19"), NULL_HOTKEY, menu_c_form_cmd},
-+ {' ', N_("&Mail... "), NULL_HOTKEY, menu_mail_cmd}
- };
-
- static menu_entry CmdMenuEmacs[] =
- {
-- {' ', N_("&Go to line... M-l"), 'G', menu_goto_line},
-- {' ', N_("Go to matching &bracket M-b"), 'B', menu_goto_bracket},
-- {' ', "", ' ', 0},
-- {' ', N_("Insert &literal... C-q"), 'L', menu_lit_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("&Refresh screen C-l"), 'R', menu_refresh_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("&Start record macro C-r"), 'S', menu_begin_record_cmd},
-- {' ', N_("&Finish record macro... C-r"), 'F', menu_end_record_cmd},
-- {' ', N_("&Execute macro... C-x e, KEY"), 'E', menu_exec_macro_cmd},
-- {' ', N_("Delete macr&o... "), 'o', menu_exec_macro_delete_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("Insert &date/time "), 'D', menu_date_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("Format p&aragraph M-p"), 'a', menu_format_paragraph},
-- {' ', N_("'ispell' s&pell check M-$"), 'P', menu_ispell_cmd},
-- {' ', N_("Sor&t... M-t"), 'T', menu_sort_cmd},
-- {' ', N_("Paste o&utput of... M-u"), 'U', menu_ext_cmd},
-- {' ', N_("E&xternal Formatter F19"), 'C', menu_c_form_cmd},
-- {' ', N_("&Mail... "), 'M', menu_mail_cmd}
-+ {' ', N_("&Go to line... M-l"), NULL_HOTKEY, menu_goto_line},
-+ {' ', N_("Go to matching &bracket M-b"), NULL_HOTKEY, menu_goto_bracket},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("Insert &literal... C-q"), NULL_HOTKEY, menu_lit_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("&Refresh screen C-l"), NULL_HOTKEY, menu_refresh_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("&Start record macro C-r"), NULL_HOTKEY, menu_begin_record_cmd},
-+ {' ', N_("&Finish record macro... C-r"), NULL_HOTKEY, menu_end_record_cmd},
-+ {' ', N_("&Execute macro... C-x e, KEY"), NULL_HOTKEY, menu_exec_macro_cmd},
-+ {' ', N_("Delete macr&o... "), NULL_HOTKEY, menu_exec_macro_delete_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("Insert &date/time "), NULL_HOTKEY, menu_date_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("Format p&aragraph M-p"), NULL_HOTKEY, menu_format_paragraph},
-+ {' ', N_("'ispell' s&pell check M-$"), NULL_HOTKEY, menu_ispell_cmd},
-+ {' ', N_("Sor&t... M-t"), NULL_HOTKEY, menu_sort_cmd},
-+ {' ', N_("Paste o&utput of... M-u"), NULL_HOTKEY, menu_ext_cmd},
-+ {' ', N_("E&xternal Formatter F19"), NULL_HOTKEY, menu_c_form_cmd},
-+ {' ', N_("&Mail... "), NULL_HOTKEY, menu_mail_cmd}
- };
-
- static menu_entry OptMenu[] =
- {
-- {' ', N_("&General... "), 'G', menu_options},
-- {' ', N_("&Save mode..."), 'S', menu_save_mode_cmd},
-- {' ', N_("Learn &Keys..."), 'K', learn_keys},
-- {' ', N_("Syntax &Highlighting..."), 'H', menu_syntax},
-- {' ', "", ' ', 0},
-- {' ', N_("Save setu&p..."), 'p', save_setup_cmd}
-+ {' ', N_("&General... "), NULL_HOTKEY, menu_options},
-+ {' ', N_("&Save mode..."), NULL_HOTKEY, menu_save_mode_cmd},
-+ {' ', N_("Learn &Keys..."), NULL_HOTKEY, learn_keys},
-+ {' ', N_("Syntax &Highlighting..."), NULL_HOTKEY, menu_syntax},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("Save setu&p..."), NULL_HOTKEY, save_setup_cmd}
- };
-
- #define OptMenuEmacs OptMenu
-diff -urpBb mc.orig/src/main.c mc/src/main.c
---- mc.orig/src/main.c 2007-11-04 15:59:11.000000000 +0100
-+++ mc/src/main.c 2007-11-05 13:18:57.000000000 +0100
-@@ -802,76 +802,76 @@ listmode_cmd (void)
-
- /* NOTICE: hotkeys specified here are overriden in menubar_paint_idx (alex) */
- static menu_entry LeftMenu[] = {
-- {' ', N_("&Listing mode..."), 'L', listing_cmd},
-- {' ', N_("&Quick view C-x q"), 'Q', quick_view_cmd},
-- {' ', N_("&Info C-x i"), 'I', info_cmd},
-- {' ', N_("&Tree"), 'T', tree_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("&Sort order..."), 'S', sort_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("&Filter..."), 'F', filter_cmd},
-+ {' ', N_("&Listing mode..."), NULL_HOTKEY, listing_cmd},
-+ {' ', N_("&Quick view C-x q"), NULL_HOTKEY, quick_view_cmd},
-+ {' ', N_("&Info C-x i"), NULL_HOTKEY, info_cmd},
-+ {' ', N_("&Tree"), NULL_HOTKEY, tree_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("&Sort order..."), NULL_HOTKEY, sort_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("&Filter..."), NULL_HOTKEY, filter_cmd},
- #ifdef USE_NETCODE
-- {' ', "", ' ', 0},
-+ {' ', "", NULL_HOTKEY, 0},
- #ifdef WITH_MCFS
-- {' ', N_("&Network link..."), 'N', netlink_cmd},
-+ {' ', N_("&Network link..."), NULL_HOTKEY, netlink_cmd},
- #endif
-- {' ', N_("FT&P link..."), 'P', ftplink_cmd},
-- {' ', N_("S&hell link..."), 'H', fishlink_cmd},
-+ {' ', N_("FT&P link..."), NULL_HOTKEY, ftplink_cmd},
-+ {' ', N_("S&hell link..."), NULL_HOTKEY, fishlink_cmd},
- #ifdef WITH_SMBFS
-- {' ', N_("SM&B link..."), 'B', smblink_cmd},
-+ {' ', N_("SM&B link..."), NULL_HOTKEY, smblink_cmd},
- #endif
- #endif
-- {' ', "", ' ', 0},
-- {' ', N_("&Rescan C-r"), 'R', reread_cmd}
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("&Rescan C-r"), NULL_HOTKEY, reread_cmd}
- };
-
- static menu_entry RightMenu[] = {
-- {' ', N_("&Listing mode..."), 'L', listing_cmd},
-- {' ', N_("&Quick view C-x q"), 'Q', quick_view_cmd},
-- {' ', N_("&Info C-x i"), 'I', info_cmd},
-- {' ', N_("&Tree"), 'T', tree_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("&Sort order..."), 'S', sort_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("&Filter..."), 'F', filter_cmd},
-+ {' ', N_("&Listing mode..."), NULL_HOTKEY, listing_cmd},
-+ {' ', N_("&Quick view C-x q"), NULL_HOTKEY, quick_view_cmd},
-+ {' ', N_("&Info C-x i"), NULL_HOTKEY, info_cmd},
-+ {' ', N_("&Tree"), NULL_HOTKEY, tree_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("&Sort order..."), NULL_HOTKEY, sort_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("&Filter..."), NULL_HOTKEY, filter_cmd},
- #ifdef USE_NETCODE
-- {' ', "", ' ', 0},
-+ {' ', "", NULL_HOTKEY, 0},
- #ifdef WITH_MCFS
-- {' ', N_("&Network link..."), 'N', netlink_cmd},
-+ {' ', N_("&Network link..."), NULL_HOTKEY, netlink_cmd},
- #endif
-- {' ', N_("FT&P link..."), 'P', ftplink_cmd},
-- {' ', N_("S&hell link..."), 'H', fishlink_cmd},
-+ {' ', N_("FT&P link..."), NULL_HOTKEY, ftplink_cmd},
-+ {' ', N_("S&hell link..."), NULL_HOTKEY, fishlink_cmd},
- #ifdef WITH_SMBFS
-- {' ', N_("SM&B link..."), 'B', smblink_cmd},
-+ {' ', N_("SM&B link..."), NULL_HOTKEY, smblink_cmd},
- #endif
- #endif
-- {' ', "", ' ', 0},
-- {' ', N_("&Rescan C-r"), 'R', reread_cmd}
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("&Rescan C-r"), NULL_HOTKEY, reread_cmd}
- };
-
- static menu_entry FileMenu[] = {
-- {' ', N_("&User menu F2"), 'U', user_file_menu_cmd},
-- {' ', N_("&View F3"), 'V', view_cmd},
-- {' ', N_("Vie&w file... "), 'W', view_file_cmd},
-- {' ', N_("&Filtered view M-!"), 'F', filtered_view_cmd},
-- {' ', N_("&Edit F4"), 'E', edit_cmd},
-- {' ', N_("&Copy F5"), 'C', copy_cmd},
-- {' ', N_("c&Hmod C-x c"), 'H', chmod_cmd},
-- {' ', N_("&Link C-x l"), 'L', link_cmd},
-- {' ', N_("&SymLink C-x s"), 'S', symlink_cmd},
-- {' ', N_("edit s&Ymlink C-x C-s"), 'Y', edit_symlink_cmd},
-- {' ', N_("ch&Own C-x o"), 'O', chown_cmd},
-- {' ', N_("&Advanced chown "), 'A', chown_advanced_cmd},
-- {' ', N_("&Rename/Move F6"), 'R', ren_cmd},
-- {' ', N_("&Mkdir F7"), 'M', mkdir_cmd},
-- {' ', N_("&Delete F8"), 'D', delete_cmd},
-- {' ', N_("&Quick cd M-c"), 'Q', quick_cd_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("select &Group M-+"), 'G', select_cmd},
-- {' ', N_("u&Nselect group M-\\"), 'N', unselect_cmd},
-- {' ', N_("reverse selec&Tion M-*"), 'T', reverse_selection_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("e&Xit F10"), 'X', quit_cmd}
-+ {' ', N_("&User menu F2"), NULL_HOTKEY, user_file_menu_cmd},
-+ {' ', N_("&View F3"), NULL_HOTKEY, view_cmd},
-+ {' ', N_("Vie&w file... "), NULL_HOTKEY, view_file_cmd},
-+ {' ', N_("&Filtered view M-!"), NULL_HOTKEY, filtered_view_cmd},
-+ {' ', N_("&Edit F4"), NULL_HOTKEY, edit_cmd},
-+ {' ', N_("&Copy F5"), NULL_HOTKEY, copy_cmd},
-+ {' ', N_("c&Hmod C-x c"), NULL_HOTKEY, chmod_cmd},
-+ {' ', N_("&Link C-x l"), NULL_HOTKEY, link_cmd},
-+ {' ', N_("&SymLink C-x s"), NULL_HOTKEY, symlink_cmd},
-+ {' ', N_("edit s&Ymlink C-x C-s"), NULL_HOTKEY, edit_symlink_cmd},
-+ {' ', N_("ch&Own C-x o"), NULL_HOTKEY, chown_cmd},
-+ {' ', N_("&Advanced chown "), NULL_HOTKEY, chown_advanced_cmd},
-+ {' ', N_("&Rename/Move F6"), NULL_HOTKEY, ren_cmd},
-+ {' ', N_("&Mkdir F7"), NULL_HOTKEY, mkdir_cmd},
-+ {' ', N_("&Delete F8"), NULL_HOTKEY, delete_cmd},
-+ {' ', N_("&Quick cd M-c"), NULL_HOTKEY, quick_cd_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("select &Group M-+"), NULL_HOTKEY, select_cmd},
-+ {' ', N_("u&Nselect group M-\\"), NULL_HOTKEY, unselect_cmd},
-+ {' ', N_("reverse selec&Tion M-*"), NULL_HOTKEY, reverse_selection_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("e&Xit F10"), NULL_HOTKEY, quit_cmd}
- };
-
- static menu_entry CmdMenu[] = {
-@@ -879,52 +879,52 @@ static menu_entry CmdMenu[] = {
- * as a panel still has some problems, I have not yet finished
- * the WTree widget port, sorry.
- */
-- {' ', N_("&Directory tree"), 'D', treebox_cmd},
-- {' ', N_("&Find file M-?"), 'F', find_cmd},
-- {' ', N_("s&Wap panels C-u"), 'W', swap_cmd},
-- {' ', N_("switch &Panels on/off C-o"), 'P', view_other_cmd},
-- {' ', N_("&Compare directories C-x d"), 'C', compare_dirs_cmd},
-- {' ', N_("e&Xternal panelize C-x !"), 'X', external_panelize},
-- {' ', N_("show directory s&Izes"), 'I', dirsizes_cmd},
-- {' ', "", ' ', 0},
-- {' ', N_("command &History"), 'H', history_cmd},
-- {' ', N_("di&Rectory hotlist C-\\"), 'R', quick_chdir_cmd},
-+ {' ', N_("&Directory tree"), NULL_HOTKEY, treebox_cmd},
-+ {' ', N_("&Find file M-?"), NULL_HOTKEY, find_cmd},
-+ {' ', N_("s&Wap panels C-u"), NULL_HOTKEY, swap_cmd},
-+ {' ', N_("switch &Panels on/off C-o"), NULL_HOTKEY, view_other_cmd},
-+ {' ', N_("&Compare directories C-x d"), NULL_HOTKEY, compare_dirs_cmd},
-+ {' ', N_("e&Xternal panelize C-x !"), NULL_HOTKEY, external_panelize},
-+ {' ', N_("show directory s&Izes"), NULL_HOTKEY, dirsizes_cmd},
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("command &History"), NULL_HOTKEY, history_cmd},
-+ {' ', N_("di&Rectory hotlist C-\\"), NULL_HOTKEY, quick_chdir_cmd},
- #ifdef USE_VFS
-- {' ', N_("&Active VFS list C-x a"), 'A', reselect_vfs},
-+ {' ', N_("&Active VFS list C-x a"), NULL_HOTKEY, reselect_vfs},
- #endif
- #ifdef WITH_BACKGROUND
-- {' ', N_("&Background jobs C-x j"), 'B', jobs_cmd},
-+ {' ', N_("&Background jobs C-x j"), NULL_HOTKEY, jobs_cmd},
- #endif
-- {' ', "", ' ', 0},
-+ {' ', "", NULL_HOTKEY, 0},
- #ifdef USE_EXT2FSLIB
-- {' ', N_("&Undelete files (ext2fs only)"), 'U', undelete_cmd},
-+ {' ', N_("&Undelete files (ext2fs only)"), NULL_HOTKEY, undelete_cmd},
- #endif
- #ifdef LISTMODE_EDITOR
-- {' ', N_("&Listing format edit"), 'L', listmode_cmd},
-+ {' ', N_("&Listing format edit"), NULL_HOTKEY, listmode_cmd},
- #endif
- #if defined (USE_EXT2FSLIB) || defined (LISTMODE_EDITOR)
-- {' ', "", ' ', 0},
-+ {' ', "", NULL_HOTKEY, 0},
- #endif
-- {' ', N_("Edit &extension file"), 'E', ext_cmd},
-- {' ', N_("Edit &menu file"), 'M', edit_mc_menu_cmd},
-+ {' ', N_("Edit &extension file"), NULL_HOTKEY, ext_cmd},
-+ {' ', N_("Edit &menu file"), NULL_HOTKEY, edit_mc_menu_cmd},
- #ifdef USE_INTERNAL_EDIT
-- {' ', N_("Edit edi&tor menu file"), 'T', edit_user_menu_cmd},
-- {' ', N_("Edit &syntax file"), 'S', edit_syntax_cmd}
-+ {' ', N_("Edit edi&tor menu file"), NULL_HOTKEY, edit_user_menu_cmd},
-+ {' ', N_("Edit &syntax file"), NULL_HOTKEY, edit_syntax_cmd}
- #endif /* USE_INTERNAL_EDIT */
- };
-
- /* Must keep in sync with the constants in menu_cmd */
- static menu_entry OptMenu[] = {
-- {' ', N_("&Configuration..."), 'C', configure_box},
-- {' ', N_("&Layout..."), 'L', layout_cmd},
-- {' ', N_("c&Onfirmation..."), 'O', confirm_box},
-- {' ', N_("&Display bits..."), 'D', display_bits_box},
-- {' ', N_("learn &Keys..."), 'K', learn_keys},
-+ {' ', N_("&Configuration..."), NULL_HOTKEY, configure_box},
-+ {' ', N_("&Layout..."), NULL_HOTKEY, layout_cmd},
-+ {' ', N_("c&Onfirmation..."), NULL_HOTKEY, confirm_box},
-+ {' ', N_("&Display bits..."), NULL_HOTKEY, display_bits_box},
-+ {' ', N_("learn &Keys..."), NULL_HOTKEY, learn_keys},
- #ifdef USE_VFS
-- {' ', N_("&Virtual FS..."), 'V', configure_vfs},
-+ {' ', N_("&Virtual FS..."), NULL_HOTKEY, configure_vfs},
- #endif /* !USE_VFS */
-- {' ', "", ' ', 0},
-- {' ', N_("&Save setup"), 'S', save_setup_cmd}
-+ {' ', "", NULL_HOTKEY, 0},
-+ {' ', N_("&Save setup"), NULL_HOTKEY, save_setup_cmd}
- };
-
- #define menu_entries(x) sizeof(x)/sizeof(menu_entry)
-diff -urpBb mc.orig/src/menu.c mc/src/menu.c
---- mc.orig/src/menu.c 2007-09-26 12:22:25.000000000 +0200
-+++ mc/src/menu.c 2007-11-05 13:30:43.000000000 +0100
-@@ -34,55 +34,35 @@
- #include "mouse.h"
- #include "win.h"
- #include "key.h" /* For mi_getch() */
-+#include "strutil.h"
-
- int menubar_visible = 1; /* This is the new default */
-
--static void
--menu_scan_hotkey (Menu *menu)
--{
-- char *cp = strchr (menu->name, '&');
--
-- if (cp != NULL && cp[1] != '\0') {
-- g_strlcpy (cp, cp + 1, strlen (cp));
-- menu->hotkey = tolower ((unsigned char) *cp);
-- } else
-- menu->hotkey = 0;
--}
--
- Menu *
- create_menu (const char *name, menu_entry *entries, int count, const char *help_node)
- {
- Menu *menu;
-- const char *cp;
-
-- menu = (Menu *) g_malloc (sizeof (*menu));
-+ menu = g_new (Menu, 1);
- menu->count = count;
- menu->max_entry_len = 20;
- menu->entries = entries;
-+ menu->text = parse_hotkey (name);
-
- if (entries != (menu_entry*) NULL) {
-+ int len;
- register menu_entry* mp;
- for (mp = entries; count--; mp++) {
-- if (mp->text[0] != '\0') {
--#ifdef ENABLE_NLS
-- mp->text = _(mp->text);
--#endif /* ENABLE_NLS */
-- cp = strchr (mp->text,'&');
--
-- if (cp != NULL && *(cp+1) != '\0') {
-- mp->hot_key = tolower ((unsigned char) *(cp+1));
-- menu->max_entry_len = max ((int) (strlen (mp->text) - 1),
-- menu->max_entry_len);
-- } else {
-- menu->max_entry_len = max ((int) strlen (mp->text),
-- menu->max_entry_len);
-- }
-+ if (mp->label[0] != '\0') {
-+ mp->label = _(mp->label);
-+ mp->text = parse_hotkey (mp->label);
-+ len = hotkey_width (mp->text);
-+
-+ menu->max_entry_len = max (len, menu->max_entry_len);
- }
- }
- }
-
-- menu->name = g_strdup (name);
-- menu_scan_hotkey(menu);
- menu->start_x = 0;
- menu->help_node = g_strdup (help_node);
- return menu;
-@@ -95,9 +75,10 @@ static void menubar_drop_compute (WMenu
-
- static void menubar_paint_idx (WMenu *menubar, int idx, int color)
- {
-- const Menu *menu = menubar->menu [menubar->selected];
-+ const Menu *menu = menubar->menu[menubar->selected];
- const int y = 2 + idx;
-- int x = menubar-> menu[menubar->selected]->start_x;
-+ int x = menu->start_x;
-+ const menu_entry *entry = &menu->entries[idx];
-
- if (x + menubar->max_entry_len + 3 > menubar->widget.cols)
- x = menubar->widget.cols - menubar->max_entry_len - 3;
-@@ -101,28 +82,28 @@ static void menubar_paint_idx (WMenu *me
-
- if (x + menubar->max_entry_len + 3 > menubar->widget.cols)
- x = menubar->widget.cols - menubar->max_entry_len - 3;
--
- widget_move (&menubar->widget, y, x);
-+
- attrset (color);
-- hline (' ', menubar->max_entry_len+2);
-- if (!*menu->entries [idx].text) {
-+ hline (' ', menubar->max_entry_len + 2);
-+
-+ if (entry->text.start == NULL) {
- attrset (SELECTED_COLOR);
- widget_move (&menubar->widget, y, x + 1);
- hline (slow_terminal ? ' ' : ACS_HLINE, menubar->max_entry_len);
- } else {
-- const char *text;
-+ addch ((unsigned char)entry->first_letter);
-
-- addch((unsigned char)menu->entries [idx].first_letter);
-- for (text = menu->entries [idx].text; *text; text++)
-- {
-- if (*text != '&')
-- addch(*text);
-- else {
-+ addstr (str_term_form (entry->text.start));
-+
-+ if (entry->text.hotkey != NULL) {
- attrset (color == MENU_SELECTED_COLOR ?
- MENU_HOTSEL_COLOR : MENU_HOT_COLOR);
-- addch(*(++text));
-+ addstr (str_term_form (entry->text.hotkey));
- attrset(color);
- }
-+ if (entry->text.end != NULL) {
-+ addstr (str_term_form (entry->text.end));
- }
- }
- widget_move (&menubar->widget, y, x + 1);
-@@ -166,10 +147,22 @@ static void menubar_draw (WMenu *menubar
- attrset (SELECTED_COLOR);
- /* Now each one of the entries */
- for (i = 0; i < items; i++){
-- if (menubar->active)
-- attrset(i == menubar->selected?MENU_SELECTED_COLOR:SELECTED_COLOR);
-+ attrset ((menubar->active && i == menubar->selected) ?
-+ MENU_SELECTED_COLOR : SELECTED_COLOR);
- widget_move (&menubar->widget, 0, menubar->menu [i]->start_x);
-- tty_printf ("%s", menubar->menu [i]->name);
-+
-+ addstr (str_term_form (menubar->menu[i]->text.start));
-+
-+ if (menubar->menu[i]->text.hotkey != NULL) {
-+ attrset ((menubar->active && i == menubar->selected) ?
-+ MENU_HOTSEL_COLOR : COLOR_HOT_FOCUS);
-+ addstr (str_term_form (menubar->menu[i]->text.hotkey));
-+ attrset ((menubar->active && i == menubar->selected) ?
-+ MENU_SELECTED_COLOR : SELECTED_COLOR);
-+ }
-+ if (menubar->menu[i]->text.end != NULL) {
-+ addstr (str_term_form (menubar->menu[i]->text.end));
-+ }
- }
-
- if (menubar->dropped)
-@@ -177,6 +170,7 @@ static void menubar_draw (WMenu *menubar
- else
- widget_move (&menubar->widget, 0,
- menubar-> menu[menubar->selected]->start_x);
-+
- }
-
- static inline void menubar_remove (WMenu *menubar)
-@@ -264,8 +258,7 @@ static int menubar_handle_key (WMenu *me
- int i;
-
- /* Lowercase */
-- if (key < 256 && isalpha (key)) /* Linux libc.so.5.x.x bug fix */
-- key = tolower (key);
-+ if (isascii (key)) key = g_ascii_tolower (key);
-
- if (is_abort_char (key)){
- menubar_finish (menubar);
-@@ -293,16 +286,19 @@ static int menubar_handle_key (WMenu *me
-
- if (!menubar->dropped){
- const int items = menubar->items;
-- for (i = 0; i < items; i++){
-+ for (i = 0; i < items; i++) {
- const Menu *menu = menubar->menu [i];
-
-- if (menu->hotkey == key){
-+ if (menu->text.hotkey != NULL) {
-+ if (g_ascii_tolower(menu->text.hotkey[0]) == key) {
- menubar_drop (menubar, i);
- return 1;
- }
- }
-- if (key == KEY_ENTER || key == XCTRL ('n') || key == KEY_DOWN
-- || key == '\n'){
-+ }
-+ if (key == KEY_ENTER || key == XCTRL ('n')
-+ || key == KEY_DOWN || key == '\n') {
-+
- menubar_drop (menubar, menubar->selected);
- return 1;
- }
-@@ -312,18 +308,20 @@ static int menubar_handle_key (WMenu *me
- const Menu *menu = menubar->menu [selected];
- const int items = menu->count;
-
-- for (i = 0; i < items; i++){
-+ for (i = 0; i < items; i++) {
- if (!menu->entries [i].call_back)
- continue;
-
-- if (key != menu->entries [i].hot_key)
-+ if (menu->entries[i].text.hotkey != NULL) {
-+ if (key != g_ascii_tolower (menu->entries[i].text.hotkey[0]))
- continue;
-
- menubar_execute (menubar, i);
- return 1;
- }
-+ }
-
-- if (key == KEY_ENTER || key == '\n'){
-+ if (key == KEY_ENTER || key == '\n') {
- menubar_execute (menubar, menubar->subsel);
- return 1;
- }
-@@ -494,7 +492,7 @@ menubar_arrange(WMenu* menubar)
-
- for (i = 0; i < items; i++)
- {
-- int len = strlen(menubar->menu[i]->name);
-+ int len = hotkey_width (menubar->menu[i]->text);
- menubar->menu[i]->start_x = start_x;
- start_x += len + gap;
- }
-@@ -507,7 +505,7 @@ menubar_arrange(WMenu* menubar)
- for (i = 0; i < items; i++)
- {
- /* preserve length here, to be used below */
-- gap -= (menubar->menu[i]->start_x = strlen(menubar->menu[i]->name));
-+ gap -= (menubar->menu[i]->start_x = hotkey_width (menubar->menu[i]->text));
- }
-
- gap /= (items - 1);
-@@ -531,7 +529,16 @@ menubar_arrange(WMenu* menubar)
- void
- destroy_menu (Menu *menu)
- {
-- g_free (menu->name);
-+ release_hotkey (menu->text);
-+ if (menu->entries != NULL) {
-+ int me;
-+ for (me = 0; me < menu->count; me++) {
-+ if (menu->entries[me].label[0] != '\0') {
-+ release_hotkey (menu->entries[me].text);
-+ }
-+ }
-+ }
-+
- g_free (menu->help_node);
- g_free (menu);
- }
-diff -urpBb mc.orig/src/menu.h mc/src/menu.h
---- mc.orig/src/menu.h 2004-12-03 20:17:47.000000000 +0100
-+++ mc/src/menu.h 2007-11-05 12:42:46.000000000 +0100
-@@ -7,17 +7,16 @@ typedef void (*callfn) (void);
-
- typedef struct {
- char first_letter;
-- const char *text;
-- int hot_key;
-+ const char *label;
-+ struct hotkey_t text;
- callfn call_back;
- } menu_entry;
-
- typedef struct Menu {
-- char *name;
-+ struct hotkey_t text;
- int count;
- int max_entry_len;
- int selected;
-- int hotkey;
- menu_entry *entries;
- int start_x; /* position relative to menubar start */
- char *help_node;
Deleted: trunk/debian/patches/29_mc-13-file.patch
===================================================================
--- trunk/debian/patches/29_mc-13-file.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-13-file.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,299 +0,0 @@
-diff -rupbBN mc.orig/src/file.c mc/src/file.c
---- mc.orig/src/file.c 2007-12-07 11:37:30.000000000 +0100
-+++ mc/src/file.c 2007-12-07 16:22:21.000000000 +0100
-@@ -63,6 +63,7 @@
- #include "widget.h"
- #include "wtools.h"
- #include "background.h" /* we_are_background */
-+#include "strutil.h"
-
- /* Needed for current_panel, other_panel and WTree */
- #include "dir.h"
-@@ -139,21 +140,30 @@ static int files_error (const char *form
- enum CaseConvs { NO_CONV = 0, UP_CHAR = 1, LOW_CHAR = 2, UP_SECT =
- 4, LOW_SECT = 8 };
-
--static char
--convert_case (char c, enum CaseConvs *conversion)
-+static int
-+convert_case (const char *text, enum CaseConvs *conversion,
-+ char **out, size_t *remain)
- {
-+ size_t left;
-+
- if (*conversion & UP_CHAR) {
- *conversion &= ~UP_CHAR;
-- return toupper ((unsigned char) c);
-+ return str_toupper (text, out, remain);
- } else if (*conversion & LOW_CHAR) {
- *conversion &= ~LOW_CHAR;
-- return tolower ((unsigned char) c);
-+ return str_tolower (text, out, remain);
- } else if (*conversion & UP_SECT) {
-- return toupper ((unsigned char) c);
-+ return str_toupper (text, out, remain);
- } else if (*conversion & LOW_SECT) {
-- return tolower ((unsigned char) c);
-- } else
-- return c;
-+ return str_tolower (text, out, remain);
-+ } else {
-+ left = str_cget_next_char (text) - text;
-+ if (left >= *remain) return 0;
-+ memcpy (*out, text, left);
-+ (*out)+= left;
-+ (*remain)-= left;
-+ return 1;
-+ }
- }
-
- static int transform_error = 0;
-@@ -161,25 +171,38 @@ static int transform_error = 0;
- static const char *
- do_transform_source (FileOpContext *ctx, const char *source)
- {
-- size_t j, k, l, len;
-+ size_t j, len;
- const char *fnsource = x_basename (source);
-+ char *fnsource_fixed = g_strdup (fnsource);
- int next_reg;
- enum CaseConvs case_conv = NO_CONV;
- static char fntarget[MC_MAXPATHLEN];
-+ const char *dm;
-+ const char *fn;
-+ char *actual;
-+ size_t remain;
-+
-+
-+ str_fix_string (fnsource_fixed);
-
-- len = strlen (fnsource);
-- j = re_match (&ctx->rx, fnsource, len, 0, &ctx->regs);
-+ len = strlen (fnsource_fixed);
-+ j = re_match (&ctx->rx, fnsource_fixed, len, 0, &ctx->regs);
- if (j != len) {
- transform_error = FILE_SKIP;
- return NULL;
- }
-- for (next_reg = 1, j = 0, k = 0; j < strlen (ctx->dest_mask); j++) {
-- switch (ctx->dest_mask[j]) {
-+ g_free (fnsource_fixed);
-+
-+ actual = fntarget;
-+ remain = sizeof (fntarget);
-+ dm = ctx->dest_mask;
-+ for (next_reg = 1; dm[0] != '\0' && remain > 1 ; str_cnext_char (&dm)) {
-+ switch (dm[0]) {
- case '\\':
-- j++;
-- if (!isdigit ((unsigned char) ctx->dest_mask[j])) {
-+ str_cnext_char (&dm);
-+ if (!str_isdigit (dm)) {
- /* Backslash followed by non-digit */
-- switch (ctx->dest_mask[j]) {
-+ switch (dm[0]) {
- case 'U':
- case_conv |= UP_SECT;
- case_conv &= ~LOW_SECT;
-@@ -199,13 +222,12 @@ do_transform_source (FileOpContext *ctx,
- break;
- default:
- /* Backslash as quote mark */
-- fntarget[k++] =
-- convert_case (ctx->dest_mask[j], &case_conv);
-+ convert_case (dm, &case_conv, &actual, &remain);
- }
- break;
- } else {
- /* Backslash followed by digit */
-- next_reg = ctx->dest_mask[j] - '0';
-+ next_reg = dm[0] - '0';
- /* Fall through */
- }
-
-@@ -216,18 +238,29 @@ do_transform_source (FileOpContext *ctx,
- transform_error = FILE_ABORT;
- return NULL;
- }
-- for (l = (size_t) ctx->regs.start[next_reg];
-- l < (size_t) ctx->regs.end[next_reg]; l++)
-- fntarget[k++] = convert_case (fnsource[l], &case_conv);
-+ for (fn = fnsource + ctx->regs.start[next_reg];
-+ fn < fnsource + ctx->regs.end[next_reg] && remain > 1; ) {
-+
-+ if (str_is_valid_char (fn, -1) == 1) {
-+ convert_case (fn, &case_conv, &actual, &remain);
-+ str_cnext_char (&fn);
-+ } else {
-+ actual[0] = fn[0];
-+ actual++;
-+ remain--;
-+ fn++;
-+ }
-+
-+ }
- next_reg++;
- break;
-
- default:
-- fntarget[k++] = convert_case (ctx->dest_mask[j], &case_conv);
-+ convert_case (dm, &case_conv, &actual, &remain);
- break;
- }
- }
-- fntarget[k] = 0;
-+ actual[0] = '\0';
- return fntarget;
- }
-
-@@ -1689,13 +1722,13 @@ panel_operate_generate_prompt (const WPa
- *dp = '\0';
-
- if (single_source) {
-- i = fmd_xlen - strlen (format_string) - 4;
-+ i = fmd_xlen - str_term_width1 (format_string) - 4;
- g_snprintf (cmd_buf, sizeof (cmd_buf), format_string,
-- name_trunc (single_source, i));
-+ str_trunc (single_source, i));
- } else {
- g_snprintf (cmd_buf, sizeof (cmd_buf), format_string,
- panel->marked);
-- i = strlen (cmd_buf) + 6 - fmd_xlen;
-+ i = str_term_width1 (cmd_buf) + 6 - fmd_xlen;
- if (i > 0) {
- fmd_xlen += i;
- fmd_init_i18n (TRUE); /* to recalculate positions of child widgets */
-@@ -2099,15 +2132,15 @@ file_error (const char *format, const ch
- static int
- files_error (const char *format, const char *file1, const char *file2)
- {
-- char nfile1[16];
-- char nfile2[16];
--
-- strcpy (nfile1, path_trunc (file1, 15));
-- strcpy (nfile2, path_trunc (file2, 15));
-+ char *nfile1 = g_strdup (path_trunc (file1, 15));
-+ char *nfile2 = g_strdup (path_trunc (file2, 15));
-
- g_snprintf (cmd_buf, sizeof (cmd_buf), format, nfile1, nfile2,
- unix_error_string (errno));
-
-+ g_free (nfile1);
-+ g_free (nfile2);
-+
- return do_file_error (cmd_buf);
- }
-
-diff -rupbBN mc.orig/src/filegui.c mc/src/filegui.c
---- mc.orig/src/filegui.c 2007-12-07 11:37:30.000000000 +0100
-+++ mc/src/filegui.c 2007-12-07 11:37:35.000000000 +0100
-@@ -66,6 +66,7 @@
- #include "filegui.h"
- #include "key.h" /* get_event */
- #include "util.h" /* strip_password() */
-+#include "strutil.h"
-
- /* }}} */
-
-@@ -424,7 +425,7 @@ file_progress_show_bytes (FileOpContext
-
- /* }}} */
-
--#define truncFileString(ui, s) name_trunc (s, ui->eta_extra + 47)
-+#define truncFileString(ui, s) str_trunc (s, ui->eta_extra + 47)
- #define truncFileStringSecure(ui, s) path_trunc (s, ui->eta_extra + 47)
-
- FileProgressStatus
-@@ -564,8 +565,8 @@ init_replace (FileOpContext *ctx, enum O
- * longest of "Overwrite..." labels
- * (assume "Target date..." are short enough)
- */
-- l1 = max (strlen (rd_widgets[6].text),
-- strlen (rd_widgets[11].text));
-+ l1 = max (str_term_width1 (rd_widgets[6].text),
-+ str_term_width1 (rd_widgets[11].text));
-
- /* longest of button rows */
- i = sizeof (rd_widgets) / sizeof (rd_widgets[0]);
-@@ -576,7 +577,7 @@ init_replace (FileOpContext *ctx, enum O
- l2 = max (l2, l);
- l = 0;
- }
-- l += strlen (rd_widgets[i].text) + 4;
-+ l+= str_term_width1 (rd_widgets[i].text) + 4;
- }
- }
- l2 = max (l2, l); /* last row */
-@@ -594,12 +595,12 @@ init_replace (FileOpContext *ctx, enum O
- l = l1;
- }
- rd_widgets[i].xpos = l;
-- l += strlen (rd_widgets[i].text) + 4;
-+ l+= str_term_width1 (rd_widgets[i].text) + 4;
- }
- }
- /* Abort button is centered */
- rd_widgets[1].xpos =
-- (rd_xlen - strlen (rd_widgets[1].text) - 3) / 2;
-+ (rd_xlen - str_term_width1 (rd_widgets[1].text) - 3) / 2;
- }
- #endif /* ENABLE_NLS */
-
-@@ -617,8 +618,8 @@ init_replace (FileOpContext *ctx, enum O
-
-
- ADD_RD_LABEL (ui, 0,
-- name_trunc (ui->replace_filename,
-- rd_trunc - strlen (rd_widgets[0].text)), 0);
-+ str_trunc (ui->replace_filename,
-+ rd_trunc - str_term_width1 (rd_widgets[0].text)), 0);
- ADD_RD_BUTTON (1);
-
- ADD_RD_BUTTON (2);
-@@ -805,36 +806,36 @@ fmd_init_i18n (int force)
- if (fmd_widgets[i].text[0] != '\0')
- fmd_widgets[i].text = _(fmd_widgets[i].text);
-
-- len = strlen (fmd_widgets[FMCB11].text)
-- + strlen (fmd_widgets[FMCB21].text) + 15;
-+ len = str_term_width1 (fmd_widgets[FMCB11].text)
-+ + str_term_width1 (fmd_widgets[FMCB21].text) + 15;
- fmd_xlen = max (fmd_xlen, len);
-
-- len = strlen (fmd_widgets[FMCB12].text)
-- + strlen (fmd_widgets[FMCB22].text) + 15;
-+ len = str_term_width1 (fmd_widgets[FMCB12].text)
-+ + str_term_width1 (fmd_widgets[FMCB22].text) + 15;
- fmd_xlen = max (fmd_xlen, len);
-
-- len = strlen (fmd_widgets[FMBRGT].text)
-- + strlen (fmd_widgets[FMBLFT].text) + 11;
-+ len = str_term_width1 (fmd_widgets[FMBRGT].text)
-+ + str_term_width1 (fmd_widgets[FMBLFT].text) + 11;
-
- #ifdef FMBMID
-- len += strlen (fmd_widgets[FMBMID].text) + 6;
-+ len+= str_term_width1 (fmd_widgets[FMBMID].text) + 6;
- #endif
-
- fmd_xlen = max (fmd_xlen, len + 4);
-
- len = (fmd_xlen - (len + 6)) / 2;
- i = fmd_widgets[FMBLFT].relative_x = len + 3;
-- i += strlen (fmd_widgets[FMBLFT].text) + 8;
-+ i+= str_term_width1 (fmd_widgets[FMBLFT].text) + 8;
-
- #ifdef FMBMID
- fmd_widgets[FMBMID].relative_x = i;
-- i += strlen (fmd_widgets[FMBMID].text) + 6;
-+ i+= str_term_width1 (fmd_widgets[FMBMID].text) + 6;
- #endif
-
- fmd_widgets[FMBRGT].relative_x = i;
-
- #define chkbox_xpos(i) \
-- fmd_widgets [i].relative_x = fmd_xlen - strlen (fmd_widgets [i].text) - 6
-+ fmd_widgets [i].relative_x = fmd_xlen - str_term_width1 (fmd_widgets [i].text) - 6
-
- chkbox_xpos (FMCB0);
- chkbox_xpos (FMCB21);
Deleted: trunk/debian/patches/29_mc-14-wtools.patch
===================================================================
--- trunk/debian/patches/29_mc-14-wtools.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-14-wtools.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,72 +0,0 @@
-diff -rupBb mc.orig/src/wtools.c mc/src/wtools.c
---- mc.orig/src/wtools.c 2007-09-25 17:33:37.000000000 +0200
-+++ mc/src/wtools.c 2007-11-05 14:49:41.000000000 +0100
-@@ -38,6 +38,7 @@
- #include "key.h" /* mi_getch() */
- #include "complete.h" /* INPUT_COMPLETE_CD */
- #include "background.h" /* parent_call */
-+#include "strutil.h"
-
-
- Listbox *
-@@ -50,11 +51,11 @@ create_listbox_window (int cols, int lin
- /* Adjust sizes */
- lines = (lines > LINES - 6) ? LINES - 6 : lines;
-
-- if (title && (cols < (len = strlen (title) + 2)))
-+ if (title && (cols < (len = str_term_width1 (title) + 2)))
- cols = len;
-
- /* no &, but 4 spaces around button for brackets and such */
-- if (cols < (len = strlen (cancel_string) + 3))
-+ if (cols < (len = str_term_width1 (cancel_string) + 3))
- cols = len;
-
- cols = cols > COLS - 6 ? COLS - 6 : cols;
-@@ -125,7 +126,7 @@ query_dialog (const char *header, const
- va_start (ap, count);
- for (i = 0; i < count; i++) {
- char *cp = va_arg (ap, char *);
-- win_len += strlen (cp) + 6;
-+ win_len += str_term_width1 (cp) + 6;
- if (strchr (cp, '&') != NULL)
- win_len--;
- }
-@@ -133,8 +134,8 @@ query_dialog (const char *header, const
- }
-
- /* count coordinates */
-- msglen (text, &lines, &cols);
-- cols = 6 + max (win_len, max ((int) strlen (header), cols));
-+ str_msg_term_size (text, &lines, &cols);
-+ cols = 6 + max (win_len, max (str_term_width1 (header), cols));
- lines += 4 + (count > 0 ? 2 : 0);
- xpos = COLS / 2 - cols / 2;
- ypos = LINES / 3 - (lines - 3) / 2;
-@@ -149,7 +150,7 @@ query_dialog (const char *header, const
- va_start (ap, count);
- for (i = 0; i < count; i++) {
- cur_name = va_arg (ap, char *);
-- xpos = strlen (cur_name) + 6;
-+ xpos = str_term_width1 (cur_name) + 6;
- if (strchr (cur_name, '&') != NULL)
- xpos--;
-
-@@ -464,7 +465,7 @@ fg_input_dialog_help (const char *header
- quick_widgets[2].histname = histname;
-
- msglen (text, &lines, &cols);
-- len = max ((int) strlen (header), cols) + 4;
-+ len = max (str_term_width1 (header), cols) + 4;
- len = max (len, 64);
-
- /* The special value of def_text is used to identify password boxes
-@@ -486,7 +487,7 @@ fg_input_dialog_help (const char *header
- quick_widgets[1].text = _(quick_widgets[1].text);
- quick_widgets[0].relative_x = len / 2 + 4;
- quick_widgets[1].relative_x =
-- len / 2 - (strlen (quick_widgets[1].text) + 9);
-+ len / 2 - (str_term_width1 (quick_widgets[1].text) + 9);
- quick_widgets[0].x_divisions = quick_widgets[1].x_divisions = len;
- #endif /* ENABLE_NLS */
-
Deleted: trunk/debian/patches/29_mc-15-dialog.patch
===================================================================
--- trunk/debian/patches/29_mc-15-dialog.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-15-dialog.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,42 +0,0 @@
-diff -rupBb mc.orig/src/dialog.c mc/src/dialog.c
---- mc.orig/src/dialog.c 2007-09-26 12:22:25.000000000 +0200
-+++ mc/src/dialog.c 2007-11-05 15:08:48.000000000 +0100
-@@ -33,6 +33,7 @@
- #include "layout.h" /* winch_flag */
- #include "execute.h" /* suspend_cmd() */
- #include "main.h" /* slow_terminal */
-+#include "strutil.h"
-
- #define waddc(w,y1,x1,c) move (w->y+y1, w->x+x1); addch (c)
-
-@@ -167,8 +168,8 @@ common_dialog_repaint (struct Dlg_head *
-
- if (h->title) {
- attrset (DLG_HOT_NORMALC (h));
-- dlg_move (h, space, (h->cols - strlen (h->title)) / 2);
-- addstr (h->title);
-+ dlg_move (h, space, (h->cols - str_term_width1 (h->title)) / 2);
-+ addstr (str_term_form (h->title));
- }
- }
-
-@@ -590,14 +591,16 @@ dlg_try_hotkey (Dlg_head *h, int d_key)
- */
-
- if (h->current->options & W_IS_INPUT) {
-- if (d_key < 255 && isalpha (d_key))
-+ /* skip ascii control characters, anything else can valid character in
-+ * some encoding */
-+ if (d_key >= 32 && d_key < 256)
- return 0;
- }
-
- /* If it's an alt key, send the message */
- c = d_key & ~ALT (0);
-- if (d_key & ALT (0) && c < 255 && isalpha (c))
-- d_key = tolower (c);
-+ if (d_key & ALT (0) && g_ascii_isalpha (c))
-+ d_key = g_ascii_tolower (c);
-
- handled = 0;
- if (h->current->options & W_WANT_HOTKEY)
Deleted: trunk/debian/patches/29_mc-16-boxes.patch
===================================================================
--- trunk/debian/patches/29_mc-16-boxes.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-16-boxes.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,201 +0,0 @@
-diff -rupBb mc.orig/src/boxes.c mc/src/boxes.c
---- mc.orig/src/boxes.c 2007-09-25 17:33:36.000000000 +0200
-+++ mc/src/boxes.c 2007-11-05 15:56:27.000000000 +0100
-@@ -49,6 +49,7 @@
- #include "tree.h"
- #include "layout.h" /* for get_nth_panel_name proto */
- #include "background.h" /* task_list */
-+#include "strutil.h"
-
- #ifdef HAVE_CHARSET
- #include "charsets.h"
-@@ -119,7 +120,7 @@ display_callback (struct Dlg_head *h, dl
- }
- }
-
-- if (tolower (parm) == user_hotkey && dlg_widget_active (user)
-+ if (g_ascii_tolower (parm) == user_hotkey && dlg_widget_active (user)
- && dlg_widget_active (status)) {
- my_radio->sel = 3;
- dlg_select_widget (my_radio); /* force redraw */
-@@ -154,23 +155,23 @@ display_init (int radio_sel, char *init_
- display_title = _(display_title);
- for (i = 0; i < LIST_TYPES; i++) {
- displays[i] = _(displays[i]);
-- if ((l = strlen (displays[i])) > maxlen)
-+ if ((l = str_term_width1 (displays[i])) > maxlen)
- maxlen = l;
- }
-
-- i = strlen (ok_button) + 5;
-- l = strlen (cancel_button) + 3;
-+ i = str_term_width1 (ok_button) + 5;
-+ l = str_term_width1 (cancel_button) + 3;
- l = max (i, l);
-
- i = maxlen + l + 16;
- if (i > DISPLAY_X)
- DISPLAY_X = i;
-
-- i = strlen (user_mini_status) + 13;
-+ i = str_term_width1 (user_mini_status) + 13;
- if (i > DISPLAY_X)
- DISPLAY_X = i;
-
-- i = strlen (display_title) + 10;
-+ i = str_term_width1 (display_title) + 10;
- if (i > DISPLAY_X)
- DISPLAY_X = i;
-
-@@ -179,7 +180,7 @@ display_init (int radio_sel, char *init_
- /* get hotkey of user-defined format string */
- cp = strchr (displays[USER_TYPE], '&');
- if (cp != NULL && *++cp != '\0')
-- user_hotkey = tolower ((unsigned char) *cp);
-+ user_hotkey = g_ascii_tolower ((gchar) cp[0]);
-
- i18n_displays_flag = 1;
- }
-@@ -289,20 +290,20 @@ sort_box (sortfn *sort_fn, int *reverse,
- int maxlen = 0;
- for (i = SORT_TYPES - 1; i >= 0; i--) {
- sort_orders_names[i] = _(sort_orders[i].sort_name);
-- r = strlen (sort_orders_names[i]);
-+ r = str_term_width1 (sort_orders_names[i]);
- if (r > maxlen)
- maxlen = r;
- }
-
- check_pos = maxlen + 9;
-
-- r = strlen (reverse_label) + 4;
-- i = strlen (case_label) + 4;
-+ r = str_term_width1 (reverse_label) + 4;
-+ i = str_term_width1 (case_label) + 4;
- if (i > r)
- r = i;
-
-- l = strlen (ok_button) + 6;
-- i = strlen (cancel_button) + 4;
-+ l = str_term_width1 (ok_button) + 6;
-+ i = str_term_width1 (cancel_button) + 4;
- if (i > l)
- l = i;
-
-@@ -311,7 +312,7 @@ sort_box (sortfn *sort_fn, int *reverse,
- if (i > SORT_X)
- SORT_X = i;
-
-- i = strlen (sort_title) + 6;
-+ i = str_term_width1 (sort_title) + 6;
- if (i > SORT_X)
- SORT_X = i;
-
-@@ -409,7 +410,7 @@ confirm_box (void)
- while (i--)
- {
- conf_widgets [i].text = _(conf_widgets [i].text);
-- l1 = strlen (conf_widgets [i].text) + 3;
-+ l1 = str_term_width1 (conf_widgets [i].text) + 3;
- if (l1 > maxlen)
- maxlen = l1;
- }
-@@ -424,8 +425,8 @@ confirm_box (void)
- * And this for the case when buttons with some space to the right
- * do not fit within 2/6
- */
-- l1 = strlen (conf_widgets [0].text) + 3;
-- i = strlen (conf_widgets [1].text) + 5;
-+ l1 = str_term_width1 (conf_widgets [0].text) + 3;
-+ i = str_term_width1 (conf_widgets [1].text) + 5;
- if (i > l1)
- l1 = i;
-
-@@ -498,11 +499,11 @@ display_bits_box (void)
- {
- display_widgets [i].text = _(display_widgets[i].text);
- display_bits_str [i] = _(display_bits_str [i]);
-- l1 = strlen (display_bits_str [i]);
-+ l1 = str_term_width1 (display_bits_str [i]);
- if (l1 > maxlen)
- maxlen = l1;
- }
-- l1 = strlen (display_widgets [2].text);
-+ l1 = str_term_width1 (display_widgets [2].text);
- if (l1 > maxlen)
- maxlen = l1;
-
-@@ -510,8 +511,8 @@ display_bits_box (void)
- display_bits.xlen = (maxlen + 5) * 6 / 4;
-
- /* See above confirm_box */
-- l1 = strlen (display_widgets [0].text) + 3;
-- i = strlen (display_widgets [1].text) + 5;
-+ l1 = str_term_width1 (display_widgets [0].text) + 3;
-+ i = str_term_width1 (display_widgets [1].text) + 5;
- if (i > l1)
- l1 = i;
-
-@@ -606,7 +607,7 @@ init_disp_bits_box (void)
-
- cpname = _("&Select");
- add_widget (dbits_dlg,
-- button_new (4, DISPX - 8 - strlen (cpname), B_USER,
-+ button_new (4, DISPX - 8 - str_term_width1 (cpname), B_USER,
- NORMAL_BUTTON, cpname, sel_charset_button));
-
- return dbits_dlg;
-@@ -817,7 +818,7 @@ cd_dialog (void)
- quick_widgets [1].y_divisions =
- quick_widgets [0].y_divisions = Quick_input.ylen = 5;
-
-- len = strlen (quick_widgets [1].text);
-+ len = str_term_width1 (quick_widgets [1].text);
-
- quick_widgets [0].relative_x =
- quick_widgets [1].relative_x + len + 1;
-@@ -976,7 +977,7 @@ jobs_cmd (void)
- {
- job_buttons [i].name = _(job_buttons [i].name);
-
-- len = strlen (job_buttons [i].name) + 4;
-+ len = str_term_width1 (job_buttons [i].name) + 4;
- JOBS_X = max (JOBS_X, startx + len + 3);
-
- job_buttons [i].xpos = startx;
-@@ -985,7 +986,7 @@ jobs_cmd (void)
-
- /* Last button - Ok a.k.a. Cancel :) */
- job_buttons [n_buttons - 1].xpos =
-- JOBS_X - strlen (job_buttons [n_buttons - 1].name) - 7;
-+ JOBS_X - str_term_width1 (job_buttons [n_buttons - 1].name) - 7;
-
- i18n_flag = 1;
- }
-@@ -1043,7 +1044,7 @@ vfs_smb_get_authinfo (const char *host,
-
- while (i--)
- {
-- l1 = strlen (labs [i] = _(labs [i]));
-+ l1 = str_term_width1 (labs [i] = _(labs [i]));
- if (l1 > maxlen)
- maxlen = l1;
- }
-@@ -1053,7 +1054,7 @@ vfs_smb_get_authinfo (const char *host,
-
- for (i = sizeof(buts)/sizeof(buts[0]), l1 = 0; i--; )
- {
-- l1 += strlen (buts [i] = _(buts [i]));
-+ l1 += str_term_width1 (buts [i] = _(buts [i]));
- }
- l1 += 15;
- if (l1 > dialog_x)
-@@ -1062,7 +1063,7 @@ vfs_smb_get_authinfo (const char *host,
- ilen = dialog_x - 7 - maxlen; /* for the case of very long buttons :) */
- istart = dialog_x - 3 - ilen;
-
-- b2 = dialog_x - (strlen(buts[1]) + 6);
-+ b2 = dialog_x - (str_term_width1 (buts[1]) + 6);
-
- i18n_flag = 1;
- }
Deleted: trunk/debian/patches/29_mc-17-layout.patch
===================================================================
--- trunk/debian/patches/29_mc-17-layout.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-17-layout.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,102 +0,0 @@
-diff -rupBb mc.orig/src/layout.c mc/src/layout.c
---- mc.orig/src/layout.c 2007-10-15 12:20:58.000000000 +0200
-+++ mc/src/layout.c 2007-10-28 23:47:44.000000000 +0100
-@@ -56,6 +56,7 @@
- #include "subshell.h" /* For use_subshell and resize_subshell() */
- #include "tree.h"
- #include "menu.h"
-+#include "strutil.h"
-
- /* Needed for the extern declarations of integer parameters */
- #include "dir.h"
-@@ -290,7 +291,7 @@ layout_callback (struct Dlg_head *h, dlg
- old_output_lines = _output_lines;
- attrset (COLOR_NORMAL);
- dlg_move (h, 9, 16 + first_width);
-- addstr (output_lines_label);
-+ addstr (str_term_form (output_lines_label));
- dlg_move (h, 9, 10 + first_width);
- tty_printf ("%02d", _output_lines);
- }
-@@ -367,36 +368,36 @@ init_layout (void)
-
- while (i--) {
- s_split_direction[i] = _(s_split_direction[i]);
-- l1 = strlen (s_split_direction[i]) + 7;
-+ l1 = str_term_width1 (s_split_direction[i]) + 7;
- if (l1 > first_width)
- first_width = l1;
- }
-
- for (i = 0; i <= 8; i++) {
- check_options[i].text = _(check_options[i].text);
-- l1 = strlen (check_options[i].text) + 7;
-+ l1 = str_term_width1 (check_options[i].text) + 7;
- if (l1 > first_width)
- first_width = l1;
- }
-
-- l1 = strlen (title1) + 1;
-+ l1 = str_term_width1 (title1) + 1;
- if (l1 > first_width)
- first_width = l1;
-
-- l1 = strlen (title2) + 1;
-+ l1 = str_term_width1 (title2) + 1;
- if (l1 > first_width)
- first_width = l1;
-
-
-- second_width = strlen (title3) + 1;
-+ second_width = str_term_width1 (title3) + 1;
- for (i = 0; i < 6; i++) {
- check_options[i].text = _(check_options[i].text);
-- l1 = strlen (check_options[i].text) + 7;
-+ l1 = str_term_width1 (check_options[i].text) + 7;
- if (l1 > second_width)
- second_width = l1;
- }
- if (console_flag) {
-- l1 = strlen (output_lines_label) + 13;
-+ l1 = str_term_width1 (output_lines_label) + 13;
- if (l1 > second_width)
- second_width = l1;
- }
-@@ -410,14 +411,14 @@ init_layout (void)
- *
- * Now the last thing to do - properly space buttons...
- */
-- l1 = 11 + strlen (ok_button) /* 14 - all brackets and inner space */
-- +strlen (save_button) /* notice: it is 3 char less because */
-- +strlen (cancel_button); /* of '&' char in button text */
-+ l1 = 11 + str_term_width1 (ok_button) /* 14 - all brackets and inner space */
-+ + str_term_width1 (save_button) /* notice: it is 3 char less because */
-+ + str_term_width1 (cancel_button); /* of '&' char in button text */
-
- i = (first_width + second_width - l1) / 4;
- b1 = 5 + i;
-- b2 = b1 + strlen (ok_button) + i + 6;
-- b3 = b2 + strlen (save_button) + i + 4;
-+ b2 = b1 + str_term_width1 (ok_button) + i + 6;
-+ b3 = b2 + str_term_width1 (save_button) + i + 4;
-
- i18n_layt_flag = 1;
- }
-@@ -681,7 +682,7 @@ setup_panels (void)
- panel_do_cols (0);
- panel_do_cols (1);
-
-- promptl = strlen (prompt);
-+ promptl = str_term_width1 (prompt);
-
- widget_set_size (&the_menubar->widget, 0, 0, 1, COLS);
-
-@@ -834,7 +835,7 @@ void print_vfs_message (const char *msg,
-
- move (0, 0);
- attrset (NORMAL_COLOR);
-- tty_printf ("%-*s", COLS-1, str);
-+ addstr (str_fit_to_term (str, COLS - 1, J_LEFT));
-
- /* Restore cursor position */
- move(row, col);
Deleted: trunk/debian/patches/29_mc-18-option.patch
===================================================================
--- trunk/debian/patches/29_mc-18-option.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-18-option.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,58 +0,0 @@
-diff -rupBb mc.orig/src/option.c mc/src/option.c
---- mc.orig/src/option.c 2007-09-26 12:22:25.000000000 +0200
-+++ mc/src/option.c 2007-10-28 16:36:45.000000000 +0100
-@@ -35,6 +35,7 @@
- #include "setup.h" /* For save_setup() */
- #include "main.h"
- #include "profile.h" /* For sync_profiles */
-+#include "strutil.h"
-
- #include "panel.h" /* Needed for the externs */
- #include "file.h" /* safe_delete */
-@@ -124,12 +125,12 @@ init_configure (void)
- title2 = _(" Pause after run... ");
- title3 = _(" Other options ");
-
-- first_width = strlen (title1) + 1;
-- second_width = strlen (title3) + 1;
-+ first_width = str_term_width1 (title1) + 1;
-+ second_width = str_term_width1 (title3) + 1;
-
- for (i = 0; check_options[i].text; i++) {
- check_options[i].text = _(check_options[i].text);
-- l1 = strlen (check_options[i].text) + 7;
-+ l1 = str_term_width1 (check_options[i].text) + 7;
- if (i >= OTHER_OPTIONS) {
- if (l1 > first_width)
- first_width = l1;
-@@ -142,23 +143,23 @@ init_configure (void)
- i = PAUSE_OPTIONS;
- while (i--) {
- pause_options[i] = _(pause_options[i]);
-- l1 = strlen (pause_options[i]) + 7;
-+ l1 = str_term_width1 (pause_options[i]) + 7;
- if (l1 > first_width)
- first_width = l1;
- }
-
-- l1 = strlen (title2) + 1;
-+ l1 = str_term_width1 (title2) + 1;
- if (l1 > first_width)
- first_width = l1;
-
-- l1 = 11 + strlen (ok_button)
-- + strlen (save_button)
-- + strlen (cancel_button);
-+ l1 = 11 + str_term_width1 (ok_button)
-+ + str_term_width1 (save_button)
-+ + str_term_width1 (cancel_button);
-
- i = (first_width + second_width - l1) / 4;
- b1 = 5 + i;
-- b2 = b1 + strlen (ok_button) + i + 6;
-- b3 = b2 + strlen (save_button) + i + 4;
-+ b2 = b1 + str_term_width1 (ok_button) + i + 6;
-+ b3 = b2 + str_term_width1 (save_button) + i + 4;
-
- i18n_config_flag = 1;
- }
Deleted: trunk/debian/patches/29_mc-19-find.patch
===================================================================
--- trunk/debian/patches/29_mc-19-find.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-19-find.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,142 +0,0 @@
-diff -rupbBN mc.orig/src/find.c mc/src/find.c
---- mc.orig/src/find.c 2007-12-06 18:21:01.000000000 +0100
-+++ mc/src/find.c 2007-12-06 18:40:46.000000000 +0100
-@@ -34,6 +34,7 @@
- #include "color.h"
- #include "setup.h"
- #include "find.h"
-+#include "strutil.h"
-
- /* Dialog manager and widgets */
- #include "dialog.h"
-@@ -218,7 +219,7 @@ find_parameters (char **start_dir, char
- int l1, maxlen = 0;
-
- while (i--) {
-- l1 = strlen (labs[i] = _(labs[i]));
-+ l1 = str_term_width1 (labs[i] = _(labs[i]));
- if (l1 > maxlen)
- maxlen = l1;
- }
-@@ -227,7 +228,7 @@ find_parameters (char **start_dir, char
- FIND_X = i;
-
- for (i = sizeof (buts) / sizeof (buts[0]), l1 = 0; i--;) {
-- l1 += strlen (buts[i] = _(buts[i]));
-+ l1 += str_term_width1 (buts[i] = _(buts[i]));
- }
- l1 += 21;
- if (l1 > FIND_X)
-@@ -236,8 +237,8 @@ find_parameters (char **start_dir, char
- ilen = FIND_X - 7 - maxlen; /* for the case of very long buttons :) */
- istart = FIND_X - 3 - ilen;
-
-- b1 = b0 + strlen (buts[0]) + 7;
-- b2 = FIND_X - (strlen (buts[2]) + 6);
-+ b1 = b0 + str_term_width1 (buts[0]) + 7;
-+ b2 = FIND_X - (str_term_width1 (buts[2]) + 6);
-
- i18n_flag = 1;
- case_label = _(case_label);
-@@ -529,7 +530,7 @@ search_content (Dlg_head *h, const char
- if (file_fd == -1)
- return 0;
-
-- g_snprintf (buffer, sizeof (buffer), _("Grepping in %s"), name_trunc (filename, FIND2_X_USE));
-+ g_snprintf (buffer, sizeof (buffer), _("Grepping in %s"), str_trunc (filename, FIND2_X_USE));
-
- status_update (buffer);
- mc_refresh ();
-@@ -544,8 +545,6 @@ search_content (Dlg_head *h, const char
- int has_newline;
- char *p;
- int found = 0;
-- typedef const char * (*search_fn) (const char *, const char *);
-- search_fn search_func;
-
- if (resuming) {
- /* We've been previously suspended, start from the previous position */
-@@ -554,8 +553,6 @@ search_content (Dlg_head *h, const char
- pos = last_pos;
- }
-
-- search_func = (case_sensitive) ? cstrstr : cstrcasestr;
--
- while ((p = get_line_at (file_fd, buffer, &pos, &n_read, sizeof (buffer), &has_newline)) && (ret_val == 0)){
- if (found == 0){ /* Search in binary line once */
- if (find_regex_flag) {
-@@ -566,7 +563,8 @@ search_content (Dlg_head *h, const char
- found = 1;
- }
- } else {
-- if (search_func (p, content_pattern) != NULL) {
-+ // str_case_search_first do not accept invalid strings
-+ if (str_is_valid_string (p) && str_search_first (p, content_pattern, case_sensitive) != NULL) {
- char *match = g_strdup_printf("%d:%s", line, filename);
- find_add_match (h, directory, match);
- found = TRUE;
-@@ -666,7 +664,7 @@ do_search (struct Dlg_head *h)
- char buffer [BUF_SMALL];
-
- g_snprintf (buffer, sizeof (buffer), _("Searching %s"),
-- name_trunc (directory, FIND2_X_USE));
-+ str_trunc (directory, FIND2_X_USE));
- status_update (buffer);
- }
- /* mc_stat should not be called after mc_opendir
-@@ -683,11 +681,17 @@ do_search (struct Dlg_head *h)
- dirp = mc_opendir (directory);
- } /* while (!dirp) */
- dp = mc_readdir (dirp);
-+ /* skip invalid filenames */
-+ while (dp != NULL && !str_is_valid_string (dp->d_name))
-+ dp = mc_readdir (dirp);
- } /* while (!dp) */
-
- if (strcmp (dp->d_name, ".") == 0 ||
- strcmp (dp->d_name, "..") == 0){
- dp = mc_readdir (dirp);
-+ /* skip invalid filenames */
-+ while (dp != NULL && !str_is_valid_string (dp->d_name))
-+ dp = mc_readdir (dirp);
- return 1;
- }
-
-@@ -711,6 +715,9 @@ do_search (struct Dlg_head *h)
- }
-
- dp = mc_readdir (dirp);
-+ /* skip invalid filenames */
-+ while (dp != NULL && !str_is_valid_string (dp->d_name))
-+ dp = mc_readdir (dirp);
-
- /* Displays the nice dot */
- count++;
-@@ -864,7 +871,7 @@ setup_gui (void)
- if (!i18n_flag) {
- register int i = sizeof (fbuts) / sizeof (fbuts[0]);
- while (i--)
-- fbuts[i].len = strlen (fbuts[i].text = _(fbuts[i].text)) + 3;
-+ fbuts[i].len = str_term_width1 (fbuts[i].text = _(fbuts[i].text)) + 3;
- fbuts[2].len += 2; /* DEFPUSH_BUTTON */
- i18n_flag = 1;
- }
-@@ -967,7 +974,9 @@ find_file (char *start_dir, char *patter
-
- /* FIXME: Need to cleanup this, this ought to be passed non-globaly */
- find_pattern = pattern;
-- content_pattern = content;
-+ content_pattern = (content != NULL && str_is_valid_string (content))
-+ ? str_create_search_needle (content, case_sensitive)
-+ : NULL;
-
- init_find_vars ();
- push_directory (start_dir);
-@@ -1057,6 +1066,7 @@ find_file (char *start_dir, char *patter
- }
- }
-
-+ if (content_pattern != NULL) str_release_search_needle (content_pattern, case_sensitive);
- kill_gui ();
- do_search (0); /* force do_search to release resources */
- g_free (old_dir);
Deleted: trunk/debian/patches/29_mc-20-dir.patch
===================================================================
--- trunk/debian/patches/29_mc-20-dir.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-20-dir.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,314 +0,0 @@
-diff -rupbBN mc.orig/src/dir.c mc/src/dir.c
---- mc.orig/src/dir.c 2007-12-06 18:43:33.000000000 +0100
-+++ mc/src/dir.c 2007-12-06 18:33:40.000000000 +0100
-@@ -30,6 +30,7 @@
- #include "dir.h"
- #include "wtools.h"
- #include "treestore.h"
-+#include "strutil.h"
-
- /* If true show files starting with a dot */
- int show_dot_files = 1;
-@@ -59,50 +60,9 @@ sort_orders_t sort_orders [SORT_TYPES_TO
- { N_("&Inode"), sort_inode },
- };
-
--#ifdef HAVE_STRCOLL
--/*
-- * g_strcasecmp() doesn't work well in some locales because it relies on
-- * the locale-specific toupper(). On the other hand, strcoll() is case
-- * sensitive in the "C" and "POSIX" locales, unlike other locales.
-- * Solution: always use strcmp() for case sensitive sort. For case
-- * insensitive sort use strcoll() if it's case insensitive for ASCII and
-- * g_strcasecmp() otherwise.
-- */
--typedef enum {
-- STRCOLL_NO,
-- STRCOLL_YES,
-- STRCOLL_TEST
--} strcoll_status;
--
--static int string_sortcomp (const char *str1, const char *str2)
--{
-- static strcoll_status use_strcoll = STRCOLL_TEST;
--
-- if (case_sensitive) {
-- return strcmp (str1, str2);
-- }
--
-- /* Initialize use_strcoll once. */
-- if (use_strcoll == STRCOLL_TEST) {
-- /* Only use strcoll() if it considers "B" between "a" and "c". */
-- if (strcoll ("a", "B") * strcoll ("B", "c") > 0) {
-- use_strcoll = STRCOLL_YES;
-- } else {
-- use_strcoll = STRCOLL_NO;
-- }
-- }
--
-- if (use_strcoll == STRCOLL_NO)
-- return g_strcasecmp (str1, str2);
-- else
-- return strcoll (str1, str2);
--}
--#else
--#define string_sortcomp(a,b) (case_sensitive ? strcmp (a,b) : g_strcasecmp (a,b))
--#endif
-
- int
--unsorted (const file_entry *a, const file_entry *b)
-+unsorted (file_entry *a, file_entry *b)
- {
- (void) a;
- (void) b;
-@@ -110,28 +70,38 @@ unsorted (const file_entry *a, const fil
- }
-
- int
--sort_name (const file_entry *a, const file_entry *b)
-+sort_name (file_entry *a, file_entry *b)
- {
- int ad = MY_ISDIR (a);
- int bd = MY_ISDIR (b);
-
-- if (ad == bd || mix_all_files)
-- return string_sortcomp (a->fname, b->fname) * reverse;
-- return bd-ad;
-+ if (ad == bd || mix_all_files) {
-+ /* create key if does not exist, key will be freed after sorting */
-+ if (a->sort_key == NULL)
-+ a->sort_key = str_create_key_for_filename (a->fname, case_sensitive);
-+ if (b->sort_key == NULL)
-+ b->sort_key = str_create_key_for_filename (b->fname, case_sensitive);
-+
-+ return str_key_collate (a->sort_key, b->sort_key, case_sensitive)
-+ * reverse;
-+ }
-+ return bd - ad;
- }
-
- int
--sort_ext (const file_entry *a, const file_entry *b)
-+sort_ext (file_entry *a, file_entry *b)
- {
-- const char *exta, *extb;
- int r;
- int ad = MY_ISDIR (a);
- int bd = MY_ISDIR (b);
-
- if (ad == bd || mix_all_files){
-- exta = extension (a->fname);
-- extb = extension (b->fname);
-- r = string_sortcomp (exta, extb);
-+ if (a->second_sort_key == NULL)
-+ a->second_sort_key = str_create_key (extension (a->fname), case_sensitive);
-+ if (b->second_sort_key == NULL)
-+ b->second_sort_key = str_create_key (extension (b->fname), case_sensitive);
-+
-+ r = str_key_collate (a->second_sort_key, b->second_sort_key, case_sensitive);
- if (r)
- return r * reverse;
- else
-@@ -141,7 +111,7 @@ sort_ext (const file_entry *a, const fil
- }
-
- int
--sort_time (const file_entry *a, const file_entry *b)
-+sort_time (file_entry *a, file_entry *b)
- {
- int ad = MY_ISDIR (a);
- int bd = MY_ISDIR (b);
-@@ -159,7 +129,7 @@ sort_time (const file_entry *a, const fi
- }
-
- int
--sort_ctime (const file_entry *a, const file_entry *b)
-+sort_ctime (file_entry *a, file_entry *b)
- {
- int ad = MY_ISDIR (a);
- int bd = MY_ISDIR (b);
-@@ -177,7 +147,7 @@ sort_ctime (const file_entry *a, const f
- }
-
- int
--sort_atime (const file_entry *a, const file_entry *b)
-+sort_atime (file_entry *a, file_entry *b)
- {
- int ad = MY_ISDIR (a);
- int bd = MY_ISDIR (b);
-@@ -195,7 +165,7 @@ sort_atime (const file_entry *a, const f
- }
-
- int
--sort_inode (const file_entry *a, const file_entry *b)
-+sort_inode (file_entry *a, file_entry *b)
- {
- int ad = MY_ISDIR (a);
- int bd = MY_ISDIR (b);
-@@ -207,7 +177,7 @@ sort_inode (const file_entry *a, const f
- }
-
- int
--sort_size (const file_entry *a, const file_entry *b)
-+sort_size (file_entry *a, file_entry *b)
- {
- int ad = MY_ISDIR (a);
- int bd = MY_ISDIR (b);
-@@ -224,6 +194,20 @@ sort_size (const file_entry *a, const fi
- return sort_name (a, b);
- }
-
-+/* clear keys, should be call after sorting is finished */
-+static void
-+clean_sort_keys (dir_list *list, int start, int count)
-+{
-+ int i;
-+
-+ for (i = 0; i < count; i++){
-+ str_release_key (list->list [i + start].sort_key, case_sensitive);
-+ list->list [i + start].sort_key = NULL;
-+ str_release_key (list->list [i + start].second_sort_key, case_sensitive);
-+ list->list [i + start].second_sort_key = NULL;
-+ }
-+}
-+
-
- void
- do_sort (dir_list *list, sortfn *sort, int top, int reverse_f, int case_sensitive_f)
-@@ -242,6 +226,8 @@ do_sort (dir_list *list, sortfn *sort, i
- case_sensitive = case_sensitive_f;
- qsort (&(list->list) [dot_dot_found],
- top + 1 - dot_dot_found, sizeof (file_entry), sort);
-+
-+ clean_sort_keys (list, dot_dot_found, top + 1 - dot_dot_found);
- }
-
- void
-@@ -251,7 +237,7 @@ clean_dir (dir_list *list, int count)
-
- for (i = 0; i < count; i++){
- g_free (list->list [i].fname);
-- list->list [i].fname = 0;
-+ list->list [i].fname = NULL;
- }
- }
-
-@@ -422,6 +408,8 @@ do_load_dir (const char *path, dir_list
- list->list[next_free].f.stale_link = stale_link;
- list->list[next_free].f.dir_size_computed = 0;
- list->list[next_free].st = st;
-+ list->list[next_free].sort_key = NULL;
-+ list->list[next_free].second_sort_key = NULL;
- next_free++;
- if (!(next_free % 32))
- rotate_dash ();
-@@ -474,8 +462,11 @@ alloc_dir_copy (int size)
- }
-
- dir_copy.list = g_new (file_entry, size);
-- for (i = 0; i < size; i++)
-- dir_copy.list [i].fname = 0;
-+ for (i = 0; i < size; i++) {
-+ dir_copy.list [i].fname = NULL;
-+ dir_copy.list [i].sort_key = NULL;
-+ dir_copy.list [i].second_sort_key = NULL;
-+ }
-
- dir_copy.size = size;
- }
-@@ -512,6 +503,8 @@ do_reload_dir (const char *path, dir_lis
- list->list[i].f.dir_size_computed;
- dir_copy.list[i].f.link_to_dir = list->list[i].f.link_to_dir;
- dir_copy.list[i].f.stale_link = list->list[i].f.stale_link;
-+ dir_copy.list[i].sort_key = NULL;
-+ dir_copy.list[i].second_sort_key = NULL;
- if (list->list[i].f.marked) {
- g_hash_table_insert (marked_files, dir_copy.list[i].fname,
- &dir_copy.list[i]);
-@@ -573,6 +566,8 @@ do_reload_dir (const char *path, dir_lis
- list->list[next_free].f.stale_link = stale_link;
- list->list[next_free].f.dir_size_computed = 0;
- list->list[next_free].st = st;
-+ list->list[next_free].sort_key = NULL;
-+ list->list[next_free].second_sort_key = NULL;
- next_free++;
- if (!(next_free % 16))
- rotate_dash ();
-diff -rupbBN mc.orig/src/dir.h mc/src/dir.h
---- mc.orig/src/dir.h 2007-12-06 18:43:33.000000000 +0100
-+++ mc/src/dir.h 2007-12-06 18:33:40.000000000 +0100
-@@ -6,6 +6,7 @@
-
- #include <sys/stat.h>
-
-+/* keys are set only during sorting */
- typedef struct {
-
- /* File attributes */
-@@ -13,6 +14,10 @@ typedef struct {
- int fnamelen;
- char *fname;
- struct stat st;
-+ /* key used for comparing names */
-+ char *sort_key;
-+ /* key used for comparing extensions */
-+ char *second_sort_key;
-
- /* Flags */
- struct {
-@@ -42,14 +47,14 @@ int handle_path (dir_list *list, const c
- int next_free, int *link_to_dir, int *stale_link);
-
- /* Sorting functions */
--int unsorted (const file_entry *a, const file_entry *b);
--int sort_name (const file_entry *a, const file_entry *b);
--int sort_ext (const file_entry *a, const file_entry *b);
--int sort_time (const file_entry *a, const file_entry *b);
--int sort_atime (const file_entry *a, const file_entry *b);
--int sort_ctime (const file_entry *a, const file_entry *b);
--int sort_size (const file_entry *a, const file_entry *b);
--int sort_inode (const file_entry *a, const file_entry *b);
-+int unsorted (file_entry *a, file_entry *b);
-+int sort_name (file_entry *a, file_entry *b);
-+int sort_ext (file_entry *a, file_entry *b);
-+int sort_time (file_entry *a, file_entry *b);
-+int sort_atime (file_entry *a, file_entry *b);
-+int sort_ctime (file_entry *a, file_entry *b);
-+int sort_size (file_entry *a, file_entry *b);
-+int sort_inode (file_entry *a, file_entry *b);
-
- /* SORT_TYPES is used to build the nice dialog box entries */
- #define SORT_TYPES 8
-@@ -62,7 +67,7 @@ int sort_inode (const file_entry *a, con
-
- typedef struct {
- const char *sort_name;
-- int (*sort_fn)(const file_entry *, const file_entry *);
-+ int (*sort_fn)(file_entry *, file_entry *);
- } sort_orders_t;
-
- extern sort_orders_t sort_orders [SORT_TYPES_TOTAL];
-diff -rupbBN mc.orig/src/find.c mc/src/find.c
---- mc.orig/src/find.c 2007-12-06 18:43:33.000000000 +0100
-+++ mc/src/find.c 2007-12-06 18:34:25.000000000 +0100
-@@ -1045,6 +1045,8 @@ find_file (char *start_dir, char *patter
- list->list[next_free].f.stale_link = stale_link;
- list->list[next_free].f.dir_size_computed = 0;
- list->list[next_free].st = st;
-+ list->list[next_free].sort_key = NULL;
-+ list->list[next_free].second_sort_key = NULL;
- next_free++;
- if (!(next_free & 15))
- rotate_dash ();
-diff -rupbBN mc.orig/src/panelize.c mc/src/panelize.c
---- mc.orig/src/panelize.c 2007-12-06 18:43:33.000000000 +0100
-+++ mc/src/panelize.c 2007-12-06 18:34:29.000000000 +0100
-@@ -402,6 +402,8 @@ static void do_external_panelize (char *
- list->list [next_free].f.stale_link = stale_link;
- list->list [next_free].f.dir_size_computed = 0;
- list->list [next_free].st = st;
-+ list->list[next_free].sort_key = NULL;
-+ list->list[next_free].second_sort_key = NULL;
- next_free++;
- if (!(next_free & 32))
- rotate_dash ();
Deleted: trunk/debian/patches/29_mc-21-hotlist.patch
===================================================================
--- trunk/debian/patches/29_mc-21-hotlist.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-21-hotlist.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,317 +0,0 @@
-diff -rupbB mc.orig/src/hotlist.c mc/src/hotlist.c
---- mc.orig/src/hotlist.c 2007-11-04 14:58:39.000000000 +0100
-+++ mc/src/hotlist.c 2007-11-11 13:31:18.000000000 +0100
-@@ -51,6 +51,7 @@
- #include "key.h" /* KEY_M_CTRL */
- #include "command.h" /* cmdline */
- #include "glibcompat.h" /* g_strlcpy for glib < 2.0 */
-+#include "strutil.h"
-
- #define UX 5
- #define UY 2
-@@ -189,15 +190,15 @@ update_path_name (void)
- }
- if (!hotlist_state.moving)
- label_set_text (pname,
-- name_trunc (text, dlg->cols - (UX * 2 + 4)));
-+ str_trunc (text, dlg->cols - (UX * 2 + 4)));
-
- p = g_strconcat (" ", current_group->label, " ", (char *) NULL);
- if (!hotlist_state.moving)
- label_set_text (pname_group,
-- name_trunc (p, dlg->cols - (UX * 2 + 4)));
-+ str_trunc (p, dlg->cols - (UX * 2 + 4)));
- else
- label_set_text (movelist_group,
-- name_trunc (p, dlg->cols - (UX * 2 + 4)));
-+ str_trunc (p, dlg->cols - (UX * 2 + 4)));
- g_free (p);
-
- dlg_redraw (dlg);
-@@ -217,23 +218,20 @@ do { \
- static void fill_listbox (void)
- {
- struct hotlist *current = current_group->head;
-- static char *buf;
-- static int buflen;
-+ struct str_buffer *buff;
-
-- if (!buf)
-- buf = g_malloc (buflen = 1024);
-- buf[0] = '\0';
-+ buff = str_get_buffer ();
-
- while (current){
- switch (current->type) {
- case HL_TYPE_GROUP:
- {
-- CHECK_BUFFER;
-- strcat (strcat (buf, "->"), current->label);
-+ str_insert_string ("->", buff);
-+ str_insert_string (current->label, buff);
- if (hotlist_state.moving)
-- listbox_add_item (l_movelist, 0, 0, buf, current);
-+ listbox_add_item (l_movelist, 0, 0, buff->data, current);
- else
-- listbox_add_item (l_hotlist, 0, 0, buf, current);
-+ listbox_add_item (l_hotlist, 0, 0, buff->data, current);
- }
- break;
- case HL_TYPE_DOTDOT:
-@@ -248,9 +246,9 @@ static void fill_listbox (void)
- }
- current = current->next;
- }
--}
-
--#undef CHECK_BUFFER
-+ str_release_buffer (buff);
-+}
-
- static void
- unlink_entry (struct hotlist *entry)
-@@ -564,7 +562,7 @@ init_i18n_stuff(int list_type, int cols)
-
- row = hotlist_but [i].y;
- ++count [row];
-- len [row] += strlen (hotlist_but [i].text) + 5;
-+ len [row] += str_term_width1 (hotlist_but [i].text) + 5;
- if (hotlist_but [i].flags == DEFPUSH_BUTTON)
- len [row] += 2;
- }
-@@ -589,12 +587,12 @@ init_i18n_stuff(int list_type, int cols)
- /* not first int the row */
- if (!strcmp (hotlist_but [i].text, cancel_but))
- hotlist_but [i].x =
-- cols - strlen (hotlist_but [i].text) - 13;
-+ cols - str_term_width1 (hotlist_but [i].text) - 13;
- else
- hotlist_but [i].x = cur_x [row];
- }
-
-- cur_x [row] += strlen (hotlist_but [i].text) + 2
-+ cur_x [row] += str_term_width1 (hotlist_but [i].text) + 2
- + (hotlist_but [i].flags == DEFPUSH_BUTTON ? 5 : 3);
- }
- }
-@@ -835,7 +833,7 @@ static void add_widgets_i18n(QuickWidget
- for (i = 0; i < 3; i++)
- {
- qw [i].text = _(qw [i].text);
-- l[i] = strlen (qw [i].text) + 3;
-+ l[i] = str_term_width1 (qw [i].text) + 3;
- }
- space = (len - 4 - l[0] - l[1] - l[2]) / 4;
-
-@@ -884,7 +882,7 @@ add_new_entry_input (const char *header,
-
- msglen(text1, &lines1, &cols1);
- msglen(text2, &lines2, &cols2);
-- len = max ((int) strlen (header), cols1);
-+ len = max (str_term_width1 (header), cols1);
- len = max (len, cols2) + 4;
- len = max (len, 64);
-
-@@ -980,7 +978,7 @@ add_new_group_input (const char *header,
- #endif /* ENABLE_NLS */
-
- msglen (label, &lines, &cols);
-- len = max ((int) strlen (header), cols) + 4;
-+ len = max (str_term_width1 (header), cols) + 4;
- len = max (len, 64);
-
- #ifdef ENABLE_NLS
-@@ -1036,7 +1034,7 @@ void add2hotlist_cmd (void)
- {
- char *prompt, *label;
- const char *cp = _("Label for \"%s\":");
-- int l = strlen (cp);
-+ int l = str_term_width1 (cp);
- char *label_string = g_strdup (current_panel->cwd);
-
- strip_password (label_string, 1);
-@@ -1083,7 +1081,7 @@ static void remove_from_hotlist (struct
- int result;
-
- title = g_strconcat (_(" Remove: "),
-- name_trunc (entry->label, 30),
-+ str_trunc (entry->label, 30),
- " ",
- NULL);
-
-@@ -1105,7 +1103,7 @@ static void remove_from_hotlist (struct
- int result;
-
- header = g_strconcat (_(" Remove: "),
-- name_trunc (entry->label, 30),
-+ str_trunc (entry->label, 30),
- " ",
- NULL);
- result = query_dialog (header, _("\n Group not empty.\n Remove it?"),
-@@ -1205,9 +1203,7 @@ load_group (struct hotlist *grp)
- #define TKN_EOF 126
- #define TKN_UNKNOWN 127
-
--static char *tkn_buf;
--static int tkn_buf_length;
--static int tkn_length;
-+static struct str_buffer *tkn_buf = NULL;
-
- static char *hotlist_file_name;
- static FILE *hotlist_file;
-@@ -1217,7 +1213,7 @@ static int hot_skip_blanks (void)
- {
- int c;
-
-- while ((c = getc (hotlist_file)) != EOF && c != '\n' && isspace (c))
-+ while ((c = getc (hotlist_file)) != EOF && c != '\n' && g_ascii_isspace (c))
- ;
- return c;
-
-@@ -1226,15 +1222,10 @@ static int hot_skip_blanks (void)
- static int hot_next_token (void)
- {
- int c;
-+ size_t l;
-
--#define CHECK_BUF() \
--do { \
-- if (tkn_length == tkn_buf_length) \
-- tkn_buf = tkn_buf ? ( g_realloc (tkn_buf, tkn_buf_length += 1024)) \
-- : ( g_malloc (tkn_buf_length = 1024)); \
--} while (0)
--
-- tkn_length = 0;
-+ if (tkn_buf == NULL) tkn_buf = str_get_buffer ();
-+ str_reset_buffer (tkn_buf);
-
- again:
- c = hot_skip_blanks ();
-@@ -1247,15 +1238,8 @@ again:
- break;
- case '#':
- while ((c = getc (hotlist_file)) != EOF && c != '\n') {
-- if (c == EOF)
-- return TKN_EOF;
-- if (c != '\n') {
-- CHECK_BUF();
-- tkn_buf[tkn_length++] = c == '\n' ? ' ' : c;
-+ str_insert_char (c, tkn_buf);
- }
-- }
-- CHECK_BUF();
-- tkn_buf[tkn_length] = '\0';
- return TKN_COMMENT;
- break;
- case '"':
-@@ -1263,13 +1247,10 @@ again:
- if (c == '\\')
- if ((c = getc (hotlist_file)) == EOF)
- return TKN_EOF;
-- CHECK_BUF();
-- tkn_buf[tkn_length++] = c == '\n' ? ' ' : c;
-+ str_insert_char (c == '\n' ? ' ' : c, tkn_buf);
- }
- if (c == EOF)
- return TKN_EOF;
-- CHECK_BUF();
-- tkn_buf[tkn_length] = '\0';
- return TKN_STRING;
- break;
- case '\\':
-@@ -1282,20 +1263,19 @@ again:
-
- default:
- do {
-- CHECK_BUF();
-- tkn_buf[tkn_length++] = toupper(c);
-- } while ((c = fgetc (hotlist_file)) != EOF && isalnum (c));
-+ str_insert_char (g_ascii_toupper (c), tkn_buf);
-+ } while ((c = fgetc (hotlist_file)) != EOF &&
-+ (g_ascii_isalnum (c) || !isascii (c)));
- if (c != EOF)
- ungetc (c, hotlist_file);
-- CHECK_BUF();
-- tkn_buf[tkn_length] = '\0';
-- if (strncmp (tkn_buf, "GROUP", tkn_length) == 0)
-+ l = tkn_buf->size - tkn_buf->remain;
-+ if (strncmp (tkn_buf->data, "GROUP", l) == 0)
- return TKN_GROUP;
-- else if (strncmp (tkn_buf, "ENTRY", tkn_length) == 0)
-+ else if (strncmp (tkn_buf->data, "ENTRY", l) == 0)
- return TKN_ENTRY;
-- else if (strncmp (tkn_buf, "ENDGROUP", tkn_length) == 0)
-+ else if (strncmp (tkn_buf->data, "ENDGROUP", l) == 0)
- return TKN_ENDGROUP;
-- else if (strncmp (tkn_buf, "URL", tkn_length) == 0)
-+ else if (strncmp (tkn_buf->data, "URL", l) == 0)
- return TKN_URL;
- else
- return TKN_UNKNOWN;
-@@ -1330,22 +1310,22 @@ hot_load_group (struct hotlist * grp)
- switch (tkn) {
- case TKN_GROUP:
- CHECK_TOKEN(TKN_STRING);
-- new_grp = add2hotlist (g_strdup (tkn_buf), 0, HL_TYPE_GROUP, 0);
-+ new_grp = add2hotlist (g_strdup (tkn_buf->data), 0, HL_TYPE_GROUP, 0);
- SKIP_TO_EOL;
- hot_load_group (new_grp);
- current_group = grp;
- break;
- case TKN_ENTRY:
- CHECK_TOKEN(TKN_STRING);
-- label = g_strdup (tkn_buf);
-+ label = g_strdup (tkn_buf->data);
- CHECK_TOKEN(TKN_URL);
- CHECK_TOKEN(TKN_STRING);
-- url = g_strdup (tkn_buf);
-+ url = g_strdup (tkn_buf->data);
- add2hotlist (label, url, HL_TYPE_ENTRY, 0);
- SKIP_TO_EOL;
- break;
- case TKN_COMMENT:
-- label = g_strdup (tkn_buf);
-+ label = g_strdup (tkn_buf->data);
- add2hotlist (label, 0, HL_TYPE_COMMENT, 0);
- break;
- case TKN_EOF:
-@@ -1378,22 +1358,22 @@ hot_load_file (struct hotlist * grp)
- switch (tkn) {
- case TKN_GROUP:
- CHECK_TOKEN(TKN_STRING);
-- new_grp = add2hotlist (g_strdup (tkn_buf), 0, HL_TYPE_GROUP, 0);
-+ new_grp = add2hotlist (g_strdup (tkn_buf->data), 0, HL_TYPE_GROUP, 0);
- SKIP_TO_EOL;
- hot_load_group (new_grp);
- current_group = grp;
- break;
- case TKN_ENTRY:
- CHECK_TOKEN(TKN_STRING);
-- label = g_strdup (tkn_buf);
-+ label = g_strdup (tkn_buf->data);
- CHECK_TOKEN(TKN_URL);
- CHECK_TOKEN(TKN_STRING);
-- url = g_strdup (tkn_buf);
-+ url = g_strdup (tkn_buf->data);
- add2hotlist (label, url, HL_TYPE_ENTRY, 0);
- SKIP_TO_EOL;
- break;
- case TKN_COMMENT:
-- label = g_strdup (tkn_buf);
-+ label = g_strdup (tkn_buf->data);
- add2hotlist (label, 0, HL_TYPE_COMMENT, 0);
- break;
- case TKN_EOL:
-@@ -1627,10 +1607,9 @@ void done_hotlist (void)
- hotlist_file_name = 0;
- l_hotlist = 0;
- current_group = 0;
-+
- if (tkn_buf){
-- g_free (tkn_buf);
-- tkn_buf_length = 0;
-- tkn_length = 0;
-+ str_release_buffer (tkn_buf);
- tkn_buf = NULL;
- }
- }
Deleted: trunk/debian/patches/29_mc-22-info.patch
===================================================================
--- trunk/debian/patches/29_mc-22-info.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-22-info.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,91 +0,0 @@
-diff -rupBb mc.orig/src/info.c mc/src/info.c
---- mc.orig/src/info.c 2007-09-26 12:22:25.000000000 +0200
-+++ mc/src/info.c 2007-11-11 14:37:46.000000000 +0100
-@@ -37,6 +37,7 @@
- #include "key.h" /* is_idle() */
- #include "mountlist.h"
- #include "unixcompat.h"
-+#include "strutil.h"
-
- #ifndef VERSION
- # define VERSION "undefined"
-@@ -65,6 +66,7 @@ info_show_info (struct WInfo *info)
- {
- static int i18n_adjust=0;
- static const char *file_label;
-+ struct str_buffer *buff;
-
- struct stat st;
-
-@@ -92,9 +94,11 @@ info_show_info (struct WInfo *info)
- if(!i18n_adjust) {
- /* This printf pattern string is used as a reference for size */
- file_label=_("File: %s");
-- i18n_adjust=strlen(file_label)+2;
-+ i18n_adjust = str_term_width1(file_label) + 2;
- }
-
-+ buff = str_get_buffer ();
-+
- switch (info->widget.lines-2){
- /* Note: all cases are fall-throughs */
-
-@@ -132,21 +136,26 @@ info_show_info (struct WInfo *info)
-
- case 13:
- widget_move (&info->widget, 13, 3);
-- tty_printf (_("Device: %s"),
-- name_trunc (myfs_stats.device, info->widget.cols - i18n_adjust));
-+ str_printf (buff, _("Device: %s"),
-+ str_trunc (myfs_stats.device, info->widget.cols - i18n_adjust));
-+ addstr (str_term_form (buff->data));
-+ str_reset_buffer (buff);
- case 12:
- widget_move (&info->widget, 12, 3);
-- tty_printf (_("Filesystem: %s"),
-- name_trunc (myfs_stats.mpoint, info->widget.cols - i18n_adjust));
--
-+ str_printf (buff, _("Filesystem: %s"),
-+ str_trunc (myfs_stats.mpoint, info->widget.cols - i18n_adjust));
-+ addstr (str_term_form (buff->data));
-+ str_reset_buffer (buff);
- case 11:
- widget_move (&info->widget, 11, 3);
-- tty_printf (_("Accessed: %s"), file_date (st.st_atime));
--
-+ str_printf (buff, _("Accessed: %s"), file_date (st.st_atime));
-+ addstr (str_term_form (buff->data));
-+ str_reset_buffer (buff);
- case 10:
- widget_move (&info->widget, 10, 3);
-- tty_printf (_("Modified: %s"), file_date (st.st_mtime));
--
-+ str_printf (buff, _("Modified: %s"), file_date (st.st_mtime));
-+ addstr (str_term_form (buff->data));
-+ str_reset_buffer (buff);
- case 9:
- widget_move (&info->widget, 9, 3);
- /* TRANSLATORS: "Status changed", like in the stat(2) man page */
-@@ -195,9 +204,11 @@ info_show_info (struct WInfo *info)
- widget_move (&info->widget, 3, 2);
- /* .ado: fname is invalid if selected == 0 && info called from current panel */
- if (current_panel->selected){
-- tty_printf (file_label,
-- name_trunc (current_panel->dir.list [current_panel->selected].fname,
-+ str_printf (buff, file_label,
-+ str_trunc (current_panel->dir.list [current_panel->selected].fname,
- info->widget.cols - i18n_adjust));
-+ addstr (str_term_form (buff->data));
-+ str_reset_buffer (buff);
- } else
- addstr (_("File: None"));
-
-@@ -206,6 +217,8 @@ info_show_info (struct WInfo *info)
- case 0:
- ;
- } /* switch */
-+
-+ str_release_buffer (buff);
- }
-
- static void info_hook (void *data)
Deleted: trunk/debian/patches/29_mc-23-profile.patch
===================================================================
--- trunk/debian/patches/29_mc-23-profile.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-23-profile.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,81 +0,0 @@
-diff -rupBb mc.orig/src/profile.c mc/src/profile.c
---- mc.orig/src/profile.c 2007-09-26 12:22:25.000000000 +0200
-+++ mc/src/profile.c 2007-10-30 01:19:35.000000000 +0100
-@@ -31,6 +31,7 @@
-
- #include "global.h"
- #include "profile.h"
-+#include "strutil.h"
-
- #define STRSIZE 4096
- #define overflow (next == &CharBuffer [STRSIZE-1])
-@@ -63,7 +64,7 @@ find_loaded (const char *FileName, TSecH
- TProfile *p = Base;
-
- while (p) {
-- if (!g_strcasecmp (FileName, p->FileName)) {
-+ if (!str_casecmp (FileName, p->FileName)) {
- *section = p->Section;
- return p;
- }
-@@ -292,10 +293,10 @@ GetSetProfileChar (int set, const char *
-
- /* Start search */
- for (; section; section = section->link){
-- if (section->AppName == 0 || g_strcasecmp (section->AppName, AppName))
-+ if (section->AppName == 0 || str_casecmp (section->AppName, AppName))
- continue;
- for (key = section->Keys; key; key = key->link){
-- if ( g_strcasecmp (key->KeyName, KeyName))
-+ if (str_casecmp (key->KeyName, KeyName))
- continue;
- if (set){
- g_free (key->Value);
-@@ -361,9 +362,9 @@ int GetPrivateProfileInt (const char * A
-
- /* Check the exact semantic with the SDK */
- GetPrivateProfileString (AppName, KeyName, buf, IntBuf, BUF_TINY, File);
-- if (! g_strcasecmp (IntBuf, "true"))
-+ if (!str_casecmp (IntBuf, "true"))
- return 1;
-- if (! g_strcasecmp (IntBuf, "yes"))
-+ if (!str_casecmp (IntBuf, "yes"))
- return 1;
- return (int) atol (IntBuf);
- }
-@@ -489,7 +490,7 @@ void *profile_init_iterator (const char
- section = Current->Section;
- }
- for (; section; section = section->link){
-- if ( g_strcasecmp (section->AppName, appname))
-+ if (str_casecmp (section->AppName, appname))
- continue;
- return section->Keys;
- }
-@@ -521,7 +522,7 @@ void profile_clean_section (const char *
- /* won't be find by further walks of the structure */
-
- for (; section; section = section->link){
-- if ( g_strcasecmp (section->AppName, appname))
-+ if (str_casecmp (section->AppName, appname))
- continue;
- section->AppName [0] = 0;
- }
-@@ -536,7 +537,7 @@ int profile_has_section (const char *sec
- return 0;
- }
- for (; section; section = section->link){
-- if ( g_strcasecmp (section->AppName, section_name))
-+ if (str_casecmp (section->AppName, section_name))
- continue;
- return 1;
- }
-@@ -548,7 +549,7 @@ void profile_forget_profile (const char
- TProfile *p;
-
- for (p = Base; p; p = p->link){
-- if ( g_strcasecmp (file, p->FileName))
-+ if (str_casecmp (file, p->FileName))
- continue;
- p->FileName [0] = 0;
- }
Deleted: trunk/debian/patches/29_mc-24-achown.patch
===================================================================
--- trunk/debian/patches/29_mc-24-achown.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-24-achown.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,88 +0,0 @@
-diff -rupBb mc.orig/src/achown.c mc/src/achown.c
---- mc.orig/src/achown.c 2007-11-04 17:01:37.000000000 +0100
-+++ mc/src/achown.c 2007-11-06 00:54:35.000000000 +0100
-@@ -35,6 +35,7 @@
- #include "widget.h"
- #include "wtools.h" /* For init_box_colors() */
- #include "key.h" /* XCTRL and ALT macros */
-+#include "strutil.h"
-
- #include "dir.h"
- #include "panel.h" /* Needed for the externs */
-@@ -373,7 +374,7 @@ static void chown_info_update (void)
-
- /* name && mode */
- dlg_move (ch_dlg, 3, 8);
-- tty_printf ("%s", name_trunc (fname, 45));
-+ addstr (str_fit_to_term (fname, 45, J_LEFT_FIT));
- dlg_move (ch_dlg, BY + 2, 9);
- tty_printf ("%12o", get_mode ());
-
-@@ -545,7 +546,7 @@ init_chown_advanced (void)
- int dx, cx;
- for (i = 0 ; i < n_elem ; i++) {
- chown_advanced_but[i].text = _(chown_advanced_but[i].text);
-- i18n_len += strlen (chown_advanced_but[i].text) + 3;
-+ i18n_len += str_term_width1 (chown_advanced_but[i].text) + 3;
- if (DEFPUSH_BUTTON == chown_advanced_but[i].flags)
- i18n_len += 2; /* "<>" */
- }
-@@ -554,7 +555,7 @@ init_chown_advanced (void)
- /* Reversed order */
- for (i = n_elem - 1; i >= 0; i--) {
- chown_advanced_but[i].x = cx;
-- cx += strlen (chown_advanced_but[i].text) + 3 + dx;
-+ cx += str_term_width1 (chown_advanced_but[i].text) + 3 + dx;
- }
- }
- #endif /* ENABLE_NLS */
-diff -rupBb mc.orig/src/chmod.c mc/src/chmod.c
---- mc.orig/src/chmod.c 2007-09-26 12:22:25.000000000 +0200
-+++ mc/src/chmod.c 2007-11-06 00:59:04.000000000 +0100
-@@ -36,6 +36,7 @@
- #include "panel.h" /* do_file_mark() */
- #include "main.h" /* update_panels() */
- #include "chmod.h"
-+#include "strutil.h"
-
- static int single_set;
-
-@@ -296,11 +297,11 @@ void chmod_cmd (void)
- }
-
- /* Set the labels */
-- c_fname = name_trunc (fname, 21);
-+ c_fname = str_trunc (fname, 21);
- add_widget (ch_dlg, label_new (FY+2, FX+2, c_fname));
-- c_fown = name_trunc (get_owner (sf_stat.st_uid), 21);
-+ c_fown = str_trunc (get_owner (sf_stat.st_uid), 21);
- add_widget (ch_dlg, label_new (FY+6, FX+2, c_fown));
-- c_fgrp = name_trunc (get_group (sf_stat.st_gid), 21);
-+ c_fgrp = str_trunc (get_group (sf_stat.st_gid), 21);
- add_widget (ch_dlg, label_new (FY+8, FX+2, c_fgrp));
- g_snprintf (buffer, sizeof (buffer), "%o", c_stat);
- statl = label_new (FY+4, FX+2, buffer);
-diff -rupBb mc.orig/src/chown.c mc/src/chown.c
---- mc.orig/src/chown.c 2007-09-26 12:22:25.000000000 +0200
-+++ mc/src/chown.c 2007-11-06 00:58:04.000000000 +0100
-@@ -33,6 +33,7 @@
- #include "color.h"
- #include "dialog.h"
- #include "widget.h"
-+#include "strutil.h"
-
- /* Needed for the extern declarations of integer parameters */
- #include "dir.h"
-@@ -268,9 +269,9 @@ chown_cmd (void)
- if (fe)
- listbox_select_entry (l_group, fe);
-
-- chown_label (0, name_trunc (fname, 15));
-- chown_label (1, name_trunc (get_owner (sf_stat.st_uid), 15));
-- chown_label (2, name_trunc (get_group (sf_stat.st_gid), 15));
-+ chown_label (0, str_trunc (fname, 15));
-+ chown_label (1, str_trunc (get_owner (sf_stat.st_uid), 15));
-+ chown_label (2, str_trunc (get_group (sf_stat.st_gid), 15));
- size_trunc_len (buffer, 15, sf_stat.st_size, 0);
- chown_label (3, buffer);
- chown_label (4, string_perm (sf_stat.st_mode));
Deleted: trunk/debian/patches/29_mc-25-key.patch
===================================================================
--- trunk/debian/patches/29_mc-25-key.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-25-key.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,41 +0,0 @@
-diff -rupBb mc.orig/src/key.c mc/src/key.c
---- mc.orig/src/key.c 2007-11-06 02:06:26.000000000 +0100
-+++ mc/src/key.c 2007-11-06 02:06:54.000000000 +0100
-@@ -919,7 +919,7 @@ int get_key_code (int no_delay)
- if (parent != NULL && parent->action == MCKEY_ESCAPE) {
-
- /* Convert escape-digits to F-keys */
-- if (isdigit(c))
-+ if (g_ascii_isdigit(c))
- c = KEY_F (c - '0');
- else if (c == ' ')
- c = ESC_CHAR;
-diff -rupBb mc.orig/src/learn.c mc/src/learn.c
---- mc.orig/src/learn.c 2007-09-25 17:33:37.000000000 +0200
-+++ mc/src/learn.c 2007-11-06 02:07:42.000000000 +0100
-@@ -42,6 +42,7 @@
- #include "main.h"
- #include "learn.h"
- #include "wtools.h"
-+#include "strutil.h"
-
- #define UX 4
- #define UY 3
-@@ -202,7 +203,7 @@ learn_check_key (int c)
-
- /* Prevent from disappearing if a non-defined sequence is pressed
- and contains a button hotkey. Only recognize hotkeys with ALT. */
-- if (c < 255 && isalnum (c))
-+ if (c < 255 && g_ascii_isalnum (c))
- return 1;
-
- return 0;
-@@ -238,7 +239,7 @@ init_learn (void)
- learn_but[0].x = 78 / 2 + 4;
-
- learn_but[1].text = _(learn_but[1].text);
-- learn_but[1].x = 78 / 2 - (strlen (learn_but[1].text) + 9);
-+ learn_but[1].x = 78 / 2 - (str_term_width1 (learn_but[1].text) + 9);
-
- learn_title = _(learn_title);
- i18n_flag = 1;
Deleted: trunk/debian/patches/29_mc-26-help.patch
===================================================================
--- trunk/debian/patches/29_mc-26-help.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-26-help.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,198 +0,0 @@
-diff -rupbBN mc.orig/src/help.c mc/src/help.c
---- mc.orig/src/help.c 2007-12-01 01:59:46.000000000 +0100
-+++ mc/src/help.c 2007-11-30 17:13:20.000000000 +0100
-@@ -59,6 +59,7 @@
- #include "dialog.h" /* For Dlg_head */
- #include "widget.h" /* For Widget */
- #include "wtools.h" /* For common_dialog_repaint() */
-+#include "strutil.h"
-
- #define MAXLINKNAME 80
- #define HISTORY_SIZE 20
-@@ -69,7 +70,13 @@
- #define STRING_LINK_END "\03"
- #define STRING_NODE_END "\04"
-
--static char *data; /* Pointer to the loaded data file */
-+/* every help file is supposed to be in utf-8 and is translated to terminal
-+ * encoding */
-+/* buffer for translation */
-+static struct str_buffer *translated_data = NULL;
-+/* point into translated_data->data or in NULL,
-+ * if help file could not be converted */
-+static char *data;
- static int help_lines; /* Lines in help viewer */
- static int history_ptr; /* For the history queue */
- static const char *main_node; /* The main node */
-@@ -113,7 +120,7 @@ search_string (const char *start, const
- while (*d){
- if (*d == '\n')
- *d = ' ';
-- d++;
-+ str_next_char (&d);
- }
- /* Do search */
- for (d = local_text; *e; e++){
-@@ -174,7 +181,9 @@ static const char *move_forward2 (const
- int line;
-
- currentpoint = c;
-- for (line = 0, p = currentpoint; *p && *p != CHAR_NODE_END; p++){
-+ for (line = 0, p = currentpoint; *p && *p != CHAR_NODE_END;
-+ str_cnext_char (&p)){
-+
- if (line == lines)
- return currentpoint = p;
- if (*p == '\n')
-@@ -189,12 +198,14 @@ static const char *move_backward2 (const
- int line;
-
- currentpoint = c;
-- for (line = 0, p = currentpoint; *p && p >= data; p--){
-+ for (line = 0, p = currentpoint; *p && p >= data;
-+ str_cprev_char (&p)) {
-+
- if (*p == CHAR_NODE_END)
- {
- /* We reached the beginning of the node */
- /* Skip the node headers */
-- while (*p != ']') p++;
-+ while (*p != ']') str_cnext_char (&p);
- return currentpoint = p + 2; /* Skip the newline following the start of the node */
- }
- if (*(p - 1) == '\n')
-@@ -334,12 +345,13 @@ static void clear_link_areas (void)
-
- static void help_show (Dlg_head *h, const char *paint_start)
- {
-- const char *p;
-- int col, line, c;
-+ const char *p, *n;
-+ int col, line, c, w;
- int painting = 1;
- int acs; /* Flag: Alternate character set active? */
- int repeat_paint;
- int active_col, active_line;/* Active link position */
-+ static char buff[MB_LEN_MAX + 1];
-
- attrset (HELP_NORMAL_COLOR);
- do {
-@@ -350,8 +362,15 @@ static void help_show (Dlg_head *h, cons
- if (selected_item < paint_start)
- selected_item = NULL;
-
-- for (p = paint_start; *p && *p != CHAR_NODE_END && line < help_lines; p++) {
-- c = (unsigned char)*p;
-+ p = paint_start;
-+ n = paint_start;
-+ while (n[0] != '\0' && n[0] != CHAR_NODE_END && line < help_lines) {
-+ p = n;
-+ n = str_cget_next_char (p);
-+ memcpy (buff, p, n - p);
-+ buff[n - p] = '\0';
-+ c = (unsigned char) buff[0];
-+
- switch (c){
- case CHAR_LINK_START:
- if (selected_item == NULL)
-@@ -384,7 +403,7 @@ static void help_show (Dlg_head *h, cons
- case CHAR_VERSION:
- dlg_move (h, line+2, col+2);
- addstr (VERSION);
-- col += strlen (VERSION);
-+ col += str_term_width1 (VERSION);
- break;
- case CHAR_FONT_BOLD:
- attrset (HELP_BOLD_COLOR);
-@@ -400,12 +419,13 @@ static void help_show (Dlg_head *h, cons
- col = 0;
- break;
- case '\t':
-- col = (col/8 + 1) * 8;
-+ col = (col / 8 + 1) * 8;
- break;
- default:
- if (!painting)
- continue;
-- if (col > HELP_WINDOW_WIDTH-1)
-+ w = str_term_width1 (buff);
-+ if (col + w > HELP_WINDOW_WIDTH)
- continue;
-
- dlg_move (h, line+2, col+2);
-@@ -418,9 +438,10 @@ static void help_show (Dlg_head *h, cons
- #else
- SLsmg_draw_object (h->y + line + 2, h->x + col + 2, c);
- #endif
-- } else
-- addch (c);
-- col++;
-+ } else {
-+ addstr (buff);
-+ }
-+ col+= w;
- break;
- }
- }
-@@ -753,7 +774,28 @@ static void
- interactive_display_finish (void)
- {
- clear_link_areas ();
-- g_free (data);
-+}
-+
-+/* translate help file into terminal encoding
-+ * translated_data is initialized */
-+static void
-+translate_file (char *filedata)
-+{
-+ str_conv_t conv;
-+
-+ if (translated_data == NULL) translated_data = str_get_buffer ();
-+
-+ str_reset_buffer (translated_data);
-+ conv = str_crt_conv_from ("UTF-8");
-+
-+ if (conv != INVALID_CONV) {
-+ if (str_convert (conv, filedata, translated_data) != ESTR_FAILURE) {
-+ data = translated_data->data;
-+ } else {
-+ data = NULL;
-+ }
-+ str_close_conv (conv);
-+ }
- }
-
- void
-@@ -762,13 +804,14 @@ interactive_display (const char *filenam
- WButtonBar *help_bar;
- Widget *md;
- char *hlpfile = NULL;
-+ char *filedata;
-
- if (filename)
-- data = load_file (filename);
-+ filedata = load_file (filename);
- else
-- data = load_mc_home_file ("mc.hlp", &hlpfile);
-+ filedata = load_mc_home_file ("mc.hlp", &hlpfile);
-
-- if (data == NULL) {
-+ if (filedata == NULL) {
- message (1, MSG_ERROR, _(" Cannot open file %s \n %s "), filename ? filename : hlpfile,
- unix_error_string (errno));
- }
-@@ -776,6 +819,13 @@ interactive_display (const char *filenam
- if (!filename)
- g_free (hlpfile);
-
-+ if (filedata == NULL)
-+ return;
-+
-+ translate_file (filedata);
-+
-+ g_free (filedata);
-+
- if (!data)
- return;
-
Deleted: trunk/debian/patches/29_mc-27-hint.patch
===================================================================
--- trunk/debian/patches/29_mc-27-hint.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-27-hint.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,48 +0,0 @@
-diff -rupBb mc.orig/src/cmd.c mc/src/cmd.c
---- mc.orig/src/cmd.c 2007-11-04 14:58:39.000000000 +0100
-+++ mc/src/cmd.c 2007-11-06 13:53:25.000000000 +0100
-@@ -61,6 +61,7 @@
- #include "setup.h" /* save_setup() */
- #include "profile.h" /* PROFILE_NAME */
- #include "execute.h" /* toggle_panels() */
-+#include "strutil.h"
-
- #ifndef MAP_FILE
- # define MAP_FILE 0
-@@ -1048,11 +1049,13 @@ char *guess_message_value (void)
- char *
- get_random_hint (int force)
- {
-- char *data, *result, *eol;
-+ char *data, *result = NULL, *eol;
- int len;
- int start;
- static int last_sec;
- static struct timeval tv;
-+ str_conv_t conv;
-+ struct str_buffer *buffer;
-
- /* Do not change hints more often than one minute */
- gettimeofday (&tv, NULL);
-@@ -1078,7 +1081,20 @@ get_random_hint (int force)
- eol = strchr (&data[start], '\n');
- if (eol)
- *eol = 0;
-- result = g_strdup (&data[start]);
-+
-+ /* hint files are stored in utf-8 */
-+ /* try convert hint file from utf-8 to terminal encoding */
-+ conv = str_crt_conv_from ("UTF-8");
-+ if (conv != INVALID_CONV) {
-+ buffer = str_get_buffer ();
-+ if (str_convert (conv, &data[start], buffer) != ESTR_FAILURE) {
-+ result = g_strdup (buffer->data);
-+ }
-+
-+ str_release_buffer (buffer);
-+ str_close_conv (conv);
-+ }
-+
- g_free (data);
- return result;
- }
Deleted: trunk/debian/patches/29_mc-28-fix.patch
===================================================================
--- trunk/debian/patches/29_mc-28-fix.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-28-fix.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,495 +0,0 @@
-diff -rupbBN mc.orig/src/cmd.c mc/src/cmd.c
---- mc.orig/src/cmd.c 2007-12-07 11:37:49.000000000 +0100
-+++ mc/src/cmd.c 2007-12-07 11:37:51.000000000 +0100
-@@ -903,7 +903,7 @@ do_link (int symbolic_link, const char *
- char *dest = NULL, *src = NULL;
-
- if (!symbolic_link) {
-- src = g_strdup_printf (_("Link %s to:"), name_trunc (fname, 46));
-+ src = g_strdup_printf (_("Link %s to:"), str_trunc (fname, 46));
- dest = input_expand_dialog (_(" Link "), src, "");
- if (!dest || !*dest)
- goto cleanup;
-@@ -968,7 +968,7 @@ void edit_symlink_cmd (void)
-
- p = selection (current_panel)->fname;
-
-- q = g_strdup_printf (_(" Symlink `%s\' points to: "), name_trunc (p, 32));
-+ q = g_strdup_printf (_(" Symlink `%s\' points to: "), str_trunc (p, 32));
-
- i = readlink (p, buffer, MC_MAXPATHLEN - 1);
- if (i > 0) {
-diff -rupbBN mc.orig/src/main.c mc/src/main.c
---- mc.orig/src/main.c 2007-12-07 11:37:49.000000000 +0100
-+++ mc/src/main.c 2007-12-07 11:37:51.000000000 +0100
-@@ -706,7 +706,7 @@ load_prompt (int fd, void *unused)
- int prompt_len;
-
- tmp_prompt = strip_ctrl_codes (subshell_prompt);
-- prompt_len = strlen (tmp_prompt);
-+ prompt_len = str_term_width1 (tmp_prompt);
-
- /* Check for prompts too big */
- if (COLS > 8 && prompt_len > COLS - 8) {
-@@ -1607,17 +1607,12 @@ midnight_callback (struct Dlg_head *h, d
- void
- update_xterm_title_path (void)
- {
-- char *p, *s;
-+ const char *p;
-
- if (xterm_flag && xterm_title) {
-- p = s = g_strdup (strip_home_and_password (current_panel->cwd));
-- do {
-- if (!is_printable ((unsigned char) *s))
-- *s = '?';
-- } while (*++s);
-- fprintf (stdout, "\33]0;mc - %s\7", p);
-+ p = strip_home_and_password (current_panel->cwd);
-+ fprintf (stdout, "\33]0;mc - %s\7", str_term_form (p));
- fflush (stdout);
-- g_free (p);
- }
- }
-
-@@ -2056,7 +2051,7 @@ handle_args (int argc, char *argv[])
- if (!STRNCOMP (base, "mce", 3) || !STRCOMP (base, "vi")) {
- edit_one_file = "";
- if (tmp) {
-- if (*tmp == '+' && isdigit ((unsigned char) tmp[1])) {
-+ if (*tmp == '+' && g_ascii_isdigit ((gchar) tmp[1])) {
- int start_line = atoi (tmp);
- if (start_line > 0) {
- char *file = poptGetArg (ctx);
-diff -rupbBN mc.orig/src/panelize.c mc/src/panelize.c
---- mc.orig/src/panelize.c 2007-12-07 11:37:48.000000000 +0100
-+++ mc/src/panelize.c 2007-12-07 11:37:51.000000000 +0100
-@@ -43,6 +43,7 @@
- #include "panel.h" /* current_panel */
- #include "main.h" /* repaint_screen */
- #include "panelize.h"
-+#include "strutil.h"
-
- #define UX 5
- #define UY 2
-@@ -128,7 +129,7 @@ init_panelize (void)
- i = sizeof (panelize_but) / sizeof (panelize_but[0]);
- while (i--) {
- panelize_but[i].text = _(panelize_but[i].text);
-- maxlen += strlen (panelize_but[i].text) + 5;
-+ maxlen += str_term_width1 (panelize_but[i].text) + 5;
- }
- maxlen += 10;
-
-@@ -137,11 +138,11 @@ init_panelize (void)
- panelize_cols = max (panelize_cols, maxlen);
-
- panelize_but[2].x =
-- panelize_but[3].x + strlen (panelize_but[3].text) + 7;
-+ panelize_but[3].x + str_term_width1 (panelize_but[3].text) + 7;
- panelize_but[1].x =
-- panelize_but[2].x + strlen (panelize_but[2].text) + 5;
-+ panelize_but[2].x + str_term_width1 (panelize_but[2].text) + 5;
- panelize_but[0].x =
-- panelize_cols - strlen (panelize_but[0].text) - 8 - BX;
-+ panelize_cols - str_term_width1 (panelize_but[0].text) - 8 - BX;
-
- #endif /* ENABLE_NLS */
-
-diff -rupbBN mc.orig/src/subshell.c mc/src/subshell.c
---- mc.orig/src/subshell.c 2007-12-07 11:37:49.000000000 +0100
-+++ mc/src/subshell.c 2007-12-07 11:37:51.000000000 +0100
-@@ -52,6 +52,7 @@
- #include "cons.saver.h" /* handle_console() */
- #include "key.h" /* XCTRL */
- #include "subshell.h"
-+#include "strutil.h"
-
- #ifndef WEXITSTATUS
- # define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
-@@ -700,8 +701,10 @@ static char *
- subshell_name_quote (const char *s)
- {
- char *ret, *d;
-+ const char *su, *n;
- const char quote_cmd_start[] = "\"`printf \"%b\" '";
- const char quote_cmd_end[] = "'`\"";
-+ int c;
-
- /* Factor 5 because we need \, 0 and 3 other digits per character. */
- d = ret = g_malloc (1 + (5 * strlen (s)) + (sizeof(quote_cmd_start) - 1)
-@@ -724,14 +727,20 @@ subshell_name_quote (const char *s)
- * sequence of the form \0nnn, where "nnn" is the numeric value of the
- * character converted to octal number.
- */
-- for (; *s; s++) {
-- if (isalnum ((unsigned char) *s)) {
-- *d++ = (unsigned char) *s;
-+ su = s;
-+ for (; su[0] != '\0'; ) {
-+ n = str_cget_next_char_safe (su);
-+ if (str_isalnum (su)) {
-+ memcpy (d, su, n - su);
-+ d+= n - su;
- } else {
-- sprintf (d, "\\0%03o", (unsigned char) *s);
-+ for (c = 0; c < n - su; c++) {
-+ sprintf (d, "\\0%03o", (unsigned char) su[c]);
- d += 5;
- }
- }
-+ su = n;
-+ }
-
- strcpy (d, quote_cmd_end);
-
-diff -rupbBN mc.orig/src/tree.c mc/src/tree.c
---- mc.orig/src/tree.c 2007-12-07 11:37:49.000000000 +0100
-+++ mc/src/tree.c 2007-12-07 11:37:51.000000000 +0100
-@@ -49,6 +49,7 @@
- #include "tree.h"
- #include "treestore.h"
- #include "cmd.h"
-+#include "strutil.h"
-
- #define tlines(t) (t->is_panel ? t->widget.lines-2 - (show_mini_info ? 2 : 0) : t->widget.lines)
-
-@@ -176,12 +177,14 @@ static void tree_show_mini_info (WTree *
- attrset (DLG_FOCUSC (h));
- addch (PATH_SEP);
-
-- addstr ((char *) name_trunc (tree->search_buffer, tree_cols-2));
-+ addstr (str_fit_to_term (tree->search_buffer,
-+ tree_cols - 2, J_LEFT_FIT));
- addch (' ');
- attrset (DLG_FOCUSC (h));
- } else {
- /* Show full name of selected directory */
-- addstr ((char *) name_trunc (tree->selected_ptr->name, tree_cols));
-+ addstr (str_fit_to_term (tree->selected_ptr->name,
-+ tree_cols, J_LEFT_FIT));
- }
- }
-
-@@ -267,7 +270,7 @@ static void show_tree (WTree *tree)
- }
-
- /* Show full name */
-- addstr ((char *) name_trunc (current->name, tree_cols - 6));
-+ addstr (str_fit_to_term (current->name, tree_cols - 6, J_LEFT_FIT));
- } else{
- /* Sub level directory */
-
-@@ -301,8 +304,8 @@ static void show_tree (WTree *tree)
-
- /* Show sub-name */
- addch (' ');
-- addstr ((char *) name_trunc (current->subname,
-- tree_cols - 2 - 4 - 3 * j));
-+ addstr (str_fit_to_term (current->subname,
-+ tree_cols - 2 - 4 - 3 * j, J_LEFT_FIT));
- }
- addch (' ');
-
-@@ -597,7 +600,7 @@ static void tree_copy (WTree *tree, cons
- if (!tree->selected_ptr)
- return;
- g_snprintf (cmd_buf, sizeof(cmd_buf), _("Copy \"%s\" directory to:"),
-- name_trunc (tree->selected_ptr->name, 50));
-+ str_trunc (tree->selected_ptr->name, 50));
- dest = input_expand_dialog (_(" Copy "), cmd_buf, default_dest);
-
- if (!dest)
-@@ -640,7 +643,7 @@ static void tree_move (WTree *tree, cons
- if (!tree->selected_ptr)
- return;
- g_snprintf (cmd_buf, sizeof (cmd_buf), _("Move \"%s\" directory to:"),
-- name_trunc (tree->selected_ptr->name, 50));
-+ str_trunc (tree->selected_ptr->name, 50));
- dest = input_expand_dialog (_(" Move "), cmd_buf, default_dest);
- if (!dest)
- return;
-diff -rupbBN mc.orig/src/tty.c mc/src/tty.c
---- mc.orig/src/tty.c 2007-12-07 11:37:49.000000000 +0100
-+++ mc/src/tty.c 2007-12-07 11:37:51.000000000 +0100
-@@ -32,6 +32,7 @@
- #include "global.h"
- #include "color.h"
- #include "main.h" /* for slow_terminal */
-+#include "strutil.h"
-
- #ifdef USE_NCURSES
- #define WANT_TERM_H
-@@ -159,9 +160,9 @@ extern void
- tty_print_string(const char *s)
- {
- #ifdef HAVE_SLANG
-- SLsmg_write_string(str_unconst(s));
-+ SLsmg_write_string (str_unconst (str_term_form (s)));
- #else
-- addstr(s);
-+ addstr (str_term_form (s));
- #endif
- }
-
-diff -rupbBN mc.orig/src/user.c mc/src/user.c
---- mc.orig/src/user.c 2007-12-07 11:37:49.000000000 +0100
-+++ mc/src/user.c 2007-12-07 11:37:51.000000000 +0100
-@@ -33,6 +33,7 @@
- #include "layout.h"
- #include "execute.h"
- #include "setup.h"
-+#include "strutil.h"
-
- #include "../edit/edit.h" /* BLOCK_FILE */
- #include "../edit/edit-widget.h" /* WEdit */
-@@ -183,7 +184,7 @@ expand_format (struct WEdit *edit_widget
- if (edit_one_file != NULL)
- fname = edit_widget->filename;
- else {
-- if (islower ((unsigned char) c))
-+ if (g_ascii_islower ((gchar) c))
- panel = current_panel;
- else {
- if (get_other_type () != view_listing)
-@@ -198,7 +199,7 @@ expand_format (struct WEdit *edit_widget
- else
- quote_func = fake_name_quote;
-
-- c_lc = tolower ((unsigned char) c);
-+ c_lc = g_ascii_tolower ((gchar) c);
-
- switch (c_lc) {
- case 'f':
-@@ -323,16 +324,22 @@ check_patterns (char *p)
- point after argument. */
- static char *extract_arg (char *p, char *arg, int size)
- {
-+ char *np;
-+
- while (*p && (*p == ' ' || *p == '\t' || *p == '\n'))
- p++;
- /* support quote space .mnu */
-- while (size > 1 && *p && (*p != ' ' || *(p-1) == '\\') && *p != '\t' && *p != '\n') {
-- *arg++ = *p++;
-- size--;
-+ while (*p && (*p != ' ' || *(p-1) == '\\') && *p != '\t' && *p != '\n') {
-+ np = str_get_next_char (p);
-+ if (np - p >= size) break;
-+ memcpy (arg, p, np - p);
-+ arg+= np - p;
-+ size-= np - p;
-+ p = np;
- }
- *arg = 0;
- if (!*p || *p == '\n')
-- p --;
-+ str_prev_char (&p);
- return p;
- }
-
-@@ -409,7 +416,7 @@ static char *test_condition (WEdit *edit
- case '!':
- p = test_condition (edit_widget, p, condition);
- *condition = ! *condition;
-- p--;
-+ str_prev_char (&p);
- break;
- case 'f': /* file name pattern */
- p = extract_arg (p, arg, sizeof (arg));
-@@ -553,7 +560,7 @@ static char *test_line (WEdit *edit_widg
- debug_out (NULL, NULL, 1);
-
- if (!*p || *p == '\n')
-- p --;
-+ str_prev_char (&p);
- return p;
- }
-
-@@ -626,9 +633,9 @@ execute_menu_command (WEdit *edit_widget
- }
- } else if (expand_prefix_found){
- expand_prefix_found = 0;
-- if (isdigit ((unsigned char) *commands)) {
-+ if (g_ascii_isdigit ((gchar) *commands)) {
- do_quote = atoi (commands);
-- while (isdigit ((unsigned char) *commands))
-+ while (g_ascii_isdigit ((gchar) *commands))
- commands++;
- }
- if (*commands == '{')
-@@ -745,7 +752,7 @@ user_menu_cmd (struct WEdit *edit_widget
- /* Parse the menu file */
- old_patterns = easy_patterns;
- p = check_patterns (data);
-- for (menu_lines = col = 0; *p; p++){
-+ for (menu_lines = col = 0; *p; str_next_char (&p)){
- if (menu_lines >= menu_limit){
- char ** new_entries;
-
-@@ -788,7 +795,7 @@ user_menu_cmd (struct WEdit *edit_widget
- selected = menu_lines;
- }
- }
-- else if (*p != ' ' && *p != '\t' && is_printable (*p)) {
-+ else if (*p != ' ' && *p != '\t' && str_isprint (p)) {
- /* A menu entry title line */
- if (accept_entry)
- entries [menu_lines] = p;
-diff -rupbBN mc.orig/src/util.c mc/src/util.c
---- mc.orig/src/util.c 2007-12-07 11:37:48.000000000 +0100
-+++ mc/src/util.c 2007-12-07 16:19:45.000000000 +0100
-@@ -229,27 +229,7 @@ fake_name_quote (const char *s, int quot
- const char *
- name_trunc (const char *txt, int trunc_len)
- {
-- static char x[MC_MAXPATHLEN + MC_MAXPATHLEN];
-- int txt_len;
-- char *p;
--
-- if ((size_t) trunc_len > sizeof (x) - 1) {
-- trunc_len = sizeof (x) - 1;
-- }
-- txt_len = strlen (txt);
-- if (txt_len <= trunc_len) {
-- strcpy (x, txt);
-- } else {
-- int y = (trunc_len / 2) + (trunc_len % 2);
-- strncpy (x, txt, y);
-- strncpy (x + y, txt + txt_len - (trunc_len / 2), trunc_len / 2);
-- x[y] = '~';
-- }
-- x[trunc_len] = 0;
-- for (p = x; *p; p++)
-- if (!is_printable (*p))
-- *p = '?';
-- return x;
-+ return str_trunc (txt, trunc_len);
- }
-
- /*
-@@ -259,12 +239,9 @@ name_trunc (const char *txt, int trunc_l
- */
- const char *
- path_trunc (const char *path, int trunc_len) {
-- const char *ret;
- char *secure_path = strip_password (g_strdup (path), 1);
--
-- ret = name_trunc (secure_path, trunc_len);
-+ const char *ret = str_trunc (secure_path, trunc_len);
- g_free (secure_path);
--
- return ret;
- }
-
-@@ -810,7 +787,7 @@ _icase_search (const char *text, const c
- e += 2;
- dlng += 2;
- }
-- if (toupper((unsigned char) *d) == toupper((unsigned char) *e))
-+ if (g_ascii_toupper((gchar) *d) == g_ascii_toupper((gchar) *e))
- d++;
- else {
- e -= d - text;
-@@ -856,19 +833,23 @@ unix_error_string (int error_num)
- const char *
- skip_separators (const char *s)
- {
-- for (;*s; s++)
-- if (*s != ' ' && *s != '\t' && *s != ',')
-- break;
-- return s;
-+ const char *su = s;
-+
-+ for (;*su; str_cnext_char (&su))
-+ if (*su != ' ' && *su != '\t' && *su != ',') break;
-+
-+ return su;
- }
-
- const char *
- skip_numbers (const char *s)
- {
-- for (;*s; s++)
-- if (!isdigit ((unsigned char) *s))
-- break;
-- return s;
-+ const char *su = s;
-+
-+ for (;*su; str_cnext_char (&su))
-+ if (!str_isdigit (su)) break;
-+
-+ return su;
- }
-
- /* Remove all control sequences from the argument string. We define
-@@ -889,6 +870,7 @@ strip_ctrl_codes (char *s)
- {
- char *w; /* Current position where the stripped data is written */
- char *r; /* Current position where the original data is read */
-+ char *n;
-
- if (!s)
- return 0;
-@@ -910,9 +892,12 @@ strip_ctrl_codes (char *s)
- continue;
- }
-
-- if (is_printable(*r))
-- *w++ = *r;
-- ++r;
-+ n = str_get_next_char (r);
-+ if (str_isprint (r)) {
-+ memmove (w, r, n - r);
-+ w+= n - r;
-+ }
-+ r = n;
- }
- *w = 0;
- return s;
-@@ -1473,21 +1458,10 @@ save_file_position (const char *filename
- extern const char *
- cstrcasestr (const char *haystack, const char *needle)
- {
-- const char *hptr;
-- size_t i, needle_len;
--
-- needle_len = strlen (needle);
-- for (hptr = haystack; *hptr != '\0'; hptr++) {
-- for (i = 0; i < needle_len; i++) {
-- if (toupper ((unsigned char) hptr[i]) !=
-- toupper ((unsigned char) needle[i]))
-- goto next_try;
-- }
-- return hptr;
-- next_try:
-- (void) 0;
-- }
-- return NULL;
-+ char *nee = str_create_search_needle (needle, 0);
-+ const char *result = str_search_first (haystack, nee, 0);
-+ str_release_search_needle (nee, 0);
-+ return result;
- }
-
- const char *
-diff -rupbBN mc.orig/src/win.c mc/src/win.c
---- mc.orig/src/win.c 2007-12-07 11:37:49.000000000 +0100
-+++ mc/src/win.c 2007-12-07 11:37:51.000000000 +0100
-@@ -34,6 +34,7 @@
- #include "win.h"
- #include "key.h" /* XCTRL and ALT macros */
- #include "layout.h"
-+#include "strutil.h"
-
- /*
- * Common handler for standard movement keys in a text area. Provided
-@@ -217,7 +218,7 @@ int lookup_key (char *keyname)
- int i;
-
- for (i = 0; key_name_conv_tab [i].code; i++){
-- if ( g_strcasecmp (key_name_conv_tab [i].name, keyname))
-+ if (str_casecmp (key_name_conv_tab [i].name, keyname))
- continue;
- return key_name_conv_tab [i].code;
- }
Deleted: trunk/debian/patches/29_mc-29-vfs.patch
===================================================================
--- trunk/debian/patches/29_mc-29-vfs.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-29-vfs.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,903 +0,0 @@
-diff -rupbBN mc.orig/src/cmd.c mc/src/cmd.c
---- mc.orig/src/cmd.c 2007-12-07 16:24:34.000000000 +0100
-+++ mc/src/cmd.c 2007-12-07 16:26:30.000000000 +0100
-@@ -1370,3 +1370,60 @@ toggle_listing_cmd (void)
- set_basic_panel_listing_to (current, (p->list_type + 1) % LIST_TYPES);
- }
-
-+/* add "#enc:encodning" to end of path */
-+/* if path end width a previous #enc:, only encoding is changed no additional
-+ * #enc: is appended
-+ * retun new string
-+ */
-+static char
-+*add_encoding_to_path (const char *path, const char *encoding)
-+{
-+ char *result;
-+ char *semi;
-+ char *slash;
-+
-+ semi = g_strrstr (path, "#enc:");
-+
-+ if (semi != NULL) {
-+ slash = strchr (semi, PATH_SEP);
-+ if (slash != NULL) {
-+ result = g_strconcat (path, "/#enc:", encoding, NULL);
-+ } else {
-+ *semi = 0;
-+ result = g_strconcat (path, "/#enc:", encoding, NULL);
-+ *semi = '#';
-+ }
-+ } else {
-+ result = g_strconcat (path, "/#enc:", encoding, NULL);
-+ }
-+
-+ return result;
-+}
-+
-+static void
-+set_panel_encoding (WPanel *panel)
-+{
-+ char *encoding;
-+ char *cd_path;
-+
-+ encoding = input_dialog ("Encoding", "Select encoding", NULL);
-+
-+ if (encoding) {
-+ cd_path = add_encoding_to_path (panel->cwd, encoding);
-+ if (!do_panel_cd (MENU_PANEL, cd_path, 0))
-+ message (1, MSG_ERROR, _(" Cannot chdir to %s "), cd_path);
-+ g_free (cd_path);
-+ }
-+}
-+
-+void
-+encoding_cmd (void)
-+{
-+ WPanel *panel;
-+
-+ if (!SELECTED_IS_PANEL)
-+ return;
-+
-+ panel = MENU_PANEL;
-+ set_panel_encoding (panel);
-+}
-diff -rupbBN mc.orig/src/cmd.h mc/src/cmd.h
---- mc.orig/src/cmd.h 2007-12-07 16:24:34.000000000 +0100
-+++ mc/src/cmd.h 2007-12-07 16:26:30.000000000 +0100
-@@ -57,5 +57,6 @@ void quick_cmd_no_menu (void);
- void info_cmd_no_menu (void);
- void quick_view_cmd (void);
- void toggle_listing_cmd (void);
-+void encoding_cmd (void);
-
- #endif
-diff -rupbBN mc.orig/src/execute.c mc/src/execute.c
---- mc.orig/src/execute.c 2007-12-07 16:24:34.000000000 +0100
-+++ mc/src/execute.c 2007-12-07 16:26:30.000000000 +0100
-@@ -30,6 +30,7 @@
- #include "dialog.h"
- #include "wtools.h"
- #include "execute.h"
-+#include "../vfs/vfs.h"
-
-
- static void
-@@ -342,7 +343,9 @@ execute_with_vfs_arg (const char *comman
-
- /* Simplest case, this file is local */
- if (!filename || vfs_file_is_local (filename)) {
-- do_execute (command, filename, EXECUTE_INTERNAL);
-+ fn = vfs_canon_and_translate (filename);
-+ do_execute (command, fn, EXECUTE_INTERNAL);
-+ g_free (fn);
- return;
- }
-
-diff -rupbBN mc.orig/src/ext.c mc/src/ext.c
---- mc.orig/src/ext.c 2007-12-07 16:24:34.000000000 +0100
-+++ mc/src/ext.c 2007-12-07 16:26:30.000000000 +0100
-@@ -62,6 +62,7 @@ static void
- exec_extension (const char *filename, const char *data, int *move_dir,
- int start_line)
- {
-+ char *fn;
- char *file_name;
- int cmd_file_fd;
- FILE *cmd_file;
-@@ -174,10 +175,13 @@ exec_extension (const char *filename, co
- localmtime = mystat.st_mtime;
- text = (*quote_func) (localcopy, 0);
- } else {
-- text = (*quote_func) (filename, 0);
-+ fn = vfs_canon_and_translate (filename);
-+ text = (*quote_func) (fn, 0);
-+ g_free (fn);
- }
-- } else
-+ } else {
- text = expand_format (NULL, *data, !is_cd);
-+ }
- if (!is_cd)
- fputs (text, cmd_file);
- else {
-diff -rupbBN mc.orig/src/main.c mc/src/main.c
---- mc.orig/src/main.c 2007-12-07 16:24:34.000000000 +0100
-+++ mc/src/main.c 2007-12-07 16:26:30.000000000 +0100
-@@ -810,6 +810,8 @@ static menu_entry LeftMenu[] = {
- {' ', N_("&Sort order..."), NULL_HOTKEY, sort_cmd},
- {' ', "", NULL_HOTKEY, 0},
- {' ', N_("&Filter..."), NULL_HOTKEY, filter_cmd},
-+ {' ', "",NULL_HOTKEY, 0},
-+ {' ', N_("&Encoding..."), NULL_HOTKEY, encoding_cmd},
- #ifdef USE_NETCODE
- {' ', "", NULL_HOTKEY, 0},
- #ifdef WITH_MCFS
-@@ -834,6 +836,8 @@ static menu_entry RightMenu[] = {
- {' ', N_("&Sort order..."), NULL_HOTKEY, sort_cmd},
- {' ', "", NULL_HOTKEY, 0},
- {' ', N_("&Filter..."), NULL_HOTKEY, filter_cmd},
-+ {' ', "",NULL_HOTKEY, 0},
-+ {' ', N_("&Encoding..."), NULL_HOTKEY, encoding_cmd},
- #ifdef USE_NETCODE
- {' ', "", NULL_HOTKEY, 0},
- #ifdef WITH_MCFS
-diff -rupbBN mc.orig/src/subshell.c mc/src/subshell.c
---- mc.orig/src/subshell.c 2007-12-07 16:24:34.000000000 +0100
-+++ mc/src/subshell.c 2007-12-07 16:26:30.000000000 +0100
-@@ -530,6 +530,8 @@ static void init_raw_mode ()
-
- int invoke_subshell (const char *command, int how, char **new_dir)
- {
-+ char *pcwd;
-+
- /* Make the MC terminal transparent */
- tcsetattr (STDOUT_FILENO, TCSANOW, &raw_mode);
-
-@@ -560,8 +562,10 @@ int invoke_subshell (const char *command
-
- feed_subshell (how, FALSE);
-
-- if (new_dir && subshell_alive && strcmp (subshell_cwd, current_panel->cwd))
-+ pcwd = vfs_translate_path_n (current_panel->cwd);
-+ if (new_dir && subshell_alive && strcmp (subshell_cwd, pcwd))
- *new_dir = subshell_cwd; /* Make MC change to the subshell's CWD */
-+ g_free (pcwd);
-
- /* Restart the subshell if it has died by SIGHUP, SIGQUIT, etc. */
- while (!subshell_alive && !quit && use_subshell)
-@@ -752,15 +756,22 @@ subshell_name_quote (const char *s)
- void
- do_subshell_chdir (const char *directory, int do_update, int reset_prompt)
- {
-+ char *pcwd;
-+ char *temp;
-+ char *translate;
-+
-+ pcwd = vfs_translate_path_n (current_panel->cwd);
-+
- if (!
- (subshell_state == INACTIVE
-- && strcmp (subshell_cwd, current_panel->cwd))) {
-+ && strcmp (subshell_cwd, pcwd))) {
- /* We have to repaint the subshell prompt if we read it from
- * the main program. Please note that in the code after this
- * if, the cd command that is sent will make the subshell
- * repaint the prompt, so we don't have to paint it. */
- if (do_update)
- do_update_prompt ();
-+ g_free (pcwd);
- return;
- }
-
-@@ -768,7 +779,9 @@ do_subshell_chdir (const char *directory
- because we set "HISTCONTROL=ignorespace") */
- write_all (subshell_pty, " cd ", 4);
- if (*directory) {
-- char *temp = subshell_name_quote (directory);
-+ translate = vfs_translate_path_n (directory);
-+ if (translate) {
-+ temp = subshell_name_quote (translate);
- if (temp) {
- write_all (subshell_pty, temp, strlen (temp));
- g_free (temp);
-@@ -777,6 +790,10 @@ do_subshell_chdir (const char *directory
- that we don't have memory to quote it. */
- write_all (subshell_pty, ".", 1);
- }
-+ g_free (translate);
-+ } else {
-+ write_all (subshell_pty, ".", 1);
-+ }
- } else {
- write_all (subshell_pty, "/", 1);
- }
-@@ -786,7 +803,7 @@ do_subshell_chdir (const char *directory
- feed_subshell (QUIETLY, FALSE);
-
- if (subshell_alive) {
-- int bPathNotEq = strcmp (subshell_cwd, current_panel->cwd);
-+ int bPathNotEq = strcmp (subshell_cwd, pcwd);
-
- if (bPathNotEq && subshell_type == TCSH) {
- char rp_subshell_cwd[PATH_MAX];
-@@ -795,17 +812,17 @@ do_subshell_chdir (const char *directory
- char *p_subshell_cwd =
- mc_realpath (subshell_cwd, rp_subshell_cwd);
- char *p_current_panel_cwd =
-- mc_realpath (current_panel->cwd, rp_current_panel_cwd);
-+ mc_realpath (pcwd, rp_current_panel_cwd);
-
- if (p_subshell_cwd == NULL)
- p_subshell_cwd = subshell_cwd;
- if (p_current_panel_cwd == NULL)
-- p_current_panel_cwd = current_panel->cwd;
-+ p_current_panel_cwd = pcwd;
- bPathNotEq = strcmp (p_subshell_cwd, p_current_panel_cwd);
- }
-
-- if (bPathNotEq && strcmp (current_panel->cwd, ".")) {
-- char *cwd = strip_password (g_strdup (current_panel->cwd), 1);
-+ if (bPathNotEq && strcmp (pcwd, ".")) {
-+ char *cwd = strip_password (g_strdup (pcwd), 1);
- fprintf (stderr, _("Warning: Cannot change to %s.\n"), cwd);
- g_free (cwd);
- }
-@@ -814,6 +831,8 @@ do_subshell_chdir (const char *directory
- if (reset_prompt)
- prompt_pos = 0;
- update_prompt = FALSE;
-+
-+ g_free (pcwd);
- /* Make sure that MC never stores the CWD in a silly format */
- /* like /usr////lib/../bin, or the strcmp() above will fail */
- }
-diff -rupbBN mc.orig/vfs/vfs.c mc/vfs/vfs.c
---- mc.orig/vfs/vfs.c 2007-12-07 16:24:33.000000000 +0100
-+++ mc/vfs/vfs.c 2007-12-07 17:06:58.000000000 +0100
-@@ -42,6 +42,7 @@
- #include "../src/tty.h" /* enable/disable interrupt key */
- #include "../src/wtools.h" /* message() */
- #include "../src/main.h" /* print_vfs_message */
-+#include "../src/strutil.h"
- #include "utilvfs.h"
- #include "gc.h"
-
-@@ -64,10 +65,32 @@ struct vfs_openfile {
- void *fsinfo;
- };
-
-+struct vfs_dirinfo{
-+ DIR *info;
-+ str_conv_t converter;
-+};
-+
-+
- static GSList *vfs_openfiles;
- #define VFS_FIRST_HANDLE 100
-
- static struct vfs_class *localfs_class;
-+static struct str_buffer *vfs_str_buffer;
-+
-+static const char *supported_encodings[] = {
-+ "UTF8",
-+ "UTF-8",
-+ "BIG5",
-+ "ASCII",
-+ "ISO8859",
-+ "ISO-8859",
-+ "ISO_8859",
-+ "KOI8",
-+ "CP852",
-+ "CP866",
-+ "CP125",
-+ NULL
-+};
-
- /* Create new VFS handle and put it to the list */
- static int
-@@ -309,6 +332,161 @@ vfs_get_class (const char *pathname)
- return vfs;
- }
-
-+const char *
-+vfs_get_encoding (const char *path)
-+{
-+ static char result[16];
-+ char *work;
-+ char *semi;
-+ char *slash;
-+
-+ work = g_strdup (path);
-+ semi = g_strrstr (work, "#enc:");
-+
-+ if (semi != NULL) {
-+ semi+= 5 * sizeof (char);
-+ slash = strchr (semi, PATH_SEP);
-+ if (slash != NULL)
-+ slash[0] = '\0';
-+
-+ g_strlcpy (result, semi, sizeof(result));
-+ g_free (work);
-+ return result;
-+ } else {
-+ g_free (work);
-+ return NULL;
-+ }
-+}
-+
-+/* return if encoding can by used in vfs (is ascci full compactible) */
-+/* contains only a few encoding now */
-+static int
-+vfs_supported_enconding (const char *encoding) {
-+ int t;
-+ int result = 0;
-+
-+ for (t = 0; supported_encodings[t] != NULL; t++) {
-+ result+= (g_ascii_strncasecmp (encoding, supported_encodings[t],
-+ strlen (supported_encodings[t])) == 0);
-+ }
-+
-+ return result;
-+}
-+
-+/* now used only by vfs_translate_path, but could be used in other vfs
-+ * plugin to automatic detect encoding
-+ * path - path to translate
-+ * size - how many bytes from path translate
-+ * defcnv - convertor, that is used as default, when path does not contain any
-+ * #enc: subtring
-+ * buffer - used to store result of translation
-+ */
-+static int
-+_vfs_translate_path (const char *path, int size,
-+ str_conv_t defcnv, struct str_buffer *buffer)
-+{
-+ const char *semi;
-+ const char *ps;
-+ const char *slash;
-+ int state = 0;
-+ static char encoding[16];
-+ str_conv_t coder;
-+ int ms;
-+
-+ if (size == 0) return 0;
-+ size = (size > 0) ? size : strlen (path);
-+
-+ /* try found #end: */
-+ semi = g_strrstr_len (path, size, "#enc:");
-+ if (semi != NULL) {
-+ /* first must be translated part before #enc: */
-+ ms = semi - path;
-+
-+ /* remove '/' before #enc */
-+ ps = str_cget_prev_char (semi);
-+ if (ps[0] == PATH_SEP) ms = ps - path;
-+
-+ state = _vfs_translate_path (path, ms, defcnv, buffer);
-+
-+ if (state != 0) return state;
-+ /* now can be translated part after #enc: */
-+
-+ semi+= 5;
-+ slash = strchr (semi, PATH_SEP);
-+ // ignore slashes after size;
-+ if (slash - path >= size) slash = NULL;
-+
-+ ms = (slash != NULL) ? slash - semi : strlen (semi);
-+ ms = min (ms, sizeof (encoding) - 1);
-+ // limit encoding size (ms) to path size (size)
-+ if (semi + ms > path + size) ms = path + size - semi;
-+ memcpy (encoding, semi, ms);
-+ encoding[ms] = '\0';
-+
-+ switch (vfs_supported_enconding (encoding)) {
-+ case 1:
-+ coder = str_crt_conv_to (encoding);
-+ if (coder != (iconv_t) (-1)) {
-+ if (slash != NULL) {
-+ state = str_vfs_convert_to (coder, slash,
-+ path + size - slash, buffer);
-+ } else if (buffer->data[0] == '\0') {
-+ /* exmaple "/#enc:utf-8" */
-+ str_insert_char (PATH_SEP, buffer);
-+ }
-+ str_close_conv (coder);
-+ return state;
-+ } else {
-+ errno = EINVAL;
-+ return ESTR_FAILURE;
-+ }
-+ break;
-+ default:
-+ errno = EINVAL;
-+ return ESTR_FAILURE;
-+ }
-+
-+ } else {
-+ /* path can be translated whole at once */
-+ state = str_vfs_convert_to (defcnv, path, size, buffer);
-+ return state;
-+ }
-+
-+ return 0;
-+}
-+
-+char *
-+vfs_translate_path (const char *path)
-+{
-+ int state;
-+
-+ str_reset_buffer (vfs_str_buffer);
-+ state = _vfs_translate_path (path, -1, str_cnv_from_term, vfs_str_buffer);
-+ // strict version
-+ //return (state == 0) ? vfs_str_buffer->data : NULL;
-+ return (state != ESTR_FAILURE) ? vfs_str_buffer->data : NULL;
-+}
-+
-+char *
-+vfs_translate_path_n (const char *path)
-+{
-+ char *result;
-+
-+ result = vfs_translate_path (path);
-+ return (result != NULL) ? g_strdup (result) : NULL;
-+}
-+
-+char *
-+vfs_canon_and_translate (const char *path)
-+{
-+ char *canon;
-+ char *result;
-+ canon = vfs_canon (path);
-+ result = vfs_translate_path_n (canon);
-+ g_free (canon);
-+ return result;
-+}
-+
- static int
- ferrno (struct vfs_class *vfs)
- {
-@@ -323,7 +501,8 @@ mc_open (const char *filename, int flags
- void *info;
- va_list ap;
-
-- char *file = vfs_canon (filename);
-+ char *file = vfs_canon_and_translate (filename);
-+ if (file != NULL) {
- struct vfs_class *vfs = vfs_get_class (file);
-
- /* Get the mode flag */
-@@ -348,6 +527,7 @@ mc_open (const char *filename, int flags
- }
-
- return vfs_new_handle (vfs, info);
-+ } else return -1;
- }
-
-
-@@ -356,13 +536,15 @@ int mc_##name inarg \
- { \
- struct vfs_class *vfs; \
- int result; \
-- char *mpath = vfs_canon (path); \
-+ char *mpath = vfs_canon_and_translate (path); \
-+ if (mpath != NULL) { \
- vfs = vfs_get_class (mpath); \
- result = vfs->name ? (*vfs->name)callarg : -1; \
- g_free (mpath); \
- if (result == -1) \
- errno = vfs->name ? ferrno (vfs) : E_NOTSUPP; \
- return result; \
-+ } else return -1; \
- }
-
- MC_NAMEOP (chmod, (const char *path, mode_t mode), (vfs, mpath, mode))
-@@ -370,11 +552,38 @@ MC_NAMEOP (chown, (const char *path, uid
- MC_NAMEOP (utime, (const char *path, struct utimbuf *times), (vfs, mpath, times))
- MC_NAMEOP (readlink, (const char *path, char *buf, int bufsiz), (vfs, mpath, buf, bufsiz))
- MC_NAMEOP (unlink, (const char *path), (vfs, mpath))
--MC_NAMEOP (symlink, (const char *name1, const char *path), (vfs, name1, mpath))
- MC_NAMEOP (mkdir, (const char *path, mode_t mode), (vfs, mpath, mode))
- MC_NAMEOP (rmdir, (const char *path), (vfs, mpath))
- MC_NAMEOP (mknod, (const char *path, mode_t mode, dev_t dev), (vfs, mpath, mode, dev))
-
-+int
-+mc_symlink (const char *name1, const char *path)
-+{
-+ struct vfs_class *vfs;
-+ int result;
-+ char *mpath;
-+ char *lpath;
-+ char *tmp;
-+
-+ mpath = vfs_canon_and_translate (path);
-+ if (mpath != NULL) {
-+ tmp = g_strdup (name1);
-+ lpath = vfs_translate_path_n (tmp);
-+ g_free (tmp);
-+
-+ if (lpath != NULL) {
-+ vfs = vfs_get_class (mpath);
-+ result = vfs->symlink ? (*vfs->symlink) (vfs, lpath, mpath) : -1;
-+ g_free (lpath);
-+
-+ if (result == -1)
-+ errno = vfs->symlink ? ferrno (vfs) : E_NOTSUPP;
-+ return result;
-+ }
-+ g_free (mpath);
-+ }
-+ return -1;
-+}
-
- #define MC_HANDLEOP(name, inarg, callarg) \
- int mc_##name inarg \
-@@ -399,9 +608,12 @@ int mc_##name (const char *fname1, const
- { \
- struct vfs_class *vfs; \
- int result; \
-- char *name2, *name1 = vfs_canon (fname1); \
-+ char *name2, *name1; \
-+ name1 = vfs_canon_and_translate (fname1); \
-+ if (name1 != NULL) { \
-+ name2 = vfs_canon_and_translate (fname2); \
-+ if (name2 != NULL) { \
- vfs = vfs_get_class (name1); \
-- name2 = vfs_canon (fname2); \
- if (vfs != vfs_get_class (name2)){ \
- errno = EXDEV; \
- g_free (name1); \
-@@ -414,6 +626,11 @@ int mc_##name (const char *fname1, const
- if (result == -1) \
- errno = vfs->name ? ferrno (vfs) : E_NOTSUPP; \
- return result; \
-+ } else { \
-+ g_free (name1); \
-+ return -1; \
-+ } \
-+ } else return -1; \
- }
-
- MC_RENAMEOP (link)
-@@ -438,11 +655,13 @@ mc_setctl (const char *path, int ctlop,
- if (!path)
- vfs_die("You don't want to pass NULL to mc_setctl.");
-
-- mpath = vfs_canon (path);
-+ mpath = vfs_canon_and_translate (path);
-+ if (mpath != NULL) {
- vfs = vfs_get_class (mpath);
- result = vfs->setctl ? (*vfs->setctl)(vfs, mpath, ctlop, arg) : 0;
- g_free (mpath);
- return result;
-+ } else return -1;
- }
-
- int
-@@ -474,22 +693,43 @@ mc_opendir (const char *dirname)
- int handle, *handlep;
- void *info;
- struct vfs_class *vfs;
-+ char *canon;
- char *dname;
-+ struct vfs_dirinfo *dirinfo;
-+ const char *encoding;
-
-- dname = vfs_canon (dirname);
-- vfs = vfs_get_class (dname);
-+ canon = vfs_canon (dirname);
-+ dname = vfs_translate_path_n (canon);
-
-+ if (dname != NULL) {
-+ vfs = vfs_get_class (dname);
- info = vfs->opendir ? (*vfs->opendir)(vfs, dname) : NULL;
- g_free (dname);
-+
- if (!info){
- errno = vfs->opendir ? ferrno (vfs) : E_NOTSUPP;
-+ g_free (canon);
- return NULL;
- }
-- handle = vfs_new_handle (vfs, info);
-+
-+ dirinfo = g_new (struct vfs_dirinfo, 1);
-+ dirinfo->info = info;
-+
-+ encoding = vfs_get_encoding (canon);
-+ g_free (canon);
-+ dirinfo->converter = (encoding != NULL) ? str_crt_conv_from (encoding) :
-+ str_cnv_from_term;
-+ if (dirinfo->converter == (iconv_t) (-1)) dirinfo->converter =str_cnv_from_term;
-+
-+ handle = vfs_new_handle (vfs, dirinfo);
-
- handlep = g_new (int, 1);
- *handlep = handle;
- return (DIR *) handlep;
-+ } else {
-+ g_free (canon);
-+ return NULL;
-+ }
- }
-
- struct dirent *
-@@ -497,7 +737,10 @@ mc_readdir (DIR *dirp)
- {
- int handle;
- struct vfs_class *vfs;
-- struct dirent *result = NULL;
-+ static struct dirent result;
-+ struct dirent *entry = NULL;
-+ struct vfs_dirinfo *dirinfo;
-+ int state;
-
- if (!dirp) {
- errno = EFAULT;
-@@ -505,11 +748,21 @@ mc_readdir (DIR *dirp)
- }
- handle = *(int *) dirp;
- vfs = vfs_op (handle);
-- if (vfs->readdir)
-- result = (*vfs->readdir) (vfs_info (handle));
-- if (!result)
-- errno = vfs->readdir ? ferrno (vfs) : E_NOTSUPP;
-- return result;
-+ dirinfo = vfs_info (handle);
-+ if (vfs->readdir) {
-+ do {
-+ entry = (*vfs->readdir) (dirinfo->info);
-+ if (entry == NULL) return NULL;
-+ str_reset_buffer (vfs_str_buffer);
-+ state = str_vfs_convert_from (dirinfo->converter,
-+ entry->d_name, vfs_str_buffer);
-+ } while (state != 0);
-+ memcpy (&result, entry, sizeof (struct dirent));
-+ g_strlcpy (result.d_name, vfs_str_buffer->data, NAME_MAX + 1);
-+ result.d_reclen = strlen (result.d_name);
-+ }
-+ if (entry == NULL) errno = vfs->readdir ? ferrno (vfs) : E_NOTSUPP;
-+ return (entry != NULL) ? &result : NULL;
- }
-
- int
-@@ -518,9 +771,14 @@ mc_closedir (DIR *dirp)
- int handle = *(int *) dirp;
- struct vfs_class *vfs = vfs_op (handle);
- int result;
-+ struct vfs_dirinfo *dirinfo;
-
-- result = vfs->closedir ? (*vfs->closedir)(vfs_info (handle)) : -1;
-+ dirinfo = vfs_info (handle);
-+ if (dirinfo->converter != str_cnv_from_term) str_close_conv (dirinfo->converter);
-+
-+ result = vfs->closedir ? (*vfs->closedir)(dirinfo->info) : -1;
- vfs_free_handle (handle);
-+ g_free (dirinfo);
- g_free (dirp);
- return result;
- }
-@@ -529,24 +787,37 @@ int mc_stat (const char *filename, struc
- struct vfs_class *vfs;
- int result;
- char *path;
-- path = vfs_canon (filename); vfs = vfs_get_class (path);
-+
-+ path = vfs_canon_and_translate (filename);
-+
-+ if (path != NULL) {
-+ vfs = vfs_get_class (path);
-+
- result = vfs->stat ? (*vfs->stat) (vfs, path, buf) : -1;
-+
- g_free (path);
-+
- if (result == -1)
- errno = vfs->name ? ferrno (vfs) : E_NOTSUPP;
- return result;
-+ } else return -1;
- }
-
- int mc_lstat (const char *filename, struct stat *buf) {
- struct vfs_class *vfs;
- int result;
- char *path;
-- path = vfs_canon (filename); vfs = vfs_get_class (path);
-+
-+ path = vfs_canon_and_translate (filename);
-+
-+ if (path != NULL) {
-+ vfs = vfs_get_class (path);
- result = vfs->lstat ? (*vfs->lstat) (vfs, path, buf) : -1;
- g_free (path);
- if (result == -1)
- errno = vfs->name ? ferrno (vfs) : E_NOTSUPP;
- return result;
-+ } else return -1;
- }
-
- int mc_fstat (int handle, struct stat *buf) {
-@@ -569,25 +840,40 @@ int mc_fstat (int handle, struct stat *b
- static const char *
- _vfs_get_cwd (void)
- {
-- char *p;
-+ char *sys_cwd;
-+ char *trans;
-+ const char *encoding;
-+ char *tmp;
-+ int state;
- struct stat my_stat, my_stat2;
-
-- if (!_vfs_get_class (current_dir)) {
-- p = g_get_current_dir ();
-- if (!p) /* One of the directories in the path is not readable */
-+ trans = vfs_translate_path_n (current_dir); //add check if NULL
-+
-+ if (!_vfs_get_class (trans)) {
-+ encoding = vfs_get_encoding (current_dir);
-+ if (encoding == NULL) {
-+ tmp = g_get_current_dir ();
-+ if (tmp != NULL) { /* One of the directories in the path is not readable */
-+ str_reset_buffer (vfs_str_buffer);
-+ state = str_vfs_convert_from (str_cnv_from_term, tmp, vfs_str_buffer);
-+ g_free (tmp);
-+ sys_cwd = (state == 0) ? g_strdup (vfs_str_buffer->data) : NULL;
-+ if (!sys_cwd)
- return current_dir;
-
- /* Otherwise check if it is O.K. to use the current_dir */
-- if (!cd_symlinks || mc_stat (p, &my_stat)
-+ if (!cd_symlinks || mc_stat (sys_cwd, &my_stat)
- || mc_stat (current_dir, &my_stat2)
- || my_stat.st_ino != my_stat2.st_ino
- || my_stat.st_dev != my_stat2.st_dev) {
- g_free (current_dir);
-- current_dir = p;
-- return p;
-- } /* Otherwise we return current_dir below */
-- g_free (p);
-+ current_dir = sys_cwd;
-+ return sys_cwd;
-+ }/* Otherwise we return current_dir below */
-+ }
- }
-+ }
-+ g_free (trans);
- return current_dir;
- }
-
-@@ -682,22 +968,27 @@ int
- mc_chdir (const char *path)
- {
- char *new_dir;
-+ char *trans_dir;
- struct vfs_class *old_vfs, *new_vfs;
- vfsid old_vfsid;
- int result;
-
- new_dir = vfs_canon (path);
-- new_vfs = vfs_get_class (new_dir);
-+ trans_dir = vfs_translate_path_n (new_dir);
-+ if (trans_dir != NULL) {
-+ new_vfs = vfs_get_class (trans_dir);
- if (!new_vfs->chdir) {
- g_free (new_dir);
-+ g_free (trans_dir);
- return -1;
- }
-
-- result = (*new_vfs->chdir) (new_vfs, new_dir);
-+ result = (*new_vfs->chdir) (new_vfs, trans_dir);
-
- if (result == -1) {
- errno = ferrno (new_vfs);
- g_free (new_dir);
-+ g_free (trans_dir);
- return -1;
- }
-
-@@ -720,7 +1011,12 @@ mc_chdir (const char *path)
- *p = 0;
- }
-
-+ g_free (trans_dir);
- return 0;
-+ } else {
-+ g_free (new_dir);
-+ return -1;
-+ }
- }
-
- /* Return 1 is the current VFS class is local */
-@@ -737,10 +1033,12 @@ vfs_file_class_flags (const char *filena
- struct vfs_class *vfs;
- char *fname;
-
-- fname = vfs_canon (filename);
-+ fname = vfs_canon_and_translate (filename);
-+ if (fname != NULL) {
- vfs = vfs_get_class (fname);
- g_free (fname);
- return vfs->flags;
-+ } else return -1;
- }
-
- static char *
-@@ -792,7 +1090,10 @@ char *
- mc_getlocalcopy (const char *pathname)
- {
- char *result;
-- char *path = vfs_canon (pathname);
-+ char *path;
-+
-+ path = vfs_canon_and_translate (pathname);
-+ if (path != NULL) {
- struct vfs_class *vfs = vfs_get_class (path);
-
- result = vfs->getlocalcopy ? (*vfs->getlocalcopy)(vfs, path) :
-@@ -801,6 +1102,7 @@ mc_getlocalcopy (const char *pathname)
- if (!result)
- errno = ferrno (vfs);
- return result;
-+ } else return NULL;
- }
-
- static int
-@@ -854,7 +1156,10 @@ int
- mc_ungetlocalcopy (const char *pathname, const char *local, int has_changed)
- {
- int return_value = 0;
-- char *path = vfs_canon (pathname);
-+ char *path;
-+
-+ path = vfs_canon_and_translate (pathname);
-+ if (path != NULL) {
- struct vfs_class *vfs = vfs_get_class (path);
-
- return_value = vfs->ungetlocalcopy ?
-@@ -862,12 +1167,14 @@ mc_ungetlocalcopy (const char *pathname,
- mc_def_ungetlocalcopy (vfs, path, local, has_changed);
- g_free (path);
- return return_value;
-+ } else return -1;
- }
-
-
- void
- vfs_init (void)
- {
-+ vfs_str_buffer = str_get_buffer ();
- /* localfs needs to be the first one */
- init_localfs();
- /* fallback value for vfs_get_class() */
-@@ -911,6 +1218,8 @@ vfs_shut (void)
- (*vfs->done) (vfs);
-
- g_slist_free (vfs_openfiles);
-+
-+ str_release_buffer (vfs_str_buffer);
- }
-
- /*
-diff -rupbBN mc.orig/vfs/vfs.h mc/vfs/vfs.h
---- mc.orig/vfs/vfs.h 2007-12-07 16:24:33.000000000 +0100
-+++ mc/vfs/vfs.h 2007-12-07 16:26:30.000000000 +0100
-@@ -10,6 +10,17 @@ char *mc_get_current_wd (char *buffer, i
- char *vfs_get_current_dir (void);
- int vfs_current_is_local (void);
- int vfs_file_is_local (const char *filename);
-+/* translate path back to terminal encoding, remove all #enc:
-+ * every invalid character is replaced with question mark
-+ * return static buffer */
-+char *vfs_translate_path (const char *path);
-+/* return new string */
-+char *vfs_translate_path_n (const char *path);
-+/* return encoding after last #enc: or NULL, if part does not contain #enc:
-+ * return static buffer */
-+const char *vfs_get_encoding (const char *path);
-+// canonize and translate path, return new string */
-+char *vfs_canon_and_translate (const char *path);
-
- /* Only the routines outside of the VFS module need the emulation macros */
-
Deleted: trunk/debian/patches/29_mc-30-view.patch
===================================================================
--- trunk/debian/patches/29_mc-30-view.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/29_mc-30-view.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,2768 +0,0 @@
-diff -rupbBN mc.orig/src/view.c mc/src/view.c
---- mc.orig/src/view.c 2007-12-06 18:47:02.000000000 +0100
-+++ mc/src/view.c 2007-12-06 15:00:53.000000000 +0100
-@@ -65,10 +64,10 @@
-
- #include "charsets.h"
- #include "selcodepage.h"
-+#include "strutil.h"
-
- /* Block size for reading files in parts */
- #define VIEW_PAGE_SIZE ((size_t) 8192)
--#define VIEW_COORD_CACHE_GRANUL 1024
-
- typedef unsigned char byte;
-
-@@ -82,18 +81,6 @@ typedef unsigned long offset_type;
- /* A width or height on the screen */
- typedef unsigned int screen_dimen;
-
--/* A cache entry for mapping offsets into line/column pairs and vice versa.
-- * cc_offset, cc_line, and cc_column are the 0-based values of the offset,
-- * line and column of that cache entry. cc_nroff_column is the column
-- * corresponding to cc_offset in nroff mode.
-- */
--struct coord_cache_entry {
-- offset_type cc_offset;
-- offset_type cc_line;
-- offset_type cc_column;
-- offset_type cc_nroff_column;
--};
--
- /* A node for building a change list on change_list */
- struct hexedit_change_node {
- struct hexedit_change_node *next;
-@@ -115,6 +102,38 @@ struct area {
- screen_dimen height, width;
- };
-
-+#define VLF_DISCARD 1
-+#define VLF_INIT 2
-+#define VLF_COMPLETE 3
-+
-+/* basic structure for caching text, it correspond to one line in wrapped text.
-+ * That makes easier to move in wrap mode.
-+ * cache_lines are stored in two linked lists, one for normal mode
-+ * and one for nroff mode
-+ * cache_line is valid of end is not INVALID_OFFSET
-+ * last line has set width to (screen_dimen) (-1)*/
-+/* never access next and previous in cache_line directly, use appropriately function
-+ * instead */
-+struct cache_line {
-+ /* number of line in text, so two cache_line have same number
-+ * if they are on same text line (text line is wider than screen) */
-+ long number;
-+ /* previous cache_line in list*/
-+ struct cache_line *prev;
-+ /* next cache_line in list*/
-+ struct cache_line *next;
-+ /* offset when cache_line start in text,
-+ * cache_line.start = cache_line->prev.end */
-+ offset_type start;
-+ /* offset when cache_line ends
-+ * cache_line.end = cache_line->next.start */
-+ offset_type end;
-+ /* how many column take on screen */
-+ screen_dimen width;
-+ /* correct ident, if prevoius line ends by tabulator */
-+ screen_dimen left;
-+};
-+
- struct WView {
- Widget widget;
-
-@@ -159,7 +178,6 @@ struct WView {
-
- /* Additional editor state */
- gboolean hexedit_lownibble; /* Are we editing the last significant nibble? */
-- GArray *coord_cache; /* Cache for mapping offsets to cursor positions */
-
- /* Display information */
- screen_dimen dpy_frame_size;/* Size of the frame surrounding the real viewer */
-@@ -183,7 +201,7 @@ struct WView {
-
- /* Search variables */
- offset_type search_start; /* First character to start searching from */
-- offset_type search_length; /* Length of found string or 0 if none was found */
-+ offset_type search_end; /* Length of found string or 0 if none was found */
- char *search_exp; /* The search expression */
- int direction; /* 1= forward; -1 backward */
- void (*last_search)(WView *);
-@@ -203,6 +221,22 @@ struct WView {
- offset_type update_steps; /* The number of bytes between percent
- * increments */
- offset_type update_activate;/* Last point where we updated the status */
-+
-+ /* never access cache_line in view directly, use appropriately function
-+ * instead */
-+ /* first cache_line for normal mode */
-+ struct cache_line *lines;
-+ /* last cache_line for normal mode, is set when text is read to the end */
-+ struct cache_line *lines_end;
-+ /* first cache_line for nroff mode */
-+ struct cache_line *nroff_lines;
-+ /* last cache_line for nroff mode, is set when text is read to the end */
-+ struct cache_line *nroff_lines_end;
-+ /* cache_line, that is first showed on display (something like cursor)
-+ * used for both normal adn nroff mode */
-+ struct cache_line *first_showed_line;
-+ /* converter for translation of text */
-+ str_conv_t converter;
- };
-
-
-@@ -241,7 +275,7 @@ int mcview_remember_file_position = FALS
- static cb_ret_t view_callback (Widget *, widget_msg_t, int);
-
- static int regexp_view_search (WView * view, char *pattern, char *string,
-- int match_type);
-+ int match_type, size_t *match_start, size_t *match_end);
- static void view_labels (WView * view);
-
- static void view_init_growbuf (WView *);
-@@ -285,11 +319,652 @@ view_is_in_panel (WView *view)
- return (view->dpy_frame_size != 0);
- }
-
-+static inline int get_byte (WView *view, offset_type offset);
-+
-+/* read on character from text, character is translated into terminal encoding
-+ * writes result in ch, return how many bytes was read or -1 if end of text */
-+static int
-+view_get_char (WView *view, offset_type from, char *ch, int size)
-+{
-+ static char buffer [MB_LEN_MAX + 1];
-+ static int c;
-+ static size_t result;
-+
-+ result = 0;
-+
-+ while (result < sizeof (buffer) - 1) {
-+ c = get_byte (view, from + result);
-+ if (c == -1) break;
-+ buffer[result] = (unsigned char) c;
-+ result++;
-+ buffer[result] = '\0';
-+ switch (str_translate_char (view->converter, buffer, result, ch, size)) {
-+ case 0:
-+ return (int) result;
-+ case 1:
-+ break;
-+ case 2:
-+ ch[0] = '?';
-+ ch[1] = '\0';
-+ return 1;
-+ }
-+ }
-+ return -1;
-+}
-+
-+/* this structure and view_read_* functions make reading text simpler
-+ * view need remeber 4 following charsets: actual, next and two previous */
-+struct read_info {
-+ char ch[4][MB_LEN_MAX + 1];
-+ char *cnxt;
-+ char *cact;
-+ char *chi1;
-+ char *chi2;
-+ offset_type next;
-+ offset_type actual;
-+ int result;
-+};
-+
-+/* set read_info into initial state and read first character to cnxt
-+ * return how many bytes was read or -1 if end of text */
-+static void
-+view_read_start (WView *view, struct read_info *info, offset_type from)
-+{
-+ info->ch[0][0] = '\0';
-+ info->ch[1][0] = '\0';
-+ info->ch[2][0] = '\0';
-+ info->ch[3][0] = '\0';
-+
-+ info->cnxt = info->ch[0];
-+ info->cact = info->ch[1];
-+ info->chi1 = info->ch[2];
-+ info->chi2 = info->ch[3];
-+
-+ info->next = from;
-+
-+ info->result = view_get_char (view, info->next, info->cnxt, MB_LEN_MAX + 1);
-+}
-+
-+/* move characters in read_info one forward (chi2 = last previous is forgotten)
-+ * read additional charsets into cnxt
-+ * return how many bytes was read or -1 if end of text */
-+static void
-+view_read_continue (WView *view, struct read_info *info)
-+{
-+ char *tmp;
-+
-+ tmp = info->chi2;
-+ info->chi2 = info->chi1;
-+ info->chi1 = info->cact;
-+ info->cact = info->cnxt;
-+ info->cnxt = tmp;
-+
-+ info->actual = info->next;
-+ info->next+= info->result;
-+
-+ info->result = view_get_char (view, info->next, info->cnxt, MB_LEN_MAX + 1);
-+}
-+
-+#define VRT_NW_NO 0
-+#define VRT_NW_YES 1
-+#define VRT_NW_CONTINUE 2
-+
-+/* test if cact of read_info is newline
-+ * return VRT_NW_NO, VRT_NW_YES
-+ * or VRT_NW_CONTINUE follow after cact ("\r\n", ...) */
-+static int
-+view_read_test_new_line (WView *view, struct read_info *info)
-+{
-+#define cmp(t1,t2) (strcmp((t1),(t2)) == 0)
-+
-+ if (cmp (info->cact, "\n")) return VRT_NW_YES;
-+
-+ if (cmp (info->cact, "\r")) {
-+ if (info->result != -1 && (cmp (info->cnxt, "\r") || cmp (info->cnxt, "\n")))
-+ return VRT_NW_CONTINUE;
-+
-+ return VRT_NW_YES;
-+ }
-+ return VRT_NW_NO;
-+}
-+
-+/* test if cact of read_info is tabulator
-+ * return VRT_NW_NO or VRT_NW_YES */
-+static int
-+view_read_test_tabulator (WView *view, struct read_info *info)
-+{
-+#define cmp(t1,t2) (strcmp((t1),(t2)) == 0)
-+ return cmp (info->cact, "\t");
-+}
-+
-+/* test if read_info.cact is '\b' and charsets in read_info are correct
-+ * nroff sequence, return VRT_NW_NO or VRT_NW_YES */
-+static int
-+view_read_test_nroff_back (WView *view, struct read_info *info)
-+{
-+#define cmp(t1,t2) (strcmp((t1),(t2)) == 0)
-+ return view->text_nroff_mode && cmp (info->cact, "\b") &&
-+ (info->result != -1) && str_isprint (info->cnxt) &&
-+ !cmp (info->chi1, "") && str_isprint (info->chi1) &&
-+ (cmp (info->chi1, info->cnxt) || cmp (info->chi1, "_")
-+ || (cmp (info->chi1, "+") && cmp (info->cnxt, "o")));
-+
-+}
-+
-+/* rutine for view_load_cache_line, line is ended and following cache_line is
-+ * set up for loading
-+ * used when end of line has been read in text */
-+static struct cache_line *
-+view_lc_create_next_line (struct cache_line *line, offset_type start)
-+{
-+ struct cache_line *result = NULL;
-+
-+ line->end = start;
-+
-+ if (line->next == NULL) {
-+ result = g_new0 (struct cache_line, 1);
-+ line->next = result;
-+ result->prev = line;
-+ } else result = line->next;
-+
-+ result->start = start;
-+ result->width = 0;
-+ result->left = 0;
-+ result->number = line->number + 1;
-+ result->end = INVALID_OFFSET;
-+
-+ return result;
-+}
-+
-+/* rutine for view_load_cache_line, line is ended and following cache_line is
-+ * set up for loading
-+ * used when line has maximum width */
-+static struct cache_line *
-+view_lc_create_wrap_line (struct cache_line *line, offset_type start,
-+ screen_dimen left)
-+{
-+ struct cache_line *result = NULL;
-+
-+ line->end = start;
-+
-+ if (line->next == NULL) {
-+ result = g_new0 (struct cache_line, 1);
-+ line->next = result;
-+ result->prev = line;
-+ } else result = line->next;
-+
-+ result->start = start;
-+ result->width = 0;
-+ result->left = left;
-+ result->number = line->number;
-+ result->end = INVALID_OFFSET;
-+
-+ return result;
-+}
-+
-+/* read charsets fro text and set up correct width, end and start of next line
-+ * view->data_area.width must be greater than 0 */
-+static struct cache_line *
-+view_load_cache_line (WView *view, struct cache_line *line)
-+{
-+ const screen_dimen width = view->data_area.width;
-+ struct read_info info;
-+ offset_type nroff_start = 0;
-+ int nroff_seq = 0;
-+ int w;
-+
-+ line->width = 0;
-+
-+ view_read_start (view, &info, line->start);
-+ while (info.result != -1) {
-+ view_read_continue (view, &info);
-+
-+ switch (view_read_test_new_line (view, &info)) {
-+ case VRT_NW_YES:
-+ line = view_lc_create_next_line (line, info.next);
-+ return line;
-+ case VRT_NW_CONTINUE:
-+ continue;
-+ }
-+
-+ if (view_read_test_tabulator (view, &info)) {
-+ line->width+= 8 - (line->left + line->width) % 8;
-+ if ((width != 0) && (line->left + line->width >= width)) {
-+ w = line->left + line->width - width;
-+ /* if width of screen is very small, tabulator is cut to line
-+ * left of next line is 0 */
-+ w = (w < width) ? w : 0;
-+ line->width = width - line->left;
-+ line = view_lc_create_wrap_line (line, info.next, w);
-+ return line;
-+ }
-+ }
-+
-+ if (view_read_test_nroff_back (view, &info)) {
-+ w = str_term_width1 (info.chi1);
-+ line->width-= w;
-+ nroff_seq = 1;
-+ continue;
-+ }
-+ /* assure, that nroff sequence never start in previous cache_line */
-+ if (nroff_seq > 0)
-+ nroff_seq--;
-+ else
-+ nroff_start = info.actual;
-+
-+ w = str_isprint (info.cact) ? str_term_width1 (info.cact) : 1;
-+
-+ if (line->left + line->width + w > width) {
-+ line = view_lc_create_wrap_line (line, nroff_start, 0);
-+ return line;
-+ } else {
-+ while (info.result != -1 && str_iscombiningmark (info.cnxt)) {
-+ view_read_continue (view, &info);
-+ }
-+ }
-+ line->width+= w;
-+
-+ }
-+
-+ /* text read to the end, seting lines_end*/
-+ if (view->text_nroff_mode)
-+ view->nroff_lines_end = line;
-+ else
-+ view->lines_end = line;
-+
-+ line = view_lc_create_next_line (line, info.next);
-+ line->width = (screen_dimen) (-1);
-+ line->end = info.next;
-+
-+ return line;
-+}
-+
-+static void
-+view_lc_set_param (offset_type *param, offset_type value)
-+{
-+ if ((*param) > value) (*param) = value;
-+}
-+
-+/* offset to column or column to offset, value that will be maped must be
-+ * set to INVALID_OFFSET, it is very analogous to view_load_cache_line
-+ * and it is possible to integrate them in one function */
-+static void
-+view_map_offset_and_column (WView *view, struct cache_line *line,
-+ offset_type *column, offset_type *offset)
-+{
-+ const screen_dimen width = view->data_area.width;
-+ struct read_info info;
-+ offset_type nroff_start = 0;
-+ int nroff_seq = 0;
-+ int w;
-+ screen_dimen col;
-+
-+ col = 0;
-+ view_read_start (view, &info, line->start);
-+ while (info.result != -1) {
-+ view_read_continue (view, &info);
-+
-+ if (*column == INVALID_OFFSET) {
-+ if (*offset < info.next) {
-+ (*column) = col + line->left;
-+ return;
-+ }
-+ }
-+
-+ switch (view_read_test_new_line (view, &info)) {
-+ case VRT_NW_YES:
-+ view_lc_set_param (offset, info.actual);
-+ view_lc_set_param (column, line->left + col);
-+ return;
-+ case VRT_NW_CONTINUE:
-+ continue;
-+ }
-+
-+ if (view_read_test_tabulator (view, &info)) {
-+ col+= 8 - (line->left + col) % 8;
-+ if ((width != 0) && (line->left + col >= width)) {
-+ w = line->left + col - width;
-+ w = (w < width) ? w : 0;
-+ col = width - line->left;
-+ view_lc_set_param (offset, info.actual);
-+ view_lc_set_param (column, line->left + col);
-+ return;
-+ }
-+ }
-+
-+ if (view_read_test_nroff_back (view, &info)) {
-+ w = str_term_width1 (info.chi1);
-+ col-= w;
-+ nroff_seq = 1;
-+ continue;
-+ }
-+ if (nroff_seq > 0)
-+ nroff_seq--;
-+ else
-+ nroff_start = info.actual;
-+
-+ w = str_isprint (info.cact) ? str_term_width1 (info.cact) : 1;
-+
-+ if (line->left + col + w > width) {
-+ view_lc_set_param (offset, nroff_start);
-+ view_lc_set_param (column, line->left + col);
-+ return;
-+ } else {
-+ while (info.result != -1 && str_iscombiningmark (info.cnxt)) {
-+ view_read_continue (view, &info);
-+ }
-+ }
-+
-+ col+= w;
-+
-+ if (*offset == INVALID_OFFSET) {
-+ if (*column < col + line->left) {
-+ (*offset) = nroff_start;
-+ return;
-+ }
-+ }
-+ }
-+
-+ view_lc_set_param (offset, info.actual);
-+ view_lc_set_param (column, line->left + col);
-+}
-+
-+/* macro, that iterate cache_line until stop holds,
-+ * nf is function to iterate cache_line
-+ * l is line to iterate and t is temporary line only */
-+#define view_move_to_stop(l,t,stop,nf) \
-+while (((t = nf (view, l)) != NULL) && (stop)) l = t;
-+
-+/* make all cache_lines invalidet */
-+static void
-+view_reset_cache_lines (WView *view)
-+{
-+ if (view->lines != NULL) {
-+ view->lines->end = INVALID_OFFSET;
-+ }
-+ view->lines_end = NULL;
-+
-+ if (view->nroff_lines != NULL) {
-+ view->nroff_lines->end = INVALID_OFFSET;
-+ }
-+ view->nroff_lines_end = NULL;
-+
-+ view->first_showed_line = NULL;
-+}
-+
-+#define MAX_UNLOADED_CACHE_LINE 100
-+
-+/* free some cache_lines, if count of cache_lines is bigger
-+ * than MAX_UNLOADED_CACHE_LINE */
-+static void
-+view_reduce_cache_lines (WView *view)
-+{
-+ struct cache_line *line;
-+ struct cache_line *next;
-+ int li;
-+
-+ li = 0;
-+ line = view->lines;
-+ while (line != NULL && li < MAX_UNLOADED_CACHE_LINE) {
-+ line = line->next;
-+ li++;
-+ }
-+ if (line != NULL) line->prev->next = NULL;
-+ while (line != NULL) {
-+ next = line->next;
-+ g_free (line);
-+ line = next;
-+ }
-+ view->lines_end = NULL;
-+
-+ line = view->nroff_lines;
-+ while (line != NULL && li < MAX_UNLOADED_CACHE_LINE) {
-+ line = line->next;
-+ li++;
-+ }
-+ if (line != NULL) line->prev->next = NULL;
-+ while (line != NULL) {
-+ next = line->next;
-+ g_free (line);
-+ line = next;
-+ }
-+ view->nroff_lines_end = NULL;
-+
-+ view->first_showed_line = NULL;
-+}
-+
-+/* return first cache_line for actual mode (normal / nroff) */
-+static struct cache_line *
-+view_get_first_line (WView *view)
-+{
-+ struct cache_line **first_line;
-+
-+ first_line = (view->text_nroff_mode) ?
-+ &(view->nroff_lines) : &(view->lines);
-+
-+ if (*first_line == NULL) {
-+ (*first_line) = g_new0 (struct cache_line, 1);
-+ (*first_line)->end = INVALID_OFFSET;
-+ }
-+
-+ if ((*first_line)->end == INVALID_OFFSET)
-+ view_load_cache_line (view, *first_line);
-+
-+ return (*first_line);
-+}
-+
-+/* return following chahe_line or NULL */
-+static struct cache_line*
-+view_get_next_line (WView *view, struct cache_line *line)
-+{
-+ struct cache_line *result;
-+
-+ if (line->next != NULL) {
-+ result = line->next;
-+
-+ if (result->end == INVALID_OFFSET)
-+ view_load_cache_line (view, result);
-+
-+ return (result->width != (screen_dimen) (-1)) ? result : NULL;
-+ }
-+ return NULL;
-+}
-+
-+/* return last cache_line, it could take same time, because whole read text must
-+ * be read (only once) */
-+static struct cache_line *
-+view_get_last_line (WView *view)
-+{
-+ struct cache_line *result;
-+ struct cache_line *next;
-+
-+ result = (view->text_nroff_mode) ?
-+ view->nroff_lines_end : view->nroff_lines_end;
-+
-+ if (result != NULL) return result;
-+
-+ if (view->first_showed_line == NULL)
-+ view->first_showed_line = view_get_first_line (view);
-+
-+ result = view->first_showed_line;
-+ next = view_get_next_line (view, result);
-+ while (next != NULL) {
-+ result = next;
-+ next = view_get_next_line (view, result);
-+ }
-+ return result;
-+}
-+
-+/* return previous cache_line or NULL */
-+static struct cache_line *
-+view_get_previous_line (WView *view, struct cache_line *line)
-+{
-+ return line->prev;
-+}
-+
-+/* return first displayed cache_line */
-+static struct cache_line *
-+view_get_first_showed_line (WView *view)
-+{
-+ struct cache_line *result;
-+
-+ if (view->first_showed_line == NULL)
-+ view->first_showed_line = view_get_first_line (view);
-+
-+ result = view->first_showed_line;
-+ return result;
-+}
-+
-+/* return first cache_line with same number as line */
-+static struct cache_line *
-+view_get_start_of_whole_line (WView *view, struct cache_line *line)
-+{
-+ struct cache_line *t;
-+
-+ if (line != NULL) {
-+ view_move_to_stop (line, t, t->number == line->number, view_get_previous_line)
-+ return line;
-+ }
-+ return NULL;
-+}
-+
-+/* return last cache_line with same number as line */
-+static struct cache_line *
-+view_get_end_of_whole_line (WView *view, struct cache_line *line)
-+{
-+ struct cache_line *t;
-+
-+ if (line != NULL) {
-+ view_move_to_stop (line, t, t->number == line->number, view_get_next_line)
-+ return line;
-+ }
-+ return NULL;
-+}
-+
-+/* return last cache_line, that has number lesser than line
-+ * or NULL */
-+static struct cache_line *
-+view_get_previous_whole_line (WView *view, struct cache_line *line)
-+{
-+ line = view_get_start_of_whole_line (view, line);
-+ return view_get_previous_line (view, line);
-+}
-+
-+/* return first cache_line, that has number greater than line
-+ * or NULL */
-+static struct cache_line *
-+view_get_next_whole_line (WView *view, struct cache_line *line)
-+{
-+ line = view_get_end_of_whole_line (view, line);
-+ return view_get_next_line (view, line);
-+}
-+
-+/* return sum of widths of all cache_lines that has same number as line */
-+static screen_dimen
-+view_width_of_whole_line (WView *view, struct cache_line *line)
-+{
-+ struct cache_line *next;
-+ screen_dimen result = 0;
-+
-+ line = view_get_start_of_whole_line (view, line);
-+ next = view_get_next_line (view, line);
-+ while ((next != NULL) && (next->number == line->number)) {
-+ result+= line->left + line->width;
-+ line = next;
-+ next = view_get_next_line (view, line);
-+ }
-+ result+= line->left + line->width;
-+ return result;
-+}
-+
-+/* return sum of widths of cache_lines before line, that has same number as line */
-+static screen_dimen
-+view_width_of_whole_line_before (WView *view, struct cache_line *line)
-+{
-+ struct cache_line *next;
-+ screen_dimen result = 0;
-+
-+ next = view_get_start_of_whole_line (view, line);
-+ while (next != line) {
-+ result+= next->left + next->width;
-+ next = view_get_next_line (view, next);
-+ }
-+ return result;
-+}
-+
-+/* map column to offset and cache_line */
-+static offset_type
-+view_column_to_offset (WView *view, struct cache_line **line, offset_type column)
-+{
-+ struct cache_line *next;
-+ offset_type result;
-+
-+ *line = view_get_start_of_whole_line (view, *line);
-+
-+ while (column >= (*line)->left + (*line)->width) {
-+ column-= (*line)->left + (*line)->width;
-+ result = (*line)->end;
-+ next = view_get_next_line (view, *line);
-+ if ((next == NULL) || (next->number != (*line)->number)) break;
-+ (*line) = next;
-+ }
-+// if (column < (*line)->left + (*line)->width) {
-+ result = INVALID_OFFSET,
-+ view_map_offset_and_column (view, *line, &column, &result);
-+// }
-+ return result;
-+}
-+
-+/* map offset to cache_line */
-+static struct cache_line *
-+view_offset_to_line (WView *view, offset_type from)
-+{
-+ struct cache_line *result;
-+ struct cache_line *t;
-+
-+ result = view_get_first_line (view);
-+
-+ view_move_to_stop (result, t, result->end <= from, view_get_next_line)
-+ return result;
-+}
-+
-+/* map offset to cache_line, searching starts from line */
-+static struct cache_line *
-+view_offset_to_line_from (WView *view, offset_type from, struct cache_line *line)
-+{
-+ struct cache_line *result;
-+ struct cache_line *t;
-+
-+ result = line;
-+
-+ view_move_to_stop (result, t, result->start > from, view_get_previous_line)
-+ view_move_to_stop (result, t, result->end <= from, view_get_next_line)
-+
-+ return result;
-+}
-+
-+/* mam offset to column */
-+static screen_dimen
-+view_offset_to_column (WView *view, struct cache_line *line, offset_type from)
-+{
-+ offset_type result = INVALID_OFFSET;
-+
-+ view_map_offset_and_column (view, line, &result, &from);
-+
-+ result+= view_width_of_whole_line_before (view, line);
-+
-+ return result;
-+}
-+
- static void
- view_compute_areas (WView *view)
- {
- struct area view_area;
-+ struct cache_line *next;
- screen_dimen height, rest, y;
-+ screen_dimen old_width;
-+
-+ old_width = view->data_area.width;
-
- /* The viewer is surrounded by a frame of size view->dpy_frame_size.
- * Inside that frame, there are: The status line (at the top),
-@@ -337,6 +1012,17 @@ view_compute_areas (WView *view)
- view->ruler_area.top = y;
- y += view->ruler_area.height;
- }
-+
-+ if (old_width != view->data_area.width) {
-+ view_reset_cache_lines (view);
-+ view->first_showed_line = view_get_first_line (view);
-+ next = view_get_next_line (view, view->first_showed_line);
-+ while ((next != NULL) && (view->first_showed_line->end <= view->dpy_start)) {
-+ view->first_showed_line = next;
-+ next = view_get_next_line (view, view->first_showed_line);
-+ }
-+ view->dpy_start = view->first_showed_line->start;
-+ }
- }
-
- static void
-@@ -661,379 +1347,61 @@ view_set_datasource_stdio_pipe (WView *v
- }
-
- static void
--view_set_datasource_string (WView *view, const char *s)
--{
-- view->datasource = DS_STRING;
-- view->ds_string_data = (byte *) g_strdup (s);
-- view->ds_string_len = strlen (s);
--}
--
--static void
--view_set_datasource_file (WView *view, int fd, const struct stat *st)
--{
-- view->datasource = DS_FILE;
-- view->ds_file_fd = fd;
-- view->ds_file_filesize = st->st_size;
-- view->ds_file_offset = 0;
-- view->ds_file_data = g_malloc (4096);
-- view->ds_file_datalen = 0;
-- view->ds_file_datasize = 4096;
--}
--
--static void
--view_close_datasource (WView *view)
--{
-- switch (view->datasource) {
-- case DS_NONE:
-- break;
-- case DS_STDIO_PIPE:
-- if (view->ds_stdio_pipe != NULL) {
-- (void) pclose (view->ds_stdio_pipe);
-- display (view);
-- close_error_pipe (0, NULL);
-- view->ds_stdio_pipe = NULL;
-- }
-- view_growbuf_free (view);
-- break;
-- case DS_VFS_PIPE:
-- if (view->ds_vfs_pipe != -1) {
-- (void) mc_close (view->ds_vfs_pipe);
-- view->ds_vfs_pipe = -1;
-- }
-- view_growbuf_free (view);
-- break;
-- case DS_FILE:
-- (void) mc_close (view->ds_file_fd);
-- view->ds_file_fd = -1;
-- g_free (view->ds_file_data);
-- view->ds_file_data = NULL;
-- break;
-- case DS_STRING:
-- g_free (view->ds_string_data);
-- view->ds_string_data = NULL;
-- break;
-- default:
-- assert (!"Unknown datasource type");
-- }
-- view->datasource = DS_NONE;
--}
--
--/* {{{ The Coordinate Cache }}} */
--
--/*
-- This cache provides you with a fast lookup to map file offsets into
-- line/column pairs and vice versa. The interface to the mapping is
-- provided by the functions view_coord_to_offset() and
-- view_offset_to_coord().
--
-- The cache is implemented as a simple sorted array holding entries
-- that map some of the offsets to their line/column pair. Entries that
-- are not cached themselves are interpolated (exactly) from their
-- neighbor entries. The algorithm used for determining the line/column
-- for a specific offset needs to be kept synchronized with the one used
-- in display().
--*/
--
--enum ccache_type {
-- CCACHE_OFFSET,
-- CCACHE_LINECOL
--};
--
--static inline gboolean
--coord_cache_entry_less (const struct coord_cache_entry *a,
-- const struct coord_cache_entry *b, enum ccache_type crit,
-- gboolean nroff_mode)
--{
-- if (crit == CCACHE_OFFSET)
-- return (a->cc_offset < b->cc_offset);
--
-- if (a->cc_line < b->cc_line)
-- return TRUE;
--
-- if (a->cc_line == b->cc_line) {
-- if (nroff_mode) {
-- return (a->cc_nroff_column < b->cc_nroff_column);
-- } else {
-- return (a->cc_column < b->cc_column);
-- }
-- }
-- return FALSE;
--}
--
--#ifdef MC_ENABLE_DEBUGGING_CODE
--static void view_coord_to_offset (WView *, offset_type *, offset_type, offset_type);
--static void view_offset_to_coord (WView *, offset_type *, offset_type *, offset_type);
--
--static void
--view_ccache_dump (WView *view)
--{
-- FILE *f;
-- offset_type offset, line, column, nextline_offset, filesize;
-- guint i;
-- const struct coord_cache_entry *cache;
--
-- assert (view->coord_cache != NULL);
--
-- filesize = view_get_filesize (view);
-- cache = &(g_array_index (view->coord_cache, struct coord_cache_entry, 0));
--
-- f = fopen("mcview-ccache.out", "w");
-- if (f == NULL)
-- return;
-- (void)setvbuf(f, NULL, _IONBF, 0);
--
-- /* cache entries */
-- for (i = 0; i < view->coord_cache->len; i++) {
-- (void) fprintf (f,
-- "entry %8u "
-- "offset %8"OFFSETTYPE_PRId" "
-- "line %8"OFFSETTYPE_PRId" "
-- "column %8"OFFSETTYPE_PRId" "
-- "nroff_column %8"OFFSETTYPE_PRId"\n",
-- (unsigned int) i, cache[i].cc_offset, cache[i].cc_line,
-- cache[i].cc_column, cache[i].cc_nroff_column);
-- }
-- (void)fprintf (f, "\n");
--
-- /* offset -> line/column translation */
-- for (offset = 0; offset < filesize; offset++) {
-- view_offset_to_coord (view, &line, &column, offset);
-- (void)fprintf (f,
-- "offset %8"OFFSETTYPE_PRId" "
-- "line %8"OFFSETTYPE_PRId" "
-- "column %8"OFFSETTYPE_PRId"\n",
-- offset, line, column);
-- }
--
-- /* line/column -> offset translation */
-- for (line = 0; TRUE; line++) {
-- view_coord_to_offset (view, &nextline_offset, line + 1, 0);
-- (void)fprintf (f, "nextline_offset %8"OFFSETTYPE_PRId"\n",
-- nextline_offset);
--
-- for (column = 0; TRUE; column++) {
-- view_coord_to_offset (view, &offset, line, column);
-- if (offset >= nextline_offset)
-- break;
--
-- (void)fprintf (f, "line %8"OFFSETTYPE_PRId" column %8"OFFSETTYPE_PRId" offset %8"OFFSETTYPE_PRId"\n",
-- line, column, offset);
-- }
--
-- if (nextline_offset >= filesize - 1)
-- break;
-- }
--
-- (void)fclose (f);
--}
--#endif
--
--static inline gboolean
--is_nroff_sequence (WView *view, offset_type offset)
--{
-- int c0, c1, c2;
--
-- /* The following commands are ordered to speed up the calculation. */
--
-- c1 = get_byte_indexed (view, offset, 1);
-- if (c1 == -1 || c1 != '\b')
-- return FALSE;
--
-- c0 = get_byte_indexed (view, offset, 0);
-- if (c0 == -1 || !is_printable(c0))
-- return FALSE;
--
-- c2 = get_byte_indexed (view, offset, 2);
-- if (c2 == -1 || !is_printable(c2))
-- return FALSE;
--
-- return (c0 == c2 || c0 == '_' || (c0 == '+' && c2 == 'o'));
--}
--
--/* Find and return the index of the last cache entry that is
-- * smaller than ''coord'', according to the criterion ''sort_by''. */
--static inline guint
--view_ccache_find (WView *view, const struct coord_cache_entry *cache,
-- const struct coord_cache_entry *coord, enum ccache_type sort_by)
--{
-- guint base, i, limit;
--
-- limit = view->coord_cache->len;
-- assert (limit != 0);
--
-- base = 0;
-- while (limit > 1) {
-- i = base + limit / 2;
-- if (coord_cache_entry_less (coord, &cache[i], sort_by, view->text_nroff_mode)) {
-- /* continue the search in the lower half of the cache */
-- } else {
-- /* continue the search in the upper half of the cache */
-- base = i;
-- }
-- limit = (limit + 1) / 2;
-- }
-- return base;
--}
--
--/* Look up the missing components of ''coord'', which are given by
-- * ''lookup_what''. The function returns the smallest value that
-- * matches the existing components of ''coord''.
-- */
--static void
--view_ccache_lookup (WView *view, struct coord_cache_entry *coord,
-- enum ccache_type lookup_what)
--{
-- guint i;
-- struct coord_cache_entry *cache, current, next, entry;
-- enum ccache_type sorter;
-- offset_type limit;
-- enum {
-- NROFF_START,
-- NROFF_BACKSPACE,
-- NROFF_CONTINUATION
-- } nroff_state;
--
-- if (!view->coord_cache) {
-- view->coord_cache = g_array_new (FALSE, FALSE, sizeof(struct coord_cache_entry));
-- current.cc_offset = 0;
-- current.cc_line = 0;
-- current.cc_column = 0;
-- current.cc_nroff_column = 0;
-- g_array_append_val (view->coord_cache, current);
-- }
--
-- sorter = (lookup_what == CCACHE_OFFSET) ? CCACHE_LINECOL : CCACHE_OFFSET;
--
-- retry:
-- /* find the two neighbor entries in the cache */
-- cache = &(g_array_index (view->coord_cache, struct coord_cache_entry, 0));
-- i = view_ccache_find (view, cache, coord, sorter);
-- /* now i points to the lower neighbor in the cache */
--
-- current = cache[i];
-- if (i + 1 < view->coord_cache->len)
-- limit = cache[i + 1].cc_offset;
-- else
-- limit = current.cc_offset + VIEW_COORD_CACHE_GRANUL;
--
-- entry = current;
-- nroff_state = NROFF_START;
-- for (; current.cc_offset < limit; current = next) {
-- int c, nextc;
--
-- if ((c = get_byte (view, current.cc_offset)) == -1)
-- break;
--
-- if (!coord_cache_entry_less (¤t, coord, sorter, view->text_nroff_mode)) {
-- if (lookup_what == CCACHE_OFFSET
-- && view->text_nroff_mode
-- && nroff_state != NROFF_START) {
-- /* don't break here */
-- } else {
-- break;
-- }
-- }
--
-- /* Provide useful default values for ''next'' */
-- next.cc_offset = current.cc_offset + 1;
-- next.cc_line = current.cc_line;
-- next.cc_column = current.cc_column + 1;
-- next.cc_nroff_column = current.cc_nroff_column + 1;
--
-- /* and override some of them as necessary. */
-- if (c == '\r') {
-- nextc = get_byte_indexed(view, current.cc_offset, 1);
--
-- /* Ignore '\r' if it is followed by '\r' or '\n'. If it is
-- * followed by anything else, it is a Mac line ending and
-- * produces a line break.
-- */
-- if (nextc == '\r' || nextc == '\n') {
-- next.cc_column = current.cc_column;
-- next.cc_nroff_column = current.cc_nroff_column;
-- } else {
-- next.cc_line = current.cc_line + 1;
-- next.cc_column = 0;
-- next.cc_nroff_column = 0;
-- }
--
-- } else if (nroff_state == NROFF_BACKSPACE) {
-- next.cc_nroff_column = current.cc_nroff_column - 1;
--
-- } else if (c == '\t') {
-- next.cc_column = offset_rounddown (current.cc_column, 8) + 8;
-- next.cc_nroff_column =
-- offset_rounddown (current.cc_nroff_column, 8) + 8;
--
-- } else if (c == '\n') {
-- next.cc_line = current.cc_line + 1;
-- next.cc_column = 0;
-- next.cc_nroff_column = 0;
--
-- } else {
-- /* Use all default values from above */
-- }
--
-- switch (nroff_state) {
-- case NROFF_START:
-- case NROFF_CONTINUATION:
-- if (is_nroff_sequence (view, current.cc_offset))
-- nroff_state = NROFF_BACKSPACE;
-- else
-- nroff_state = NROFF_START;
-- break;
-- case NROFF_BACKSPACE:
-- nroff_state = NROFF_CONTINUATION;
-- break;
-- }
--
-- /* Cache entries must guarantee that for each i < j,
-- * line[i] <= line[j] and column[i] < column[j]. In the case of
-- * nroff sequences and '\r' characters, this is not guaranteed,
-- * so we cannot save them. */
-- if (nroff_state == NROFF_START && c != '\r')
-- entry = next;
-- }
--
-- if (i + 1 == view->coord_cache->len && entry.cc_offset != cache[i].cc_offset) {
-- g_array_append_val (view->coord_cache, entry);
-- goto retry;
-- }
--
-- if (lookup_what == CCACHE_OFFSET) {
-- coord->cc_offset = current.cc_offset;
-- } else {
-- coord->cc_line = current.cc_line;
-- coord->cc_column = current.cc_column;
-- coord->cc_nroff_column = current.cc_nroff_column;
-- }
--}
--
--static void
--view_coord_to_offset (WView *view, offset_type *ret_offset,
-- offset_type line, offset_type column)
-+view_set_datasource_string (WView *view, const char *s)
- {
-- struct coord_cache_entry coord;
--
-- coord.cc_line = line;
-- coord.cc_column = column;
-- coord.cc_nroff_column = column;
-- view_ccache_lookup (view, &coord, CCACHE_OFFSET);
-- *ret_offset = coord.cc_offset;
-+ view->datasource = DS_STRING;
-+ view->ds_string_data = (byte *) g_strdup (s);
-+ view->ds_string_len = strlen (s);
- }
-
- static void
--view_offset_to_coord (WView *view, offset_type *ret_line,
-- offset_type *ret_column, offset_type offset)
-+view_set_datasource_file (WView *view, int fd, const struct stat *st)
- {
-- struct coord_cache_entry coord;
-+ view->datasource = DS_FILE;
-+ view->ds_file_fd = fd;
-+ view->ds_file_filesize = st->st_size;
-+ view->ds_file_offset = 0;
-+ view->ds_file_data = g_malloc (4096);
-+ view->ds_file_datalen = 0;
-+ view->ds_file_datasize = 4096;
-+}
-
-- coord.cc_offset = offset;
-- view_ccache_lookup (view, &coord, CCACHE_LINECOL);
-- *ret_line = coord.cc_line;
-- *ret_column = (view->text_nroff_mode)
-- ? coord.cc_nroff_column
-- : coord.cc_column;
-+static void
-+view_close_datasource (WView *view)
-+{
-+ switch (view->datasource) {
-+ case DS_NONE:
-+ break;
-+ case DS_STDIO_PIPE:
-+ if (view->ds_stdio_pipe != NULL) {
-+ (void) pclose (view->ds_stdio_pipe);
-+ display (view);
-+ close_error_pipe (0, NULL);
-+ view->ds_stdio_pipe = NULL;
-+ }
-+ view_growbuf_free (view);
-+ break;
-+ case DS_VFS_PIPE:
-+ if (view->ds_vfs_pipe != -1) {
-+ (void) mc_close (view->ds_vfs_pipe);
-+ view->ds_vfs_pipe = -1;
-+ }
-+ view_growbuf_free (view);
-+ break;
-+ case DS_FILE:
-+ (void) mc_close (view->ds_file_fd);
-+ view->ds_file_fd = -1;
-+ g_free (view->ds_file_data);
-+ view->ds_file_data = NULL;
-+ break;
-+ case DS_STRING:
-+ g_free (view->ds_string_data);
-+ view->ds_string_data = NULL;
-+ break;
-+ default:
-+ assert (!"Unknown datasource type");
-+ }
-+ view->datasource = DS_NONE;
- }
-
- /* {{{ Cursor Movement }}} */
-@@ -1058,6 +1426,24 @@ view_offset_to_coord (WView *view, offse
- static void view_move_up (WView *, offset_type);
- static void view_moveto_bol (WView *);
-
-+/* set view->first_showed_line and view->dpy_start
-+ * use view->dpy_text_column in nowrap mode */
-+static void
-+view_set_first_showed (WView *view, struct cache_line *line)
-+{
-+ if (view->text_wrap_mode) {
-+ view->dpy_start = line->start;
-+ view->first_showed_line = line;
-+ } else {
-+ view->dpy_start = view_column_to_offset (view, &line, view->dpy_text_column);
-+ view->first_showed_line = line;
-+ }
-+ if (view->search_start == view->search_end) {
-+ view->search_start = view->dpy_start;
-+ view->search_end = view->dpy_start;
-+ }
-+}
-+
- static void
- view_scroll_to_cursor (WView *view)
- {
-@@ -1074,16 +1460,8 @@ view_scroll_to_cursor (WView *view)
- topleft = offset_rounddown (cursor, bytes);
- view->dpy_start = topleft;
- } else if (view->text_wrap_mode) {
-- offset_type line, col, columns;
--
-- columns = view->data_area.width;
-- view_offset_to_coord (view, &line, &col, view->dpy_start + view->dpy_text_column);
-- if (columns != 0)
-- col = offset_rounddown (col, columns);
-- view_coord_to_offset (view, &(view->dpy_start), line, col);
- view->dpy_text_column = 0;
- } else {
-- /* nothing to do */
- }
- }
-
-@@ -1093,7 +1471,7 @@ view_movement_fixups (WView *view, gbool
- view_scroll_to_cursor (view);
- if (reset_search) {
- view->search_start = view->dpy_start;
-- view->search_length = 0;
-+ view->search_end = view->dpy_start;
- }
- view->dirty++;
- }
-@@ -1103,6 +1481,7 @@ view_moveto_top (WView *view)
- {
- view->dpy_start = 0;
- view->hex_cursor = 0;
-+ view->first_showed_line = view_get_first_line (view);
- view->dpy_text_column = 0;
- view_movement_fixups (view, TRUE);
- }
-@@ -1111,6 +1490,7 @@ static void
- view_moveto_bottom (WView *view)
- {
- offset_type datalines, lines_up, filesize, last_offset;
-+ struct cache_line *line;
-
- if (view->growbuf_in_use)
- view_growbuf_read_until (view, OFFSETTYPE_MAX);
-@@ -1125,8 +1505,11 @@ view_moveto_bottom (WView *view)
- view_move_up (view, lines_up);
- view->hex_cursor = last_offset;
- } else {
-- view->dpy_start = last_offset;
-- view_moveto_bol (view);
-+ line = view_get_last_line (view);
-+ if (!view->text_wrap_mode)
-+ line = view_get_start_of_whole_line (view, line);
-+ view_set_first_showed (view, line);
-+ view->dpy_text_column = 0;
- view_move_up (view, lines_up);
- }
- view_movement_fixups (view, TRUE);
-@@ -1135,15 +1518,17 @@ view_moveto_bottom (WView *view)
- static void
- view_moveto_bol (WView *view)
- {
-+ struct cache_line *line;
-+
- if (view->hex_mode) {
- view->hex_cursor -= view->hex_cursor % view->bytes_per_line;
- } else if (view->text_wrap_mode) {
- /* do nothing */
- } else {
-- offset_type line, column;
-- view_offset_to_coord (view, &line, &column, view->dpy_start);
-- view_coord_to_offset (view, &(view->dpy_start), line, 0);
-+ line = view_get_first_showed_line (view);
-+ line = view_get_start_of_whole_line (view, line);
- view->dpy_text_column = 0;
-+ view_set_first_showed (view, line);
- }
- view_movement_fixups (view, TRUE);
- }
-@@ -1151,6 +1536,10 @@ view_moveto_bol (WView *view)
- static void
- view_moveto_eol (WView *view)
- {
-+ const screen_dimen width = view->data_area.width;
-+ struct cache_line *line;
-+ screen_dimen w;
-+
- if (view->hex_mode) {
- offset_type filesize, bol;
-
-@@ -1164,10 +1553,17 @@ view_moveto_eol (WView *view)
- } else if (view->text_wrap_mode) {
- /* nothing to do */
- } else {
-- offset_type line, col;
--
-- view_offset_to_coord (view, &line, &col, view->dpy_start);
-- view_coord_to_offset (view, &(view->dpy_start), line, OFFSETTYPE_MAX);
-+ line = view_get_first_showed_line (view);
-+ line = view_get_start_of_whole_line (view, line);
-+ w = view_width_of_whole_line (view, line);
-+ if (w > width) {
-+ view->dpy_text_column = w - width;
-+ } else {
-+// if (w + width <= view->dpy_text_column) {
-+ view->dpy_text_column = 0;
-+// }
-+ }
-+ view_set_first_showed (view, line);
- }
- view_movement_fixups (view, FALSE);
- }
-@@ -1175,27 +1571,50 @@ view_moveto_eol (WView *view)
- static void
- view_moveto_offset (WView *view, offset_type offset)
- {
-+ struct cache_line *line;
-+
- if (view->hex_mode) {
- view->hex_cursor = offset;
- view->dpy_start = offset - offset % view->bytes_per_line;
- } else {
-- view->dpy_start = offset;
-+ line = view_offset_to_line (view, offset);
-+ view->dpy_start = (view->text_wrap_mode) ? line->start : offset;
-+ view->first_showed_line = line;
-+ view->dpy_text_column = (view->text_wrap_mode) ?
-+ 0 : view_offset_to_column (view, line, offset);
- }
- view_movement_fixups (view, TRUE);
- }
-
- static void
--view_moveto (WView *view, offset_type line, offset_type col)
-+view_moveto (WView *view, offset_type row, offset_type col)
- {
-- offset_type offset;
-+ struct cache_line *act;
-+ struct cache_line *t;
-
-- view_coord_to_offset (view, &offset, line, col);
-- view_moveto_offset (view, offset);
-+ act = view_get_first_line (view);
-+ view_move_to_stop (act, t, act->number != row, view_get_next_line)
-+
-+ view->dpy_text_column = (view->text_wrap_mode) ? 0 : col;
-+ view->dpy_start = view_column_to_offset (view, &act, col);
-+ view->dpy_start = (view->text_wrap_mode) ? act->start : view->dpy_start;
-+ view->first_showed_line = act;
-+
-+ if (view->hex_mode)
-+ view_moveto_offset (view, view->dpy_start);
- }
-
-+/* extendet view_move_to_stop, now has counter, too */
-+#define view_count_to_stop(l,t,i,stop,nf)\
-+while (((t = nf(view, l)) != NULL) && (stop)) {\
-+ l = t;i++;}
-+
- static void
- view_move_up (WView *view, offset_type lines)
- {
-+ struct cache_line *line, *t;
-+ int li;
-+
- if (view->hex_mode) {
- offset_type bytes = lines * view->bytes_per_line;
- if (view->hex_cursor >= bytes) {
-@@ -1206,35 +1625,15 @@ view_move_up (WView *view, offset_type l
- view->hex_cursor %= view->bytes_per_line;
- }
- } else if (view->text_wrap_mode) {
-- const screen_dimen width = view->data_area.width;
-- offset_type i, col, line, linestart;
--
-- for (i = 0; i < lines; i++) {
-- view_offset_to_coord (view, &line, &col, view->dpy_start);
-- if (col >= width) {
-- col -= width;
-- } else if (line >= 1) {
-- view_coord_to_offset (view, &linestart, line, 0);
-- view_offset_to_coord (view, &line, &col, linestart - 1);
--
-- /* if the only thing that would be displayed were a
-- * single newline character, advance to the previous
-- * part of the line. */
-- if (col > 0 && col % width == 0)
-- col -= width;
-- else
-- col -= col % width;
-- } else {
-- /* nothing to do */
-- }
-- view_coord_to_offset (view, &(view->dpy_start), line, col);
-- }
-- } else {
-- offset_type line, column;
--
-- view_offset_to_coord (view, &line, &column, view->dpy_start);
-- line = offset_doz(line, lines);
-- view_coord_to_offset (view, &(view->dpy_start), line, column);
-+ line = view_get_first_showed_line (view);
-+ li = 0;
-+ view_count_to_stop (line, t, li, (li < lines), view_get_previous_line)
-+ view_set_first_showed (view, line);
-+ } else {
-+ line = view_get_first_showed_line (view);
-+ li = 0;
-+ view_count_to_stop (line, t, li, (li < lines), view_get_previous_whole_line)
-+ view_set_first_showed (view, line);
- }
- view_movement_fixups (view, (lines != 1));
- }
-@@ -1242,6 +1641,29 @@ view_move_up (WView *view, offset_type l
- static void
- view_move_down (WView *view, offset_type lines)
- {
-+ struct cache_line *line;
-+ struct cache_line *t;
-+ int li;
-+
-+ void
-+ return_up (struct cache_line * (*ne) (WView *, struct cache_line *),
-+ struct cache_line * (*pr) (WView *, struct cache_line *))
-+ {
-+ li = 0;
-+ t = line;
-+ while ((t != NULL) && (li < view->data_area.height)) {
-+ li++;
-+ t = ne (view, t);
-+ }
-+ li = view->data_area.height - li;
-+ t = pr (view, line);
-+ while ((t != NULL) && (li > 0)) {
-+ line = t;
-+ t = pr (view, line);
-+ li--;
-+ }
-+ }
-+
- if (view->hex_mode) {
- offset_type i, limit, last_byte;
-
-@@ -1256,35 +1678,20 @@ view_move_down (WView *view, offset_type
- view->dpy_start += view->bytes_per_line;
- }
-
-- } else if (view->dpy_end == view_get_filesize (view)) {
-- /* don't move further down. There's nothing more to see. */
--
- } else if (view->text_wrap_mode) {
-- offset_type line, col, i;
--
-- for (i = 0; i < lines; i++) {
-- offset_type new_offset, chk_line, chk_col;
--
-- view_offset_to_coord (view, &line, &col, view->dpy_start);
-- col += view->data_area.width;
-- view_coord_to_offset (view, &new_offset, line, col);
--
-- /* skip to the next line if the only thing that would be
-- * displayed is the newline character. */
-- view_offset_to_coord (view, &chk_line, &chk_col, new_offset);
-- if (chk_line == line && chk_col == col
-- && get_byte (view, new_offset) == '\n')
-- new_offset++;
--
-- view->dpy_start = new_offset;
-- }
--
-- } else {
-- offset_type line, col;
-+ line = view_get_first_showed_line (view);
-+ li = 0;
-+ view_count_to_stop (line, t, li, li < lines, view_get_next_line)
-+
-+ // return_up (view_get_next_line, view_get_previous_line);
-+ view_set_first_showed (view, line);
-+ } else {
-+ line = view_get_first_showed_line (view);
-+ li = 0;
-+ view_count_to_stop (line, t, li, li < lines, view_get_next_whole_line)
-
-- view_offset_to_coord (view, &line, &col, view->dpy_start);
-- line += lines;
-- view_coord_to_offset (view, &(view->dpy_start), line, col);
-+ // return_up (view_get_next_whole_line, view_get_previous_whole_line);
-+ view_set_first_showed (view, line);
- }
- view_movement_fixups (view, (lines != 1));
- }
-@@ -1292,6 +1699,8 @@ view_move_down (WView *view, offset_type
- static void
- view_move_left (WView *view, offset_type columns)
- {
-+ struct cache_line *line;
-+
- if (view->hex_mode) {
- assert (columns == 1);
- if (view->hexview_in_text || !view->hexedit_lownibble) {
-@@ -1304,9 +1713,12 @@ view_move_left (WView *view, offset_type
- /* nothing to do */
- } else {
- if (view->dpy_text_column >= columns)
-- view->dpy_text_column -= columns;
-+ view->dpy_text_column-= columns;
- else
- view->dpy_text_column = 0;
-+
-+ line = view_get_first_showed_line (view);
-+ view_set_first_showed (view, line);
- }
- view_movement_fixups (view, FALSE);
- }
-@@ -1314,6 +1726,8 @@ view_move_left (WView *view, offset_type
- static void
- view_move_right (WView *view, offset_type columns)
- {
-+ struct cache_line *line;
-+
- if (view->hex_mode) {
- assert (columns == 1);
- if (view->hexview_in_text || view->hexedit_lownibble) {
-@@ -1326,6 +1740,8 @@ view_move_right (WView *view, offset_typ
- /* nothing to do */
- } else {
- view->dpy_text_column += columns;
-+ line = view_get_first_showed_line (view);
-+ view_set_first_showed (view, line);
- }
- view_movement_fixups (view, FALSE);
- }
-@@ -1335,6 +1751,8 @@ view_move_right (WView *view, offset_typ
- static void
- view_toggle_hex_mode (WView *view)
- {
-+ struct cache_line *line;
-+
- view->hex_mode = !view->hex_mode;
-
- if (view->hex_mode) {
-@@ -1343,8 +1761,10 @@ view_toggle_hex_mode (WView *view)
- offset_rounddown (view->dpy_start, view->bytes_per_line);
- view->widget.options |= W_WANT_CURSOR;
- } else {
-- view->dpy_start = view->hex_cursor;
-- view_moveto_bol (view);
-+ line = view_offset_to_line (view, view->hex_cursor);
-+ view->dpy_text_column = (view->text_wrap_mode) ? 0 :
-+ view_offset_to_column (view, line, view->hex_cursor);
-+ view_set_first_showed (view, line);
- view->widget.options &= ~W_WANT_CURSOR;
- }
- altered_hex_mode = 1;
-@@ -1363,14 +1783,15 @@ view_toggle_hexedit_mode (WView *view)
- static void
- view_toggle_wrap_mode (WView *view)
- {
-+ struct cache_line *line;
-+
- view->text_wrap_mode = !view->text_wrap_mode;
- if (view->text_wrap_mode) {
-- view_scroll_to_cursor (view);
-+ view->dpy_text_column = 0;
-+ view->dpy_start = view_get_first_showed_line (view)->start;
- } else {
-- offset_type line;
--
-- view_offset_to_coord (view, &line, &(view->dpy_text_column), view->dpy_start);
-- view_coord_to_offset (view, &(view->dpy_start), line, 0);
-+ line = view_get_first_showed_line (view);
-+ view->dpy_text_column = view_width_of_whole_line_before (view, line);
- }
- view->dpy_bbar_dirty = TRUE;
- view->dirty++;
-@@ -1379,10 +1800,18 @@ view_toggle_wrap_mode (WView *view)
- static void
- view_toggle_nroff_mode (WView *view)
- {
-+ struct cache_line *line;
-+ struct cache_line *next;
-+
- view->text_nroff_mode = !view->text_nroff_mode;
- altered_nroff_flag = 1;
- view->dpy_bbar_dirty = TRUE;
- view->dirty++;
-+
-+ line = view_get_first_line (view);
-+ view_move_to_stop (line, next, line->end <= view->dpy_start, view_get_next_line)
-+
-+ view_set_first_showed (view, line);
- }
-
- static void
-@@ -1410,12 +1839,16 @@ view_done (WView *view)
- {
- /* Save current file position */
- if (mcview_remember_file_position && view->filename != NULL) {
-+ struct cache_line *line;
- char *canon_fname;
-- offset_type line, col;
-+ offset_type row, col;
-
- canon_fname = vfs_canon (view->filename);
-- view_offset_to_coord (view, &line, &col, view->dpy_start);
-- save_file_position (canon_fname, line + 1, col);
-+ line = view_get_first_showed_line (view);
-+ row = line->number + 1;
-+ col = view_offset_to_column (view, line, view->dpy_start);
-+
-+ save_file_position (canon_fname, row, col);
- g_free (canon_fname);
- }
-
-@@ -1425,7 +1858,6 @@ view_done (WView *view)
- default_magic_flag = view->magic_mode;
- global_wrap_mode = view->text_wrap_mode;
-
-- /* Free memory used by the viewer */
-
- /* view->widget needs no destructor */
-
-@@ -1435,12 +1867,13 @@ view_done (WView *view)
- view_close_datasource (view);
- /* the growing buffer is freed with the datasource */
-
-- if (view->coord_cache) {
-- g_array_free (view->coord_cache, TRUE), view->coord_cache = NULL;
-- }
--
- view_hexedit_free_change_list (view);
- /* FIXME: what about view->search_exp? */
-+
-+ /* Free memory used by the viewer */
-+ view_reduce_cache_lines (view);
-+ if (view->converter != str_cnv_from_term) str_close_conv (view->converter);
-+
- }
-
- static void
-@@ -1491,12 +1924,15 @@ view_load (WView *view, const char *comm
- int i, type;
- int fd = -1;
- char tmp[BUF_MEDIUM];
-+ const char *enc;
-+ char *canon_fname;
- struct stat st;
- gboolean retval = FALSE;
-
- assert (view->bytes_per_line != 0);
- view_done (view);
-
-+
- /* Set up the state */
- view_set_datasource_none (view);
- view->filename = g_strdup (file);
-@@ -1519,6 +1955,8 @@ view_load (WView *view, const char *comm
- g_snprintf (tmp, sizeof (tmp), _(" Cannot open \"%s\"\n %s "),
- file, unix_error_string (errno));
- view_show_error (view, tmp);
-+ g_free (view->filename);
-+ view->filename = NULL;
- goto finish;
- }
-
-@@ -1528,12 +1966,16 @@ view_load (WView *view, const char *comm
- g_snprintf (tmp, sizeof (tmp), _(" Cannot stat \"%s\"\n %s "),
- file, unix_error_string (errno));
- view_show_error (view, tmp);
-+ g_free (view->filename);
-+ view->filename = NULL;
- goto finish;
- }
-
- if (!S_ISREG (st.st_mode)) {
- mc_close (fd);
- view_show_error (view, _(" Cannot view: not a regular file "));
-+ g_free (view->filename);
-+ view->filename = NULL;
- goto finish;
- }
-
-@@ -1556,16 +1998,31 @@ view_load (WView *view, const char *comm
- view->command = g_strdup (command);
- view->dpy_start = 0;
- view->search_start = 0;
-- view->search_length = 0;
-+ view->search_end = 0;
- view->dpy_text_column = 0;
- view->last_search = 0; /* Start a new search */
-
-+ view->converter = str_cnv_from_term;
-+ /* try detect encoding from path */
-+ if (view->filename != NULL) {
-+ canon_fname = vfs_canon (view->filename);
-+ enc = vfs_get_encoding (canon_fname);
-+ if (enc != NULL) {
-+ view->converter = str_crt_conv_from (enc);
-+ if (view->converter == (iconv_t) (-1)) view->converter = str_cnv_from_term;
-+ }
-+ g_free (canon_fname);
-+ }
-+
-+ view_compute_areas (view);
-+ view_reset_cache_lines (view);
-+ view->first_showed_line = view_get_first_line (view);
-+
- assert (view->bytes_per_line != 0);
-- if (mcview_remember_file_position && file != NULL && start_line == 0) {
-+ if (mcview_remember_file_position && view->filename != NULL && start_line == 0) {
- long line, col;
-- char *canon_fname;
-
-- canon_fname = vfs_canon (file);
-+ canon_fname = vfs_canon (view->filename);
- load_file_position (file, &line, &col);
- g_free (canon_fname);
- view_moveto (view, offset_doz(line, 1), col);
-@@ -1634,6 +2091,7 @@ view_display_status (WView *view)
- const char *file_label, *file_name;
- screen_dimen file_label_width;
- int i;
-+ char *tmp;
-
- if (height < 1)
- return;
-@@ -1643,27 +2101,38 @@ view_display_status (WView *view)
- hline (' ', width);
-
- file_label = _("File: %s");
-- file_label_width = strlen (file_label) - 2;
-+ file_label_width = str_term_width1 (file_label) - 2;
- file_name = view->filename ? view->filename
- : view->command ? view->command
- : "";
-
- if (width < file_label_width + 6)
-- addstr ((char *) name_trunc (file_name, width));
-+ addstr (str_fit_to_term (file_name, width, J_LEFT_FIT));
- else {
- i = (width > 22 ? 22 : width) - file_label_width;
-- tty_printf (file_label, name_trunc (file_name, i));
-+
-+ tmp = g_strdup_printf (file_label, str_fit_to_term (file_name, i, J_LEFT_FIT));
-+ addstr (tmp);
-+ g_free (tmp);
- if (width > 46) {
- widget_move (view, top, left + 24);
- /* FIXME: the format strings need to be changed when offset_type changes */
- if (view->hex_mode)
- tty_printf (_("Offset 0x%08lx"), (unsigned long) view->hex_cursor);
- else {
-- offset_type line, col;
-- view_offset_to_coord (view, &line, &col, view->dpy_start);
-+ screen_dimen row, col;
-+ struct cache_line *line;
-+
-+ line = view_get_first_showed_line (view);
-+ row = line->number + 1;
-+
-+ col = (view->text_wrap_mode) ?
-+ view_width_of_whole_line_before (view, line) :
-+ view->dpy_text_column;
-+ col++;
-+
- tty_printf (_("Line %lu Col %lu"),
-- (unsigned long) line + 1,
-- (unsigned long) (view->text_wrap_mode ? col : view->dpy_text_column));
-+ (unsigned long) row, (unsigned long) col);
- }
- }
- if (width > 62) {
-@@ -1793,7 +2262,8 @@ view_display_hex (WView *view)
- widget_move (view, top + row, left);
- tty_setcolor (MARKED_COLOR);
- for (i = 0; col < width && hex_buff[i] != '\0'; i++) {
-- tty_print_char(hex_buff[i]);
-+ addch (hex_buff[i]);
-+/* tty_print_char(hex_buff[i]);*/
- col += 1;
- }
- tty_setcolor (NORMAL_COLOR);
-@@ -1814,8 +2284,7 @@ view_display_hex (WView *view)
- (from == view->hex_cursor) ? MARK_CURSOR
- : (curr != NULL && from == curr->offset) ? MARK_CHANGED
- : (view->search_start <= from &&
-- from < view->search_start + view->search_length
-- ) ? MARK_SELECTED
-+ from < view->search_end) ? MARK_SELECTED
- : MARK_NORMAL;
-
- /* Determine the value of the current byte */
-@@ -1876,7 +2345,7 @@ view_display_hex (WView *view)
- MARKED_SELECTED_COLOR);
-
- c = convert_to_display_c (c);
-- if (!is_printable (c))
-+ if (!g_ascii_isprint (c))
- c = '.';
-
- /* Print corresponding character on the text side */
-@@ -1903,101 +2372,116 @@ view_display_hex (WView *view)
- static void
- view_display_text (WView * view)
- {
-+ #define cmp(t1,t2) (strcmp((t1),(t2)) == 0)
-+
- const screen_dimen left = view->data_area.left;
- const screen_dimen top = view->data_area.top;
- const screen_dimen width = view->data_area.width;
- const screen_dimen height = view->data_area.height;
-- screen_dimen row, col;
-- offset_type from;
-- int c;
-- struct hexedit_change_node *curr = view->change_list;
-+ struct read_info info;
-+ offset_type row, col;
-+ int w;
-+ struct cache_line *line_act;
-+ struct cache_line *line_nxt;
-
- view_display_clean (view);
- view_display_ruler (view);
-
-- /* Find the first displayable changed byte */
-- from = view->dpy_start;
-- while (curr && (curr->offset < from)) {
-- curr = curr->next;
-- }
--
- tty_setcolor (NORMAL_COLOR);
-- for (row = 0, col = 0; row < height && (c = get_byte (view, from)) != -1; from++) {
-
-- if (view->text_nroff_mode && c == '\b') {
-- int c_prev;
-- int c_next;
--
-- if ((c_next = get_byte_indexed (view, from, 1)) != -1
-- && is_printable (c_next)
-- && from >= 1
-- && (c_prev = get_byte (view, from - 1)) != -1
-- && is_printable (c_prev)
-- && (c_prev == c_next || c_prev == '_'
-- || (c_prev == '+' && c_next == 'o'))) {
-- if (col == 0) {
-- if (row == 0) {
-- /* We're inside an nroff character sequence at the
-- * beginning of the screen -- just skip the
-- * backspace and continue with the next character. */
-+ widget_move (view, top, left);
-+
-+ line_act = view_get_first_showed_line (view);
-+
-+ row = 0;
-+ /* set col correct value */
-+ col = (view->text_wrap_mode) ? 0 : view_width_of_whole_line_before (view, line_act);
-+ col+= line_act->left;
-+
-+ view_read_start (view, &info, line_act->start);
-+ while ((info.result != -1) && (row < height)) {
-+ /* real detection of new line */
-+ if (info.next >= line_act->end) {
-+ line_nxt = view_get_next_line (view, line_act);
-+ if (line_nxt == NULL) break;
-+
-+ if (view->text_wrap_mode || (line_act->number != line_nxt->number)){
-+ row++;
-+ col = line_nxt->left;
-+ }
-+ line_act = line_nxt;
-+
- continue;
- }
-- row--;
-- col = width;
-+
-+ view_read_continue (view, &info);
-+ if (view_read_test_nroff_back (view, &info)) {
-+ w = str_term_width1 (info.chi1);
-+ col-= w;
-+ if (col >= view->dpy_text_column
-+ && col + w - view->dpy_text_column <= width) {
-+
-+ widget_move (view, top + row, left + (col - view->dpy_text_column));
-+ int c;
-+ for (c = 0; c < w; c++) addch (' ');
- }
-- col--;
-- if (c_prev == '_' && (c_next != '_' || view_count_backspaces (view, from) == 1))
-+ if (cmp (info.chi1, "_") && (!cmp (info.cnxt, "_") || !cmp (info.chi2, "\b")))
- tty_setcolor (VIEW_UNDERLINED_COLOR);
- else
- tty_setcolor (MARKED_COLOR);
- continue;
- }
-- }
-
-- if ((c == '\n') || (col >= width && view->text_wrap_mode)) {
-- col = 0;
-- row++;
-- if (c == '\n' || row >= height)
-+ if (view_read_test_new_line (view, &info))
- continue;
-- }
-
-- if (c == '\r') {
-- c = get_byte_indexed(view, from, 1);
-- if (c == '\r' || c == '\n')
-- continue;
-- col = 0;
-- row++;
-- continue;
-- }
-
-- if (c == '\t') {
-- offset_type line, column;
-- view_offset_to_coord (view, &line, &column, from);
-- col += (8 - column % 8);
-- if (view->text_wrap_mode && col >= width && width != 0) {
-- row += col / width;
-- col %= width;
-- }
-+ if (view_read_test_tabulator (view, &info)) {
-+ col+= (8 - (col % 8));
- continue;
- }
-
-- if (view->search_start <= from
-- && from < view->search_start + view->search_length) {
-+ if (view->search_start <= info.actual
-+ && info.actual < view->search_end) {
- tty_setcolor (SELECTED_COLOR);
- }
-
-+ w = str_isprint (info.cact) ? str_term_width1 (info.cact) : 1;
-+
- if (col >= view->dpy_text_column
-- && col - view->dpy_text_column < width) {
-+ && col + w - view->dpy_text_column <= width) {
- widget_move (view, top + row, left + (col - view->dpy_text_column));
-- c = convert_to_display_c (c);
-- if (!is_printable (c))
-- c = '.';
-- tty_print_char (c);
-+
-+ if (!str_iscombiningmark (info.cnxt)) {
-+ if (str_isprint (info.cact)) {
-+ addstr (str_term_form (info.cact));
-+ } else {
-+ addch ('.');
- }
-- col++;
-+ } else {
-+ struct str_buffer *comb = str_get_buffer ();
-+ if (str_isprint (info.cact)) {
-+ str_insert_string (info.cact, comb);
-+ } else {
-+ str_insert_string (".", comb);
-+ }
-+ while (str_iscombiningmark (info.cnxt)) {
-+ view_read_continue (view, &info);
-+ str_insert_string (info.cact, comb);
-+ }
-+ addstr (str_term_form (comb->data));
-+ str_release_buffer (comb);
-+ }
-+ } else {
-+ while (str_iscombiningmark (info.cnxt)) {
-+ view_read_continue (view, &info);
-+ }
-+ }
-+ col+= w;
-+
- tty_setcolor (NORMAL_COLOR);
- }
-- view->dpy_end = from;
-+ view->dpy_end = info.next;
- }
-
- /* Displays as much data from view->dpy_start as fits on the screen */
-@@ -2168,8 +2652,8 @@ view_hexedit_save_changes (WView *view)
-
- if (mc_close (fp) == -1) {
- error = g_strdup (strerror (errno));
-- message (D_ERROR, _(" Save file "),
-- _(" Error while closing the file: \n %s \n"
-+ message (D_ERROR, _(" Save file "), _(
-+ " Error while closing the file: \n %s \n"
- " Data may have been written or not. "), error);
- g_free (error);
- }
-@@ -2227,122 +2711,264 @@ my_define (Dlg_head *h, int idx, const c
-
- /* Case insensitive search of text in data */
- static int
--icase_search_p (WView *view, char *text, char *data, int nothing)
-+icase_search_p (WView *view, char *text, char *data, int nothing,
-+ size_t *match_start, size_t *match_end)
- {
- const char *q;
-- int lng;
-- const int direction = view->direction;
--
- (void) nothing;
-
-- /* If we are searching backwards, reverse the string */
-- if (direction == -1) {
-- g_strreverse (text);
-- g_strreverse (data);
-- }
--
-- q = _icase_search (text, data, &lng);
--
-- if (direction == -1) {
-- g_strreverse (text);
-- g_strreverse (data);
-- }
-
-- if (q != 0) {
-- if (direction > 0)
-- view->search_start = q - data - lng;
-- else
-- view->search_start = strlen (data) - (q - data);
-- view->search_length = lng;
-+ q = (view->direction == 1)
-+ ? str_search_first (data, text, 0)
-+ : str_search_last (data, text, 0);
-+
-+ if (q != NULL) {
-+ (*match_start) = str_length_noncomb (data) - str_length_noncomb (q);
-+ (*match_end) = (*match_start) + str_length_noncomb (text);
- return 1;
- }
- return 0;
- }
-
--static char *
--grow_string_buffer (char *text, gulong *size)
-+/* read one whole line into buffer, return where line start and end */
-+static int
-+view_get_line_at (WView *view, offset_type from, struct str_buffer * buffer,
-+ offset_type *buff_start, offset_type *buff_end)
- {
-- char *new;
-+ #define cmp(t1,t2) (strcmp((t1),(t2)) == 0)
-+ struct read_info info;
-+ struct cache_line *line;
-+ offset_type start;
-+ offset_type end;
-+
-+ line = view_get_first_showed_line (view);
-+
-+ line = view_offset_to_line_from (view, from, line);
-
-- /* The grow steps */
-- *size += 160;
-- new = g_realloc (text, *size);
-- if (text == NULL) {
-- *new = '\0';
-+ if (view->direction == 1) {
-+ start = from;
-+ end = view_get_end_of_whole_line (view, line)->end;
-+ if (start >= end) return 0;
-+ } else {
-+ start = view_get_start_of_whole_line (view, line)->start;
-+ end = from;
- }
-- return new;
--}
-
--static char *
--get_line_at (WView *view, offset_type *p, offset_type *skipped)
--{
-- char *buffer = NULL;
-- gulong buffer_size = 0;
-- offset_type usable_size = 0;
-- int ch;
-- const int direction = view->direction;
-- offset_type pos = *p;
-- offset_type i = 0;
-- int prev = '\0';
-+ (*buff_start) = start;
-+ (*buff_end) = end;
-
-- *skipped = 0;
-+ str_reset_buffer (buffer);
-
-- if (pos == 0 && direction == -1)
-- return 0;
-+ view_read_start (view, &info, start);
-+ while ((info.result != -1) && (info.next < end)) {
-+ view_read_continue (view, &info);
-
-- /* skip over all the possible zeros in the file */
-- while ((ch = get_byte (view, pos)) == 0) {
-- if (pos == 0 && direction == -1)
-- return 0;
-- pos += direction;
-- i++;
-+ /* if text contains '\0' */
-+ if (cmp (info.cact, "")) {
-+ if (info.actual < from) {
-+ /* '\0' before start offset, continue */
-+ str_reset_buffer (buffer);
-+ (*buff_start) = info.next;
-+ continue;
-+ } else {
-+ /* '\0' after start offset, end */
-+ (*buff_end) = info.next;
-+ return 1;
-+ }
- }
-- *skipped = i;
-
-- if (i == 0 && (pos != 0 || direction == -1)) {
-- prev = get_byte (view, pos - direction);
-- if ((prev == -1) || (prev == '\n'))
-- prev = '\0';
-+ if (view_read_test_new_line (view, &info))
-+ continue;
-+
-+ if (view_read_test_nroff_back (view, &info)) {
-+ str_backward_buffer (buffer, 1);
-+ continue;
- }
-
-- for (i = 1; ch != -1; ch = get_byte (view, pos)) {
-- if (i >= usable_size) {
-- buffer = grow_string_buffer (buffer, &buffer_size);
-- usable_size = buffer_size - 2; /* prev & null terminator */
-+ str_insert_string (info.cact, buffer);
- }
-
-- buffer[i++] = ch;
-+ return 1;
-+}
-
-- if (pos == 0 && direction == -1)
-- break;
-+/* map search result positions to offsets in text */
-+void
-+view_matchs_to_offsets (WView *view, offset_type start, offset_type end,
-+ size_t match_start, size_t match_end,
-+ offset_type *search_start, offset_type *search_end)
-+{
-+ struct read_info info;
-+ size_t c = 0;
-
-- pos += direction;
-+ (*search_start) = INVALID_OFFSET;
-+ (*search_end) = INVALID_OFFSET;
-
-- if (ch == '\n' || ch == '\0') {
-- i--; /* Strip newline/zero */
-- break;
-+ view_read_start (view, &info, start);
-+
-+ while ((info.result != -1) && (info.next < end)) {
-+ view_read_continue (view, &info);
-+
-+ if (view_read_test_nroff_back (view, &info)) {
-+ c-= 1;
-+ continue;
- }
-+ if ((c == match_start) && (*search_start == INVALID_OFFSET))
-+ *search_start = info.actual;
-+ if (c == match_end) (*search_end) = info.actual;
-+ c+= !str_iscombiningmark (info.cact) || (c == 0);
- }
-
-- if (buffer) {
-- buffer[0] = prev;
-- buffer[i] = '\0';
-+ if ((c == match_start) && (*search_start == INVALID_OFFSET)) *search_start = info.next;
-+ if (c == match_end) (*search_end) = info.next;
-+}
-
-- /* If we are searching backwards, reverse the string */
-- if (direction == -1) {
-- g_strreverse (buffer + 1);
-+/* we have set view->search_start and view->search_end and must set
-+ * view->dpy_text_column, view->first_showed_line and view->dpy_start
-+ * try to displaye maximum of match */
-+void
-+view_moveto_match (WView *view)
-+{
-+ const screen_dimen height = view->data_area.height;
-+ const screen_dimen height3 = height / 3;
-+ const screen_dimen width = view->data_area.width;
-+ struct cache_line *line;
-+ struct cache_line *line_end, *line_start;
-+ struct cache_line *t;
-+ int start_off = -1;
-+ int end_off = -1;
-+ int off = 0;
-+
-+ line = view_get_first_showed_line (view);
-+ if (view->text_wrap_mode) {
-+ if (line->start > view->search_start) {
-+ if (line->start <= view->search_start && line->end > view->search_start)
-+ start_off = 0;
-+ if (line->start <= view->search_end && line->end >= view->search_end)
-+ end_off = 0;
-+ t = view_get_previous_line (view, line);
-+ while ((t != NULL) && ((start_off == -1) || (end_off == -1))) {
-+ line = t;
-+ t = view_get_previous_line (view, line);
-+ off++;
-+ if (line->start <= view->search_start && line->end > view->search_start)
-+ start_off = off;
-+ if (line->start <= view->search_end && line->end >= view->search_end)
-+ end_off = off;
-+ }
-+
-+ line = view_get_first_showed_line (view);
-+
-+ off = (start_off - end_off < height - height3) ? start_off + height3: end_off;
-+ for (;off >= 0 && line->start > 0; off--)
-+ line = view_get_previous_line (view, line);
-+ } else {
-+ /* start_off, end_off - how many cache_lines far are
-+ * view->search_start, end from line */
-+ if (line->start <= view->search_start && line->end > view->search_start)
-+ start_off = 0;
-+ if (line->start <= view->search_end && line->end >= view->search_end)
-+ end_off = 0;
-+ t = view_get_next_line (view, line);
-+ while ((t != NULL) && ((start_off == -1) || (end_off == -1))) {
-+ line = t;
-+ t = view_get_next_line (view, line);
-+ off++;
-+ if (line->start <= view->search_start && line->end > view->search_start)
-+ start_off = off;
-+ if (line->start <= view->search_end && line->end >= view->search_end)
-+ end_off = off;
-+ }
-+
-+ line = view_get_first_showed_line (view);
-+ // if view->search_end is farther then screen heigth */
-+ if (end_off >= height) {
-+ off = (end_off - start_off < height - height3) ? end_off - height + height3: start_off;
-+
-+ for (;off >= 0; off--)
-+ line = view_get_next_line (view, line);
-+ }
-+ }
-+ } else {
-+ /* first part similar like in wrap mode,only wokrs with whole lines */
-+ line = view_get_first_showed_line (view);
-+ line = view_get_start_of_whole_line (view, line);
-+ if (line->start > view->search_start) {
-+ line_start = view_get_start_of_whole_line (view, line);
-+ if (line_start->start <= view->search_start && line->end > view->search_start)
-+ start_off = 0;
-+ if (line_start->start <= view->search_end && line->end >= view->search_end)
-+ end_off = 0;
-+ t = view_get_previous_whole_line (view, line_start);
-+ while ((t != NULL) && ((start_off == -1) || (end_off == -1))) {
-+ line = t;
-+ line_start = view_get_start_of_whole_line (view, line);
-+ t = view_get_previous_whole_line (view, line_start);
-+ off++;
-+ if (line_start->start <= view->search_start && line->end > view->search_start)
-+ start_off = off;
-+ if (line_start->start <= view->search_end && line->end >= view->search_end)
-+ end_off = off;
-+ }
-+
-+ line = view_get_first_showed_line (view);
-+ line = view_get_start_of_whole_line (view, line);
-+ off = (start_off - end_off < height - height3) ? start_off + height3: end_off;
-+ for (;off >= 0 && line->start > 0; off--) {
-+ line = view_get_previous_whole_line (view, line);
-+ line = view_get_start_of_whole_line (view, line);
-+ }
-+ } else {
-+ line_end = view_get_end_of_whole_line (view, line);
-+ if (line->start <= view->search_start && line_end->end > view->search_start)
-+ start_off = 0;
-+ if (line->start <= view->search_end && line_end->end >= view->search_end)
-+ end_off = 0;
-+ t = view_get_next_whole_line (view, line_end);
-+ while ((t != NULL) && ((start_off == -1) || (end_off == -1))) {
-+ line = t;
-+ line_end = view_get_end_of_whole_line (view, line);
-+ t = view_get_next_whole_line (view, line_end);
-+ off++;
-+ if (line->start <= view->search_start && line_end->end > view->search_start)
-+ start_off = off;
-+ if (line->start <= view->search_end && line_end->end >= view->search_end)
-+ end_off = off;
-+ }
-+
-+ line = view_get_first_showed_line (view);
-+ line = view_get_start_of_whole_line (view, line);
-+ if (end_off >= height) {
-+ off = (end_off - start_off < height - height3) ? end_off - height + height3: start_off;
-+
-+ for (;off >= 0; off--)
-+ line = view_get_next_whole_line (view, line);
-+ }
-+ }
-+ /*now line point to begin of line, that we want show*/
-+
-+ t = view_offset_to_line_from (view, view->search_start, line);
-+ start_off = view_offset_to_column (view, t, view->search_start);
-+ t = view_offset_to_line_from (view, view->search_end, line);
-+ end_off = view_offset_to_column (view, t, view->search_end);
-+
-+ if (end_off - start_off > width) end_off = start_off + width;
-+ if (view->dpy_text_column > start_off) {
-+ view->dpy_text_column = start_off;
-+ } else {
-+ if (view->dpy_text_column + width < end_off) {
-+ view->dpy_text_column = end_off - width;
-+ }
- }
- }
-
-- *p = pos;
-- return buffer;
-+ view_set_first_showed (view, line);
- }
-
- static void
- search_update_steps (WView *view)
- {
- offset_type filesize = view_get_filesize (view);
-- if (filesize != 0)
-+ if (filesize == 0)
- view->update_steps = 40000;
- else /* viewing a data stream, not a file */
- view->update_steps = filesize / 100;
-@@ -2353,90 +2979,75 @@ search_update_steps (WView *view)
- }
-
- static void
--search (WView *view, char *text,
-- int (*search) (WView *, char *, char *, int))
-+view_search (WView *view, char *text,
-+ int (*search) (WView *, char *, char *, int, size_t *, size_t *))
- {
-- char *s = NULL; /* The line we read from the view buffer */
-- offset_type p, beginning, search_start;
-- int found_len;
-+ struct str_buffer *buffer;
-+ offset_type search_start;
- int search_status;
- Dlg_head *d = 0;
-
-- /* Used to keep track of where the line starts, when looking forward
-- * is the index before transfering the line; the reverse case uses
-- * the position returned after the line has been read */
-- offset_type forward_line_start;
-- offset_type reverse_line_start;
-- offset_type t;
-+ offset_type line_start;
-+ offset_type line_end;
-+ size_t match_start;
-+ size_t match_end;
-
- if (verbose) {
- d = create_message (D_NORMAL, _("Search"), _("Searching %s"), text);
- mc_refresh ();
- }
-
-- found_len = view->search_length;
-- search_start = view->search_start;
-+ buffer = str_get_buffer ();
-
-- if (view->direction == 1) {
-- p = search_start + ((found_len) ? 1 : 0);
-- } else {
-- p = search_start - ((found_len && search_start >= 1) ? 1 : 0);
-- }
-- beginning = p;
-+ search_start = (view->direction != 1) ? view->search_start :
-+ view->search_end;
-
- /* Compute the percent steps */
- search_update_steps (view);
- view->update_activate = 0;
-
- enable_interrupt_key ();
-- for (;; g_free (s)) {
-- if (p >= view->update_activate) {
-+ search_status = -1;
-+
-+ while (1) {
-+ if (search_start >= view->update_activate) {
- view->update_activate += view->update_steps;
- if (verbose) {
-- view_percent (view, p);
-+ view_percent (view, search_start);
- mc_refresh ();
- }
- if (got_interrupt ())
- break;
- }
-- forward_line_start = p;
-- s = get_line_at (view, &p, &t);
-- reverse_line_start = p;
-
-- if (!s)
-+ if (!view_get_line_at (view, search_start, buffer, &line_start, &line_end))
- break;
-
-- search_status = (*search) (view, text, s + 1, match_normal);
-+ search_status = (*search) (view, text, buffer->data, match_normal,
-+ &match_start, &match_end);
-+
- if (search_status < 0) {
-- g_free (s);
- break;
- }
-
-- if (search_status == 0)
-+ if (search_status == 0) {
-+ if (view->direction == 1)
-+ search_start = line_end;
-+ else {
-+ if (line_start > 0) search_start = line_start - 1;
-+ else break;
-+ }
- continue;
-+ }
-
- /* We found the string */
-
-- /* Handle ^ and $ when regexp search starts at the middle of the line */
-- if (*s && !view->search_start && (search == regexp_view_search)) {
-- if ((*text == '^' && view->direction == 1)
-- || (view->direction == -1 && text[strlen (text) - 1] == '$')
-- ) {
-- continue;
-- }
-- }
-- /* Record the position used to continue the search */
-- if (view->direction == 1)
-- t += forward_line_start;
-- else
-- t = reverse_line_start ? reverse_line_start + 2 : 0;
-- view->search_start += t;
-+ view_matchs_to_offsets (view, line_start, line_end,
-+ match_start, match_end,
-+ &(view->search_start), &(view->search_end));
-
-- if (t != beginning) {
-- view->dpy_start = t;
-- }
-+ view_moveto_match (view);
-
-- g_free (s);
- break;
- }
- disable_interrupt_key ();
-@@ -2444,10 +3055,11 @@ search (WView *view, char *text,
- dlg_run_done (d);
- destroy_dlg (d);
- }
-- if (!s) {
-+ if (search_status <= 0) {
- message (0, _("Search"), _(" Search string not found "));
-- view->search_length = 0;
-+ view->search_end = view->search_start;
- }
-+ str_release_buffer (buffer);
- }
-
- /* Search buffer (its size is len) in the complete buffer
-@@ -2463,10 +3075,10 @@ block_search (WView *view, const char *b
-
- enable_interrupt_key ();
- if (direction == 1)
-- e = view->search_start + ((view->search_length) ? 1 : 0);
-+ e = view->search_start + ((view->search_start != view->search_end) ? 1 : 0);
- else
- e = view->search_start
-- - ((view->search_length && view->search_start >= 1) ? 1 : 0);
-+ - ((view->search_end != view->search_start && view->search_start >= 1) ? 1 : 0);
-
- search_update_steps (view);
- view->update_activate = 0;
-@@ -2541,7 +3153,7 @@ hex_search (WView *view, const char *tex
- int parse_error = 0;
-
- if (!*text) {
-- view->search_length = 0;
-+ view->search_end = view->search_start;
- return;
- }
-
-@@ -2598,7 +3210,7 @@ hex_search (WView *view, const char *tex
- if (block_len <= 0 || parse_error) {
- message (0, _("Search"), _("Invalid hex search expression"));
- g_free (buffer);
-- view->search_length = 0;
-+ view->search_end = view->search_start;
- return;
- }
-
-@@ -2609,12 +3221,12 @@ hex_search (WView *view, const char *tex
-
- if (pos == INVALID_OFFSET) {
- message (0, _("Search"), _(" Search string not found "));
-- view->search_length = 0;
-+ view->search_end = view->search_start;
- return;
- }
-
- view->search_start = pos;
-- view->search_length = block_len;
-+ view->search_end = pos + block_len;
- /* Set the edit cursor to the search position, left nibble */
- view->hex_cursor = view->search_start;
- view->hexedit_lownibble = FALSE;
-@@ -2625,7 +3237,7 @@ hex_search (WView *view, const char *tex
-
- static int
- regexp_view_search (WView *view, char *pattern, char *string,
-- int match_type)
-+ int match_type, size_t *match_start, size_t *match_end)
- {
- static regex_t r;
- static char *old_pattern = NULL;
-@@ -2656,15 +3268,17 @@ regexp_view_search (WView *view, char *p
- }
- if (regexec (&r, string, 1, pmatch, 0) != 0)
- return 0;
-- view->search_length = pmatch[0].rm_eo - pmatch[0].rm_so;
-- view->search_start = pmatch[0].rm_so;
-+
-+ i = str_length (string);
-+ (*match_start) = i - str_length (string + pmatch[0].rm_so);
-+ (*match_end) = i - str_length (string + pmatch[0].rm_eo);
- return 1;
- }
-
- static void
- do_regexp_search (WView *view)
- {
-- search (view, view->search_exp, regexp_view_search);
-+ view_search (view, view->search_exp, regexp_view_search);
- /* Had a refresh here */
- view->dirty++;
- view_update (view);
-@@ -2675,8 +3289,11 @@ do_normal_search (WView *view)
- {
- if (view->hex_mode)
- hex_search (view, view->search_exp);
-- else
-- search (view, view->search_exp, icase_search_p);
-+ else {
-+ char *needle = str_create_search_needle (view->search_exp, 0);
-+ view_search (view, needle, icase_search_p);
-+ str_release_search_needle (needle, 0);
-+ }
- /* Had a refresh here */
- view->dirty++;
- view_update (view);
-@@ -2727,19 +3344,21 @@ static void
- view_moveto_line_cmd (WView *view)
- {
- char *answer, *answer_end, prompt[BUF_SMALL];
-- offset_type line, col;
-+ struct cache_line *line;
-+ offset_type row;
-
-- view_offset_to_coord (view, &line, &col, view->dpy_start);
-+ line = view_get_first_showed_line (view);
-+ row = line->number + 1;
-
- g_snprintf (prompt, sizeof (prompt),
- _(" The current line number is %d.\n"
-- " Enter the new line number:"), (int) (line + 1));
-+ " Enter the new line number:"), (int) row);
- answer = input_dialog (_(" Goto line "), prompt, "");
- if (answer != NULL && answer[0] != '\0') {
- errno = 0;
-- line = strtoul (answer, &answer_end, 10);
-- if (*answer_end == '\0' && errno == 0 && line >= 1)
-- view_moveto (view, line - 1, 0);
-+ row = strtoul (answer, &answer_end, 10);
-+ if (*answer_end == '\0' && errno == 0 && row >= 1)
-+ view_moveto (view, row - 1, 0);
- }
- g_free (answer);
- view->dirty++;
-@@ -2903,18 +3522,16 @@ view_quit_cmd (WView *view)
- static void
- view_labels (WView *view)
- {
-+ const char *text;
- Dlg_head *h = view->widget.parent;
-
- buttonbar_set_label (h, 1, Q_("ButtonBar|Help"), view_help_cmd);
-
- my_define (h, 10, Q_("ButtonBar|Quit"), view_quit_cmd, view);
-- my_define (h, 4, view->hex_mode
-- ? Q_("ButtonBar|Ascii")
-- : Q_("ButtonBar|Hex"),
-- view_toggle_hex_mode_cmd, view);
-- my_define (h, 5, view->hex_mode
-- ? Q_("ButtonBar|Goto")
-- : Q_("ButtonBar|Line"),
-+ text = view->hex_mode ? "ButtonBar|Ascii" : "ButtonBar|Hex";
-+ my_define (h, 4, Q_(text), view_toggle_hex_mode_cmd, view);
-+ text = view->hex_mode ?"ButtonBar|Goto": "ButtonBar|Line";
-+ my_define (h, 5, Q_(text),
- view->hex_mode ? view_moveto_addr_cmd : view_moveto_line_cmd, view);
-
- if (view->hex_mode) {
-@@ -2930,29 +3547,21 @@ view_labels (WView *view)
- my_define (h, 6, Q_("ButtonBar|Save"),
- view_hexedit_save_changes_cmd, view);
- } else {
-- my_define (h, 2, view->text_wrap_mode
-- ? Q_("ButtonBar|UnWrap")
-- : Q_("ButtonBar|Wrap"),
-- view_toggle_wrap_mode_cmd, view);
-+ text = view->text_wrap_mode ? "ButtonBar|UnWrap" : "ButtonBar|Wrap";
-+ my_define (h, 2, Q_(text), view_toggle_wrap_mode_cmd, view);
- my_define (h, 6, Q_("ButtonBar|RxSrch"),
- view_regexp_search_cmd, view);
- }
-
-- my_define (h, 7, view->hex_mode
-- ? Q_("ButtonBar|HxSrch")
-- : Q_("ButtonBar|Search"),
-- view_normal_search_cmd, view);
-- my_define (h, 8, view->magic_mode
-- ? Q_("ButtonBar|Raw")
-- : Q_("ButtonBar|Parse"),
-- view_toggle_magic_mode_cmd, view);
-+ text = view->hex_mode ? "ButtonBar|HxSrch" : "ButtonBar|Search";
-+ my_define (h, 7, Q_(text), view_normal_search_cmd, view);
-+ text = view->magic_mode ? "ButtonBar|Raw" : "ButtonBar|Parse";
-+ my_define (h, 8, Q_(text), view_toggle_magic_mode_cmd, view);
-
- /* don't override the key to access the main menu */
- if (!view_is_in_panel (view)) {
-- my_define (h, 9, view->text_nroff_mode
-- ? Q_("ButtonBar|Unform")
-- : Q_("ButtonBar|Format"),
-- view_toggle_nroff_mode_cmd, view);
-+ text = view->text_nroff_mode ? "ButtonBar|Unform" : "ButtonBar|Format";
-+ my_define (h, 9, Q_(text), view_toggle_nroff_mode_cmd, view);
- my_define (h, 3, Q_("ButtonBar|Quit"), view_quit_cmd, view);
- }
- }
-@@ -3042,6 +3651,29 @@ static void view_cmk_moveto_bottom (void
- view_moveto_bottom ((WView *) w);
- }
-
-+static void
-+view_select_encoding (WView *view)
-+{
-+ char *enc;
-+ iconv_t conv;
-+ struct cache_line *line;
-+
-+ enc = input_dialog ("encoding", "paste encoding", "");
-+
-+ if (enc != NULL) {
-+ conv = str_crt_conv_from (enc);
-+ if (conv != (iconv_t)(-1)) {
-+ if (view->converter != str_cnv_from_term) str_close_conv (view->converter);
-+ view->converter = conv;
-+
-+ view_reset_cache_lines (view);
-+ line = view_offset_to_line (view, view->dpy_start);
-+ view_set_first_showed (view, line);
-+ }
-+ }
-+}
-+
-+
- /* Both views */
- static cb_ret_t
- view_handle_key (WView *view, int c)
-@@ -3185,13 +3817,11 @@ view_handle_key (WView *view, int c)
- view->want_to_quit = TRUE;
- return MSG_HANDLED;
-
--#ifdef HAVE_CHARSET
- case XCTRL ('t'):
-- do_select_codepage ();
-+ view_select_encoding (view);
- view->dirty++;
- view_update (view);
- return MSG_HANDLED;
--#endif /* HAVE_CHARSET */
-
- #ifdef MC_ENABLE_DEBUGGING_CODE
- case 't': /* mnemonic: "test" */
-@@ -3459,16 +4089,16 @@ view_new (int y, int x, int cols, int li
- view->magic_mode = FALSE;
-
- view->hexedit_lownibble = FALSE;
-- view->coord_cache = NULL;
-
- view->dpy_frame_size = is_panel ? 1 : 0;
- view->dpy_start = 0;
- view->dpy_text_column = 0;
-- view->dpy_end= 0;
-+ view->dpy_end = 0;
- view->hex_cursor = 0;
- view->cursor_col = 0;
- view->cursor_row = 0;
- view->change_list = NULL;
-+ view->converter = str_cnv_from_term;
-
- /* {status,ruler,data}_area are left uninitialized */
-
-@@ -3477,7 +4107,7 @@ view_new (int y, int x, int cols, int li
- view->bytes_per_line = 1;
-
- view->search_start = 0;
-- view->search_length = 0;
-+ view->search_end = 0;
- view->search_exp = NULL;
- view->direction = 1; /* forward */
- view->last_search = 0; /* it's a function */
Deleted: trunk/debian/patches/31_autogen-run.patch
===================================================================
--- trunk/debian/patches/31_autogen-run.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/31_autogen-run.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,61607 +0,0 @@
-diff -Nurwd mc-4.6.2~pre1.orig/config.h.in mc-4.6.2~pre1/config.h.in
---- mc-4.6.2~pre1.orig/config.h.in 2008-02-26 18:20:31.000000000 +0100
-+++ mc-4.6.2~pre1/config.h.in 2008-02-26 18:24:26.000000000 +0100
-@@ -94,7 +94,7 @@
- /* Define to 1 if you have the <dustat.h> header file. */
- #undef HAVE_DUSTAT_H
-
--/* Define if ncurses has ESCDELAY variable */
-+/* Define if ncursesw has ESCDELAY variable */
- #undef HAVE_ESCDELAY
-
- /* Define to 1 if you have the <ext2fs/ext2fs.h> header file. */
-@@ -243,6 +243,9 @@
- /* Define to 1 if you have the `munmap' function. */
- #undef HAVE_MUNMAP
-
-+/* Define to 1 if you have the <ncursesw/curses.h> header file. */
-+#undef HAVE_NCURSESW_CURSES_H
-+
- /* Define to 1 if you have the <ncurses/curses.h> header file. */
- #undef HAVE_NCURSES_CURSES_H
-
-@@ -647,25 +650,25 @@
- /* Define if <inttypes.h> exists and defines unusable PRI* macros. */
- #undef PRI_MACROS_BROKEN
-
--/* The size of a `double', as computed by sizeof. */
-+/* The size of `double', as computed by sizeof. */
- #undef SIZEOF_DOUBLE
-
--/* The size of a `float', as computed by sizeof. */
-+/* The size of `float', as computed by sizeof. */
- #undef SIZEOF_FLOAT
-
--/* The size of a `int', as computed by sizeof. */
-+/* The size of `int', as computed by sizeof. */
- #undef SIZEOF_INT
-
--/* The size of a `long', as computed by sizeof. */
-+/* The size of `long', as computed by sizeof. */
- #undef SIZEOF_LONG
-
--/* The size of a `long long', as computed by sizeof. */
-+/* The size of `long long', as computed by sizeof. */
- #undef SIZEOF_LONG_LONG
-
--/* The size of a `off_t', as computed by sizeof. */
-+/* The size of `off_t', as computed by sizeof. */
- #undef SIZEOF_OFF_T
-
--/* The size of a `short', as computed by sizeof. */
-+/* The size of `short', as computed by sizeof. */
- #undef SIZEOF_SHORT
-
- /* Define as the maximum value of type 'size_t', if the system doesn't define
-@@ -677,7 +680,7 @@
-
- /* If using the C implementation of alloca, define if you know the
- direction of stack growth for your system; otherwise it will be
-- automatically deduced at run-time.
-+ automatically deduced at runtime.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown */
-@@ -735,6 +738,9 @@
- /* Define to use ncurses for screen management */
- #undef USE_NCURSES
-
-+/* Define to use ncursesw for screen management */
-+#undef USE_NCURSESW
-+
- /* Define to use networked VFS */
- #undef USE_NETCODE
-
-@@ -808,7 +814,7 @@
- /* Define to `unsigned int' if <sys/types.h> does not define. */
- #undef nlink_t
-
--/* Define to `long' if <sys/types.h> does not define. */
-+/* Define to `long int' if <sys/types.h> does not define. */
- #undef off_t
-
- /* Define to `int' if <sys/types.h> does not define. */
-@@ -821,7 +827,7 @@
- /* Define to empty if the C compiler doesn't support this keyword. */
- #undef signed
-
--/* Define to `unsigned' if <sys/types.h> does not define. */
-+/* Define to `unsigned int' if <sys/types.h> does not define. */
- #undef size_t
-
- /* Define to `int' if <sys/types.h> doesn't define. */
-diff -Nurwd mc-4.6.2~pre1.orig/configure mc-4.6.2~pre1/configure
---- mc-4.6.2~pre1.orig/configure 2008-02-26 18:26:10.000000000 +0100
-+++ mc-4.6.2~pre1/configure 2008-02-26 18:24:20.000000000 +0100
-@@ -1,25 +1,54 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.61.
- #
--# Copyright (C) 2003 Free Software Foundation, Inc.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
- ## M4sh Initialization. ##
- ## --------------------- ##
-
--# Be Bourne compatible
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-- set -o posix
-+ setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+
-+
-+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+ PATH_SEPARATOR=';'
-+ else
-+ PATH_SEPARATOR=:
-+ fi
-+ rm -f conf$$.sh
- fi
--DUALCASE=1; export DUALCASE # for MKS sh
-
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -29,8 +58,43 @@
- fi
-
-
-+# IFS
-+# We need space, tab and new line, in precisely that order. Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" "" $as_nl"
-+
-+# Find who we are. Look in the path if we contain no directory separator.
-+case $0 in
-+ *[\\/]* ) as_myself=$0 ;;
-+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+ as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+ { (exit 1); exit 1; }
-+fi
-+
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -44,18 +108,19 @@
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
-- $as_unset $as_var
-+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
- done
-
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
- else
- as_basename=false
-@@ -63,157 +128,388 @@
-
-
- # Name of the executable.
--as_me=`$as_basename "$0" ||
-+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)$' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
-- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-- /^X\/\(\/\/\)$/{ s//\1/; q; }
-- /^X\/\(\/\).*/{ s//\1/; q; }
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\).*/{
-+ s//\1/
-+ q
-+ }
- s/.*/./; q'`
-
-+# CDPATH.
-+$as_unset CDPATH
-
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
-
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
-- echo "#! /bin/sh" >conf$$.sh
-- echo "exit 0" >>conf$$.sh
-- chmod +x conf$$.sh
-- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-- PATH_SEPARATOR=';'
-+if test "x$CONFIG_SHELL" = x; then
-+ if (eval ":") 2>/dev/null; then
-+ as_have_required=yes
- else
-- PATH_SEPARATOR=:
-+ as_have_required=no
- fi
-- rm -f conf$$.sh
-+
-+ if test $as_have_required = yes && (eval ":
-+(as_func_return () {
-+ (exit \$1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
- fi
-
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-
-- as_lineno_1=$LINENO
-- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" || {
-- # Find who we are. Look in the path if we contain no path at all
-- # relative or not.
-- case $0 in
-- *[\\/]* ) as_myself=$0 ;;
-- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-
-- ;;
-- esac
-- # We did not find ourselves, most probably we were run as `sh COMMAND'
-- # in which case we are not to be found in the path.
-- if test "x$as_myself" = x; then
-- as_myself=$0
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
- fi
-- if test ! -f "$as_myself"; then
-- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-- { (exit 1); exit 1; }; }
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
- fi
-- case $CONFIG_SHELL in
-- '')
-+
-+test \$exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-+ as_lineno_1=\$LINENO
-+ as_lineno_2=\$LINENO
-+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-+") 2> /dev/null; then
-+ :
-+else
-+ as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for as_base in sh bash ksh sh5; do
- case $as_dir in
- /*)
-- if ("$as_dir/$as_base" -c '
-+ for as_base in sh bash ksh sh5; do
-+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-+ done;;
-+ esac
-+done
-+IFS=$as_save_IFS
-+
-+
-+ for as_shell in $as_candidate_shells $SHELL; do
-+ # Try only shells that exist, to save several forks.
-+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-+ { ("$as_shell") 2> /dev/null <<\_ASEOF
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '${1+"$@"}'='"$@"'
-+ setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+:
-+_ASEOF
-+}; then
-+ CONFIG_SHELL=$as_shell
-+ as_have_required=yes
-+ if { "$as_shell" 2> /dev/null <<\_ASEOF
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '${1+"$@"}'='"$@"'
-+ setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+:
-+(as_func_return () {
-+ (exit $1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = "$1" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test $exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
-- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-- CONFIG_SHELL=$as_dir/$as_base
-- export CONFIG_SHELL
-- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-- fi;;
-- esac
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-+
-+_ASEOF
-+}; then
-+ break
-+fi
-+
-+fi
-+
- done
-+
-+ if test "x$CONFIG_SHELL" != x; then
-+ for as_var in BASH_ENV ENV
-+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
--;;
-- esac
-+ export CONFIG_SHELL
-+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+fi
-+
-+
-+ if test $as_have_required = no; then
-+ echo This script requires a shell more modern than all the
-+ echo shells that I found on your system. Please install a
-+ echo modern shell, or manually run the script under such a
-+ echo shell if you do have one.
-+ { (exit 1); exit 1; }
-+fi
-+
-+
-+fi
-+
-+fi
-+
-+
-+
-+(eval "as_func_return () {
-+ (exit \$1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0") || {
-+ echo No shell found that supports shell functions.
-+ echo Please tell autoconf at gnu.org about your system,
-+ echo including any error possibly output before this
-+ echo message
-+}
-+
-+
-+
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
-- # line-number line before each line; the second 'sed' does the real
-- # work. The second script uses 'N' to pair each line-number line
-- # with the numbered line, and appends trailing '-' during
-- # substitution so that $LINENO is not a special case at line end.
-+ # line-number line after each line using $LINENO; the second 'sed'
-+ # does the real work. The second script uses 'N' to pair each
-+ # line-number line with the line containing $LINENO, and appends
-+ # trailing '-' during substitution so that $LINENO is not a special
-+ # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
-- sed '=' <$as_myself |
-+ # scripts with optimization help from Paolo Bonzini. Blame Lee
-+ # E. McMahon (1931-1989) for sed's syntax. :-)
-+ sed -n '
-+ p
-+ /[$]LINENO/=
-+ ' <$as_myself |
- sed '
-+ s/[$]LINENO.*/&-/
-+ t lineno
-+ b
-+ :lineno
- N
-- s,$,-,
- : loop
-- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
-- s,-$,,
-- s,^['$as_cr_digits']*\n,,
-+ s/-\n.*//
- ' >$as_me.lineno &&
-- chmod +x $as_me.lineno ||
-+ chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
-- # original and so on. Autoconf is especially sensible to this).
-- . ./$as_me.lineno
-+ # original and so on. Autoconf is especially sensitive to this).
-+ . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
- }
-
-
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-- *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T=' ' ;;
-- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+ as_dirname=dirname
-+else
-+ as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+ case `echo 'x\c'` in
-+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
-+ *) ECHO_C='\c';;
-+ esac;;
-+*)
-+ ECHO_N='-n';;
- esac
-
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
- rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+ rm -f conf$$.dir/conf$$.file
-+else
-+ rm -f conf$$.dir
-+ mkdir conf$$.dir
-+fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
-- # We could just check for DJGPP; but this test a) works b) is more generic
-- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-- if test -f conf$$.exe; then
-- # Don't use ln at all; we don't have any links
-- as_ln_s='cp -p'
-- else
- as_ln_s='ln -s'
-- fi
-+ # ... but there are two gotchas:
-+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+ # In both cases, we have to default to `cp -p'.
-+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+ as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
--rm -f conf$$ conf$$.exe conf$$.file
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-
- if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
-@@ -222,7 +518,28 @@
- as_mkdir_p=false
- fi
-
--as_executable_p="test -f"
-+if test -x / >/dev/null 2>&1; then
-+ as_test_x='test -x'
-+else
-+ if ls -dL / >/dev/null 2>&1; then
-+ as_ls_L_option=L
-+ else
-+ as_ls_L_option=
-+ fi
-+ as_test_x='
-+ eval sh -c '\''
-+ if test -d "$1"; then
-+ test -d "$1/.";
-+ else
-+ case $1 in
-+ -*)set "./$1";;
-+ esac;
-+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-+ ???[sx]*):;;*)false;;esac;fi
-+ '\'' sh
-+ '
-+fi
-+as_executable_p=$as_test_x
-
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -231,39 +548,27 @@
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" $as_nl"
--
--# CDPATH.
--$as_unset CDPATH
-
-+exec 7<&0 </dev/null 6>&1
-
- # Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
- # so uname gets run too.
- ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
--exec 6>&1
--
- #
- # Initializations.
- #
- ac_default_prefix=/usr/local
-+ac_clean_files=
- ac_config_libobj_dir=.
-+LIBOBJS=
- cross_compiling=no
- subdirs=
- MFLAGS=
- MAKEFLAGS=
- SHELL=${CONFIG_SHELL-/bin/sh}
-
--# Maximum number of lines to put in a shell here document.
--# This variable seems obsolete. It should probably be removed, and
--# only ac_max_sed_lines should be used.
--: ${ac_max_here_lines=38}
--
- # Identity of this package.
- PACKAGE_NAME=
- PACKAGE_TARNAME=
-@@ -276,43 +581,219 @@
- # Factoring default headers for most tests.
- ac_includes_default="\
- #include <stdio.h>
--#if HAVE_SYS_TYPES_H
-+#ifdef HAVE_SYS_TYPES_H
- # include <sys/types.h>
- #endif
--#if HAVE_SYS_STAT_H
-+#ifdef HAVE_SYS_STAT_H
- # include <sys/stat.h>
- #endif
--#if STDC_HEADERS
-+#ifdef STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
- #else
--# if HAVE_STDLIB_H
-+# ifdef HAVE_STDLIB_H
- # include <stdlib.h>
- # endif
- #endif
--#if HAVE_STRING_H
--# if !STDC_HEADERS && HAVE_MEMORY_H
-+#ifdef HAVE_STRING_H
-+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
- # include <memory.h>
- # endif
- # include <string.h>
- #endif
--#if HAVE_STRINGS_H
-+#ifdef HAVE_STRINGS_H
- # include <strings.h>
- #endif
--#if HAVE_INTTYPES_H
-+#ifdef HAVE_INTTYPES_H
- # include <inttypes.h>
--#else
--# if HAVE_STDINT_H
--# include <stdint.h>
- # endif
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
- #endif
--#if HAVE_UNISTD_H
-+#ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif"
-
--ac_subdirs_all="$ac_subdirs_all vfs/samba"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_CONFIG GMODULE_CFLAGS GMODULE_LIBS LN_S AR ac_ct_AR X11_WWW MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE GLIBC2 RANLIB ac_ct_RANLIB ALLOCA GLIBC21 INTL_MACOSX_LIBS HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB DOC_LINGUAS LIBOBJS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS ZIP UNZIP HAVE_ZIPINFO PERL MCSERVLIBS configdir HAVE_nroff MANDOC MAN_FLAGS HAVE_FILECMD MCLIBS RPM_VERSION subdirs USE_EDIT_TRUE USE_EDIT_FALSE USE_VFS_TRUE USE_VFS_FALSE USE_VFS_NET_TRUE USE_VFS_NET_FALSE USE_UNDEL_FS_TRUE USE_UNDEL_FS_FALSE USE_SAMBA_FS_TRUE USE_SAMBA_FS_FALSE USE_MCFS_TRUE USE_MCFS_FALSE INCLUDED_SLANG_TRUE INCLUDED_SLANG_FALSE CHARSET_TRUE CHARSET_FALSE CONS_SAVER_TRUE CONS_SAVER_FALSE LTLIBOBJS'
-+ac_subst_vars='SHELL
-+PATH_SEPARATOR
-+PACKAGE_NAME
-+PACKAGE_TARNAME
-+PACKAGE_VERSION
-+PACKAGE_STRING
-+PACKAGE_BUGREPORT
-+exec_prefix
-+prefix
-+program_transform_name
-+bindir
-+sbindir
-+libexecdir
-+datarootdir
-+datadir
-+sysconfdir
-+sharedstatedir
-+localstatedir
-+includedir
-+oldincludedir
-+docdir
-+infodir
-+htmldir
-+dvidir
-+pdfdir
-+psdir
-+libdir
-+localedir
-+mandir
-+DEFS
-+ECHO_C
-+ECHO_N
-+ECHO_T
-+LIBS
-+build_alias
-+host_alias
-+target_alias
-+INSTALL_PROGRAM
-+INSTALL_SCRIPT
-+INSTALL_DATA
-+am__isrc
-+CYGPATH_W
-+PACKAGE
-+VERSION
-+ACLOCAL
-+AUTOCONF
-+AUTOMAKE
-+AUTOHEADER
-+MAKEINFO
-+install_sh
-+STRIP
-+INSTALL_STRIP_PROGRAM
-+mkdir_p
-+AWK
-+SET_MAKE
-+am__leading_dot
-+AMTAR
-+am__tar
-+am__untar
-+MAINTAINER_MODE_TRUE
-+MAINTAINER_MODE_FALSE
-+MAINT
-+build
-+build_cpu
-+build_vendor
-+build_os
-+host
-+host_cpu
-+host_vendor
-+host_os
-+CC
-+CFLAGS
-+LDFLAGS
-+CPPFLAGS
-+ac_ct_CC
-+EXEEXT
-+OBJEXT
-+DEPDIR
-+am__include
-+am__quote
-+AMDEP_TRUE
-+AMDEP_FALSE
-+AMDEPBACKSLASH
-+CCDEPMODE
-+am__fastdepCC_TRUE
-+am__fastdepCC_FALSE
-+CPP
-+GREP
-+EGREP
-+PKG_CONFIG
-+GLIB_CFLAGS
-+GLIB_LIBS
-+GLIB_CONFIG
-+GMODULE_CFLAGS
-+GMODULE_LIBS
-+LN_S
-+AR
-+X11_WWW
-+MKINSTALLDIRS
-+USE_NLS
-+MSGFMT
-+GMSGFMT
-+XGETTEXT
-+MSGMERGE
-+GLIBC2
-+RANLIB
-+ALLOCA
-+GLIBC21
-+INTL_MACOSX_LIBS
-+HAVE_POSIX_PRINTF
-+HAVE_ASPRINTF
-+HAVE_SNPRINTF
-+HAVE_WPRINTF
-+LIBICONV
-+LTLIBICONV
-+INTLBISON
-+BUILD_INCLUDED_LIBINTL
-+USE_INCLUDED_LIBINTL
-+CATOBJEXT
-+DATADIRNAME
-+INSTOBJEXT
-+GENCAT
-+INTLOBJS
-+INTL_LIBTOOL_SUFFIX_PREFIX
-+INTLLIBS
-+LIBINTL
-+LTLIBINTL
-+POSUB
-+DOC_LINGUAS
-+LIBOBJS
-+XMKMF
-+X_CFLAGS
-+X_PRE_LIBS
-+X_LIBS
-+X_EXTRA_LIBS
-+ZIP
-+UNZIP
-+HAVE_ZIPINFO
-+PERL
-+MCSERVLIBS
-+configdir
-+HAVE_nroff
-+MANDOC
-+MAN_FLAGS
-+HAVE_FILECMD
-+MCLIBS
-+RPM_VERSION
-+subdirs
-+USE_EDIT_TRUE
-+USE_EDIT_FALSE
-+USE_VFS_TRUE
-+USE_VFS_FALSE
-+USE_VFS_NET_TRUE
-+USE_VFS_NET_FALSE
-+USE_UNDEL_FS_TRUE
-+USE_UNDEL_FS_FALSE
-+USE_SAMBA_FS_TRUE
-+USE_SAMBA_FS_FALSE
-+USE_MCFS_TRUE
-+USE_MCFS_FALSE
-+INCLUDED_SLANG_TRUE
-+INCLUDED_SLANG_FALSE
-+CHARSET_TRUE
-+CHARSET_FALSE
-+CONS_SAVER_TRUE
-+CONS_SAVER_FALSE
-+LTLIBOBJS'
- ac_subst_files=''
-+ ac_precious_vars='build_alias
-+host_alias
-+target_alias
-+CC
-+CFLAGS
-+LDFLAGS
-+LIBS
-+CPPFLAGS
-+CPP
-+GLIB_CONFIG
-+XMKMF'
-+ac_subdirs_all='vfs/samba'
-
- # Initialize some variables set by options.
- ac_init_help=
-@@ -339,34 +820,48 @@
- # and all the variables that are supposed to be based on exec_prefix
- # by default will actually change.
- # Use braces instead of parens because sh, perl, etc. also accept them.
-+# (The list follows the same order as the GNU Coding Standards.)
- bindir='${exec_prefix}/bin'
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
--datadir='${prefix}/share'
-+datarootdir='${prefix}/share'
-+datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
--libdir='${exec_prefix}/lib'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
--infodir='${prefix}/info'
--mandir='${prefix}/man'
-+docdir='${datarootdir}/doc/${PACKAGE}'
-+infodir='${datarootdir}/info'
-+htmldir='${docdir}'
-+dvidir='${docdir}'
-+pdfdir='${docdir}'
-+psdir='${docdir}'
-+libdir='${exec_prefix}/lib'
-+localedir='${datarootdir}/locale'
-+mandir='${datarootdir}/man'
-
- ac_prev=
-+ac_dashdash=
- for ac_option
- do
- # If the previous option needs an argument, assign it.
- if test -n "$ac_prev"; then
-- eval "$ac_prev=\$ac_option"
-+ eval $ac_prev=\$ac_option
- ac_prev=
- continue
- fi
-
-- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-+ case $ac_option in
-+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+ *) ac_optarg=yes ;;
-+ esac
-
- # Accept the important Cygnus configure options, so we can diagnose typos.
-
-- case $ac_option in
-+ case $ac_dashdash$ac_option in
-+ --)
-+ ac_dashdash=yes ;;
-
- -bindir | --bindir | --bindi | --bind | --bin | --bi)
- ac_prev=bindir ;;
-@@ -388,33 +883,45 @@
- --config-cache | -C)
- cache_file=config.cache ;;
-
-- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-+ -datadir | --datadir | --datadi | --datad)
- ac_prev=datadir ;;
-- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-- | --da=*)
-+ -datadir=* | --datadir=* | --datadi=* | --datad=*)
- datadir=$ac_optarg ;;
-
-+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-+ | --dataroo | --dataro | --datar)
-+ ac_prev=datarootdir ;;
-+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-+ datarootdir=$ac_optarg ;;
-+
- -disable-* | --disable-*)
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
-- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-- eval "enable_$ac_feature=no" ;;
-+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+ eval enable_$ac_feature=no ;;
-+
-+ -docdir | --docdir | --docdi | --doc | --do)
-+ ac_prev=docdir ;;
-+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-+ docdir=$ac_optarg ;;
-+
-+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-+ ac_prev=dvidir ;;
-+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-+ dvidir=$ac_optarg ;;
-
- -enable-* | --enable-*)
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
-- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-- case $ac_option in
-- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-- *) ac_optarg=yes ;;
-- esac
-- eval "enable_$ac_feature='$ac_optarg'" ;;
-+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+ eval enable_$ac_feature=\$ac_optarg ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -441,6 +948,12 @@
- -host=* | --host=* | --hos=* | --ho=*)
- host_alias=$ac_optarg ;;
-
-+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-+ ac_prev=htmldir ;;
-+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-+ | --ht=*)
-+ htmldir=$ac_optarg ;;
-+
- -includedir | --includedir | --includedi | --included | --include \
- | --includ | --inclu | --incl | --inc)
- ac_prev=includedir ;;
-@@ -465,13 +978,16 @@
- | --libexe=* | --libex=* | --libe=*)
- libexecdir=$ac_optarg ;;
-
-+ -localedir | --localedir | --localedi | --localed | --locale)
-+ ac_prev=localedir ;;
-+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-+ localedir=$ac_optarg ;;
-+
- -localstatedir | --localstatedir | --localstatedi | --localstated \
-- | --localstate | --localstat | --localsta | --localst \
-- | --locals | --local | --loca | --loc | --lo)
-+ | --localstate | --localstat | --localsta | --localst | --locals)
- ac_prev=localstatedir ;;
- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
- localstatedir=$ac_optarg ;;
-
- -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -536,6 +1052,16 @@
- | --progr-tra=* | --program-tr=* | --program-t=*)
- program_transform_name=$ac_optarg ;;
-
-+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-+ ac_prev=pdfdir ;;
-+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-+ pdfdir=$ac_optarg ;;
-+
-+ -psdir | --psdir | --psdi | --psd | --ps)
-+ ac_prev=psdir ;;
-+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-+ psdir=$ac_optarg ;;
-+
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- silent=yes ;;
-@@ -588,24 +1114,20 @@
- -with-* | --with-*)
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
-- ac_package=`echo $ac_package| sed 's/-/_/g'`
-- case $ac_option in
-- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-- *) ac_optarg=yes ;;
-- esac
-- eval "with_$ac_package='$ac_optarg'" ;;
-+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+ eval with_$ac_package=\$ac_optarg ;;
-
- -without-* | --without-*)
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
-- ac_package=`echo $ac_package | sed 's/-/_/g'`
-- eval "with_$ac_package=no" ;;
-+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+ eval with_$ac_package=no ;;
-
- --x)
- # Obsolete; use --with-x.
-@@ -636,8 +1158,7 @@
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
-- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-- eval "$ac_envvar='$ac_optarg'"
-+ eval $ac_envvar=\$ac_optarg
- export $ac_envvar ;;
-
- *)
-@@ -657,27 +1178,19 @@
- { (exit 1); exit 1; }; }
- fi
-
--# Be sure to have absolute paths.
--for ac_var in exec_prefix prefix
--do
-- eval ac_val=$`echo $ac_var`
-- case $ac_val in
-- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-- { (exit 1); exit 1; }; };;
-- esac
--done
--
--# Be sure to have absolute paths.
--for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-- localstatedir libdir includedir oldincludedir infodir mandir
-+# Be sure to have absolute directory names.
-+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
-+ datadir sysconfdir sharedstatedir localstatedir includedir \
-+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-+ libdir localedir mandir
- do
-- eval ac_val=$`echo $ac_var`
-+ eval ac_val=\$$ac_var
- case $ac_val in
-- [\\/$]* | ?:[\\/]* ) ;;
-- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-- { (exit 1); exit 1; }; };;
-+ [\\/$]* | ?:[\\/]* ) continue;;
-+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
- esac
-+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+ { (exit 1); exit 1; }; }
- done
-
- # There might be people who depend on the old broken behavior: `$host'
-@@ -704,78 +1217,76 @@
- test "$silent" = yes && exec 6>/dev/null
-
-
-+ac_pwd=`pwd` && test -n "$ac_pwd" &&
-+ac_ls_di=`ls -di .` &&
-+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-+ { echo "$as_me: error: Working directory cannot be determined" >&2
-+ { (exit 1); exit 1; }; }
-+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-+ { echo "$as_me: error: pwd does not report name of working directory" >&2
-+ { (exit 1); exit 1; }; }
-+
-+
- # Find the source files, if location was not specified.
- if test -z "$srcdir"; then
- ac_srcdir_defaulted=yes
-- # Try the directory containing this script, then its parent.
-- ac_confdir=`(dirname "$0") 2>/dev/null ||
-+ # Try the directory containing this script, then the parent directory.
-+ ac_confdir=`$as_dirname -- "$0" ||
- $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$0" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
- s/.*/./; q'`
- srcdir=$ac_confdir
-- if test ! -r $srcdir/$ac_unique_file; then
-+ if test ! -r "$srcdir/$ac_unique_file"; then
- srcdir=..
- fi
- else
- ac_srcdir_defaulted=no
- fi
--if test ! -r $srcdir/$ac_unique_file; then
-- if test "$ac_srcdir_defaulted" = yes; then
-- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-- { (exit 1); exit 1; }; }
-- else
-+if test ! -r "$srcdir/$ac_unique_file"; then
-+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
- fi
--fi
--(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-+ac_abs_confdir=`(
-+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
- { (exit 1); exit 1; }; }
--srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
--ac_env_build_alias_set=${build_alias+set}
--ac_env_build_alias_value=$build_alias
--ac_cv_env_build_alias_set=${build_alias+set}
--ac_cv_env_build_alias_value=$build_alias
--ac_env_host_alias_set=${host_alias+set}
--ac_env_host_alias_value=$host_alias
--ac_cv_env_host_alias_set=${host_alias+set}
--ac_cv_env_host_alias_value=$host_alias
--ac_env_target_alias_set=${target_alias+set}
--ac_env_target_alias_value=$target_alias
--ac_cv_env_target_alias_set=${target_alias+set}
--ac_cv_env_target_alias_value=$target_alias
--ac_env_CC_set=${CC+set}
--ac_env_CC_value=$CC
--ac_cv_env_CC_set=${CC+set}
--ac_cv_env_CC_value=$CC
--ac_env_CFLAGS_set=${CFLAGS+set}
--ac_env_CFLAGS_value=$CFLAGS
--ac_cv_env_CFLAGS_set=${CFLAGS+set}
--ac_cv_env_CFLAGS_value=$CFLAGS
--ac_env_LDFLAGS_set=${LDFLAGS+set}
--ac_env_LDFLAGS_value=$LDFLAGS
--ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
--ac_cv_env_LDFLAGS_value=$LDFLAGS
--ac_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_env_CPPFLAGS_value=$CPPFLAGS
--ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_cv_env_CPPFLAGS_value=$CPPFLAGS
--ac_env_CPP_set=${CPP+set}
--ac_env_CPP_value=$CPP
--ac_cv_env_CPP_set=${CPP+set}
--ac_cv_env_CPP_value=$CPP
--ac_env_GLIB_CONFIG_set=${GLIB_CONFIG+set}
--ac_env_GLIB_CONFIG_value=$GLIB_CONFIG
--ac_cv_env_GLIB_CONFIG_set=${GLIB_CONFIG+set}
--ac_cv_env_GLIB_CONFIG_value=$GLIB_CONFIG
-+ pwd)`
-+# When building in place, set srcdir=.
-+if test "$ac_abs_confdir" = "$ac_pwd"; then
-+ srcdir=.
-+fi
-+# Remove unnecessary trailing slashes from srcdir.
-+# Double slashes in file names in object file debugging info
-+# mess up M-x gdb in Emacs.
-+case $srcdir in
-+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-+esac
-+for ac_var in $ac_precious_vars; do
-+ eval ac_env_${ac_var}_set=\${${ac_var}+set}
-+ eval ac_env_${ac_var}_value=\$${ac_var}
-+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-+ eval ac_cv_env_${ac_var}_value=\$${ac_var}
-+done
-
- #
- # Report the --help message.
-@@ -804,9 +1315,6 @@
- -n, --no-create do not create output files
- --srcdir=DIR find the sources in DIR [configure dir or \`..']
-
--_ACEOF
--
-- cat <<_ACEOF
- Installation directories:
- --prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
-@@ -824,15 +1332,22 @@
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
-- --datadir=DIR read-only architecture-independent data [PREFIX/share]
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
-- --infodir=DIR info documentation [PREFIX/info]
-- --mandir=DIR man documentation [PREFIX/man]
-+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
-+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
-+ --infodir=DIR info documentation [DATAROOTDIR/info]
-+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
-+ --mandir=DIR man documentation [DATAROOTDIR/man]
-+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
-+ --htmldir=DIR html documentation [DOCDIR]
-+ --dvidir=DIR dvi documentation [DOCDIR]
-+ --pdfdir=DIR pdf documentation [DOCDIR]
-+ --psdir=DIR ps documentation [DOCDIR]
- _ACEOF
-
- cat <<\_ACEOF
-@@ -897,8 +1412,8 @@
- [yes if found]
- --with-subshell Compile in concurrent subshell [yes]
- --with-subshell=optional Don't run concurrent shell by default [no]
-- --with-screen=LIB Compile with screen library: slang, mcslang or
-- ncurses [slang if found, else mcslang]
-+ --with-screen=LIB Compile with screen library: slang, mcslang,
-+ ncurses or ncursesw [slang if found, else mcslang]
- --with-termcap Try using termcap database [only if no terminfo]
- --with-edit Enable internal editor [yes]
-
-@@ -907,127 +1422,97 @@
- CFLAGS C compiler flags
- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
- nonstandard directory <lib dir>
-- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
-- headers in a nonstandard directory <include dir>
-+ LIBS libraries to pass to the linker, e.g. -l<library>
-+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-+ you have headers in a nonstandard directory <include dir>
- CPP C preprocessor
- GLIB_CONFIG Path to glib-config (version 1.2.x only)
-+ XMKMF Path to xmkmf, Makefile generator for X Window System
-
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-
- _ACEOF
-+ac_status=$?
- fi
-
- if test "$ac_init_help" = "recursive"; then
- # If there are subdirs, report their specific --help.
-- ac_popdir=`pwd`
- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-- test -d $ac_dir || continue
-+ test -d "$ac_dir" || continue
- ac_builddir=.
-
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-- # A "../" for each directory in $ac_dir_suffix.
-- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
-- ac_dir_suffix= ac_top_builddir=
--fi
-+ # A ".." for each directory in $ac_dir_suffix.
-+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+ case $ac_top_builddir_sub in
-+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+ esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-
- case $srcdir in
-- .) # No --srcdir option. We are building in place.
-+ .) # We are building in place.
- ac_srcdir=.
-- if test -z "$ac_top_builddir"; then
-- ac_top_srcdir=.
-- else
-- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-- fi ;;
-- [\\/]* | ?:[\\/]* ) # Absolute path.
-+ ac_top_srcdir=$ac_top_builddir_sub
-+ ac_abs_top_srcdir=$ac_pwd ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
-- ac_top_srcdir=$srcdir ;;
-- *) # Relative path.
-- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
--
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
-- case "$ac_dir" in
-- .) ac_abs_builddir=`pwd`;;
-- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-- *) ac_abs_builddir=`pwd`/"$ac_dir";;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
-- case ${ac_top_builddir}. in
-- .) ac_abs_top_builddir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
-- case $ac_srcdir in
-- .) ac_abs_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
-- case $ac_top_srcdir in
-- .) ac_abs_top_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-- esac;;
-+ ac_top_srcdir=$srcdir
-+ ac_abs_top_srcdir=$srcdir ;;
-+ *) # Relative name.
-+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_build_prefix$srcdir
-+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
- esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-- cd $ac_dir
-- # Check for guested configure; otherwise get Cygnus style configure.
-- if test -f $ac_srcdir/configure.gnu; then
-- echo
-- $SHELL $ac_srcdir/configure.gnu --help=recursive
-- elif test -f $ac_srcdir/configure; then
-- echo
-- $SHELL $ac_srcdir/configure --help=recursive
-- elif test -f $ac_srcdir/configure.ac ||
-- test -f $ac_srcdir/configure.in; then
-- echo
-- $ac_configure --help
-+ cd "$ac_dir" || { ac_status=$?; continue; }
-+ # Check for guested configure.
-+ if test -f "$ac_srcdir/configure.gnu"; then
-+ echo &&
-+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-+ elif test -f "$ac_srcdir/configure"; then
-+ echo &&
-+ $SHELL "$ac_srcdir/configure" --help=recursive
- else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-- fi
-- cd $ac_popdir
-+ fi || ac_status=$?
-+ cd "$ac_pwd" || { ac_status=$?; break; }
- done
- fi
-
--test -n "$ac_init_help" && exit 0
-+test -n "$ac_init_help" && exit $ac_status
- if $ac_init_version; then
- cat <<\_ACEOF
-+configure
-+generated by GNU Autoconf 2.61
-
--Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-- exit 0
-+ exit
- fi
--exec 5>config.log
--cat >&5 <<_ACEOF
-+cat >config.log <<_ACEOF
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
-
- It was created by $as_me, which was
--generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.61. Invocation command line was
-
- $ $0 $@
-
- _ACEOF
-+exec 5>>config.log
- {
- cat <<_ASUNAME
- ## --------- ##
-@@ -1046,7 +1531,7 @@
- /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
- /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
- /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
--hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
-+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
- /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
- /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
- /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-@@ -1060,6 +1545,7 @@
- test -z "$as_dir" && as_dir=.
- echo "PATH: $as_dir"
- done
-+IFS=$as_save_IFS
-
- } >&5
-
-@@ -1081,7 +1567,6 @@
- ac_configure_args=
- ac_configure_args0=
- ac_configure_args1=
--ac_sep=
- ac_must_keep_next=false
- for ac_pass in 1 2
- do
-@@ -1092,7 +1577,7 @@
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- continue ;;
-- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-+ *\'*)
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- case $ac_pass in
-@@ -1114,9 +1599,7 @@
- -* ) ac_must_keep_next=true ;;
- esac
- fi
-- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-- # Get rid of the leading space.
-- ac_sep=" "
-+ ac_configure_args="$ac_configure_args '$ac_arg'"
- ;;
- esac
- done
-@@ -1127,8 +1610,8 @@
- # When interrupted or exit'd, cleanup temporary files, and complete
- # config.log. We remove comments because anyway the quotes in there
- # would cause problems or look ugly.
--# WARNING: Be sure not to use single quotes in there, as some shells,
--# such as our DU 5.0 friend, will then `close' the trap.
-+# WARNING: Use '\'' to represent an apostrophe within the trap.
-+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
- trap 'exit_status=$?
- # Save into config.log some information that might help in debugging.
- {
-@@ -1141,20 +1624,34 @@
- _ASBOX
- echo
- # The following way of writing the cache mishandles newlines in values,
--{
-+(
-+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-+ eval ac_val=\$$ac_var
-+ case $ac_val in #(
-+ *${as_nl}*)
-+ case $ac_var in #(
-+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+ esac
-+ case $ac_var in #(
-+ _ | IFS | as_nl) ;; #(
-+ *) $as_unset $ac_var ;;
-+ esac ;;
-+ esac
-+ done
- (set) 2>&1 |
-- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-- *ac_space=\ *)
-+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-+ *${as_nl}ac_space=\ *)
- sed -n \
-- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-- ;;
-+ "s/'\''/'\''\\\\'\'''\''/g;
-+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-+ ;; #(
- *)
-- sed -n \
-- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
-- esac;
--}
-+ esac |
-+ sort
-+)
- echo
-
- cat <<\_ASBOX
-@@ -1165,22 +1662,28 @@
- echo
- for ac_var in $ac_subst_vars
- do
-- eval ac_val=$`echo $ac_var`
-- echo "$ac_var='"'"'$ac_val'"'"'"
-+ eval ac_val=\$$ac_var
-+ case $ac_val in
-+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ esac
-+ echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
-
- if test -n "$ac_subst_files"; then
- cat <<\_ASBOX
--## ------------- ##
--## Output files. ##
--## ------------- ##
-+## ------------------- ##
-+## File substitutions. ##
-+## ------------------- ##
- _ASBOX
- echo
- for ac_var in $ac_subst_files
- do
-- eval ac_val=$`echo $ac_var`
-- echo "$ac_var='"'"'$ac_val'"'"'"
-+ eval ac_val=\$$ac_var
-+ case $ac_val in
-+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ esac
-+ echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
- fi
-@@ -1192,15 +1695,15 @@
- ## ----------- ##
- _ASBOX
- echo
-- sed "/^$/d" confdefs.h | sort
-+ cat confdefs.h
- echo
- fi
- test "$ac_signal" != 0 &&
- echo "$as_me: caught signal $ac_signal"
- echo "$as_me: exit $exit_status"
- } >&5
-- rm -f core *.core &&
-- rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-+ rm -f core *.core core.conftest.* &&
-+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
- exit $exit_status
- ' 0
- for ac_signal in 1 2 13 15; do
-@@ -1209,9 +1712,7 @@
- ac_signal=0
-
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
--rm -rf conftest* confdefs.h
--# AIX cpp loses on an empty file, so make sure it contains at least a newline.
--echo >confdefs.h
-+rm -f -r conftest* confdefs.h
-
- # Predefined preprocessor variables.
-
-@@ -1242,14 +1743,17 @@
-
- # Let the site file select an alternate cache file if it wants to.
- # Prefer explicitly selected file to automatically selected ones.
--if test -z "$CONFIG_SITE"; then
-- if test "x$prefix" != xNONE; then
-- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-+if test -n "$CONFIG_SITE"; then
-+ set x "$CONFIG_SITE"
-+elif test "x$prefix" != xNONE; then
-+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
- else
-- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-- fi
-+ set x "$ac_default_prefix/share/config.site" \
-+ "$ac_default_prefix/etc/config.site"
- fi
--for ac_site_file in $CONFIG_SITE; do
-+shift
-+for ac_site_file
-+do
- if test -r "$ac_site_file"; then
- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
- echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1265,8 +1769,8 @@
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
-- [\\/]* | ?:[\\/]* ) . $cache_file;;
-- *) . ./$cache_file;;
-+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
-+ *) . "./$cache_file";;
- esac
- fi
- else
-@@ -1278,12 +1782,11 @@
- # Check that the precious variables saved in the cache have kept the same
- # value.
- ac_cache_corrupted=false
--for ac_var in `(set) 2>&1 |
-- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-+for ac_var in $ac_precious_vars; do
- eval ac_old_set=\$ac_cv_env_${ac_var}_set
- eval ac_new_set=\$ac_env_${ac_var}_set
-- eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-- eval ac_new_val="\$ac_env_${ac_var}_value"
-+ eval ac_old_val=\$ac_cv_env_${ac_var}_value
-+ eval ac_new_val=\$ac_env_${ac_var}_value
- case $ac_old_set,$ac_new_set in
- set,)
- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1308,8 +1811,7 @@
- # Pass precious variables to config.status.
- if test "$ac_new_set" = set; then
- case $ac_new_val in
-- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
- *) ac_arg=$ac_var=$ac_new_val ;;
- esac
- case " $ac_configure_args " in
-@@ -1326,12 +1828,6 @@
- { (exit 1); exit 1; }; }
- fi
-
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
-
-
-
-@@ -1348,37 +1844,49 @@
-
-
-
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
- ac_aux_dir=
--for ac_dir in config $srcdir/config; do
-- if test -f $ac_dir/install-sh; then
-+for ac_dir in config "$srcdir"/config; do
-+ if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
-- elif test -f $ac_dir/install.sh; then
-+ elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
-- elif test -f $ac_dir/shtool; then
-+ elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
- done
- if test -z "$ac_aux_dir"; then
-- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config $srcdir/config" >&5
--echo "$as_me: error: cannot find install-sh or install.sh in config $srcdir/config" >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5
-+echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
- { (exit 1); exit 1; }; }
- fi
--ac_config_guess="$SHELL $ac_aux_dir/config.guess"
--ac_config_sub="$SHELL $ac_aux_dir/config.sub"
--ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
--am__api_version="1.9"
-+# These three variables are undocumented and unsupported,
-+# and are intended to be withdrawn in a future Autoconf release.
-+# They can cause serious problems if a builder's source tree is in a directory
-+# whose full name contains unusual characters.
-+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
-+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
-+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-+
-+
-+am__api_version='1.10'
-+
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
- # incompatible versions:
-@@ -1392,8 +1900,8 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
--echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
--echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1415,7 +1923,7 @@
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
-@@ -1434,21 +1942,22 @@
- ;;
- esac
- done
-+IFS=$as_save_IFS
-
-
- fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
-- # As a last resort, use the slow shell script. We don't cache a
-- # path for INSTALL within a source directory, because that will
-+ # As a last resort, use the slow shell script. Don't cache a
-+ # value for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
-- # removed, or if the path is relative.
-+ # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
- fi
--echo "$as_me:$LINENO: result: $INSTALL" >&5
--echo "${ECHO_T}$INSTALL" >&6
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6; }
-
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-@@ -1458,8 +1967,8 @@
-
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
--echo "$as_me:$LINENO: checking whether build environment is sane" >&5
--echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
- # Just in case
- sleep 1
- echo timestamp > conftest.file
-@@ -1501,20 +2010,20 @@
- Check your system clock" >&2;}
- { (exit 1); exit 1; }; }
- fi
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- test "$program_prefix" != NONE &&
-- program_transform_name="s,^,$program_prefix,;$program_transform_name"
-+ program_transform_name="s&^&$program_prefix&;$program_transform_name"
- # Use a double $ so make ignores it.
- test "$program_suffix" != NONE &&
-- program_transform_name="s,\$,$program_suffix,;$program_transform_name"
-+ program_transform_name="s&\$&$program_suffix&;$program_transform_name"
- # Double any \ or $. echo might interpret backslashes.
- # By default was `s,x,x', remove it if useless.
- cat <<\_ACEOF >conftest.sed
- s/[\\$]/&&/g;s/;s,x,x,$//
- _ACEOF
- program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
--rm conftest.sed
-+rm -f conftest.sed
-
- # expand $ac_aux_dir to an absolute path
- am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -1529,45 +2038,60 @@
- echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
- fi
-
--if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-- # We used to keeping the `.' as first argument, in order to
-- # allow $(mkdir_p) to be used without argument. As in
-- # $(mkdir_p) $(somedir)
-- # where $(somedir) is conditionally defined. However this is wrong
-- # for two reasons:
-- # 1. if the package is installed by a user who cannot write `.'
-- # make install will fail,
-- # 2. the above comment should most certainly read
-- # $(mkdir_p) $(DESTDIR)$(somedir)
-- # so it does not work when $(somedir) is undefined and
-- # $(DESTDIR) is not.
-- # To support the latter case, we have to write
-- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-- # so the `.' trick is pointless.
-- mkdir_p='mkdir -p --'
-+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
-+if test -z "$MKDIR_P"; then
-+ if test "${ac_cv_path_mkdir+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- # On NextStep and OpenStep, the `mkdir' command does not
-- # recognize any option. It will interpret all options as
-- # directories to create, and then abort because `.' already
-- # exists.
-- for d in ./-p ./--version;
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
- do
-- test -d $d && rmdir $d
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_prog in mkdir gmkdir; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-+ 'mkdir (GNU coreutils) '* | \
-+ 'mkdir (coreutils) '* | \
-+ 'mkdir (fileutils) '4.1*)
-+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-+ break 3;;
-+ esac
- done
-- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-- if test -f "$ac_aux_dir/mkinstalldirs"; then
-- mkdir_p='$(mkinstalldirs)'
-+ done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+
-+ if test "${ac_cv_path_mkdir+set}" = set; then
-+ MKDIR_P="$ac_cv_path_mkdir -p"
- else
-- mkdir_p='$(install_sh) -d'
-+ # As a last resort, use the slow shell script. Don't cache a
-+ # value for MKDIR_P within a source directory, because that will
-+ # break other packages using the cache if that directory is
-+ # removed, or if the value is a relative name.
-+ test -d ./--version && rmdir ./--version
-+ MKDIR_P="$ac_install_sh -d"
- fi
- fi
-+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-+echo "${ECHO_T}$MKDIR_P" >&6; }
-
--for ac_prog in awk gawk mawk nawk
-+mkdir_p="$MKDIR_P"
-+case $mkdir_p in
-+ [\\/$]* | ?:[\\/]*) ;;
-+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
-+
-+for ac_prog in gawk mawk nawk awk
- 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 "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AWK+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1580,54 +2104,57 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AWK="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
-- echo "$as_me:$LINENO: result: $AWK" >&5
--echo "${ECHO_T}$AWK" >&6
-+ { echo "$as_me:$LINENO: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$AWK" && break
- done
-
--echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
--echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
--set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
--if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.make <<\_ACEOF
-+SHELL = /bin/sh
- all:
-- @echo 'ac_maketemp="$(MAKE)"'
-+ @echo '@@@%%%=$(MAKE)=@@@%%%'
- _ACEOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
--if test -n "$ac_maketemp"; then
-- eval ac_cv_prog_make_${ac_make}_set=yes
--else
-- eval ac_cv_prog_make_${ac_make}_set=no
--fi
-+case `${MAKE-make} -f conftest.make 2>/dev/null` in
-+ *@@@%%%=?*=@@@%%%*)
-+ eval ac_cv_prog_make_${ac_make}_set=yes;;
-+ *)
-+ eval ac_cv_prog_make_${ac_make}_set=no;;
-+esac
- rm -f conftest.make
- fi
--if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- SET_MAKE=
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- SET_MAKE="MAKE=${MAKE-make}"
- fi
-
-@@ -1640,13 +2167,17 @@
- fi
- rmdir .tst 2>/dev/null
-
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+ # is not polluted with repeated "-I."
-+ am__isrc=' -I$(srcdir)'
- # test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" &&
-- test -f $srcdir/config.status; then
-+ if test -f $srcdir/config.status; then
- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
- echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
- { (exit 1); exit 1; }; }
- fi
-+fi
-
- # test whether we have cygpath
- if test -z "$CYGPATH_W"; then
-@@ -1688,7 +2219,7 @@
-
- MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
--install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-
- # Installed binaries are usually stripped using `strip' when the user
- # run `make install-strip'. However `strip' might not be the right
-@@ -1698,8 +2229,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1712,32 +2243,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
-- echo "$as_me:$LINENO: result: $STRIP" >&5
--echo "${ECHO_T}$STRIP" >&6
-+ { echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_prog_STRIP"; then
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
- set dummy strip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1750,33 +2283,47 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_STRIP="strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
- fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
-- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--echo "${ECHO_T}$ac_ct_STRIP" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+ if test "x$ac_ct_STRIP" = x; then
-+ STRIP=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
- STRIP=$ac_ct_STRIP
-+ fi
- else
- STRIP="$ac_cv_prog_STRIP"
- fi
-
- fi
--INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
- # We need awk for the "check" target. The system "awk" is bad on
- # some platforms.
-@@ -1793,19 +2340,17 @@
-
- ac_config_headers="$ac_config_headers config.h"
-
--echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
--echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-- # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
-+ # Check whether --enable-maintainer-mode was given.
- if test "${enable_maintainer_mode+set}" = set; then
-- enableval="$enable_maintainer_mode"
-- USE_MAINTAINER_MODE=$enableval
-+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
- else
- USE_MAINTAINER_MODE=no
--fi;
-- echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
--echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
--
-+fi
-
-+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
- if test $USE_MAINTAINER_MODE = yes; then
- MAINTAINER_MODE_TRUE=
- MAINTAINER_MODE_FALSE='#'
-@@ -1819,57 +2364,86 @@
-
-
- # Make sure we can run config.sub.
--$ac_config_sub sun4 >/dev/null 2>&1 ||
-- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
--echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
- { (exit 1); exit 1; }; }
-
--echo "$as_me:$LINENO: checking build system type" >&5
--echo $ECHO_N "checking build system type... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking build system type" >&5
-+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
- if test "${ac_cv_build+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_build_alias=$build_alias
--test -z "$ac_cv_build_alias" &&
-- ac_cv_build_alias=`$ac_config_guess`
--test -z "$ac_cv_build_alias" &&
-+ ac_build_alias=$build_alias
-+test "x$ac_build_alias" = x &&
-+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-+test "x$ac_build_alias" = x &&
- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
- echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }
--ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_build" >&5
--echo "${ECHO_T}$ac_cv_build" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+echo "${ECHO_T}$ac_cv_build" >&6; }
-+case $ac_cv_build in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-+echo "$as_me: error: invalid value of canonical build" >&2;}
-+ { (exit 1); exit 1; }; };;
-+esac
- build=$ac_cv_build
--build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_build
-+shift
-+build_cpu=$1
-+build_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+build_os=$*
-+IFS=$ac_save_IFS
-+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
--echo "$as_me:$LINENO: checking host system type" >&5
--echo $ECHO_N "checking host system type... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking host system type" >&5
-+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
- if test "${ac_cv_host+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_host_alias=$host_alias
--test -z "$ac_cv_host_alias" &&
-- ac_cv_host_alias=$ac_cv_build_alias
--ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-+ if test "x$host_alias" = x; then
-+ ac_cv_host=$ac_cv_build
-+else
-+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-+fi
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_host" >&5
--echo "${ECHO_T}$ac_cv_host" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+echo "${ECHO_T}$ac_cv_host" >&6; }
-+case $ac_cv_host in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-+echo "$as_me: error: invalid value of canonical host" >&2;}
-+ { (exit 1); exit 1; }; };;
-+esac
- host=$ac_cv_host
--host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_host
-+shift
-+host_cpu=$1
-+host_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+host_os=$*
-+IFS=$ac_save_IFS
-+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-
-@@ -1891,8 +2465,8 @@
- .PHONY: am__doit
- END
- # If we don't find an include directive, just comment out the code.
--echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
--echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
- am__include="#"
- am__quote=
- _am_result=none
-@@ -1919,21 +2493,19 @@
- fi
-
-
--echo "$as_me:$LINENO: result: $_am_result" >&5
--echo "${ECHO_T}$_am_result" >&6
-+{ echo "$as_me:$LINENO: result: $_am_result" >&5
-+echo "${ECHO_T}$_am_result" >&6; }
- rm -f confinc confmf
-
--# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
-+# Check whether --enable-dependency-tracking was given.
- if test "${enable_dependency_tracking+set}" = set; then
-- enableval="$enable_dependency_tracking"
-+ enableval=$enable_dependency_tracking;
-+fi
-
--fi;
- if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
- fi
--
--
- if test "x$enable_dependency_tracking" != xno; then
- AMDEP_TRUE=
- AMDEP_FALSE='#'
-@@ -1943,7 +2515,6 @@
- fi
-
-
--
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -1952,8 +2523,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1966,32 +2537,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2004,26 +2577,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
- CC=$ac_ct_CC
-+ fi
- else
- CC="$ac_cv_prog_CC"
- fi
-@@ -2032,8 +2620,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2046,74 +2634,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--fi
--if test -z "$ac_cv_prog_CC"; then
-- ac_ct_CC=$CC
-- # Extract the first word of "cc", so it can be a program name with args.
--set dummy cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test -n "$ac_ct_CC"; then
-- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_ac_ct_CC="cc"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--done
--done
-
--fi
--fi
--ac_ct_CC=$ac_cv_prog_ac_ct_CC
--if test -n "$ac_ct_CC"; then
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
-
-- CC=$ac_ct_CC
--else
-- CC="$ac_cv_prog_CC"
- fi
--
- fi
- 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 "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2127,7 +2675,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
-@@ -2138,6 +2686,7 @@
- fi
- done
- done
-+IFS=$as_save_IFS
-
- if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
-@@ -2155,22 +2704,23 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
-- for ac_prog in cl
-+ for ac_prog in cl.exe
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2183,36 +2733,38 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$CC" && break
- done
- fi
- if test -z "$CC"; then
- ac_ct_CC=$CC
-- for ac_prog in cl
-+ for ac_prog in cl.exe
- 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 "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2225,30 +2777,46 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$ac_ct_CC" && break
- done
-
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
- CC=$ac_ct_CC
- fi
-+fi
-
- fi
-
-@@ -2260,21 +2828,35 @@
- { (exit 1); exit 1; }; }
-
- # Provide some information about the compiler.
--echo "$as_me:$LINENO:" \
-- "checking for C compiler version" >&5
-+echo "$as_me:$LINENO: checking for C compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-- (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler --version >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-- (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -v >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-- (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -V >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-@@ -2299,47 +2881,77 @@
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
--echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
- ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-- (eval $ac_link_default) 2>&5
-+#
-+# List of possible output files, starting from the most likely.
-+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-+# only as a last resort. b.out is created by i960 compilers.
-+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-+#
-+# The IRIX 6 linker writes into existing files which may not be
-+# executable, retaining their permissions. Remove them first so a
-+# subsequent execution test works.
-+ac_rmfiles=
-+for ac_file in $ac_files
-+do
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-+ esac
-+done
-+rm -f $ac_rmfiles
-+
-+if { (ac_try="$ac_link_default"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link_default") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- # Find the output, starting from the most likely. This scheme is
--# not robust to junk in `.', hence go to wildcards (a.*) only as a last
--# resort.
--
--# Be careful to initialize this variable, since it used to be cached.
--# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
--ac_cv_exeext=
--# b.out is created by i960 compilers.
--for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-+# in a Makefile. We should not override ac_cv_exeext if it was cached,
-+# so that the user can short-circuit this test for compilers unknown to
-+# Autoconf.
-+for ac_file in $ac_files ''
- do
- test -f "$ac_file" || continue
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-- ;;
-- conftest.$ac_ext )
-- # This is the source file.
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
- ;;
- [ab].out )
- # We found the default executable, but exeext='' is most
- # certainly right.
- break;;
- *.* )
-+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-+ then :; else
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-- # FIXME: I believe we export ac_cv_exeext for Libtool,
-- # but it would be cool to find out if it's true. Does anybody
-- # maintain Libtool? --akim.
-- export ac_cv_exeext
-+ fi
-+ # We set ac_cv_exeext here because the later test for it is not
-+ # safe: cross compilers may not add the suffix if given an `-o'
-+ # argument, so we may need to know it at that point already.
-+ # Even if this section looks crufty: it has the advantage of
-+ # actually working.
- break;;
- * )
- break;;
- esac
- done
-+test "$ac_cv_exeext" = no && ac_cv_exeext=
-+
- else
-+ ac_file=''
-+fi
-+
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
-+if test -z "$ac_file"; then
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-@@ -2351,19 +2963,21 @@
- fi
-
- ac_exeext=$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_file" >&5
--echo "${ECHO_T}$ac_file" >&6
-
--# Check the compiler produces executables we can run. If not, either
-+# Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether the C compiler works" >&5
--echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
- # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -2382,22 +2996,27 @@
- fi
- fi
- fi
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- rm -f a.out a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check the compiler produces executables we can run. If not, either
-+# Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
--echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
--echo "$as_me:$LINENO: result: $cross_compiling" >&5
--echo "${ECHO_T}$cross_compiling" >&6
-+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+echo "${ECHO_T}$cross_compiling" >&6; }
-
--echo "$as_me:$LINENO: checking for suffix of executables" >&5
--echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-@@ -2408,9 +3027,8 @@
- for ac_file in conftest.exe conftest conftest.*; do
- test -f "$ac_file" || continue
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-- export ac_cv_exeext
- break;;
- * ) break;;
- esac
-@@ -2424,14 +3042,14 @@
- fi
-
- rm -f conftest$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--echo "${ECHO_T}$ac_cv_exeext" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+echo "${ECHO_T}$ac_cv_exeext" >&6; }
-
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--echo "$as_me:$LINENO: checking for suffix of object files" >&5
--echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
- if test "${ac_cv_objext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2451,14 +3069,20 @@
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-+ for ac_file in conftest.o conftest.obj conftest.*; do
-+ test -f "$ac_file" || continue;
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
- break;;
- esac
-@@ -2476,12 +3100,12 @@
-
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
--echo "${ECHO_T}$ac_cv_objext" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+echo "${ECHO_T}$ac_cv_objext" >&6; }
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2504,27 +3128,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -2532,21 +3151,25 @@
-
- ac_compiler_gnu=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
- GCC=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--CFLAGS="-g"
--echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-+ ac_save_c_werror_flag=$ac_c_werror_flag
-+ ac_c_werror_flag=yes
-+ ac_cv_prog_cc_g=no
-+ CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -2563,38 +3186,118 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_g=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ CFLAGS=""
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_g=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_prog_cc_g=no
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
- if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
-@@ -2610,12 +3313,12 @@
- CFLAGS=
- fi
- fi
--echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
--echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
--if test "${ac_cv_prog_cc_stdc+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_prog_cc_stdc=no
-+ ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -2649,12 +3352,17 @@
- /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
-- as 'x'. The following induces an error, until -std1 is added to get
-+ as 'x'. The following induces an error, until -std is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
-- that's true only with -std1. */
-+ that's true only with -std. */
- int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+ inside strings and character constants. */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+
- int test (int i, double x);
- struct s1 {int (*f) (int a);};
- struct s2 {int (*f) (double a);};
-@@ -2669,205 +3377,57 @@
- return 0;
- }
- _ACEOF
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX -qlanglvl=ansi
--# Ultrix and OSF/1 -std1
--# HP-UX 10.20 and later -Ae
--# HP-UX older versions -Aa -D_HPUX_SOURCE
--# SVR4 -Xc -D__EXTENSIONS__
--for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
- do
- CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_prog_cc_stdc=$ac_arg
--break
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_c89=$ac_arg
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext
-+
-+rm -f core conftest.err conftest.$ac_objext
-+ test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
--rm -f conftest.$ac_ext conftest.$ac_objext
-+rm -f conftest.$ac_ext
- CC=$ac_save_CC
-
- fi
--
--case "x$ac_cv_prog_cc_stdc" in
-- x|xno)
-- echo "$as_me:$LINENO: result: none needed" >&5
--echo "${ECHO_T}none needed" >&6 ;;
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+ x)
-+ { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+ xno)
-+ { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
- *)
-- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-- CC="$CC $ac_cv_prog_cc_stdc" ;;
-+ CC="$CC $ac_cv_prog_cc_c89"
-+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
- esac
-
--# Some people use a C++ compiler to compile C. Since we use `exit',
--# in C++ we need to declare it. In case someone uses the same compiler
--# for both compiling C and C++ we need to have the C++ compiler decide
--# the declaration of exit, since it's the most demanding environment.
--cat >conftest.$ac_ext <<_ACEOF
--#ifndef __cplusplus
-- choke me
--#endif
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- for ac_declaration in \
-- '' \
-- 'extern "C" void std::exit (int) throw (); using std::exit;' \
-- 'extern "C" void std::exit (int); using std::exit;' \
-- 'extern "C" void exit (int) throw ();' \
-- 'extern "C" void exit (int);' \
-- 'void exit (int);'
--do
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_declaration
--#include <stdlib.h>
--int
--main ()
--{
--exit (42);
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- :
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--continue
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_declaration
--int
--main ()
--{
--exit (42);
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--rm -f conftest*
--if test -n "$ac_declaration"; then
-- echo '#ifdef __cplusplus' >>confdefs.h
-- echo $ac_declaration >>confdefs.h
-- echo '#endif' >>confdefs.h
--fi
-
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2876,8 +3436,8 @@
-
- depcc="$CC" am_compiler_list=
-
--echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
- if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2941,6 +3501,7 @@
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
- >/dev/null 2>conftest.err &&
-+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-@@ -2966,12 +3527,10 @@
- fi
-
- fi
--echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
--
--
- if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-@@ -2989,8 +3548,8 @@
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
--echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
--echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-@@ -3024,24 +3583,22 @@
- #endif
- Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- :
- else
- echo "$as_me: failed program was:" >&5
-@@ -3050,9 +3607,10 @@
- # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
-- # OK, works on sane cases. Now check whether non-existent headers
-+ # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -3062,24 +3620,22 @@
- /* end confdefs.h. */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- # Broken: success on invalid input.
- continue
- else
-@@ -3090,6 +3646,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
- done
-@@ -3107,8 +3664,8 @@
- else
- ac_cv_prog_CPP=$CPP
- fi
--echo "$as_me:$LINENO: result: $CPP" >&5
--echo "${ECHO_T}$CPP" >&6
-+{ echo "$as_me:$LINENO: result: $CPP" >&5
-+echo "${ECHO_T}$CPP" >&6; }
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
- do
-@@ -3131,24 +3688,22 @@
- #endif
- Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- :
- else
- echo "$as_me: failed program was:" >&5
-@@ -3157,9 +3712,10 @@
- # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
-- # OK, works on sane cases. Now check whether non-existent headers
-+ # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -3169,24 +3725,22 @@
- /* end confdefs.h. */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- # Broken: success on invalid input.
- continue
- else
-@@ -3197,6 +3751,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
- done
-@@ -3219,24 +3774,171 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-+if test "${ac_cv_path_GREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-- then ac_cv_prog_egrep='grep -E'
-- else ac_cv_prog_egrep='egrep'
-+ # Extract the first word of "grep ggrep" to use in msg output
-+if test -z "$GREP"; then
-+set dummy grep ggrep; ac_prog_name=$2
-+if test "${ac_cv_path_GREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_path_GREP_found=false
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_prog in grep ggrep; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-+ # Check for GNU ac_path_GREP and select it if it is found.
-+ # Check for GNU $ac_path_GREP
-+case `"$ac_path_GREP" --version 2>&1` in
-+*GNU*)
-+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-+*)
-+ ac_count=0
-+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+ while :
-+ do
-+ cat "conftest.in" "conftest.in" >"conftest.tmp"
-+ mv "conftest.tmp" "conftest.in"
-+ cp "conftest.in" "conftest.nl"
-+ echo 'GREP' >> "conftest.nl"
-+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+ ac_count=`expr $ac_count + 1`
-+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
-+ # Best one so far, save it but keep looking for a better one
-+ ac_cv_path_GREP="$ac_path_GREP"
-+ ac_path_GREP_max=$ac_count
- fi
-+ # 10*(2^10) chars as input seems more than enough
-+ test $ac_count -gt 10 && break
-+ done
-+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+
-+ $ac_path_GREP_found && break 3
-+ done
-+done
-+
-+done
-+IFS=$as_save_IFS
-+
-+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
-
-+GREP="$ac_cv_path_GREP"
-+if test -z "$GREP"; then
-+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-
-+else
-+ ac_cv_path_GREP=$GREP
-+fi
-
--echo "$as_me:$LINENO: checking for AIX" >&5
--echo $ECHO_N "checking for AIX... $ECHO_C" >&6
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
-+ GREP="$ac_cv_path_GREP"
-+
-+
-+{ echo "$as_me:$LINENO: checking for egrep" >&5
-+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-+ then ac_cv_path_EGREP="$GREP -E"
-+ else
-+ # Extract the first word of "egrep" to use in msg output
-+if test -z "$EGREP"; then
-+set dummy egrep; ac_prog_name=$2
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_path_EGREP_found=false
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_prog in egrep; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-+ # Check for GNU ac_path_EGREP and select it if it is found.
-+ # Check for GNU $ac_path_EGREP
-+case `"$ac_path_EGREP" --version 2>&1` in
-+*GNU*)
-+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-+*)
-+ ac_count=0
-+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+ while :
-+ do
-+ cat "conftest.in" "conftest.in" >"conftest.tmp"
-+ mv "conftest.tmp" "conftest.in"
-+ cp "conftest.in" "conftest.nl"
-+ echo 'EGREP' >> "conftest.nl"
-+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+ ac_count=`expr $ac_count + 1`
-+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-+ # Best one so far, save it but keep looking for a better one
-+ ac_cv_path_EGREP="$ac_path_EGREP"
-+ ac_path_EGREP_max=$ac_count
-+ fi
-+ # 10*(2^10) chars as input seems more than enough
-+ test $ac_count -gt 10 && break
-+ done
-+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+
-+ $ac_path_EGREP_found && break 3
-+ done
-+done
-+
-+done
-+IFS=$as_save_IFS
-+
-+
-+fi
-+
-+EGREP="$ac_cv_path_EGREP"
-+if test -z "$EGREP"; then
-+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+else
-+ ac_cv_path_EGREP=$EGREP
-+fi
-+
-+
-+ fi
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
-+ EGREP="$ac_cv_path_EGREP"
-+
-+
-+
-+{ echo "$as_me:$LINENO: checking for AIX" >&5
-+echo $ECHO_N "checking for AIX... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -3250,21 +3952,21 @@
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- cat >>confdefs.h <<\_ACEOF
- #define _ALL_SOURCE 1
- _ACEOF
-
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- rm -f conftest*
-
-
--echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3288,27 +3990,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_header_stdc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -3316,7 +4013,8 @@
-
- ac_cv_header_stdc=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -3372,6 +4070,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <ctype.h>
-+#include <stdlib.h>
- #if ((' ' & 0x0FF) == 0x020)
- # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
- # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -3391,18 +4090,27 @@
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
-- exit(2);
-- exit (0);
-+ return 2;
-+ return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -3415,12 +4123,14 @@
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -3443,9 +4153,9 @@
- inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -3459,27 +4169,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -3487,10 +4192,12 @@
-
- eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -3502,17 +4209,17 @@
-
-
- if test "${ac_cv_header_minix_config_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for minix/config.h" >&5
--echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for minix/config.h" >&5
-+echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_minix_config_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
--echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-+echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking minix/config.h usability" >&5
--echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking minix/config.h usability" >&5
-+echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -3523,27 +4230,22 @@
- #include <minix/config.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -3551,13 +4253,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking minix/config.h presence" >&5
--echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking minix/config.h presence" >&5
-+echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -3566,24 +4269,22 @@
- /* end confdefs.h. */
- #include <minix/config.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -3591,9 +4292,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -3617,25 +4319,18 @@
- echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for minix/config.h" >&5
--echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for minix/config.h" >&5
-+echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_minix_config_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_minix_config_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
--echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-+echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
-
- fi
- if test $ac_cv_header_minix_config_h = yes; then
-@@ -3664,8 +4359,8 @@
- fi
-
-
-- echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
--echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
-+echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6; }
- if test "${ac_cv_lib_cposix_strerror+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3678,43 +4373,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char strerror ();
- int
- main ()
- {
--strerror ();
-+return strerror ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_cposix_strerror=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -3722,12 +4413,13 @@
-
- ac_cv_lib_cposix_strerror=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
--echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
-+echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6; }
- if test $ac_cv_lib_cposix_strerror = yes; then
- LIBS="$LIBS -lcposix"
- fi
-@@ -3735,22 +4427,364 @@
-
-
-
-+ case $ac_cv_prog_cc_stdc in
-+ no) ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;;
-+ *) { echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C99... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_c99+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_prog_cc_c99=no
-+ac_save_CC=$CC
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdarg.h>
-+#include <stdbool.h>
-+#include <stdlib.h>
-+#include <wchar.h>
-+#include <stdio.h>
-+
-+// Check varargs macros. These examples are taken from C99 6.10.3.5.
-+#define debug(...) fprintf (stderr, __VA_ARGS__)
-+#define showlist(...) puts (#__VA_ARGS__)
-+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
-+static void
-+test_varargs_macros (void)
-+{
-+ int x = 1234;
-+ int y = 5678;
-+ debug ("Flag");
-+ debug ("X = %d\n", x);
-+ showlist (The first, second, and third items.);
-+ report (x>y, "x is %d but y is %d", x, y);
-+}
-+
-+// Check long long types.
-+#define BIG64 18446744073709551615ull
-+#define BIG32 4294967295ul
-+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
-+#if !BIG_OK
-+ your preprocessor is broken;
-+#endif
-+#if BIG_OK
-+#else
-+ your preprocessor is broken;
-+#endif
-+static long long int bignum = -9223372036854775807LL;
-+static unsigned long long int ubignum = BIG64;
-+
-+struct incomplete_array
-+{
-+ int datasize;
-+ double data[];
-+};
-+
-+struct named_init {
-+ int number;
-+ const wchar_t *name;
-+ double average;
-+};
-+
-+typedef const char *ccp;
-+
-+static inline int
-+test_restrict (ccp restrict text)
-+{
-+ // See if C++-style comments work.
-+ // Iterate through items via the restricted pointer.
-+ // Also check for declarations in for loops.
-+ for (unsigned int i = 0; *(text+i) != '\0'; ++i)
-+ continue;
-+ return 0;
-+}
-+
-+// Check varargs and va_copy.
-+static void
-+test_varargs (const char *format, ...)
-+{
-+ va_list args;
-+ va_start (args, format);
-+ va_list args_copy;
-+ va_copy (args_copy, args);
-
-+ const char *str;
-+ int number;
-+ float fnumber;
-
-+ while (*format)
-+ {
-+ switch (*format++)
-+ {
-+ case 's': // string
-+ str = va_arg (args_copy, const char *);
-+ break;
-+ case 'd': // int
-+ number = va_arg (args_copy, int);
-+ break;
-+ case 'f': // float
-+ fnumber = va_arg (args_copy, double);
-+ break;
-+ default:
-+ break;
-+ }
-+ }
-+ va_end (args_copy);
-+ va_end (args);
-+}
-
-+int
-+main ()
-+{
-
--# Check whether --with-glib12 or --without-glib12 was given.
-+ // Check bool.
-+ _Bool success = false;
-+
-+ // Check restrict.
-+ if (test_restrict ("String literal") == 0)
-+ success = true;
-+ char *restrict newvar = "Another string";
-+
-+ // Check varargs.
-+ test_varargs ("s, d' f .", "string", 65, 34.234);
-+ test_varargs_macros ();
-+
-+ // Check flexible array members.
-+ struct incomplete_array *ia =
-+ malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
-+ ia->datasize = 10;
-+ for (int i = 0; i < ia->datasize; ++i)
-+ ia->data[i] = i * 1.234;
-+
-+ // Check named initializers.
-+ struct named_init ni = {
-+ .number = 34,
-+ .name = L"Test wide string",
-+ .average = 543.34343,
-+ };
-+
-+ ni.number = 58;
-+
-+ int dynamic_array[ni.number];
-+ dynamic_array[ni.number - 1] = 543;
-+
-+ // work around unused variable warnings
-+ return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'
-+ || dynamic_array[ni.number - 1] != 543);
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+for ac_arg in '' -std=gnu99 -c99 -qlanglvl=extc99
-+do
-+ CC="$ac_save_CC $ac_arg"
-+ rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_c99=$ac_arg
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext
-+ test "x$ac_cv_prog_cc_c99" != "xno" && break
-+done
-+rm -f conftest.$ac_ext
-+CC=$ac_save_CC
-+
-+fi
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c99" in
-+ x)
-+ { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+ xno)
-+ { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
-+ *)
-+ CC="$CC $ac_cv_prog_cc_c99"
-+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c99" >&6; } ;;
-+esac
-+if test "x$ac_cv_prog_cc_c99" != xno; then
-+ ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
-+else
-+ { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_prog_cc_c89=no
-+ac_save_CC=$CC
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+ char **p;
-+ int i;
-+{
-+ return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+ char *s;
-+ va_list v;
-+ va_start (v,p);
-+ s = g (p, va_arg (v,int));
-+ va_end (v);
-+ return s;
-+}
-+
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
-+ function prototypes and stuff, but not '\xHH' hex character constants.
-+ These don't provoke an error unfortunately, instead are silently treated
-+ as 'x'. The following induces an error, until -std is added to get
-+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
-+ array size at least. It's necessary to write '\x00'==0 to get something
-+ that's true only with -std. */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+ inside strings and character constants. */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
-+int
-+main ()
-+{
-+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+ CC="$ac_save_CC $ac_arg"
-+ rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_c89=$ac_arg
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext
-+ test "x$ac_cv_prog_cc_c89" != "xno" && break
-+done
-+rm -f conftest.$ac_ext
-+CC=$ac_save_CC
-+
-+fi
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+ x)
-+ { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+ xno)
-+ { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
-+ *)
-+ CC="$CC $ac_cv_prog_cc_c89"
-+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-+esac
-+if test "x$ac_cv_prog_cc_c89" != xno; then
-+ ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
-+else
-+ ac_cv_prog_cc_stdc=no
-+fi
-+
-+
-+fi
-+
-+ ;;
-+esac
-+ { echo "$as_me:$LINENO: checking for $CC option to accept ISO Standard C" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO Standard C... $ECHO_C" >&6; }
-+ if test "${ac_cv_prog_cc_stdc+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+
-+ case $ac_cv_prog_cc_stdc in
-+ no) { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
-+ '') { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+ *) { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6; } ;;
-+esac
-+
-+
-+
-+
-+
-+# Check whether --with-glib12 was given.
- if test "${with_glib12+set}" = set; then
-- withval="$with_glib12"
-+ withval=$with_glib12;
-+fi
-
--fi;
-
-
--# Check whether --with-glib_static or --without-glib_static was given.
-+# Check whether --with-glib_static was given.
- if test "${with_glib_static+set}" = set; then
-- withval="$with_glib_static"
-+ withval=$with_glib_static;
-+fi
-
--fi;
-
- glib_found=no
- if test "x$with_glib12" != "xyes"; then
-@@ -3760,8 +4794,8 @@
- if test -z "$PKG_CONFIG"; then
- # Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3776,28 +4810,29 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
- ;;
- esac
- fi
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--
- if test -n "$PKG_CONFIG"; then
-- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--echo "${ECHO_T}$PKG_CONFIG" >&6
-+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+echo "${ECHO_T}$PKG_CONFIG" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
-
- if test "$PKG_CONFIG" = "no" ; then
-@@ -3808,25 +4843,25 @@
- else
- PKG_CONFIG_MIN_VERSION=0.9.0
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-- echo "$as_me:$LINENO: checking for glib-2.0" >&5
--echo $ECHO_N "checking for glib-2.0... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for glib-2.0" >&5
-+echo $ECHO_N "checking for glib-2.0... $ECHO_C" >&6; }
-
- if $PKG_CONFIG --exists "glib-2.0" ; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- succeeded=yes
-
-- echo "$as_me:$LINENO: checking GLIB_CFLAGS" >&5
--echo $ECHO_N "checking GLIB_CFLAGS... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking GLIB_CFLAGS" >&5
-+echo $ECHO_N "checking GLIB_CFLAGS... $ECHO_C" >&6; }
- GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0"`
-- echo "$as_me:$LINENO: result: $GLIB_CFLAGS" >&5
--echo "${ECHO_T}$GLIB_CFLAGS" >&6
-+ { echo "$as_me:$LINENO: result: $GLIB_CFLAGS" >&5
-+echo "${ECHO_T}$GLIB_CFLAGS" >&6; }
-
-- echo "$as_me:$LINENO: checking GLIB_LIBS" >&5
--echo $ECHO_N "checking GLIB_LIBS... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking GLIB_LIBS" >&5
-+echo $ECHO_N "checking GLIB_LIBS... $ECHO_C" >&6; }
- GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0"`
-- echo "$as_me:$LINENO: result: $GLIB_LIBS" >&5
--echo "${ECHO_T}$GLIB_LIBS" >&6
-+ { echo "$as_me:$LINENO: result: $GLIB_LIBS" >&5
-+echo "${ECHO_T}$GLIB_LIBS" >&6; }
- else
- GLIB_CFLAGS=""
- GLIB_LIBS=""
-@@ -3859,8 +4894,8 @@
- 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 "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GLIB_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3875,55 +4910,56 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- ;;
- esac
- fi
- GLIB_CONFIG=$ac_cv_path_GLIB_CONFIG
--
- if test -n "$GLIB_CONFIG"; then
-- echo "$as_me:$LINENO: result: $GLIB_CONFIG" >&5
--echo "${ECHO_T}$GLIB_CONFIG" >&6
-+ { echo "$as_me:$LINENO: result: $GLIB_CONFIG" >&5
-+echo "${ECHO_T}$GLIB_CONFIG" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$GLIB_CONFIG" && break
- done
-
-
-
-
--# Check whether --with-glib-prefix or --without-glib-prefix was given.
-+# Check whether --with-glib-prefix was given.
- if test "${with_glib_prefix+set}" = set; then
-- withval="$with_glib_prefix"
-- glib_config_prefix="$withval"
-+ withval=$with_glib_prefix; glib_config_prefix="$withval"
- else
- glib_config_prefix=""
--fi;
-+fi
-
--# Check whether --with-glib-exec-prefix or --without-glib-exec-prefix was given.
-+
-+# Check whether --with-glib-exec-prefix was given.
- if test "${with_glib_exec_prefix+set}" = set; then
-- withval="$with_glib_exec_prefix"
-- glib_config_exec_prefix="$withval"
-+ withval=$with_glib_exec_prefix; glib_config_exec_prefix="$withval"
- else
- glib_config_exec_prefix=""
--fi;
--# Check whether --enable-glibtest or --disable-glibtest was given.
--if test "${enable_glibtest+set}" = set; then
-- enableval="$enable_glibtest"
-+fi
-
-+# Check whether --enable-glibtest was given.
-+if test "${enable_glibtest+set}" = set; then
-+ enableval=$enable_glibtest;
- else
- enable_glibtest=yes
--fi;
-+fi
-+
-
- if test x$glib_config_exec_prefix != x ; then
- glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
-@@ -3952,8 +4988,8 @@
-
- # Extract the first word of "glib-config", so it can be a program name with args.
- set dummy glib-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GLIB_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3968,31 +5004,32 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_path_GLIB_CONFIG" && ac_cv_path_GLIB_CONFIG="no"
- ;;
- esac
- fi
- GLIB_CONFIG=$ac_cv_path_GLIB_CONFIG
--
- if test -n "$GLIB_CONFIG"; then
-- echo "$as_me:$LINENO: result: $GLIB_CONFIG" >&5
--echo "${ECHO_T}$GLIB_CONFIG" >&6
-+ { echo "$as_me:$LINENO: result: $GLIB_CONFIG" >&5
-+echo "${ECHO_T}$GLIB_CONFIG" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- min_glib_version=1.2.6
-- echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5
--echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5
-+echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6; }
- no_glib=""
- if test "$GLIB_CONFIG" = "no" ; then
- no_glib=yes
-@@ -4095,13 +5132,22 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -4114,19 +5160,21 @@
- ( exit $ac_status )
- no_glib=yes
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_glib" = x ; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- :
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- if test "$GLIB_CONFIG" = "no" ; then
- echo "*** The glib-config script installed by GLIB could not be found"
- echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
-@@ -4158,27 +5206,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding GLIB or finding the wrong"
- echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-@@ -4202,7 +5246,8 @@
- echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
- echo "*** may want to edit the glib-config script: $GLIB_CONFIG"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
-@@ -4223,28 +5268,28 @@
- save_GLIB_CFLAGS="$GLIB_CFLAGS"
- save_GLIB_LIBS="$GLIB_LIBS"
-
--# Check whether --with-glib-prefix or --without-glib-prefix was given.
-+# Check whether --with-glib-prefix was given.
- if test "${with_glib_prefix+set}" = set; then
-- withval="$with_glib_prefix"
-- glib_config_prefix="$withval"
-+ withval=$with_glib_prefix; glib_config_prefix="$withval"
- else
- glib_config_prefix=""
--fi;
-+fi
-
--# Check whether --with-glib-exec-prefix or --without-glib-exec-prefix was given.
-+
-+# Check whether --with-glib-exec-prefix was given.
- if test "${with_glib_exec_prefix+set}" = set; then
-- withval="$with_glib_exec_prefix"
-- glib_config_exec_prefix="$withval"
-+ withval=$with_glib_exec_prefix; glib_config_exec_prefix="$withval"
- else
- glib_config_exec_prefix=""
--fi;
--# Check whether --enable-glibtest or --disable-glibtest was given.
--if test "${enable_glibtest+set}" = set; then
-- enableval="$enable_glibtest"
-+fi
-
-+# Check whether --enable-glibtest was given.
-+if test "${enable_glibtest+set}" = set; then
-+ enableval=$enable_glibtest;
- else
- enable_glibtest=yes
--fi;
-+fi
-+
-
- if test x$glib_config_exec_prefix != x ; then
- glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
-@@ -4273,8 +5318,8 @@
-
- # Extract the first word of "glib-config", so it can be a program name with args.
- set dummy glib-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GLIB_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4289,31 +5334,32 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_path_GLIB_CONFIG" && ac_cv_path_GLIB_CONFIG="no"
- ;;
- esac
- fi
- GLIB_CONFIG=$ac_cv_path_GLIB_CONFIG
--
- if test -n "$GLIB_CONFIG"; then
-- echo "$as_me:$LINENO: result: $GLIB_CONFIG" >&5
--echo "${ECHO_T}$GLIB_CONFIG" >&6
-+ { echo "$as_me:$LINENO: result: $GLIB_CONFIG" >&5
-+echo "${ECHO_T}$GLIB_CONFIG" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- min_glib_version=1.2.6
-- echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5
--echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5
-+echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6; }
- no_glib=""
- if test "$GLIB_CONFIG" = "no" ; then
- no_glib=yes
-@@ -4416,13 +5462,22 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -4435,19 +5490,21 @@
- ( exit $ac_status )
- no_glib=yes
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_glib" = x ; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- gmodule_found=yes
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- if test "$GLIB_CONFIG" = "no" ; then
- echo "*** The glib-config script installed by GLIB could not be found"
- echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
-@@ -4479,27 +5536,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding GLIB or finding the wrong"
- echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-@@ -4523,7 +5576,8 @@
- echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
- echo "*** may want to edit the glib-config script: $GLIB_CONFIG"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
-@@ -4547,9 +5601,9 @@
- for ac_func in strlcpy
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -4575,56 +5629,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -4632,11 +5676,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -4652,8 +5698,8 @@
- if test -z "$PKG_CONFIG"; then
- # Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4668,28 +5714,29 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
- ;;
- esac
- fi
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--
- if test -n "$PKG_CONFIG"; then
-- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--echo "${ECHO_T}$PKG_CONFIG" >&6
-+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+echo "${ECHO_T}$PKG_CONFIG" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
-
- if test "$PKG_CONFIG" = "no" ; then
-@@ -4700,25 +5747,25 @@
- else
- PKG_CONFIG_MIN_VERSION=0.9.0
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-- echo "$as_me:$LINENO: checking for gmodule-2.0" >&5
--echo $ECHO_N "checking for gmodule-2.0... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for gmodule-2.0" >&5
-+echo $ECHO_N "checking for gmodule-2.0... $ECHO_C" >&6; }
-
- if $PKG_CONFIG --exists "gmodule-2.0" ; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- succeeded=yes
-
-- echo "$as_me:$LINENO: checking GMODULE_CFLAGS" >&5
--echo $ECHO_N "checking GMODULE_CFLAGS... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking GMODULE_CFLAGS" >&5
-+echo $ECHO_N "checking GMODULE_CFLAGS... $ECHO_C" >&6; }
- GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0"`
-- echo "$as_me:$LINENO: result: $GMODULE_CFLAGS" >&5
--echo "${ECHO_T}$GMODULE_CFLAGS" >&6
-+ { echo "$as_me:$LINENO: result: $GMODULE_CFLAGS" >&5
-+echo "${ECHO_T}$GMODULE_CFLAGS" >&6; }
-
-- echo "$as_me:$LINENO: checking GMODULE_LIBS" >&5
--echo $ECHO_N "checking GMODULE_LIBS... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking GMODULE_LIBS" >&5
-+echo $ECHO_N "checking GMODULE_LIBS... $ECHO_C" >&6; }
- GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0"`
-- echo "$as_me:$LINENO: result: $GMODULE_LIBS" >&5
--echo "${ECHO_T}$GMODULE_LIBS" >&6
-+ { echo "$as_me:$LINENO: result: $GMODULE_LIBS" >&5
-+echo "${ECHO_T}$GMODULE_LIBS" >&6; }
- else
- GMODULE_CFLAGS=""
- GMODULE_LIBS=""
-@@ -4749,8 +5796,8 @@
-
- if test "x$gmodule_found" = "xyes" ; then
-
-- echo "$as_me:$LINENO: checking if gmodule functionality is supported" >&5
--echo $ECHO_N "checking if gmodule functionality is supported... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking if gmodule functionality is supported" >&5
-+echo $ECHO_N "checking if gmodule functionality is supported... $ECHO_C" >&6; }
- if test "${mc_cv_g_module_supported+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4780,13 +5827,22 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -4799,14 +5855,16 @@
- ( exit $ac_status )
- mc_cv_g_module_supported=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
-
- fi
--echo "$as_me:$LINENO: result: $mc_cv_g_module_supported" >&5
--echo "${ECHO_T}$mc_cv_g_module_supported" >&6
-+{ echo "$as_me:$LINENO: result: $mc_cv_g_module_supported" >&5
-+echo "${ECHO_T}$mc_cv_g_module_supported" >&6; }
-
- if test "$mc_cv_g_module_supported" = yes; then
-
-@@ -4818,8 +5876,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking whether sys/types.h defines makedev" >&5
--echo $ECHO_N "checking whether sys/types.h defines makedev... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether sys/types.h defines makedev" >&5
-+echo $ECHO_N "checking whether sys/types.h defines makedev... $ECHO_C" >&6; }
- if test "${ac_cv_header_sys_types_h_makedev+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4839,27 +5897,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_header_sys_types_h_makedev=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -4867,26 +5921,27 @@
-
- ac_cv_header_sys_types_h_makedev=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sys_types_h_makedev" >&5
--echo "${ECHO_T}$ac_cv_header_sys_types_h_makedev" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_types_h_makedev" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_types_h_makedev" >&6; }
-
- if test $ac_cv_header_sys_types_h_makedev = no; then
- if test "${ac_cv_header_sys_mkdev_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for sys/mkdev.h" >&5
--echo $ECHO_N "checking for sys/mkdev.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for sys/mkdev.h" >&5
-+echo $ECHO_N "checking for sys/mkdev.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_sys_mkdev_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sys_mkdev_h" >&5
--echo "${ECHO_T}$ac_cv_header_sys_mkdev_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_mkdev_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_mkdev_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking sys/mkdev.h usability" >&5
--echo $ECHO_N "checking sys/mkdev.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking sys/mkdev.h usability" >&5
-+echo $ECHO_N "checking sys/mkdev.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -4897,27 +5952,22 @@
- #include <sys/mkdev.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -4925,13 +5975,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking sys/mkdev.h presence" >&5
--echo $ECHO_N "checking sys/mkdev.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking sys/mkdev.h presence" >&5
-+echo $ECHO_N "checking sys/mkdev.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -4940,24 +5991,22 @@
- /* end confdefs.h. */
- #include <sys/mkdev.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -4965,9 +6014,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -4991,25 +6041,18 @@
- echo "$as_me: WARNING: sys/mkdev.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/mkdev.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: sys/mkdev.h: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for sys/mkdev.h" >&5
--echo $ECHO_N "checking for sys/mkdev.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for sys/mkdev.h" >&5
-+echo $ECHO_N "checking for sys/mkdev.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_sys_mkdev_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_sys_mkdev_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sys_mkdev_h" >&5
--echo "${ECHO_T}$ac_cv_header_sys_mkdev_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_mkdev_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_mkdev_h" >&6; }
-
- fi
- if test $ac_cv_header_sys_mkdev_h = yes; then
-@@ -5024,17 +6067,17 @@
-
- if test $ac_cv_header_sys_mkdev_h = no; then
- if test "${ac_cv_header_sys_sysmacros_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for sys/sysmacros.h" >&5
--echo $ECHO_N "checking for sys/sysmacros.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for sys/sysmacros.h" >&5
-+echo $ECHO_N "checking for sys/sysmacros.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_sys_sysmacros_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysmacros_h" >&5
--echo "${ECHO_T}$ac_cv_header_sys_sysmacros_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysmacros_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_sysmacros_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking sys/sysmacros.h usability" >&5
--echo $ECHO_N "checking sys/sysmacros.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking sys/sysmacros.h usability" >&5
-+echo $ECHO_N "checking sys/sysmacros.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5045,27 +6088,22 @@
- #include <sys/sysmacros.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -5073,13 +6111,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking sys/sysmacros.h presence" >&5
--echo $ECHO_N "checking sys/sysmacros.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking sys/sysmacros.h presence" >&5
-+echo $ECHO_N "checking sys/sysmacros.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5088,24 +6127,22 @@
- /* end confdefs.h. */
- #include <sys/sysmacros.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -5113,9 +6150,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -5139,25 +6177,18 @@
- echo "$as_me: WARNING: sys/sysmacros.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/sysmacros.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: sys/sysmacros.h: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for sys/sysmacros.h" >&5
--echo $ECHO_N "checking for sys/sysmacros.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for sys/sysmacros.h" >&5
-+echo $ECHO_N "checking for sys/sysmacros.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_sys_sysmacros_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_sys_sysmacros_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysmacros_h" >&5
--echo "${ECHO_T}$ac_cv_header_sys_sysmacros_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysmacros_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_sysmacros_h" >&6; }
-
- fi
- if test $ac_cv_header_sys_sysmacros_h = yes; then
-@@ -5172,8 +6203,8 @@
- fi
- fi
-
--echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
--echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
- if test "${ac_cv_c_const+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5191,10 +6222,10 @@
- #ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
- typedef int charset[2];
-- const charset x;
-+ const charset cs;
- /* SunOS 4.1.1 cc rejects this. */
-- char const *const *ccp;
-- char **p;
-+ char const *const *pcpcc;
-+ char **ppc;
- /* NEC SVR4.0.2 mips cc rejects this. */
- struct point {int x, y;};
- static struct point const zero = {0,0};
-@@ -5203,16 +6234,17 @@
- an arm of an if-expression whose if-part is not a constant
- expression */
- const char *g = "string";
-- ccp = &g + (g ? g-g : 0);
-+ pcpcc = &g + (g ? g-g : 0);
- /* HPUX 7.0 cc rejects these. */
-- ++ccp;
-- p = (char**) ccp;
-- ccp = (char const *const *) p;
-+ ++pcpcc;
-+ ppc = (char**) pcpcc;
-+ pcpcc = (char const *const *) ppc;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
- char const *s = 0 ? (char *) 0 : (char const *) 0;
-
- *t++ = 0;
-+ if (s) return 0;
- }
- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
- int x[] = {25, 17};
-@@ -5231,7 +6263,9 @@
- }
- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
- const int foo = 10;
-+ if (!foo) return 0;
- }
-+ return !cs[0] && !zero.x;
- #endif
-
- ;
-@@ -5239,27 +6273,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_c_const=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -5267,10 +6296,11 @@
-
- ac_cv_c_const=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
--echo "${ECHO_T}$ac_cv_c_const" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-+echo "${ECHO_T}$ac_cv_c_const" >&6; }
- if test $ac_cv_c_const = no; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -5279,15 +6309,15 @@
-
- fi
-
--# Check whether --enable-largefile or --disable-largefile was given.
-+# Check whether --enable-largefile was given.
- if test "${enable_largefile+set}" = set; then
-- enableval="$enable_largefile"
-+ enableval=$enable_largefile;
-+fi
-
--fi;
- if test "$enable_largefile" != no; then
-
-- echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
--echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
-+echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; }
- if test "${ac_cv_sys_largefile_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5321,83 +6351,76 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext
-+
-+rm -f core conftest.err conftest.$ac_objext
- CC="$CC -n32"
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_sys_largefile_CC=' -n32'; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext
-+
-+rm -f core conftest.err conftest.$ac_objext
- break
- done
- CC=$ac_save_CC
- rm -f conftest.$ac_ext
- fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
--echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
-+echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; }
- if test "$ac_cv_sys_largefile_CC" != no; then
- CC=$CC$ac_cv_sys_largefile_CC
- fi
-
-- echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
--echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; }
- if test "${ac_cv_sys_file_offset_bits+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- while :; do
-- ac_cv_sys_file_offset_bits=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5422,34 +6445,31 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- break
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_sys_file_offset_bits=no; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5475,54 +6495,53 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_sys_file_offset_bits=64; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_cv_sys_file_offset_bits=unknown
- break
- done
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
--echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
--if test "$ac_cv_sys_file_offset_bits" != no; then
--
-+{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; }
-+case $ac_cv_sys_file_offset_bits in #(
-+ no | unknown) ;;
-+ *)
- cat >>confdefs.h <<_ACEOF
- #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
- _ACEOF
--
--fi
-+;;
-+esac
- rm -f conftest*
-- echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
--echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
-+ if test $ac_cv_sys_file_offset_bits = unknown; then
-+ { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
-+echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
- if test "${ac_cv_sys_large_files+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- while :; do
-- ac_cv_sys_large_files=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5547,34 +6566,31 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- break
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_sys_large_files=no; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5600,66 +6616,66 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_sys_large_files=1; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_cv_sys_large_files=unknown
- break
- done
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
--echo "${ECHO_T}$ac_cv_sys_large_files" >&6
--if test "$ac_cv_sys_large_files" != no; then
--
-+{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
-+echo "${ECHO_T}$ac_cv_sys_large_files" >&6; }
-+case $ac_cv_sys_large_files in #(
-+ no | unknown) ;;
-+ *)
- cat >>confdefs.h <<_ACEOF
- #define _LARGE_FILES $ac_cv_sys_large_files
- _ACEOF
--
--fi
-+;;
-+esac
- rm -f conftest*
- fi
-+fi
-
-
--echo "$as_me:$LINENO: checking whether ln -s works" >&5
--echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
- LN_S=$as_ln_s
- if test "$LN_S" = "ln -s"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-- echo "$as_me:$LINENO: result: no, using $LN_S" >&5
--echo "${ECHO_T}no, using $LN_S" >&6
-+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-+echo "${ECHO_T}no, using $LN_S" >&6; }
- fi
-
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5672,32 +6688,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AR="${ac_tool_prefix}ar"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
-- echo "$as_me:$LINENO: result: $AR" >&5
--echo "${ECHO_T}$AR" >&6
-+ { echo "$as_me:$LINENO: result: $AR" >&5
-+echo "${ECHO_T}$AR" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_prog_AR"; then
- ac_ct_AR=$AR
- # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5710,27 +6728,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_AR="ar"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="ar"
- fi
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
-- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
--echo "${ECHO_T}$ac_ct_AR" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-+echo "${ECHO_T}$ac_ct_AR" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+ if test "x$ac_ct_AR" = x; then
-+ AR="ar"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
- AR=$ac_ct_AR
-+ fi
- else
- AR="$ac_cv_prog_AR"
- fi
-@@ -5740,8 +6772,8 @@
- 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 "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_X11_WWW+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5754,35 +6786,37 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_X11_WWW="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- X11_WWW=$ac_cv_prog_X11_WWW
- if test -n "$X11_WWW"; then
-- echo "$as_me:$LINENO: result: $X11_WWW" >&5
--echo "${ECHO_T}$X11_WWW" >&6
-+ { echo "$as_me:$LINENO: result: $X11_WWW" >&5
-+echo "${ECHO_T}$X11_WWW" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$X11_WWW" && break
- done
-
-
-
--# Check whether --with-mmap or --without-mmap was given.
-+# Check whether --with-mmap was given.
- if test "${with_mmap+set}" = set; then
-- withval="$with_mmap"
-+ withval=$with_mmap;
-+fi
-
--fi;
- if test x$with_mmap != xno; then
- if test x$with_mmap = x; then
-
-@@ -5790,18 +6824,19 @@
- for ac_header in stdlib.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5812,27 +6847,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -5840,13 +6870,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5855,24 +6886,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -5880,9 +6909,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -5906,25 +6936,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -5940,9 +6964,9 @@
- for ac_func in getpagesize
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -5968,56 +6992,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -6025,11 +7039,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -6038,8 +7054,8 @@
- fi
- done
-
--echo "$as_me:$LINENO: checking for working mmap" >&5
--echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for working mmap" >&5
-+echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; }
- if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6081,21 +7097,21 @@
- #include <fcntl.h>
- #include <sys/mman.h>
-
--#if !STDC_HEADERS && !HAVE_STDLIB_H
-+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
- char *malloc ();
- #endif
-
- /* This mess was copied from the GNU getpagesize.h. */
--#if !HAVE_GETPAGESIZE
-+#ifndef HAVE_GETPAGESIZE
- /* Assume that all systems that can run configure have sys/param.h. */
--# if !HAVE_SYS_PARAM_H
-+# ifndef HAVE_SYS_PARAM_H
- # define HAVE_SYS_PARAM_H 1
- # endif
-
- # ifdef _SC_PAGESIZE
- # define getpagesize() sysconf(_SC_PAGESIZE)
- # else /* no _SC_PAGESIZE */
--# if HAVE_SYS_PARAM_H
-+# ifdef HAVE_SYS_PARAM_H
- # include <sys/param.h>
- # ifdef EXEC_PAGESIZE
- # define getpagesize() EXEC_PAGESIZE
-@@ -6134,15 +7150,15 @@
- /* First, make a file with some known garbage in it. */
- data = (char *) malloc (pagesize);
- if (!data)
-- exit (1);
-+ return 1;
- for (i = 0; i < pagesize; ++i)
- *(data + i) = rand ();
- umask (0);
- fd = creat ("conftest.mmap", 0600);
- if (fd < 0)
-- exit (1);
-+ return 1;
- if (write (fd, data, pagesize) != pagesize)
-- exit (1);
-+ return 1;
- close (fd);
-
- /* Next, try to mmap the file at a fixed address which already has
-@@ -6150,17 +7166,17 @@
- we see the same garbage. */
- fd = open ("conftest.mmap", O_RDWR);
- if (fd < 0)
-- exit (1);
-+ return 1;
- data2 = (char *) malloc (2 * pagesize);
- if (!data2)
-- exit (1);
-- data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1);
-+ return 1;
-+ data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
- if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
- MAP_PRIVATE | MAP_FIXED, fd, 0L))
-- exit (1);
-+ return 1;
- for (i = 0; i < pagesize; ++i)
- if (*(data + i) != *(data2 + i))
-- exit (1);
-+ return 1;
-
- /* Finally, make sure that changes to the mapped area do not
- percolate back to the file as seen by read(). (This is a bug on
-@@ -6169,24 +7185,33 @@
- *(data2 + i) = *(data2 + i) + 1;
- data3 = (char *) malloc (pagesize);
- if (!data3)
-- exit (1);
-+ return 1;
- if (read (fd, data3, pagesize) != pagesize)
-- exit (1);
-+ return 1;
- for (i = 0; i < pagesize; ++i)
- if (*(data + i) != *(data3 + i))
-- exit (1);
-+ return 1;
- close (fd);
-- exit (0);
-+ return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -6199,11 +7224,13 @@
- ( exit $ac_status )
- ac_cv_func_mmap_fixed_mapped=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
--echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
-+echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; }
- if test $ac_cv_func_mmap_fixed_mapped = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -6236,17 +7263,17 @@
-
-
-
-- echo "$as_me:$LINENO: checking whether NLS is requested" >&5
--echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
-- # Check whether --enable-nls or --disable-nls was given.
-+ { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-+echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
-+ # Check whether --enable-nls was given.
- if test "${enable_nls+set}" = set; then
-- enableval="$enable_nls"
-- USE_NLS=$enableval
-+ enableval=$enable_nls; USE_NLS=$enableval
- else
- USE_NLS=yes
--fi;
-- echo "$as_me:$LINENO: result: $USE_NLS" >&5
--echo "${ECHO_T}$USE_NLS" >&6
-+fi
-+
-+ { echo "$as_me:$LINENO: result: $USE_NLS" >&5
-+echo "${ECHO_T}$USE_NLS" >&6; }
-
-
-
-@@ -6283,8 +7310,8 @@
-
- # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_MSGFMT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6315,17 +7342,17 @@
- fi
- MSGFMT="$ac_cv_path_MSGFMT"
- if test "$MSGFMT" != ":"; then
-- echo "$as_me:$LINENO: result: $MSGFMT" >&5
--echo "${ECHO_T}$MSGFMT" >&6
-+ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+echo "${ECHO_T}$MSGFMT" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GMSGFMT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6340,30 +7367,31 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
- ;;
- esac
- fi
- GMSGFMT=$ac_cv_path_GMSGFMT
--
- if test -n "$GMSGFMT"; then
-- echo "$as_me:$LINENO: result: $GMSGFMT" >&5
--echo "${ECHO_T}$GMSGFMT" >&6
-+ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+echo "${ECHO_T}$GMSGFMT" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-
-+
- # Prepare PATH_SEPARATOR.
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
-@@ -6394,8 +7422,8 @@
-
- # Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_XGETTEXT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6426,11 +7454,11 @@
- fi
- XGETTEXT="$ac_cv_path_XGETTEXT"
- if test "$XGETTEXT" != ":"; then
-- echo "$as_me:$LINENO: result: $XGETTEXT" >&5
--echo "${ECHO_T}$XGETTEXT" >&6
-+ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+echo "${ECHO_T}$XGETTEXT" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- rm -f messages.po
-@@ -6466,8 +7494,8 @@
-
- # Extract the first word of "msgmerge", so it can be a program name with args.
- set dummy msgmerge; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_MSGMERGE+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6497,11 +7525,11 @@
- fi
- MSGMERGE="$ac_cv_path_MSGMERGE"
- if test "$MSGMERGE" != ":"; then
-- echo "$as_me:$LINENO: result: $MSGMERGE" >&5
--echo "${ECHO_T}$MSGMERGE" >&6
-+ { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-+echo "${ECHO_T}$MSGMERGE" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -6511,8 +7539,8 @@
- : ;
- else
- GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-- echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
--echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6
-+ { echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
-+echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
- GMSGFMT=":"
- fi
- fi
-@@ -6522,8 +7550,8 @@
- (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
- : ;
- else
-- echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
--echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
-+ { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
-+echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
- XGETTEXT=":"
- fi
- rm -f messages.po
-@@ -6533,8 +7561,8 @@
-
-
-
-- echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2 or newer" >&5
--echo $ECHO_N "checking whether we are using the GNU C Library 2 or newer... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2 or newer" >&5
-+echo $ECHO_N "checking whether we are using the GNU C Library 2 or newer... $ECHO_C" >&6; }
- if test "${ac_cv_gnu_library_2+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6564,8 +7592,8 @@
-
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2" >&5
--echo "${ECHO_T}$ac_cv_gnu_library_2" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2" >&5
-+echo "${ECHO_T}$ac_cv_gnu_library_2" >&6; }
-
- GLIBC2="$ac_cv_gnu_library_2"
-
-@@ -6573,8 +7601,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6587,32 +7615,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
-- echo "$as_me:$LINENO: result: $RANLIB" >&5
--echo "${ECHO_T}$RANLIB" >&6
-+ { echo "$as_me:$LINENO: result: $RANLIB" >&5
-+echo "${ECHO_T}$RANLIB" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_prog_RANLIB"; then
- ac_ct_RANLIB=$RANLIB
- # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6625,34 +7655,48 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_RANLIB="ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
- fi
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
-- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
--echo "${ECHO_T}$ac_ct_RANLIB" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+ if test "x$ac_ct_RANLIB" = x; then
-+ RANLIB=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
- RANLIB=$ac_ct_RANLIB
-+ fi
- else
- RANLIB="$ac_cv_prog_RANLIB"
- fi
-
-
-- echo "$as_me:$LINENO: checking for signed" >&5
--echo $ECHO_N "checking for signed... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for signed" >&5
-+echo $ECHO_N "checking for signed... $ECHO_C" >&6; }
- if test "${bh_cv_c_signed+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6672,27 +7716,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- bh_cv_c_signed=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -6700,10 +7739,11 @@
-
- bh_cv_c_signed=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $bh_cv_c_signed" >&5
--echo "${ECHO_T}$bh_cv_c_signed" >&6
-+{ echo "$as_me:$LINENO: result: $bh_cv_c_signed" >&5
-+echo "${ECHO_T}$bh_cv_c_signed" >&6; }
- if test $bh_cv_c_signed = no; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -6712,8 +7752,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for inline" >&5
--echo $ECHO_N "checking for inline... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for inline" >&5
-+echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
- if test "${ac_cv_c_inline+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6733,39 +7773,37 @@
-
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_c_inline=$ac_kw; break
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_c_inline=$ac_kw
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ test "$ac_cv_c_inline" != no && break
- done
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
--echo "${ECHO_T}$ac_cv_c_inline" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-+echo "${ECHO_T}$ac_cv_c_inline" >&6; }
-
-
- case $ac_cv_c_inline in
-@@ -6783,8 +7821,8 @@
- ;;
- esac
-
--echo "$as_me:$LINENO: checking for off_t" >&5
--echo $ECHO_N "checking for off_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for off_t" >&5
-+echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_off_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6795,39 +7833,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef off_t ac__type_new_;
- int
- main ()
- {
--if ((off_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (off_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_off_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -6835,22 +7869,23 @@
-
- ac_cv_type_off_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
--echo "${ECHO_T}$ac_cv_type_off_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-+echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
- if test $ac_cv_type_off_t = yes; then
- :
- else
-
- cat >>confdefs.h <<_ACEOF
--#define off_t long
-+#define off_t long int
- _ACEOF
-
- fi
-
--echo "$as_me:$LINENO: checking for size_t" >&5
--echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for size_t" >&5
-+echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_size_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6861,39 +7896,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef size_t ac__type_new_;
- int
- main ()
- {
--if ((size_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (size_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_size_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -6901,23 +7932,24 @@
-
- ac_cv_type_size_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
--echo "${ECHO_T}$ac_cv_type_size_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-+echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
- if test $ac_cv_type_size_t = yes; then
- :
- else
-
- cat >>confdefs.h <<_ACEOF
--#define size_t unsigned
-+#define size_t unsigned int
- _ACEOF
-
- fi
-
-
-- echo "$as_me:$LINENO: checking for long long" >&5
--echo $ECHO_N "checking for long long... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for long long" >&5
-+echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
- if test "${ac_cv_type_long_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6938,27 +7970,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_type_long_long=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -6966,11 +7994,12 @@
-
- ac_cv_type_long_long=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
--echo "${ECHO_T}$ac_cv_type_long_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-+echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
- if test $ac_cv_type_long_long = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -6980,8 +8009,8 @@
- fi
-
-
-- echo "$as_me:$LINENO: checking for long double" >&5
--echo $ECHO_N "checking for long double... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for long double" >&5
-+echo $ECHO_N "checking for long double... $ECHO_C" >&6; }
- if test "${gt_cv_c_long_double+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7009,27 +8038,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- gt_cv_c_long_double=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -7037,11 +8061,12 @@
-
- gt_cv_c_long_double=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:$LINENO: result: $gt_cv_c_long_double" >&5
--echo "${ECHO_T}$gt_cv_c_long_double" >&6
-+{ echo "$as_me:$LINENO: result: $gt_cv_c_long_double" >&5
-+echo "${ECHO_T}$gt_cv_c_long_double" >&6; }
- if test $gt_cv_c_long_double = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -7051,8 +8076,8 @@
- fi
-
-
-- echo "$as_me:$LINENO: checking for wchar_t" >&5
--echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for wchar_t" >&5
-+echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6; }
- if test "${gt_cv_c_wchar_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7073,27 +8098,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- gt_cv_c_wchar_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -7101,10 +8121,11 @@
-
- gt_cv_c_wchar_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $gt_cv_c_wchar_t" >&5
--echo "${ECHO_T}$gt_cv_c_wchar_t" >&6
-+{ echo "$as_me:$LINENO: result: $gt_cv_c_wchar_t" >&5
-+echo "${ECHO_T}$gt_cv_c_wchar_t" >&6; }
- if test $gt_cv_c_wchar_t = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -7114,8 +8135,8 @@
- fi
-
-
-- echo "$as_me:$LINENO: checking for wint_t" >&5
--echo $ECHO_N "checking for wint_t... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for wint_t" >&5
-+echo $ECHO_N "checking for wint_t... $ECHO_C" >&6; }
- if test "${gt_cv_c_wint_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7136,27 +8157,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- gt_cv_c_wint_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -7164,10 +8180,11 @@
-
- gt_cv_c_wint_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5
--echo "${ECHO_T}$gt_cv_c_wint_t" >&6
-+{ echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5
-+echo "${ECHO_T}$gt_cv_c_wint_t" >&6; }
- if test $gt_cv_c_wint_t = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -7177,8 +8194,8 @@
- fi
-
-
-- echo "$as_me:$LINENO: checking for inttypes.h" >&5
--echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for inttypes.h" >&5
-+echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6; }
- if test "${gl_cv_header_inttypes_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7199,27 +8216,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- gl_cv_header_inttypes_h=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -7227,10 +8239,11 @@
-
- gl_cv_header_inttypes_h=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $gl_cv_header_inttypes_h" >&5
--echo "${ECHO_T}$gl_cv_header_inttypes_h" >&6
-+{ echo "$as_me:$LINENO: result: $gl_cv_header_inttypes_h" >&5
-+echo "${ECHO_T}$gl_cv_header_inttypes_h" >&6; }
- if test $gl_cv_header_inttypes_h = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -7240,8 +8253,8 @@
- fi
-
-
-- echo "$as_me:$LINENO: checking for stdint.h" >&5
--echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for stdint.h" >&5
-+echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6; }
- if test "${gl_cv_header_stdint_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7262,27 +8275,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- gl_cv_header_stdint_h=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -7290,10 +8298,11 @@
-
- gl_cv_header_stdint_h=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $gl_cv_header_stdint_h" >&5
--echo "${ECHO_T}$gl_cv_header_stdint_h" >&6
-+{ echo "$as_me:$LINENO: result: $gl_cv_header_stdint_h" >&5
-+echo "${ECHO_T}$gl_cv_header_stdint_h" >&6; }
- if test $gl_cv_header_stdint_h = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -7305,8 +8314,8 @@
-
-
-
-- echo "$as_me:$LINENO: checking for intmax_t" >&5
--echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for intmax_t" >&5
-+echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6; }
- if test "${gt_cv_c_intmax_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7335,27 +8344,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- gt_cv_c_intmax_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -7363,10 +8367,11 @@
-
- gt_cv_c_intmax_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $gt_cv_c_intmax_t" >&5
--echo "${ECHO_T}$gt_cv_c_intmax_t" >&6
-+{ echo "$as_me:$LINENO: result: $gt_cv_c_intmax_t" >&5
-+echo "${ECHO_T}$gt_cv_c_intmax_t" >&6; }
- if test $gt_cv_c_intmax_t = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -7377,8 +8382,8 @@
-
-
-
-- echo "$as_me:$LINENO: checking whether printf() supports POSIX/XSI format strings" >&5
--echo $ECHO_N "checking whether printf() supports POSIX/XSI format strings... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether printf() supports POSIX/XSI format strings" >&5
-+echo $ECHO_N "checking whether printf() supports POSIX/XSI format strings... $ECHO_C" >&6; }
- if test "${gt_cv_func_printf_posix+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7427,13 +8432,22 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -7446,12 +8460,14 @@
- ( exit $ac_status )
- gt_cv_func_printf_posix=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-
-+
-+
- fi
--echo "$as_me:$LINENO: result: $gt_cv_func_printf_posix" >&5
--echo "${ECHO_T}$gt_cv_func_printf_posix" >&6
-+{ echo "$as_me:$LINENO: result: $gt_cv_func_printf_posix" >&5
-+echo "${ECHO_T}$gt_cv_func_printf_posix" >&6; }
- case $gt_cv_func_printf_posix in
- *yes)
-
-@@ -7464,8 +8480,8 @@
-
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
--echo "$as_me:$LINENO: checking for working alloca.h" >&5
--echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for working alloca.h" >&5
-+echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; }
- if test "${ac_cv_working_alloca_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7480,32 +8496,29 @@
- main ()
- {
- char *p = (char *) alloca (2 * sizeof (int));
-+ if (p) return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_working_alloca_h=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -7513,11 +8526,12 @@
-
- ac_cv_working_alloca_h=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
--echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-+echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; }
- if test $ac_cv_working_alloca_h = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -7526,8 +8540,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for alloca" >&5
--echo $ECHO_N "checking for alloca... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for alloca" >&5
-+echo $ECHO_N "checking for alloca... $ECHO_C" >&6; }
- if test "${ac_cv_func_alloca_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7544,7 +8558,7 @@
- # include <malloc.h>
- # define alloca _alloca
- # else
--# if HAVE_ALLOCA_H
-+# ifdef HAVE_ALLOCA_H
- # include <alloca.h>
- # else
- # ifdef _AIX
-@@ -7562,32 +8576,29 @@
- main ()
- {
- char *p = (char *) alloca (1);
-+ if (p) return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_alloca_works=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -7595,11 +8606,12 @@
-
- ac_cv_func_alloca_works=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
--echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-+echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; }
-
- if test $ac_cv_func_alloca_works = yes; then
-
-@@ -7613,15 +8625,15 @@
- # contain a buggy version. If you still want to use their alloca,
- # use ar to extract alloca.o from them instead of compiling alloca.c.
-
--ALLOCA=alloca.$ac_objext
-+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-
- cat >>confdefs.h <<\_ACEOF
- #define C_ALLOCA 1
- _ACEOF
-
-
--echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
--echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-+echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; }
- if test "${ac_cv_os_cray+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7631,7 +8643,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#if defined(CRAY) && ! defined(CRAY2)
-+#if defined CRAY && ! defined CRAY2
- webecray
- #else
- wenotbecray
-@@ -7647,14 +8659,14 @@
- rm -f conftest*
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
--echo "${ECHO_T}$ac_cv_os_cray" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-+echo "${ECHO_T}$ac_cv_os_cray" >&6; }
- if test $ac_cv_os_cray = yes; then
- for ac_func in _getb67 GETB67 getb67; do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7680,56 +8692,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -7737,11 +8739,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -7754,8 +8758,8 @@
- done
- fi
-
--echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
--echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-+echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; }
- if test "${ac_cv_c_stack_direction+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7768,6 +8772,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+$ac_includes_default
- int
- find_stack_direction ()
- {
-@@ -7785,17 +8790,26 @@
- int
- main ()
- {
-- exit (find_stack_direction () < 0);
-+ return find_stack_direction () < 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -7808,11 +8822,13 @@
- ( exit $ac_status )
- ac_cv_c_stack_direction=-1
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
--echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-+echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; }
-
- cat >>confdefs.h <<_ACEOF
- #define STACK_DIRECTION $ac_cv_c_stack_direction
-@@ -7822,8 +8838,8 @@
- fi
-
-
-- echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5
--echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5
-+echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6; }
- if test "${ac_cv_gnu_library_2_1+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7853,16 +8869,16 @@
-
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5
--echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5
-+echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6; }
-
- GLIBC21="$ac_cv_gnu_library_2_1"
-
-
-
-
-- echo "$as_me:$LINENO: checking whether integer division by zero raises SIGFPE" >&5
--echo $ECHO_N "checking whether integer division by zero raises SIGFPE... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether integer division by zero raises SIGFPE" >&5
-+echo $ECHO_N "checking whether integer division by zero raises SIGFPE... $ECHO_C" >&6; }
- if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7923,13 +8939,22 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -7942,12 +8967,14 @@
- ( exit $ac_status )
- gt_cv_int_divbyzero_sigfpe=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-
-+
-+
- fi
--echo "$as_me:$LINENO: result: $gt_cv_int_divbyzero_sigfpe" >&5
--echo "${ECHO_T}$gt_cv_int_divbyzero_sigfpe" >&6
-+{ echo "$as_me:$LINENO: result: $gt_cv_int_divbyzero_sigfpe" >&5
-+echo "${ECHO_T}$gt_cv_int_divbyzero_sigfpe" >&6; }
- case "$gt_cv_int_divbyzero_sigfpe" in
- *yes) value=1;;
- *) value=0;;
-@@ -7959,8 +8986,8 @@
-
-
-
-- echo "$as_me:$LINENO: checking for unsigned long long" >&5
--echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for unsigned long long" >&5
-+echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6; }
- if test "${ac_cv_type_unsigned_long_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7981,27 +9008,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_type_unsigned_long_long=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -8009,11 +9032,12 @@
-
- ac_cv_type_unsigned_long_long=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5
--echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5
-+echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6; }
- if test $ac_cv_type_unsigned_long_long = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -8044,8 +9068,8 @@
- fi
-
-
-- echo "$as_me:$LINENO: checking for inttypes.h" >&5
--echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for inttypes.h" >&5
-+echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6; }
- if test "${gt_cv_header_inttypes_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8067,27 +9091,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- gt_cv_header_inttypes_h=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -8095,11 +9114,12 @@
-
- gt_cv_header_inttypes_h=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- fi
--echo "$as_me:$LINENO: result: $gt_cv_header_inttypes_h" >&5
--echo "${ECHO_T}$gt_cv_header_inttypes_h" >&6
-+{ echo "$as_me:$LINENO: result: $gt_cv_header_inttypes_h" >&5
-+echo "${ECHO_T}$gt_cv_header_inttypes_h" >&6; }
- if test $gt_cv_header_inttypes_h = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -8111,8 +9131,8 @@
-
-
- if test $gt_cv_header_inttypes_h = yes; then
-- echo "$as_me:$LINENO: checking whether the inttypes.h PRIxNN macros are broken" >&5
--echo $ECHO_N "checking whether the inttypes.h PRIxNN macros are broken... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether the inttypes.h PRIxNN macros are broken" >&5
-+echo $ECHO_N "checking whether the inttypes.h PRIxNN macros are broken... $ECHO_C" >&6; }
- if test "${gt_cv_inttypes_pri_broken+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8137,27 +9157,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- gt_cv_inttypes_pri_broken=no
- else
- echo "$as_me: failed program was:" >&5
-@@ -8165,11 +9180,12 @@
-
- gt_cv_inttypes_pri_broken=yes
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- fi
--echo "$as_me:$LINENO: result: $gt_cv_inttypes_pri_broken" >&5
--echo "${ECHO_T}$gt_cv_inttypes_pri_broken" >&6
-+{ echo "$as_me:$LINENO: result: $gt_cv_inttypes_pri_broken" >&5
-+echo "${ECHO_T}$gt_cv_inttypes_pri_broken" >&6; }
- fi
- if test "$gt_cv_inttypes_pri_broken" = yes; then
-
-@@ -8184,18 +9200,19 @@
- for ac_header in stdint.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -8206,27 +9223,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -8234,13 +9246,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -8249,24 +9262,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -8274,9 +9285,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8300,25 +9312,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8330,8 +9336,8 @@
-
- done
-
-- echo "$as_me:$LINENO: checking for SIZE_MAX" >&5
--echo $ECHO_N "checking for SIZE_MAX... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for SIZE_MAX" >&5
-+echo $ECHO_N "checking for SIZE_MAX... $ECHO_C" >&6; }
- result=
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -8376,27 +9382,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8417,27 +9418,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -8450,7 +9446,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -8474,27 +9471,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8515,27 +9507,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -8548,7 +9535,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -8556,9 +9544,11 @@
-
- ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -8580,27 +9570,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
-@@ -8608,20 +9593,14 @@
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) res_hi=$ac_lo;;
- '') result=? ;;
- esac
- else
-- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
--else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -8629,8 +9608,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <stddef.h>
--long longval () { return ~(size_t)0 / 10; }
--unsigned long ulongval () { return ~(size_t)0 / 10; }
-+static long int longval () { return ~(size_t)0 / 10; }
-+static unsigned long int ulongval () { return ~(size_t)0 / 10; }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -8639,35 +9618,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-+ return 1;
- if ((~(size_t)0 / 10) < 0)
- {
-- long i = longval ();
-+ long int i = longval ();
- if (i != (~(size_t)0 / 10))
-- exit (1);
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-+ unsigned long int i = ulongval ();
- if (i != (~(size_t)0 / 10))
-- exit (1);
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -8680,10 +9668,10 @@
- ( exit $ac_status )
- result=?
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
-+
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8704,27 +9692,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8745,27 +9728,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -8778,7 +9756,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -8802,27 +9781,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8843,27 +9817,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -8876,7 +9845,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -8884,9 +9854,11 @@
-
- ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -8908,27 +9880,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
-@@ -8936,20 +9903,14 @@
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) res_lo=$ac_lo;;
- '') result=? ;;
- esac
- else
-- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
--else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -8957,8 +9918,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <stddef.h>
--long longval () { return ~(size_t)0 % 10; }
--unsigned long ulongval () { return ~(size_t)0 % 10; }
-+static long int longval () { return ~(size_t)0 % 10; }
-+static unsigned long int ulongval () { return ~(size_t)0 % 10; }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -8967,35 +9928,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-+ return 1;
- if ((~(size_t)0 % 10) < 0)
- {
-- long i = longval ();
-+ long int i = longval ();
- if (i != (~(size_t)0 % 10))
-- exit (1);
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-+ unsigned long int i = ulongval ();
- if (i != (~(size_t)0 % 10))
-- exit (1);
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -9008,10 +9978,10 @@
- ( exit $ac_status )
- result=?
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
-+
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -9032,27 +10002,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -9073,27 +10038,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -9106,7 +10066,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -9130,27 +10091,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -9171,27 +10127,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -9204,7 +10155,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -9212,9 +10164,11 @@
-
- ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -9236,27 +10190,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
-@@ -9264,20 +10213,14 @@
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) fits_in_uint=$ac_lo;;
- '') result=? ;;
- esac
- else
-- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
--else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -9285,8 +10228,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <stddef.h>
--long longval () { return sizeof (size_t) <= sizeof (unsigned int); }
--unsigned long ulongval () { return sizeof (size_t) <= sizeof (unsigned int); }
-+static long int longval () { return sizeof (size_t) <= sizeof (unsigned int); }
-+static unsigned long int ulongval () { return sizeof (size_t) <= sizeof (unsigned int); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -9295,35 +10238,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-+ return 1;
- if ((sizeof (size_t) <= sizeof (unsigned int)) < 0)
- {
-- long i = longval ();
-+ long int i = longval ();
- if (i != (sizeof (size_t) <= sizeof (unsigned int)))
-- exit (1);
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-+ unsigned long int i = ulongval ();
- if (i != (sizeof (size_t) <= sizeof (unsigned int)))
-- exit (1);
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -9336,10 +10288,10 @@
- ( exit $ac_status )
- result=?
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
-+
- if test "$fits_in_uint" = 1; then
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -9360,34 +10312,31 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- fits_in_uint=0
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- if test -z "$result"; then
- if test "$fits_in_uint" = 1; then
-@@ -9399,8 +10348,8 @@
- result='~(size_t)0'
- fi
- fi
-- echo "$as_me:$LINENO: result: $result" >&5
--echo "${ECHO_T}$result" >&6
-+ { echo "$as_me:$LINENO: result: $result" >&5
-+echo "${ECHO_T}$result" >&6; }
- if test "$result" != yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -9416,18 +10365,19 @@
- for ac_header in stdint.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -9438,27 +10388,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -9466,13 +10411,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -9481,24 +10427,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -9506,9 +10450,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -9532,25 +10477,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -9564,8 +10503,8 @@
-
-
-
-- echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
--echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
-+echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6; }
- if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9589,27 +10528,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- gt_cv_func_CFPreferencesCopyAppValue=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -9617,13 +10552,14 @@
-
- gt_cv_func_CFPreferencesCopyAppValue=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- CPPFLAGS="$gt_save_CPPFLAGS"
- LIBS="$gt_save_LIBS"
- fi
--echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
--echo "${ECHO_T}$gt_cv_func_CFPreferencesCopyAppValue" >&6
-+{ echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
-+echo "${ECHO_T}$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -9631,8 +10567,8 @@
- _ACEOF
-
- fi
-- echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
--echo $ECHO_N "checking for CFLocaleCopyCurrent... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
-+echo $ECHO_N "checking for CFLocaleCopyCurrent... $ECHO_C" >&6; }
- if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9656,27 +10592,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- gt_cv_func_CFLocaleCopyCurrent=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -9684,13 +10616,14 @@
-
- gt_cv_func_CFLocaleCopyCurrent=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- CPPFLAGS="$gt_save_CPPFLAGS"
- LIBS="$gt_save_LIBS"
- fi
--echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
--echo "${ECHO_T}$gt_cv_func_CFLocaleCopyCurrent" >&6
-+{ echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
-+echo "${ECHO_T}$gt_cv_func_CFLocaleCopyCurrent" >&6; }
- if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -9721,13 +10654,13 @@
- prefix="$acl_save_prefix"
-
-
--# Check whether --with-gnu-ld or --without-gnu-ld was given.
-+# Check whether --with-gnu-ld was given.
- if test "${with_gnu_ld+set}" = set; then
-- withval="$with_gnu_ld"
-- test "$withval" = no || with_gnu_ld=yes
-+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
- else
- with_gnu_ld=no
--fi;
-+fi
-+
- # Prepare PATH_SEPARATOR.
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
-@@ -9744,8 +10677,8 @@
- ac_prog=ld
- if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
-- echo "$as_me:$LINENO: checking for ld used by GCC" >&5
--echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for ld used by GCC" >&5
-+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
-@@ -9774,11 +10707,11 @@
- ;;
- esac
- elif test "$with_gnu_ld" = yes; then
-- echo "$as_me:$LINENO: checking for GNU ld" >&5
--echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for GNU ld" >&5
-+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
- else
-- echo "$as_me:$LINENO: checking for non-GNU ld" >&5
--echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
- fi
- if test "${acl_cv_path_LD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9808,17 +10741,17 @@
-
- LD="$acl_cv_path_LD"
- if test -n "$LD"; then
-- echo "$as_me:$LINENO: result: $LD" >&5
--echo "${ECHO_T}$LD" >&6
-+ { echo "$as_me:$LINENO: result: $LD" >&5
-+echo "${ECHO_T}$LD" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
- echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
--echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
--echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
- if test "${acl_cv_prog_gnu_ld+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9830,15 +10763,15 @@
- acl_cv_prog_gnu_ld=no ;;
- esac
- fi
--echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
--echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
-+{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
-+echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; }
- with_gnu_ld=$acl_cv_prog_gnu_ld
-
-
-
-
-- echo "$as_me:$LINENO: checking for shared library run path origin" >&5
--echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for shared library run path origin" >&5
-+echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; }
- if test "${acl_cv_rpath+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9850,8 +10783,8 @@
- acl_cv_rpath=done
-
- fi
--echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
--echo "${ECHO_T}$acl_cv_rpath" >&6
-+{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
-+echo "${ECHO_T}$acl_cv_rpath" >&6; }
- wl="$acl_cv_wl"
- libext="$acl_cv_libext"
- shlibext="$acl_cv_shlibext"
-@@ -9859,13 +10792,13 @@
- hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
- hardcode_direct="$acl_cv_hardcode_direct"
- hardcode_minus_L="$acl_cv_hardcode_minus_L"
-- # Check whether --enable-rpath or --disable-rpath was given.
-+ # Check whether --enable-rpath was given.
- if test "${enable_rpath+set}" = set; then
-- enableval="$enable_rpath"
-- :
-+ enableval=$enable_rpath; :
- else
- enable_rpath=yes
--fi;
-+fi
-+
-
-
-
-@@ -9887,10 +10820,9 @@
- prefix="$acl_save_prefix"
-
-
--# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
-+# Check whether --with-libiconv-prefix was given.
- if test "${with_libiconv_prefix+set}" = set; then
-- withval="$with_libiconv_prefix"
--
-+ withval=$with_libiconv_prefix;
- if test "X$withval" = "Xno"; then
- use_additional=no
- else
-@@ -9913,7 +10845,8 @@
- fi
- fi
-
--fi;
-+fi
-+
- LIBICONV=
- LTLIBICONV=
- INCICONV=
-@@ -10256,8 +11189,8 @@
-
-
-
-- echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
--echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
-+echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_ptrdiff_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10268,39 +11201,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef ptrdiff_t ac__type_new_;
- int
- main ()
- {
--if ((ptrdiff_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (ptrdiff_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_ptrdiff_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -10308,10 +11237,11 @@
-
- ac_cv_type_ptrdiff_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
--echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
-+echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6; }
- if test $ac_cv_type_ptrdiff_t = yes; then
- :
- else
-@@ -10337,18 +11267,19 @@
- stdlib.h string.h unistd.h sys/param.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -10359,27 +11290,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -10387,13 +11313,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -10402,24 +11329,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -10427,9 +11352,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -10453,25 +11379,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -10512,9 +11432,9 @@
- __fsetlocking
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -10540,56 +11460,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -10597,11 +11507,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -10612,8 +11524,8 @@
-
-
-
-- echo "$as_me:$LINENO: checking whether _snprintf is declared" >&5
--echo $ECHO_N "checking whether _snprintf is declared... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether _snprintf is declared" >&5
-+echo $ECHO_N "checking whether _snprintf is declared... $ECHO_C" >&6; }
- if test "${ac_cv_have_decl__snprintf+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10637,27 +11549,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_have_decl__snprintf=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -10665,10 +11572,11 @@
-
- ac_cv_have_decl__snprintf=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_have_decl__snprintf" >&5
--echo "${ECHO_T}$ac_cv_have_decl__snprintf" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl__snprintf" >&5
-+echo "${ECHO_T}$ac_cv_have_decl__snprintf" >&6; }
- if test $ac_cv_have_decl__snprintf = yes; then
- gt_value=1
- else
-@@ -10681,8 +11589,8 @@
-
-
-
-- echo "$as_me:$LINENO: checking whether _snwprintf is declared" >&5
--echo $ECHO_N "checking whether _snwprintf is declared... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether _snwprintf is declared" >&5
-+echo $ECHO_N "checking whether _snwprintf is declared... $ECHO_C" >&6; }
- if test "${ac_cv_have_decl__snwprintf+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10706,27 +11614,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_have_decl__snwprintf=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -10734,10 +11637,11 @@
-
- ac_cv_have_decl__snwprintf=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_have_decl__snwprintf" >&5
--echo "${ECHO_T}$ac_cv_have_decl__snwprintf" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl__snwprintf" >&5
-+echo "${ECHO_T}$ac_cv_have_decl__snwprintf" >&6; }
- if test $ac_cv_have_decl__snwprintf = yes; then
- gt_value=1
- else
-@@ -10751,8 +11655,8 @@
-
-
-
-- echo "$as_me:$LINENO: checking whether feof_unlocked is declared" >&5
--echo $ECHO_N "checking whether feof_unlocked is declared... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether feof_unlocked is declared" >&5
-+echo $ECHO_N "checking whether feof_unlocked is declared... $ECHO_C" >&6; }
- if test "${ac_cv_have_decl_feof_unlocked+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10776,27 +11680,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_have_decl_feof_unlocked=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -10804,10 +11703,11 @@
-
- ac_cv_have_decl_feof_unlocked=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_have_decl_feof_unlocked" >&5
--echo "${ECHO_T}$ac_cv_have_decl_feof_unlocked" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_feof_unlocked" >&5
-+echo "${ECHO_T}$ac_cv_have_decl_feof_unlocked" >&6; }
- if test $ac_cv_have_decl_feof_unlocked = yes; then
- gt_value=1
- else
-@@ -10820,8 +11720,8 @@
-
-
-
-- echo "$as_me:$LINENO: checking whether fgets_unlocked is declared" >&5
--echo $ECHO_N "checking whether fgets_unlocked is declared... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether fgets_unlocked is declared" >&5
-+echo $ECHO_N "checking whether fgets_unlocked is declared... $ECHO_C" >&6; }
- if test "${ac_cv_have_decl_fgets_unlocked+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10845,27 +11745,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_have_decl_fgets_unlocked=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -10873,10 +11768,11 @@
-
- ac_cv_have_decl_fgets_unlocked=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_have_decl_fgets_unlocked" >&5
--echo "${ECHO_T}$ac_cv_have_decl_fgets_unlocked" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_fgets_unlocked" >&5
-+echo "${ECHO_T}$ac_cv_have_decl_fgets_unlocked" >&6; }
- if test $ac_cv_have_decl_fgets_unlocked = yes; then
- gt_value=1
- else
-@@ -10889,8 +11785,8 @@
-
-
-
-- echo "$as_me:$LINENO: checking whether getc_unlocked is declared" >&5
--echo $ECHO_N "checking whether getc_unlocked is declared... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether getc_unlocked is declared" >&5
-+echo $ECHO_N "checking whether getc_unlocked is declared... $ECHO_C" >&6; }
- if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10914,27 +11810,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_have_decl_getc_unlocked=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -10942,10 +11833,11 @@
-
- ac_cv_have_decl_getc_unlocked=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5
--echo "${ECHO_T}$ac_cv_have_decl_getc_unlocked" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5
-+echo "${ECHO_T}$ac_cv_have_decl_getc_unlocked" >&6; }
- if test $ac_cv_have_decl_getc_unlocked = yes; then
- gt_value=1
- else
-@@ -11012,8 +11904,8 @@
- done
-
-
-- echo "$as_me:$LINENO: checking for iconv" >&5
--echo $ECHO_N "checking for iconv... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for iconv" >&5
-+echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
- if test "${am_cv_func_iconv+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11039,34 +11931,32 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- am_cv_func_iconv=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test "$am_cv_func_iconv" != yes; then
- am_save_LIBS="$LIBS"
-@@ -11090,42 +11980,40 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- am_cv_lib_iconv=yes
- am_cv_func_iconv=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$am_save_LIBS"
- fi
-
- fi
--echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
--echo "${ECHO_T}$am_cv_func_iconv" >&6
-+{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
-+echo "${ECHO_T}$am_cv_func_iconv" >&6; }
- if test "$am_cv_func_iconv" = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -11134,10 +12022,10 @@
-
- fi
- if test "$am_cv_lib_iconv" = yes; then
-- echo "$as_me:$LINENO: checking how to link with libiconv" >&5
--echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6
-- echo "$as_me:$LINENO: result: $LIBICONV" >&5
--echo "${ECHO_T}$LIBICONV" >&6
-+ { echo "$as_me:$LINENO: checking how to link with libiconv" >&5
-+echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; }
-+ { echo "$as_me:$LINENO: result: $LIBICONV" >&5
-+echo "${ECHO_T}$LIBICONV" >&6; }
- else
- CPPFLAGS="$am_save_CPPFLAGS"
- LIBICONV=
-@@ -11147,8 +12035,8 @@
-
-
- if test "$am_cv_func_iconv" = yes; then
-- echo "$as_me:$LINENO: checking for iconv declaration" >&5
--echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for iconv declaration" >&5
-+echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6; }
- if test "${am_cv_proto_iconv+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11181,27 +12069,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- am_cv_proto_iconv_arg1=""
- else
- echo "$as_me: failed program was:" >&5
-@@ -11209,15 +12092,16 @@
-
- am_cv_proto_iconv_arg1="const"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
- fi
-
- am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-- echo "$as_me:$LINENO: result: ${ac_t:-
-+ { echo "$as_me:$LINENO: result: ${ac_t:-
- }$am_cv_proto_iconv" >&5
- echo "${ECHO_T}${ac_t:-
-- }$am_cv_proto_iconv" >&6
-+ }$am_cv_proto_iconv" >&6; }
-
- cat >>confdefs.h <<_ACEOF
- #define ICONV_CONST $am_cv_proto_iconv_arg1
-@@ -11226,8 +12110,8 @@
- fi
-
-
-- echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
--echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
-+echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6; }
- if test "${am_cv_langinfo_codeset+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11247,27 +12131,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- am_cv_langinfo_codeset=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -11275,12 +12155,13 @@
-
- am_cv_langinfo_codeset=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-
- fi
--echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
--echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
-+{ echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
-+echo "${ECHO_T}$am_cv_langinfo_codeset" >&6; }
- if test $am_cv_langinfo_codeset = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -11291,8 +12172,8 @@
-
- if test $ac_cv_header_locale_h = yes; then
-
-- echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
--echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
-+echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
- if test "${gt_cv_val_LC_MESSAGES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11312,27 +12193,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- gt_cv_val_LC_MESSAGES=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -11340,11 +12217,12 @@
-
- gt_cv_val_LC_MESSAGES=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $gt_cv_val_LC_MESSAGES" >&5
--echo "${ECHO_T}$gt_cv_val_LC_MESSAGES" >&6
-+{ echo "$as_me:$LINENO: result: $gt_cv_val_LC_MESSAGES" >&5
-+echo "${ECHO_T}$gt_cv_val_LC_MESSAGES" >&6; }
- if test $gt_cv_val_LC_MESSAGES = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -11363,8 +12241,8 @@
- 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 "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_INTLBISON+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11377,33 +12255,35 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_INTLBISON="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- INTLBISON=$ac_cv_prog_INTLBISON
- if test -n "$INTLBISON"; then
-- echo "$as_me:$LINENO: result: $INTLBISON" >&5
--echo "${ECHO_T}$INTLBISON" >&6
-+ { echo "$as_me:$LINENO: result: $INTLBISON" >&5
-+echo "${ECHO_T}$INTLBISON" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$INTLBISON" && break
- done
-
- if test -z "$INTLBISON"; then
- ac_verc_fail=yes
- else
-- echo "$as_me:$LINENO: checking version of bison" >&5
--echo $ECHO_N "checking version of bison... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking version of bison" >&5
-+echo $ECHO_N "checking version of bison... $ECHO_C" >&6; }
- ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
- case $ac_prog_version in
- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-@@ -11411,8 +12291,8 @@
- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- esac
-- echo "$as_me:$LINENO: result: $ac_prog_version" >&5
--echo "${ECHO_T}$ac_prog_version" >&6
-+ { echo "$as_me:$LINENO: result: $ac_prog_version" >&5
-+echo "${ECHO_T}$ac_prog_version" >&6; }
- fi
- if test $ac_verc_fail = yes; then
- INTLBISON=:
-@@ -11433,8 +12313,8 @@
-
-
-
-- echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
--echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
-+echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6; }
- if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11458,27 +12338,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- gt_cv_func_CFPreferencesCopyAppValue=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -11486,13 +12362,14 @@
-
- gt_cv_func_CFPreferencesCopyAppValue=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- CPPFLAGS="$gt_save_CPPFLAGS"
- LIBS="$gt_save_LIBS"
- fi
--echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
--echo "${ECHO_T}$gt_cv_func_CFPreferencesCopyAppValue" >&6
-+{ echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
-+echo "${ECHO_T}$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -11500,8 +12377,8 @@
- _ACEOF
-
- fi
-- echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
--echo $ECHO_N "checking for CFLocaleCopyCurrent... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
-+echo $ECHO_N "checking for CFLocaleCopyCurrent... $ECHO_C" >&6; }
- if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11525,27 +12402,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- gt_cv_func_CFLocaleCopyCurrent=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -11553,13 +12426,14 @@
-
- gt_cv_func_CFLocaleCopyCurrent=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- CPPFLAGS="$gt_save_CPPFLAGS"
- LIBS="$gt_save_LIBS"
- fi
--echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
--echo "${ECHO_T}$gt_cv_func_CFLocaleCopyCurrent" >&6
-+{ echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
-+echo "${ECHO_T}$gt_cv_func_CFLocaleCopyCurrent" >&6; }
- if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -11575,17 +12449,17 @@
-
-
-
-- echo "$as_me:$LINENO: checking whether NLS is requested" >&5
--echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
-- # Check whether --enable-nls or --disable-nls was given.
-+ { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-+echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
-+ # Check whether --enable-nls was given.
- if test "${enable_nls+set}" = set; then
-- enableval="$enable_nls"
-- USE_NLS=$enableval
-+ enableval=$enable_nls; USE_NLS=$enableval
- else
- USE_NLS=yes
--fi;
-- echo "$as_me:$LINENO: result: $USE_NLS" >&5
--echo "${ECHO_T}$USE_NLS" >&6
-+fi
-+
-+ { echo "$as_me:$LINENO: result: $USE_NLS" >&5
-+echo "${ECHO_T}$USE_NLS" >&6; }
-
-
-
-@@ -11600,18 +12474,18 @@
- if test "$USE_NLS" = "yes"; then
- gt_use_preinstalled_gnugettext=no
-
-- echo "$as_me:$LINENO: checking whether included gettext is requested" >&5
--echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether included gettext is requested" >&5
-+echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6; }
-
--# Check whether --with-included-gettext or --without-included-gettext was given.
-+# Check whether --with-included-gettext was given.
- if test "${with_included_gettext+set}" = set; then
-- withval="$with_included_gettext"
-- nls_cv_force_use_gnu_gettext=$withval
-+ withval=$with_included_gettext; nls_cv_force_use_gnu_gettext=$withval
- else
- nls_cv_force_use_gnu_gettext=no
--fi;
-- echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5
--echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
-+fi
-+
-+ { echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5
-+echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6; }
-
- nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
- if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-@@ -11621,8 +12495,8 @@
-
-
-
-- echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
--echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
-+echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; }
- if test "${gt_cv_func_gnugettext2_libc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11645,27 +12519,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- gt_cv_func_gnugettext2_libc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -11673,11 +12543,12 @@
-
- gt_cv_func_gnugettext2_libc=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext2_libc" >&5
--echo "${ECHO_T}$gt_cv_func_gnugettext2_libc" >&6
-+{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext2_libc" >&5
-+echo "${ECHO_T}$gt_cv_func_gnugettext2_libc" >&6; }
-
- if test "$gt_cv_func_gnugettext2_libc" != "yes"; then
-
-@@ -11697,10 +12568,9 @@
- prefix="$acl_save_prefix"
-
-
--# Check whether --with-libintl-prefix or --without-libintl-prefix was given.
-+# Check whether --with-libintl-prefix was given.
- if test "${with_libintl_prefix+set}" = set; then
-- withval="$with_libintl_prefix"
--
-+ withval=$with_libintl_prefix;
- if test "X$withval" = "Xno"; then
- use_additional=no
- else
-@@ -11723,7 +12593,8 @@
- fi
- fi
-
--fi;
-+fi
-+
- LIBINTL=
- LTLIBINTL=
- INCINTL=
-@@ -12059,8 +12930,8 @@
- done
- fi
-
-- echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
--echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
-+echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6; }
- if test "${gt_cv_func_gnugettext2_libintl+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12091,27 +12962,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- gt_cv_func_gnugettext2_libintl=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -12119,7 +12986,8 @@
-
- gt_cv_func_gnugettext2_libintl=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test "$gt_cv_func_gnugettext2_libintl" != yes && test -n "$LIBICONV"; then
- LIBS="$LIBS $LIBICONV"
-@@ -12146,27 +13014,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- LIBINTL="$LIBINTL $LIBICONV"
- LTLIBINTL="$LTLIBINTL $LTLIBICONV"
- gt_cv_func_gnugettext2_libintl=yes
-@@ -12175,15 +13039,17 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- CPPFLAGS="$gt_save_CPPFLAGS"
- LIBS="$gt_save_LIBS"
- fi
--echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext2_libintl" >&5
--echo "${ECHO_T}$gt_cv_func_gnugettext2_libintl" >&6
-+{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext2_libintl" >&5
-+echo "${ECHO_T}$gt_cv_func_gnugettext2_libintl" >&6; }
- fi
-
- if test "$gt_cv_func_gnugettext2_libc" = "yes" \
-@@ -12238,13 +13104,13 @@
- fi
- fi
-
-- echo "$as_me:$LINENO: checking whether to use NLS" >&5
--echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6
-- echo "$as_me:$LINENO: result: $USE_NLS" >&5
--echo "${ECHO_T}$USE_NLS" >&6
-+ { echo "$as_me:$LINENO: checking whether to use NLS" >&5
-+echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6; }
-+ { echo "$as_me:$LINENO: result: $USE_NLS" >&5
-+echo "${ECHO_T}$USE_NLS" >&6; }
- if test "$USE_NLS" = "yes"; then
-- echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
--echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
-+echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6; }
- if test "$gt_use_preinstalled_gnugettext" = "yes"; then
- if test "$gt_cv_func_gnugettext2_libintl" = "yes"; then
- gt_source="external libintl"
-@@ -12254,18 +13120,18 @@
- else
- gt_source="included intl directory"
- fi
-- echo "$as_me:$LINENO: result: $gt_source" >&5
--echo "${ECHO_T}$gt_source" >&6
-+ { echo "$as_me:$LINENO: result: $gt_source" >&5
-+echo "${ECHO_T}$gt_source" >&6; }
- fi
-
- if test "$USE_NLS" = "yes"; then
-
- if test "$gt_use_preinstalled_gnugettext" = "yes"; then
- if test "$gt_cv_func_gnugettext2_libintl" = "yes"; then
-- echo "$as_me:$LINENO: checking how to link with libintl" >&5
--echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6
-- echo "$as_me:$LINENO: result: $LIBINTL" >&5
--echo "${ECHO_T}$LIBINTL" >&6
-+ { echo "$as_me:$LINENO: checking how to link with libintl" >&5
-+echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6; }
-+ { echo "$as_me:$LINENO: result: $LIBINTL" >&5
-+echo "${ECHO_T}$LIBINTL" >&6; }
-
- for element in $INCINTL; do
- haveit=
-@@ -12384,11 +13250,11 @@
- ;;
- esac
-
--# Check whether --enable-extcharset or --disable-extcharset was given.
-+# Check whether --enable-extcharset was given.
- if test "${enable_extcharset+set}" = set; then
-- enableval="$enable_extcharset"
-+ enableval=$enable_extcharset;
-+fi
-
--fi;
- if test x"$enable_extcharset" = x"yes"; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -12410,8 +13276,8 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
--echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
--echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12433,7 +13299,7 @@
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
-@@ -12452,21 +13318,22 @@
- ;;
- esac
- done
-+IFS=$as_save_IFS
-
-
- fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
-- # As a last resort, use the slow shell script. We don't cache a
-- # path for INSTALL within a source directory, because that will
-+ # As a last resort, use the slow shell script. Don't cache a
-+ # value for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
-- # removed, or if the path is relative.
-+ # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
- fi
--echo "$as_me:$LINENO: result: $INSTALL" >&5
--echo "${ECHO_T}$INSTALL" >&6
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6; }
-
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-@@ -12508,18 +13375,19 @@
- sys/mkdev.h wchar.h wctype.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -12530,27 +13398,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -12558,13 +13421,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -12573,24 +13437,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -12598,9 +13460,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -12624,25 +13487,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -12655,8 +13512,8 @@
- done
-
-
--echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
--echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-+echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
- if test "${ac_cv_header_time+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12680,27 +13537,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_header_time=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -12708,10 +13560,11 @@
-
- ac_cv_header_time=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
--echo "${ECHO_T}$ac_cv_header_time" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-+echo "${ECHO_T}$ac_cv_header_time" >&6; }
- if test $ac_cv_header_time = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -12720,8 +13573,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
--echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
-+echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; }
- if test "${ac_cv_header_sys_wait_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12734,7 +13587,7 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- #ifndef WEXITSTATUS
--# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
-+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
- #endif
- #ifndef WIFEXITED
- # define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-@@ -12751,27 +13604,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_header_sys_wait_h=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -12779,10 +13627,11 @@
-
- ac_cv_header_sys_wait_h=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
--echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; }
- if test $ac_cv_header_sys_wait_h = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -12799,9 +13648,9 @@
- ac_header_dirent=no
- for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
- as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
--echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-+echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -12823,27 +13672,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -12851,10 +13695,12 @@
-
- eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -12866,13 +13712,12 @@
- done
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
-- echo "$as_me:$LINENO: checking for library containing opendir" >&5
--echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
- if test "${ac_cv_search_opendir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_func_search_save_LIBS=$LIBS
--ac_cv_search_opendir=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -12880,126 +13725,83 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char opendir ();
- int
- main ()
- {
--opendir ();
-+return opendir ();
- ;
- return 0;
- }
- _ACEOF
-+for ac_lib in '' dir; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="none required"
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_search_opendir=$ac_res
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_opendir" = no; then
-- for ac_lib in dir; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char opendir ();
--int
--main ()
--{
--opendir ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="-l$ac_lib"
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_opendir+set}" = set; then
- break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
- done
-+if test "${ac_cv_search_opendir+set}" = set; then
-+ :
-+else
-+ ac_cv_search_opendir=no
- fi
-+rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
--echo "${ECHO_T}$ac_cv_search_opendir" >&6
--if test "$ac_cv_search_opendir" != no; then
-- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
-+if test "$ac_res" != no; then
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
- fi
-
- else
-- echo "$as_me:$LINENO: checking for library containing opendir" >&5
--echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
- if test "${ac_cv_search_opendir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_func_search_save_LIBS=$LIBS
--ac_cv_search_opendir=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -13007,122 +13809,80 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char opendir ();
- int
- main ()
- {
--opendir ();
-+return opendir ();
- ;
- return 0;
- }
- _ACEOF
-+for ac_lib in '' x; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="none required"
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_search_opendir=$ac_res
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_opendir" = no; then
-- for ac_lib in x; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char opendir ();
--int
--main ()
--{
--opendir ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="-l$ac_lib"
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_opendir+set}" = set; then
- break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
- done
-+if test "${ac_cv_search_opendir+set}" = set; then
-+ :
-+else
-+ ac_cv_search_opendir=no
- fi
-+rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
--echo "${ECHO_T}$ac_cv_search_opendir" >&6
--if test "$ac_cv_search_opendir" != no; then
-- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
-+if test "$ac_res" != no; then
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
- fi
-
- fi
-
--echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13146,27 +13906,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_header_stdc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -13174,7 +13929,8 @@
-
- ac_cv_header_stdc=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -13230,6 +13986,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <ctype.h>
-+#include <stdlib.h>
- #if ((' ' & 0x0FF) == 0x020)
- # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
- # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -13249,18 +14006,27 @@
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
-- exit(2);
-- exit (0);
-+ return 2;
-+ return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -13273,12 +14039,14 @@
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -13288,8 +14056,8 @@
- fi
-
-
--echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5
--echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5
-+echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6; }
- if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13311,27 +14079,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_blksize=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -13355,27 +14118,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_blksize=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -13383,12 +14141,14 @@
-
- ac_cv_member_struct_stat_st_blksize=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5
--echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5
-+echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6; }
- if test $ac_cv_member_struct_stat_st_blksize = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -13397,8 +14157,8 @@
-
-
- fi
--echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
--echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
-+echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6; }
- if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13420,27 +14180,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_rdev=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -13464,27 +14219,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_rdev=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -13492,12 +14242,14 @@
-
- ac_cv_member_struct_stat_st_rdev=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
--echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
-+echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6; }
- if test $ac_cv_member_struct_stat_st_rdev = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -13507,8 +14259,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5
--echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5
-+echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6; }
- if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13530,27 +14282,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_blocks=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -13574,27 +14321,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_blocks=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -13602,12 +14344,14 @@
-
- ac_cv_member_struct_stat_st_blocks=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blocks" >&5
--echo "${ECHO_T}$ac_cv_member_struct_stat_st_blocks" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blocks" >&5
-+echo "${ECHO_T}$ac_cv_member_struct_stat_st_blocks" >&6; }
- if test $ac_cv_member_struct_stat_st_blocks = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -13620,12 +14364,10 @@
- _ACEOF
-
- else
-- case $LIBOBJS in
-- "fileblocks.$ac_objext" | \
-- *" fileblocks.$ac_objext" | \
-- "fileblocks.$ac_objext "* | \
-+ case " $LIBOBJS " in
- *" fileblocks.$ac_objext "* ) ;;
-- *) LIBOBJS="$LIBOBJS fileblocks.$ac_objext" ;;
-+ *) LIBOBJS="$LIBOBJS fileblocks.$ac_objext"
-+ ;;
- esac
-
- fi
-@@ -13667,9 +14409,9 @@
-
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -13695,56 +14437,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -13752,11 +14484,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -13773,9 +14507,9 @@
- for ac_func in sigaction sigemptyset sigprocmask sigaddset
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -13801,56 +14535,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -13858,11 +14582,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -13885,9 +14611,9 @@
- for ac_func in posix_openpt
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -13913,56 +14639,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -13970,11 +14686,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -13985,9 +14703,9 @@
- for ac_func in getpt
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -14013,56 +14731,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -14070,11 +14778,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -14090,9 +14800,9 @@
- for ac_func in grantpt
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -14118,56 +14828,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -14175,11 +14875,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -14187,8 +14889,8 @@
-
- else
-
--echo "$as_me:$LINENO: checking for grantpt in -lpt" >&5
--echo $ECHO_N "checking for grantpt in -lpt... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for grantpt in -lpt" >&5
-+echo $ECHO_N "checking for grantpt in -lpt... $ECHO_C" >&6; }
- if test "${ac_cv_lib_pt_grantpt+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14201,43 +14903,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char grantpt ();
- int
- main ()
- {
--grantpt ();
-+return grantpt ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_pt_grantpt=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -14245,12 +14943,13 @@
-
- ac_cv_lib_pt_grantpt=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_pt_grantpt" >&5
--echo "${ECHO_T}$ac_cv_lib_pt_grantpt" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_pt_grantpt" >&5
-+echo "${ECHO_T}$ac_cv_lib_pt_grantpt" >&6; }
- if test $ac_cv_lib_pt_grantpt = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBPT 1
-@@ -14268,9 +14967,9 @@
- for ac_func in statlstat
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -14296,56 +14995,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -14353,11 +15042,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -14367,8 +15058,8 @@
- done
-
-
--echo "$as_me:$LINENO: checking for AIX defines" >&5
--echo $ECHO_N "checking for AIX defines... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for AIX defines" >&5
-+echo $ECHO_N "checking for AIX defines... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -14388,12 +15079,12 @@
- #define IS_AIX 1
- _ACEOF
-
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- rm -f conftest*
-
-@@ -14403,18 +15094,19 @@
- for ac_header in sys/param.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -14425,27 +15117,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -14453,13 +15140,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -14468,24 +15156,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -14493,9 +15179,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -14519,25 +15206,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -14555,18 +15236,19 @@
- for ac_header in sys/statvfs.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -14577,27 +15259,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -14605,13 +15282,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -14620,24 +15298,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -14645,9 +15321,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -14671,25 +15348,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -14707,18 +15378,19 @@
- for ac_header in sys/vfs.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -14729,27 +15401,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -14757,13 +15424,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -14772,24 +15440,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -14797,9 +15463,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -14823,25 +15490,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -14859,18 +15520,19 @@
- for ac_header in sys/fs_types.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -14881,27 +15543,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -14909,13 +15566,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -14924,24 +15582,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -14949,9 +15605,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -14975,25 +15632,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -15012,18 +15663,19 @@
- for ac_header in fcntl.h utime.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -15034,27 +15686,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -15062,13 +15709,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -15077,24 +15725,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -15102,9 +15748,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -15128,25 +15775,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -15165,9 +15806,9 @@
- for ac_func in listmntent getmntinfo
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -15193,56 +15834,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -15250,11 +15881,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -15280,9 +15913,9 @@
- for ac_header in sys/ucred.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -15296,27 +15929,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -15324,10 +15952,12 @@
-
- eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -15342,9 +15972,9 @@
- for ac_header in sys/mount.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -15361,27 +15991,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -15389,10 +16014,12 @@
-
- eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -15408,18 +16035,19 @@
- for ac_header in mntent.h sys/fs_types.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -15430,27 +16058,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -15458,13 +16081,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -15473,24 +16097,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -15498,9 +16120,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -15524,25 +16147,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -15570,8 +16187,8 @@
- # include <sys/fs_types.h> /* needed by powerpc-apple-darwin1.3.7 */
- #endif
- "
--echo "$as_me:$LINENO: checking for struct fsstat.f_fstypename" >&5
--echo $ECHO_N "checking for struct fsstat.f_fstypename... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for struct fsstat.f_fstypename" >&5
-+echo $ECHO_N "checking for struct fsstat.f_fstypename... $ECHO_C" >&6; }
- if test "${ac_cv_member_struct_fsstat_f_fstypename+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15594,27 +16211,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_fsstat_f_fstypename=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -15639,27 +16251,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_fsstat_f_fstypename=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -15667,12 +16274,14 @@
-
- ac_cv_member_struct_fsstat_f_fstypename=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_member_struct_fsstat_f_fstypename" >&5
--echo "${ECHO_T}$ac_cv_member_struct_fsstat_f_fstypename" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_fsstat_f_fstypename" >&5
-+echo "${ECHO_T}$ac_cv_member_struct_fsstat_f_fstypename" >&6; }
- if test $ac_cv_member_struct_fsstat_f_fstypename = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -15690,13 +16299,12 @@
- # make sure LIBS contains the appropriate -l option.
- # getmntent is in the standard C library on UNICOS, in -lsun on Irix 4,
- # -lseq on Dynix/PTX, -lgen on Unixware.
--echo "$as_me:$LINENO: checking for library containing getmntent" >&5
--echo $ECHO_N "checking for library containing getmntent... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for library containing getmntent" >&5
-+echo $ECHO_N "checking for library containing getmntent... $ECHO_C" >&6; }
- if test "${ac_cv_search_getmntent+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_func_search_save_LIBS=$LIBS
--ac_cv_search_getmntent=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -15704,115 +16312,73 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char getmntent ();
- int
- main ()
- {
--getmntent ();
-+return getmntent ();
- ;
- return 0;
- }
- _ACEOF
-+for ac_lib in '' sun seq gen; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_getmntent="none required"
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_search_getmntent=$ac_res
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_getmntent" = no; then
-- for ac_lib in sun seq gen; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char getmntent ();
--int
--main ()
--{
--getmntent ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_getmntent="-l$ac_lib"
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_getmntent+set}" = set; then
- break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
- done
-+if test "${ac_cv_search_getmntent+set}" = set; then
-+ :
-+else
-+ ac_cv_search_getmntent=no
- fi
-+rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_search_getmntent" >&5
--echo "${ECHO_T}$ac_cv_search_getmntent" >&6
--if test "$ac_cv_search_getmntent" != no; then
-- test "$ac_cv_search_getmntent" = "none required" || LIBS="$ac_cv_search_getmntent $LIBS"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_getmntent" >&5
-+echo "${ECHO_T}$ac_cv_search_getmntent" >&6; }
-+ac_res=$ac_cv_search_getmntent
-+if test "$ac_res" != no; then
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
- fi
-
-@@ -15820,9 +16386,9 @@
- for ac_func in getmntent
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -15848,56 +16414,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -15905,11 +16461,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -15931,8 +16489,8 @@
-
- if test -z "$ac_list_mounted_fs"; then
- # Cray UNICOS 9
-- echo "$as_me:$LINENO: checking for listmntent of Cray/Unicos-9" >&5
--echo $ECHO_N "checking for listmntent of Cray/Unicos-9... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for listmntent of Cray/Unicos-9" >&5
-+echo $ECHO_N "checking for listmntent of Cray/Unicos-9... $ECHO_C" >&6; }
- if test "${fu_cv_sys_mounted_cray_listmntent+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15960,8 +16518,8 @@
-
- fi
-
-- echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_cray_listmntent" >&5
--echo "${ECHO_T}$fu_cv_sys_mounted_cray_listmntent" >&6
-+ { echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_cray_listmntent" >&5
-+echo "${ECHO_T}$fu_cv_sys_mounted_cray_listmntent" >&6; }
- if test $fu_cv_sys_mounted_cray_listmntent = yes; then
- ac_list_mounted_fs=found
-
-@@ -15974,8 +16532,8 @@
-
- if test -z "$ac_list_mounted_fs"; then
- # AIX.
-- echo "$as_me:$LINENO: checking for mntctl function and struct vmount" >&5
--echo $ECHO_N "checking for mntctl function and struct vmount... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for mntctl function and struct vmount" >&5
-+echo $ECHO_N "checking for mntctl function and struct vmount... $ECHO_C" >&6; }
- if test "${fu_cv_sys_mounted_vmount+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15987,24 +16545,22 @@
- /* end confdefs.h. */
- #include <fshelp.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- fu_cv_sys_mounted_vmount=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -16012,11 +16568,12 @@
-
- fu_cv_sys_mounted_vmount=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- fi
-
-- echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_vmount" >&5
--echo "${ECHO_T}$fu_cv_sys_mounted_vmount" >&6
-+ { echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_vmount" >&5
-+echo "${ECHO_T}$fu_cv_sys_mounted_vmount" >&6; }
- if test $fu_cv_sys_mounted_vmount = yes; then
- ac_list_mounted_fs=found
-
-@@ -16034,8 +16591,8 @@
-
- if test -z "$ac_list_mounted_fs"; then
- # 4.3BSD, SunOS, HP-UX, Dynix, Irix
-- echo "$as_me:$LINENO: checking for one-argument getmntent function" >&5
--echo $ECHO_N "checking for one-argument getmntent function... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for one-argument getmntent function" >&5
-+echo $ECHO_N "checking for one-argument getmntent function... $ECHO_C" >&6; }
- if test "${fu_cv_sys_mounted_getmntent1+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16072,27 +16629,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- fu_cv_sys_mounted_getmntent1=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -16100,11 +16652,12 @@
-
- fu_cv_sys_mounted_getmntent1=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-
-- echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getmntent1" >&5
--echo "${ECHO_T}$fu_cv_sys_mounted_getmntent1" >&6
-+ { echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getmntent1" >&5
-+echo "${ECHO_T}$fu_cv_sys_mounted_getmntent1" >&6; }
- if test $fu_cv_sys_mounted_getmntent1 = yes; then
- ac_list_mounted_fs=found
-
-@@ -16117,8 +16670,8 @@
-
- if test -z "$ac_list_mounted_fs"; then
- # SVR4
-- echo "$as_me:$LINENO: checking for two-argument getmntent function" >&5
--echo $ECHO_N "checking for two-argument getmntent function... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for two-argument getmntent function" >&5
-+echo $ECHO_N "checking for two-argument getmntent function... $ECHO_C" >&6; }
- if test "${fu_cv_sys_mounted_getmntent2+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16141,8 +16694,8 @@
-
- fi
-
-- echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getmntent2" >&5
--echo "${ECHO_T}$fu_cv_sys_mounted_getmntent2" >&6
-+ { echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getmntent2" >&5
-+echo "${ECHO_T}$fu_cv_sys_mounted_getmntent2" >&6; }
- if test $fu_cv_sys_mounted_getmntent2 = yes; then
- ac_list_mounted_fs=found
-
-@@ -16154,9 +16707,9 @@
- for ac_func in hasmntopt
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -16182,56 +16735,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -16239,11 +16782,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -16261,8 +16806,8 @@
- # DEC Alpha running OSF/1, and Apple Darwin 1.3.
- # powerpc-apple-darwin1.3.7 needs sys/param.h sys/ucred.h sys/fs_types.h
-
-- echo "$as_me:$LINENO: checking for getfsstat function" >&5
--echo $ECHO_N "checking for getfsstat function... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for getfsstat function" >&5
-+echo $ECHO_N "checking for getfsstat function... $ECHO_C" >&6; }
- if test "${fu_cv_sys_mounted_getfsstat+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16292,27 +16837,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- fu_cv_sys_mounted_getfsstat=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -16320,12 +16861,13 @@
-
- fu_cv_sys_mounted_getfsstat=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
-
-- echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getfsstat" >&5
--echo "${ECHO_T}$fu_cv_sys_mounted_getfsstat" >&6
-+ { echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getfsstat" >&5
-+echo "${ECHO_T}$fu_cv_sys_mounted_getfsstat" >&6; }
- if test $fu_cv_sys_mounted_getfsstat = yes; then
- ac_list_mounted_fs=found
-
-@@ -16338,8 +16880,8 @@
-
- if test -z "$ac_list_mounted_fs"; then
- # SVR3
-- echo "$as_me:$LINENO: checking for FIXME existence of three headers" >&5
--echo $ECHO_N "checking for FIXME existence of three headers... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for FIXME existence of three headers" >&5
-+echo $ECHO_N "checking for FIXME existence of three headers... $ECHO_C" >&6; }
- if test "${fu_cv_sys_mounted_fread_fstyp+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16354,24 +16896,22 @@
- #include <sys/fstyp.h>
- #include <mnttab.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- fu_cv_sys_mounted_fread_fstyp=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -16379,11 +16919,12 @@
-
- fu_cv_sys_mounted_fread_fstyp=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- fi
-
-- echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_fread_fstyp" >&5
--echo "${ECHO_T}$fu_cv_sys_mounted_fread_fstyp" >&6
-+ { echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_fread_fstyp" >&5
-+echo "${ECHO_T}$fu_cv_sys_mounted_fread_fstyp" >&6; }
- if test $fu_cv_sys_mounted_fread_fstyp = yes; then
- ac_list_mounted_fs=found
-
-@@ -16396,8 +16937,8 @@
-
- if test -z "$ac_list_mounted_fs"; then
- # 4.4BSD and DEC OSF/1.
-- echo "$as_me:$LINENO: checking for getmntinfo function" >&5
--echo $ECHO_N "checking for getmntinfo function... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for getmntinfo function" >&5
-+echo $ECHO_N "checking for getmntinfo function... $ECHO_C" >&6; }
- if test "${fu_cv_sys_mounted_getmntinfo+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16408,11 +16949,11 @@
-
- fi
-
-- echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getmntinfo" >&5
--echo "${ECHO_T}$fu_cv_sys_mounted_getmntinfo" >&6
-+ { echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getmntinfo" >&5
-+echo "${ECHO_T}$fu_cv_sys_mounted_getmntinfo" >&6; }
- if test $fu_cv_sys_mounted_getmntinfo = yes; then
-- echo "$as_me:$LINENO: checking whether getmntinfo returns statvfs structures" >&5
--echo $ECHO_N "checking whether getmntinfo returns statvfs structures... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether getmntinfo returns statvfs structures" >&5
-+echo $ECHO_N "checking whether getmntinfo returns statvfs structures... $ECHO_C" >&6; }
- if test "${fu_cv_sys_mounted_getmntinfo2+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16445,27 +16986,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- fu_cv_sys_mounted_getmntinfo2=no
- else
- echo "$as_me: failed program was:" >&5
-@@ -16473,12 +17009,13 @@
-
- fu_cv_sys_mounted_getmntinfo2=yes
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- fi
-
-- echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getmntinfo2" >&5
--echo "${ECHO_T}$fu_cv_sys_mounted_getmntinfo2" >&6
-+ { echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getmntinfo2" >&5
-+echo "${ECHO_T}$fu_cv_sys_mounted_getmntinfo2" >&6; }
- if test $fu_cv_sys_mounted_getmntinfo2 = no; then
- ac_list_mounted_fs=found
-
-@@ -16499,8 +17036,8 @@
-
- if test -z "$ac_list_mounted_fs"; then
- # Ultrix
-- echo "$as_me:$LINENO: checking for getmnt function" >&5
--echo $ECHO_N "checking for getmnt function... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for getmnt function" >&5
-+echo $ECHO_N "checking for getmnt function... $ECHO_C" >&6; }
- if test "${fu_cv_sys_mounted_getmnt+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16514,24 +17051,22 @@
- #include <sys/fs_types.h>
- #include <sys/mount.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- fu_cv_sys_mounted_getmnt=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -16539,11 +17074,12 @@
-
- fu_cv_sys_mounted_getmnt=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- fi
-
-- echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getmnt" >&5
--echo "${ECHO_T}$fu_cv_sys_mounted_getmnt" >&6
-+ { echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getmnt" >&5
-+echo "${ECHO_T}$fu_cv_sys_mounted_getmnt" >&6; }
- if test $fu_cv_sys_mounted_getmnt = yes; then
- ac_list_mounted_fs=found
-
-@@ -16561,9 +17097,9 @@
- for ac_func in next_dev fs_stat_dev
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -16589,56 +17125,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -16646,11 +17172,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -16663,18 +17191,19 @@
- for ac_header in fs_info.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -16685,27 +17214,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -16713,13 +17237,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -16728,24 +17253,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -16753,9 +17276,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -16779,25 +17303,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -16809,8 +17327,8 @@
-
- done
-
-- echo "$as_me:$LINENO: checking for BEOS mounted file system support functions" >&5
--echo $ECHO_N "checking for BEOS mounted file system support functions... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for BEOS mounted file system support functions" >&5
-+echo $ECHO_N "checking for BEOS mounted file system support functions... $ECHO_C" >&6; }
- if test $ac_cv_header_fs_info_h = yes \
- && test $ac_cv_func_next_dev = yes \
- && test $ac_cv_func_fs_stat_dev = yes; then
-@@ -16818,8 +17336,8 @@
- else
- fu_result=no
- fi
-- echo "$as_me:$LINENO: result: $fu_result" >&5
--echo "${ECHO_T}$fu_result" >&6
-+ { echo "$as_me:$LINENO: result: $fu_result" >&5
-+echo "${ECHO_T}$fu_result" >&6; }
- if test $fu_result = yes; then
- ac_list_mounted_fs=found
-
-@@ -16832,8 +17350,8 @@
-
- if test -z "$ac_list_mounted_fs"; then
- # SVR2
-- echo "$as_me:$LINENO: checking whether it is possible to resort to fread on /etc/mnttab" >&5
--echo $ECHO_N "checking whether it is possible to resort to fread on /etc/mnttab... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether it is possible to resort to fread on /etc/mnttab" >&5
-+echo $ECHO_N "checking whether it is possible to resort to fread on /etc/mnttab... $ECHO_C" >&6; }
- if test "${fu_cv_sys_mounted_fread+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16845,24 +17363,22 @@
- /* end confdefs.h. */
- #include <mnttab.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- fu_cv_sys_mounted_fread=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -16870,11 +17386,12 @@
-
- fu_cv_sys_mounted_fread=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- fi
-
-- echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_fread" >&5
--echo "${ECHO_T}$fu_cv_sys_mounted_fread" >&6
-+ { echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_fread" >&5
-+echo "${ECHO_T}$fu_cv_sys_mounted_fread" >&6; }
- if test $fu_cv_sys_mounted_fread = yes; then
- ac_list_mounted_fs=found
-
-@@ -16932,9 +17449,9 @@
- for ac_header in sys/mount.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -16951,27 +17468,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -16979,10 +17491,12 @@
-
- eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -17006,8 +17520,8 @@
- # is what it gets when this test fails.
- if test $ac_fsusage_space = no; then
- # SVR4
-- echo "$as_me:$LINENO: checking for statvfs function (SVR4)" >&5
--echo $ECHO_N "checking for statvfs function (SVR4)... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for statvfs function (SVR4)" >&5
-+echo $ECHO_N "checking for statvfs function (SVR4)... $ECHO_C" >&6; }
- if test "${fu_cv_sys_stat_statvfs+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -17035,27 +17549,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- fu_cv_sys_stat_statvfs=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -17063,11 +17573,12 @@
-
- fu_cv_sys_stat_statvfs=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statvfs" >&5
--echo "${ECHO_T}$fu_cv_sys_stat_statvfs" >&6
-+{ echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statvfs" >&5
-+echo "${ECHO_T}$fu_cv_sys_stat_statvfs" >&6; }
- if test $fu_cv_sys_stat_statvfs = yes; then
- ac_fsusage_space=yes
-
-@@ -17080,8 +17591,8 @@
-
- if test $ac_fsusage_space = no; then
- # DEC Alpha running OSF/1
-- echo "$as_me:$LINENO: checking for 3-argument statfs function (DEC OSF/1)" >&5
--echo $ECHO_N "checking for 3-argument statfs function (DEC OSF/1)... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for 3-argument statfs function (DEC OSF/1)" >&5
-+echo $ECHO_N "checking for 3-argument statfs function (DEC OSF/1)... $ECHO_C" >&6; }
- if test "${fu_cv_sys_stat_statfs3_osf1+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -17107,13 +17618,22 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -17126,12 +17646,14 @@
- ( exit $ac_status )
- fu_cv_sys_stat_statfs3_osf1=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
-
-- echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs3_osf1" >&5
--echo "${ECHO_T}$fu_cv_sys_stat_statfs3_osf1" >&6
-+ { echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs3_osf1" >&5
-+echo "${ECHO_T}$fu_cv_sys_stat_statfs3_osf1" >&6; }
- if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
- ac_fsusage_space=yes
-
-@@ -17144,8 +17666,8 @@
-
- if test $ac_fsusage_space = no; then
- # AIX
-- echo "$as_me:$LINENO: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
--echo $ECHO_N "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
-+echo $ECHO_N "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)... $ECHO_C" >&6; }
- if test "${fu_cv_sys_stat_statfs2_bsize+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -17177,13 +17699,22 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -17196,12 +17727,14 @@
- ( exit $ac_status )
- fu_cv_sys_stat_statfs2_bsize=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
-
-- echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs2_bsize" >&5
--echo "${ECHO_T}$fu_cv_sys_stat_statfs2_bsize" >&6
-+ { echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs2_bsize" >&5
-+echo "${ECHO_T}$fu_cv_sys_stat_statfs2_bsize" >&6; }
- if test $fu_cv_sys_stat_statfs2_bsize = yes; then
- ac_fsusage_space=yes
-
-@@ -17214,8 +17747,8 @@
-
- if test $ac_fsusage_space = no; then
- # SVR3
-- echo "$as_me:$LINENO: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
--echo $ECHO_N "checking for four-argument statfs (AIX-3.2.5, SVR3)... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
-+echo $ECHO_N "checking for four-argument statfs (AIX-3.2.5, SVR3)... $ECHO_C" >&6; }
- if test "${fu_cv_sys_stat_statfs4+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -17238,13 +17771,22 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -17257,12 +17799,14 @@
- ( exit $ac_status )
- fu_cv_sys_stat_statfs4=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
-
-- echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs4" >&5
--echo "${ECHO_T}$fu_cv_sys_stat_statfs4" >&6
-+ { echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs4" >&5
-+echo "${ECHO_T}$fu_cv_sys_stat_statfs4" >&6; }
- if test $fu_cv_sys_stat_statfs4 = yes; then
- ac_fsusage_space=yes
-
-@@ -17275,8 +17819,8 @@
-
- if test $ac_fsusage_space = no; then
- # 4.4BSD and NetBSD
-- echo "$as_me:$LINENO: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
--echo $ECHO_N "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
-+echo $ECHO_N "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)... $ECHO_C" >&6; }
- if test "${fu_cv_sys_stat_statfs2_fsize+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -17305,13 +17849,22 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -17324,12 +17877,14 @@
- ( exit $ac_status )
- fu_cv_sys_stat_statfs2_fsize=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
-
-- echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs2_fsize" >&5
--echo "${ECHO_T}$fu_cv_sys_stat_statfs2_fsize" >&6
-+ { echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs2_fsize" >&5
-+echo "${ECHO_T}$fu_cv_sys_stat_statfs2_fsize" >&6; }
- if test $fu_cv_sys_stat_statfs2_fsize = yes; then
- ac_fsusage_space=yes
-
-@@ -17342,8 +17897,8 @@
-
- if test $ac_fsusage_space = no; then
- # Ultrix
-- echo "$as_me:$LINENO: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
--echo $ECHO_N "checking for two-argument statfs with struct fs_data (Ultrix)... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
-+echo $ECHO_N "checking for two-argument statfs with struct fs_data (Ultrix)... $ECHO_C" >&6; }
- if test "${fu_cv_sys_stat_fs_data+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -17376,13 +17931,22 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -17395,12 +17959,14 @@
- ( exit $ac_status )
- fu_cv_sys_stat_fs_data=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
-
-- echo "$as_me:$LINENO: result: $fu_cv_sys_stat_fs_data" >&5
--echo "${ECHO_T}$fu_cv_sys_stat_fs_data" >&6
-+ { echo "$as_me:$LINENO: result: $fu_cv_sys_stat_fs_data" >&5
-+echo "${ECHO_T}$fu_cv_sys_stat_fs_data" >&6; }
- if test $fu_cv_sys_stat_fs_data = yes; then
- ac_fsusage_space=yes
-
-@@ -17422,24 +17988,22 @@
- #include <sys/filsys.h>
-
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
-
- cat >>confdefs.h <<\_ACEOF
- #define STAT_READ_FILSYS 1
-@@ -17452,6 +18016,7 @@
-
-
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- fi
-
-@@ -17464,12 +18029,10 @@
-
-
- if test $gl_cv_fs_space = yes; then
-- case $LIBOBJS in
-- "fsusage.$ac_objext" | \
-- *" fsusage.$ac_objext" | \
-- "fsusage.$ac_objext "* | \
-+ case " $LIBOBJS " in
- *" fsusage.$ac_objext "* ) ;;
-- *) LIBOBJS="$LIBOBJS fsusage.$ac_objext" ;;
-+ *) LIBOBJS="$LIBOBJS fsusage.$ac_objext"
-+ ;;
- esac
-
-
-@@ -17481,18 +18044,19 @@
- for ac_header in dustat.h sys/fs/s5param.h sys/filsys.h sys/statfs.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -17503,27 +18067,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -17531,13 +18090,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -17546,24 +18106,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -17571,9 +18129,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -17597,25 +18156,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -17628,8 +18181,8 @@
- done
-
-
-- echo "$as_me:$LINENO: checking for statfs that truncates block counts" >&5
--echo $ECHO_N "checking for statfs that truncates block counts... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for statfs that truncates block counts" >&5
-+echo $ECHO_N "checking for statfs that truncates block counts... $ECHO_C" >&6; }
- if test "${fu_cv_sys_truncating_statfs+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -17655,27 +18208,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- fu_cv_sys_truncating_statfs=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -17683,7 +18231,8 @@
-
- fu_cv_sys_truncating_statfs=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-
- if test $fu_cv_sys_truncating_statfs = yes; then
-@@ -17693,15 +18242,15 @@
- _ACEOF
-
- fi
-- echo "$as_me:$LINENO: result: $fu_cv_sys_truncating_statfs" >&5
--echo "${ECHO_T}$fu_cv_sys_truncating_statfs" >&6
-+ { echo "$as_me:$LINENO: result: $fu_cv_sys_truncating_statfs" >&5
-+echo "${ECHO_T}$fu_cv_sys_truncating_statfs" >&6; }
-
-
- fi
-
-
-- echo "$as_me:$LINENO: checking for struct statfs.f_fstypename" >&5
--echo $ECHO_N "checking for struct statfs.f_fstypename... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for struct statfs.f_fstypename" >&5
-+echo $ECHO_N "checking for struct statfs.f_fstypename... $ECHO_C" >&6; }
- if test "${ac_cv_member_struct_statfs_f_fstypename+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -17728,27 +18277,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_statfs_f_fstypename=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -17777,27 +18321,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_statfs_f_fstypename=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -17805,12 +18344,14 @@
-
- ac_cv_member_struct_statfs_f_fstypename=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_member_struct_statfs_f_fstypename" >&5
--echo "${ECHO_T}$ac_cv_member_struct_statfs_f_fstypename" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_statfs_f_fstypename" >&5
-+echo "${ECHO_T}$ac_cv_member_struct_statfs_f_fstypename" >&6; }
- if test $ac_cv_member_struct_statfs_f_fstypename = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -17824,8 +18365,8 @@
-
-
-
--echo "$as_me:$LINENO: checking for mode_t" >&5
--echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for mode_t" >&5
-+echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_mode_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -17836,39 +18377,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef mode_t ac__type_new_;
- int
- main ()
- {
--if ((mode_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (mode_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_mode_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -17876,10 +18413,11 @@
-
- ac_cv_type_mode_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
--echo "${ECHO_T}$ac_cv_type_mode_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
-+echo "${ECHO_T}$ac_cv_type_mode_t" >&6; }
- if test $ac_cv_type_mode_t = yes; then
- :
- else
-@@ -17890,8 +18428,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for off_t" >&5
--echo $ECHO_N "checking for off_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for off_t" >&5
-+echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_off_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -17902,39 +18440,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef off_t ac__type_new_;
- int
- main ()
- {
--if ((off_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (off_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_off_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -17942,10 +18476,11 @@
-
- ac_cv_type_off_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
--echo "${ECHO_T}$ac_cv_type_off_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-+echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
- if test $ac_cv_type_off_t = yes; then
- :
- else
-@@ -17956,8 +18491,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for pid_t" >&5
--echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for pid_t" >&5
-+echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_pid_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -17968,39 +18503,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef pid_t ac__type_new_;
- int
- main ()
- {
--if ((pid_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (pid_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_pid_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -18008,10 +18539,11 @@
-
- ac_cv_type_pid_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
--echo "${ECHO_T}$ac_cv_type_pid_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-+echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }
- if test $ac_cv_type_pid_t = yes; then
- :
- else
-@@ -18022,8 +18554,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
--echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
-+echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }
- if test "${ac_cv_type_uid_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -18045,8 +18577,8 @@
- rm -f conftest*
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
--echo "${ECHO_T}$ac_cv_type_uid_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-+echo "${ECHO_T}$ac_cv_type_uid_t" >&6; }
- if test $ac_cv_type_uid_t = no; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -18060,8 +18592,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for nlink_t" >&5
--echo $ECHO_N "checking for nlink_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for nlink_t" >&5
-+echo $ECHO_N "checking for nlink_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_nlink_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -18072,39 +18604,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef nlink_t ac__type_new_;
- int
- main ()
- {
--if ((nlink_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (nlink_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_nlink_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -18112,10 +18640,11 @@
-
- ac_cv_type_nlink_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_nlink_t" >&5
--echo "${ECHO_T}$ac_cv_type_nlink_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_nlink_t" >&5
-+echo "${ECHO_T}$ac_cv_type_nlink_t" >&6; }
- if test $ac_cv_type_nlink_t = yes; then
- :
- else
-@@ -18126,8 +18655,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for socklen_t" >&5
--echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for socklen_t" >&5
-+echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_socklen_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -18142,39 +18671,35 @@
- #include <sys/socket.h>
-
-
-+typedef socklen_t ac__type_new_;
- int
- main ()
- {
--if ((socklen_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (socklen_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_socklen_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -18182,10 +18707,11 @@
-
- ac_cv_type_socklen_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
--echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
-+echo "${ECHO_T}$ac_cv_type_socklen_t" >&6; }
- if test $ac_cv_type_socklen_t = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -18196,8 +18722,8 @@
- fi
-
-
--echo "$as_me:$LINENO: checking for uintptr_t" >&5
--echo $ECHO_N "checking for uintptr_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for uintptr_t" >&5
-+echo $ECHO_N "checking for uintptr_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_uintptr_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -18208,39 +18734,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef uintptr_t ac__type_new_;
- int
- main ()
- {
--if ((uintptr_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (uintptr_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_uintptr_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -18248,10 +18770,11 @@
-
- ac_cv_type_uintptr_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5
--echo "${ECHO_T}$ac_cv_type_uintptr_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5
-+echo "${ECHO_T}$ac_cv_type_uintptr_t" >&6; }
- if test $ac_cv_type_uintptr_t = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -18264,8 +18787,8 @@
-
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
--echo "$as_me:$LINENO: checking for working alloca.h" >&5
--echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for working alloca.h" >&5
-+echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; }
- if test "${ac_cv_working_alloca_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -18280,32 +18803,29 @@
- main ()
- {
- char *p = (char *) alloca (2 * sizeof (int));
-+ if (p) return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_working_alloca_h=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -18313,11 +18833,12 @@
-
- ac_cv_working_alloca_h=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
--echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-+echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; }
- if test $ac_cv_working_alloca_h = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -18326,8 +18847,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for alloca" >&5
--echo $ECHO_N "checking for alloca... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for alloca" >&5
-+echo $ECHO_N "checking for alloca... $ECHO_C" >&6; }
- if test "${ac_cv_func_alloca_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -18344,7 +18865,7 @@
- # include <malloc.h>
- # define alloca _alloca
- # else
--# if HAVE_ALLOCA_H
-+# ifdef HAVE_ALLOCA_H
- # include <alloca.h>
- # else
- # ifdef _AIX
-@@ -18362,32 +18883,29 @@
- main ()
- {
- char *p = (char *) alloca (1);
-+ if (p) return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_alloca_works=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -18395,11 +18913,12 @@
-
- ac_cv_func_alloca_works=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
--echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-+echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; }
-
- if test $ac_cv_func_alloca_works = yes; then
-
-@@ -18413,15 +18932,15 @@
- # contain a buggy version. If you still want to use their alloca,
- # use ar to extract alloca.o from them instead of compiling alloca.c.
-
--ALLOCA=alloca.$ac_objext
-+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-
- cat >>confdefs.h <<\_ACEOF
- #define C_ALLOCA 1
- _ACEOF
-
-
--echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
--echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-+echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; }
- if test "${ac_cv_os_cray+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -18431,7 +18950,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#if defined(CRAY) && ! defined(CRAY2)
-+#if defined CRAY && ! defined CRAY2
- webecray
- #else
- wenotbecray
-@@ -18447,14 +18966,14 @@
- rm -f conftest*
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
--echo "${ECHO_T}$ac_cv_os_cray" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-+echo "${ECHO_T}$ac_cv_os_cray" >&6; }
- if test $ac_cv_os_cray = yes; then
- for ac_func in _getb67 GETB67 getb67; do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -18480,56 +18999,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -18537,11 +19046,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -18554,8 +19065,8 @@
- done
- fi
-
--echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
--echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-+echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; }
- if test "${ac_cv_c_stack_direction+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -18568,6 +19079,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+$ac_includes_default
- int
- find_stack_direction ()
- {
-@@ -18585,17 +19097,26 @@
- int
- main ()
- {
-- exit (find_stack_direction () < 0);
-+ return find_stack_direction () < 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -18608,11 +19129,13 @@
- ( exit $ac_status )
- ac_cv_c_stack_direction=-1
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
--echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-+echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; }
-
- cat >>confdefs.h <<_ACEOF
- #define STACK_DIRECTION $ac_cv_c_stack_direction
-@@ -18621,8 +19144,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for working strcoll" >&5
--echo $ECHO_N "checking for working strcoll... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for working strcoll" >&5
-+echo $ECHO_N "checking for working strcoll... $ECHO_C" >&6; }
- if test "${ac_cv_func_strcoll_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -18639,7 +19162,7 @@
- int
- main ()
- {
--exit (strcoll ("abc", "def") >= 0 ||
-+return (strcoll ("abc", "def") >= 0 ||
- strcoll ("ABC", "DEF") >= 0 ||
- strcoll ("123", "456") >= 0)
- ;
-@@ -18647,13 +19170,22 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -18666,11 +19198,13 @@
- ( exit $ac_status )
- ac_cv_func_strcoll_works=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_strcoll_works" >&5
--echo "${ECHO_T}$ac_cv_func_strcoll_works" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_strcoll_works" >&5
-+echo "${ECHO_T}$ac_cv_func_strcoll_works" >&6; }
- if test $ac_cv_func_strcoll_works = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -18681,44 +19215,49 @@
-
-
-
--echo "$as_me:$LINENO: checking for X" >&5
--echo $ECHO_N "checking for X... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for X" >&5
-+echo $ECHO_N "checking for X... $ECHO_C" >&6; }
-
-
--# Check whether --with-x or --without-x was given.
-+# Check whether --with-x was given.
- if test "${with_x+set}" = set; then
-- withval="$with_x"
-+ withval=$with_x;
-+fi
-
--fi;
- # $have_x is `yes', `no', `disabled', or empty when we do not yet know.
- if test "x$with_x" = xno; then
- # The user explicitly disabled X.
- have_x=disabled
- else
-- if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
-- # Both variables are already set.
-- have_x=yes
-- else
-- if test "${ac_cv_have_x+set}" = set; then
-+ case $x_includes,$x_libraries in #(
-+ *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
-+echo "$as_me: error: Cannot use X directory names containing '" >&2;}
-+ { (exit 1); exit 1; }; };; #(
-+ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- # One or both of the vars are not set, and there is no cached value.
- ac_x_includes=no ac_x_libraries=no
--rm -fr conftest.dir
-+rm -f -r conftest.dir
- if mkdir conftest.dir; then
- cd conftest.dir
-- # Make sure to not put "make" in the Imakefile rules, since we grep it out.
- cat >Imakefile <<'_ACEOF'
--acfindx:
-- @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-+incroot:
-+ @echo incroot='${INCROOT}'
-+usrlibdir:
-+ @echo usrlibdir='${USRLIBDIR}'
-+libdir:
-+ @echo libdir='${LIBDIR}'
- _ACEOF
-- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-+ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
-+ for ac_var in incroot usrlibdir libdir; do
-+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
-+ done
- # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
- for ac_extension in a so sl; do
-- if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-- test -f $ac_im_libdir/libX11.$ac_extension; then
-+ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
-+ test -f "$ac_im_libdir/libX11.$ac_extension"; then
- ac_im_usrlibdir=$ac_im_libdir; break
- fi
- done
-@@ -18726,7 +19265,7 @@
- # bogus both because they are the default anyway, and because
- # using them would break gcc on systems where it needs fixed includes.
- case $ac_im_incroot in
-- /usr/include) ;;
-+ /usr/include) ac_x_includes= ;;
- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
- esac
- case $ac_im_usrlibdir in
-@@ -18735,7 +19274,7 @@
- esac
- fi
- cd ..
-- rm -fr conftest.dir
-+ rm -f -r conftest.dir
- fi
-
- # Standard set of common directories for X headers.
-@@ -18786,24 +19325,22 @@
- /* end confdefs.h. */
- #include <X11/Xlib.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- # We can compile using X headers with no special include directory.
- ac_x_includes=
- else
-@@ -18817,6 +19354,7 @@
- fi
- done
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- fi # $ac_x_includes = no
-
-@@ -18842,27 +19380,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- LIBS=$ac_save_LIBS
- # We can link X programs with no special library path.
- ac_x_libraries=
-@@ -18875,34 +19409,38 @@
- do
- # Don't even attempt the hair of trying to link an X program!
- for ac_extension in a so sl; do
-- if test -r $ac_dir/libXt.$ac_extension; then
-+ if test -r "$ac_dir/libX11.$ac_extension"; then
- ac_x_libraries=$ac_dir
- break 2
- fi
- done
- done
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi # $ac_x_libraries = no
-
--if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
-- # Didn't find X anywhere. Cache the known absence of X.
-- ac_cv_have_x="have_x=no"
--else
-+case $ac_x_includes,$ac_x_libraries in #(
-+ no,* | *,no | *\'*)
-+ # Didn't find X, or a directory has "'" in its name.
-+ ac_cv_have_x="have_x=no";; #(
-+ *)
- # Record where we found X for the cache.
- ac_cv_have_x="have_x=yes \
-- ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
--fi
--fi
--
-+ ac_x_includes='$ac_x_includes'\
-+ ac_x_libraries='$ac_x_libraries'"
-+esac
- fi
-+;; #(
-+ *) have_x=yes;;
-+ esac
- eval "$ac_cv_have_x"
- fi # $with_x != no
-
- if test "$have_x" != yes; then
-- echo "$as_me:$LINENO: result: $have_x" >&5
--echo "${ECHO_T}$have_x" >&6
-+ { echo "$as_me:$LINENO: result: $have_x" >&5
-+echo "${ECHO_T}$have_x" >&6; }
- no_x=yes
- else
- # If each of the values was on the command line, it overrides each guess.
-@@ -18910,9 +19448,10 @@
- test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
- # Update the cache value to reflect the command line values.
- ac_cv_have_x="have_x=yes \
-- ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-- echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
--echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
-+ ac_x_includes='$x_includes'\
-+ ac_x_libraries='$x_libraries'"
-+ { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }
- fi
-
- if test "$no_x" = yes; then
-@@ -18933,11 +19472,11 @@
- X_LIBS="$X_LIBS -L$x_libraries"
- # For Solaris; some versions of Sun CC require a space after -R and
- # others require no space. Words are not sufficient . . . .
-- case `(uname -sr) 2>/dev/null` in
-- "SunOS 5"*)
-- echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
--echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-+echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-+ ac_xsave_c_werror_flag=$ac_c_werror_flag
-+ ac_c_werror_flag=yes
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -18954,41 +19493,30 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_R_nospace=yes
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ X_LIBS="$X_LIBS -R$x_libraries"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_R_nospace=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-- if test $ac_R_nospace = yes; then
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-- X_LIBS="$X_LIBS -R$x_libraries"
-- else
- LIBS="$ac_xsave_LIBS -R $x_libraries"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -19006,47 +19534,42 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_R_space=yes
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ X_LIBS="$X_LIBS -R $x_libraries"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_R_space=no
-+ { echo "$as_me:$LINENO: result: neither works" >&5
-+echo "${ECHO_T}neither works" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-- if test $ac_R_space = yes; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-- X_LIBS="$X_LIBS -R $x_libraries"
-- else
-- echo "$as_me:$LINENO: result: neither works" >&5
--echo "${ECHO_T}neither works" >&6
-- fi
- fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+ ac_c_werror_flag=$ac_xsave_c_werror_flag
- LIBS=$ac_xsave_LIBS
-- esac
- fi
-
- # Check for system-dependent libraries X programs must link with.
-@@ -19067,50 +19590,46 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char XOpenDisplay ();
- int
- main ()
- {
--XOpenDisplay ();
-+return XOpenDisplay ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- :
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
--echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -19123,43 +19642,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char dnet_ntoa ();
- int
- main ()
- {
--dnet_ntoa ();
-+return dnet_ntoa ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dnet_dnet_ntoa=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -19167,19 +19682,20 @@
-
- ac_cv_lib_dnet_dnet_ntoa=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
--echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
- if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
- fi
-
- if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-- echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
--echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -19192,43 +19708,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char dnet_ntoa ();
- int
- main ()
- {
--dnet_ntoa ();
-+return dnet_ntoa ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dnet_stub_dnet_ntoa=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -19236,19 +19748,21 @@
-
- ac_cv_lib_dnet_stub_dnet_ntoa=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
--echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
- if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
- fi
-
- fi
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_xsave_LIBS"
-
-@@ -19260,8 +19774,8 @@
- # on Irix 5.2, according to T.E. Dickey.
- # The functions gethostbyname, getservbyname, and inet_addr are
- # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-- echo "$as_me:$LINENO: checking for gethostbyname" >&5
--echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for gethostbyname" >&5
-+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }
- if test "${ac_cv_func_gethostbyname+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -19288,56 +19802,46 @@
-
- #undef gethostbyname
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char gethostbyname ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
-+#if defined __stub_gethostbyname || defined __stub___gethostbyname
- choke me
--#else
--char (*f) () = gethostbyname;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != gethostbyname;
-+return gethostbyname ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_gethostbyname=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -19345,15 +19849,16 @@
-
- ac_cv_func_gethostbyname=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
-
- if test $ac_cv_func_gethostbyname = no; then
-- echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
--echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -19366,43 +19871,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char gethostbyname ();
- int
- main ()
- {
--gethostbyname ();
-+return gethostbyname ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_nsl_gethostbyname=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -19410,19 +19911,20 @@
-
- ac_cv_lib_nsl_gethostbyname=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
- if test $ac_cv_lib_nsl_gethostbyname = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
- fi
-
- if test $ac_cv_lib_nsl_gethostbyname = no; then
-- echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
--echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-+echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
- if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -19435,43 +19937,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char gethostbyname ();
- int
- main ()
- {
--gethostbyname ();
-+return gethostbyname ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_bsd_gethostbyname=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -19479,12 +19977,13 @@
-
- ac_cv_lib_bsd_gethostbyname=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
- if test $ac_cv_lib_bsd_gethostbyname = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
- fi
-@@ -19499,8 +19998,8 @@
- # variants that don't use the name server (or something). -lsocket
- # must be given before -lnsl if both are needed. We assume that
- # if connect needs -lnsl, so does gethostbyname.
-- echo "$as_me:$LINENO: checking for connect" >&5
--echo $ECHO_N "checking for connect... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for connect" >&5
-+echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
- if test "${ac_cv_func_connect+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -19527,56 +20026,46 @@
-
- #undef connect
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char connect ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_connect) || defined (__stub___connect)
-+#if defined __stub_connect || defined __stub___connect
- choke me
--#else
--char (*f) () = connect;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != connect;
-+return connect ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_connect=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -19584,15 +20073,16 @@
-
- ac_cv_func_connect=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
--echo "${ECHO_T}$ac_cv_func_connect" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_connect" >&6; }
-
- if test $ac_cv_func_connect = no; then
-- echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
--echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
- if test "${ac_cv_lib_socket_connect+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -19605,43 +20095,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char connect ();
- int
- main ()
- {
--connect ();
-+return connect ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_socket_connect=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -19649,12 +20135,13 @@
-
- ac_cv_lib_socket_connect=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
--echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
- if test $ac_cv_lib_socket_connect = yes; then
- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
- fi
-@@ -19662,8 +20149,8 @@
- fi
-
- # Guillermo Gomez says -lposix is necessary on A/UX.
-- echo "$as_me:$LINENO: checking for remove" >&5
--echo $ECHO_N "checking for remove... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for remove" >&5
-+echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
- if test "${ac_cv_func_remove+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -19690,56 +20177,46 @@
-
- #undef remove
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char remove ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_remove) || defined (__stub___remove)
-+#if defined __stub_remove || defined __stub___remove
- choke me
--#else
--char (*f) () = remove;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != remove;
-+return remove ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_remove=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -19747,15 +20224,16 @@
-
- ac_cv_func_remove=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
--echo "${ECHO_T}$ac_cv_func_remove" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-+echo "${ECHO_T}$ac_cv_func_remove" >&6; }
-
- if test $ac_cv_func_remove = no; then
-- echo "$as_me:$LINENO: checking for remove in -lposix" >&5
--echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
- if test "${ac_cv_lib_posix_remove+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -19768,43 +20246,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char remove ();
- int
- main ()
- {
--remove ();
-+return remove ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_posix_remove=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -19812,12 +20286,13 @@
-
- ac_cv_lib_posix_remove=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
--echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
- if test $ac_cv_lib_posix_remove = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
- fi
-@@ -19825,8 +20300,8 @@
- fi
-
- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-- echo "$as_me:$LINENO: checking for shmat" >&5
--echo $ECHO_N "checking for shmat... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for shmat" >&5
-+echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
- if test "${ac_cv_func_shmat+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -19853,56 +20328,46 @@
-
- #undef shmat
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char shmat ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_shmat) || defined (__stub___shmat)
-+#if defined __stub_shmat || defined __stub___shmat
- choke me
--#else
--char (*f) () = shmat;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != shmat;
-+return shmat ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_shmat=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -19910,15 +20375,16 @@
-
- ac_cv_func_shmat=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
--echo "${ECHO_T}$ac_cv_func_shmat" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-+echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
-
- if test $ac_cv_func_shmat = no; then
-- echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
--echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ipc_shmat+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -19931,43 +20397,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char shmat ();
- int
- main ()
- {
--shmat ();
-+return shmat ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_ipc_shmat=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -19975,12 +20437,13 @@
-
- ac_cv_lib_ipc_shmat=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
--echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-+echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
- if test $ac_cv_lib_ipc_shmat = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
- fi
-@@ -19997,8 +20460,8 @@
- # These have to be linked with before -lX11, unlike the other
- # libraries we check for below, so use a different variable.
- # John Interrante, Karl Berry
-- echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
--echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -20011,43 +20474,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char IceConnectionNumber ();
- int
- main ()
- {
--IceConnectionNumber ();
-+return IceConnectionNumber ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_ICE_IceConnectionNumber=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -20055,12 +20514,13 @@
-
- ac_cv_lib_ICE_IceConnectionNumber=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
--echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
- if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
- X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
- fi
-@@ -20121,13 +20581,12 @@
-
-
-
--echo "$as_me:$LINENO: checking for library containing socket" >&5
--echo $ECHO_N "checking for library containing socket... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for library containing socket" >&5
-+echo $ECHO_N "checking for library containing socket... $ECHO_C" >&6; }
- if test "${ac_cv_search_socket+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_func_search_save_LIBS=$LIBS
--ac_cv_search_socket=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -20135,125 +20594,82 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char socket ();
- int
- main ()
- {
--socket ();
-+return socket ();
- ;
- return 0;
- }
- _ACEOF
-+for ac_lib in '' socket; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_socket="none required"
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_search_socket=$ac_res
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_socket" = no; then
-- for ac_lib in socket; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char socket ();
--int
--main ()
--{
--socket ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_socket="-l$ac_lib"
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_socket+set}" = set; then
- break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
- done
-+if test "${ac_cv_search_socket+set}" = set; then
-+ :
-+else
-+ ac_cv_search_socket=no
- fi
-+rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_search_socket" >&5
--echo "${ECHO_T}$ac_cv_search_socket" >&6
--if test "$ac_cv_search_socket" != no; then
-- test "$ac_cv_search_socket" = "none required" || LIBS="$ac_cv_search_socket $LIBS"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_socket" >&5
-+echo "${ECHO_T}$ac_cv_search_socket" >&6; }
-+ac_res=$ac_cv_search_socket
-+if test "$ac_res" != no; then
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
- fi
-
--echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
--echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
-+echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6; }
- if test "${ac_cv_search_gethostbyname+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_func_search_save_LIBS=$LIBS
--ac_cv_search_gethostbyname=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -20261,121 +20677,79 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char gethostbyname ();
- int
- main ()
- {
--gethostbyname ();
-+return gethostbyname ();
- ;
- return 0;
- }
- _ACEOF
-+for ac_lib in '' nsl; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_gethostbyname="none required"
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_search_gethostbyname=$ac_res
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_gethostbyname" = no; then
-- for ac_lib in nsl; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char gethostbyname ();
--int
--main ()
--{
--gethostbyname ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_gethostbyname="-l$ac_lib"
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_gethostbyname+set}" = set; then
- break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
- done
-+if test "${ac_cv_search_gethostbyname+set}" = set; then
-+ :
-+else
-+ ac_cv_search_gethostbyname=no
- fi
-+rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_search_gethostbyname" >&6
--if test "$ac_cv_search_gethostbyname" != no; then
-- test "$ac_cv_search_gethostbyname" = "none required" || LIBS="$ac_cv_search_gethostbyname $LIBS"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_search_gethostbyname" >&6; }
-+ac_res=$ac_cv_search_gethostbyname
-+if test "$ac_res" != no; then
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
- fi
-
-
--echo "$as_me:$LINENO: checking for get_process_stats in -lseq" >&5
--echo $ECHO_N "checking for get_process_stats in -lseq... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for get_process_stats in -lseq" >&5
-+echo $ECHO_N "checking for get_process_stats in -lseq... $ECHO_C" >&6; }
- if test "${ac_cv_lib_seq_get_process_stats+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -20388,43 +20762,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char get_process_stats ();
- int
- main ()
- {
--get_process_stats ();
-+return get_process_stats ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_seq_get_process_stats=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -20432,12 +20802,13 @@
-
- ac_cv_lib_seq_get_process_stats=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_seq_get_process_stats" >&5
--echo "${ECHO_T}$ac_cv_lib_seq_get_process_stats" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_seq_get_process_stats" >&5
-+echo "${ECHO_T}$ac_cv_lib_seq_get_process_stats" >&6; }
- if test $ac_cv_lib_seq_get_process_stats = yes; then
-
- LIBS="$LIBS -lseq"
-@@ -20452,19 +20823,19 @@
-
- use_vfs=yes
-
--# Check whether --with-vfs or --without-vfs was given.
-+# Check whether --with-vfs was given.
- if test "${with_vfs+set}" = set; then
-- withval="$with_vfs"
-- use_vfs=$withval
-+ withval=$with_vfs; use_vfs=$withval
-+
-+fi
-
--fi;
- case $use_vfs in
- yes)
-
- # Extract the first word of "zip", so it can be a program name with args.
- set dummy zip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_ZIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -20479,32 +20850,33 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_path_ZIP" && ac_cv_path_ZIP="/usr/bin/zip"
- ;;
- esac
- fi
- ZIP=$ac_cv_path_ZIP
--
- if test -n "$ZIP"; then
-- echo "$as_me:$LINENO: result: $ZIP" >&5
--echo "${ECHO_T}$ZIP" >&6
-+ { echo "$as_me:$LINENO: result: $ZIP" >&5
-+echo "${ECHO_T}$ZIP" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- # Extract the first word of "unzip", so it can be a program name with args.
- set dummy unzip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_UNZIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -20519,30 +20891,31 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_UNZIP="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_path_UNZIP" && ac_cv_path_UNZIP="/usr/bin/unzip"
- ;;
- esac
- fi
- UNZIP=$ac_cv_path_UNZIP
--
- if test -n "$UNZIP"; then
-- echo "$as_me:$LINENO: result: $UNZIP" >&5
--echo "${ECHO_T}$UNZIP" >&6
-+ { echo "$as_me:$LINENO: result: $UNZIP" >&5
-+echo "${ECHO_T}$UNZIP" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- echo "$as_me:$LINENO: checking for zipinfo code in unzip" >&5
--echo $ECHO_N "checking for zipinfo code in unzip... $ECHO_C" >&6
-+
-+ { echo "$as_me:$LINENO: checking for zipinfo code in unzip" >&5
-+echo $ECHO_N "checking for zipinfo code in unzip... $ECHO_C" >&6; }
- if test "${mc_cv_have_zipinfo+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -20551,8 +20924,8 @@
- mc_cv_have_zipinfo=yes
- fi
- fi
--echo "$as_me:$LINENO: result: $mc_cv_have_zipinfo" >&5
--echo "${ECHO_T}$mc_cv_have_zipinfo" >&6
-+{ echo "$as_me:$LINENO: result: $mc_cv_have_zipinfo" >&5
-+echo "${ECHO_T}$mc_cv_have_zipinfo" >&6; }
- if test "x$mc_cv_have_zipinfo" = xyes; then
- HAVE_ZIPINFO=1
- else
-@@ -20561,8 +20934,8 @@
-
- # Extract the first word of "perl", so it can be a program name with args.
- set dummy perl; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_PERL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -20577,47 +20950,47 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="/usr/bin/perl"
- ;;
- esac
- fi
- PERL=$ac_cv_path_PERL
--
- if test -n "$PERL"; then
-- echo "$as_me:$LINENO: result: $PERL" >&5
--echo "${ECHO_T}$PERL" >&6
-+ { echo "$as_me:$LINENO: result: $PERL" >&5
-+echo "${ECHO_T}$PERL" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-
-+
- vfs_flags="cpiofs, extfs, tarfs"
- use_net_code=false
-
-- # Check whether --enable-netcode or --disable-netcode was given.
-+ # Check whether --enable-netcode was given.
- if test "${enable_netcode+set}" = set; then
-- enableval="$enable_netcode"
-+ enableval=$enable_netcode;
-+fi
-
--fi;
-
- if test "x$enable_netcode" != xno; then
-- echo "$as_me:$LINENO: checking for library containing socket" >&5
--echo $ECHO_N "checking for library containing socket... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for library containing socket" >&5
-+echo $ECHO_N "checking for library containing socket... $ECHO_C" >&6; }
- if test "${ac_cv_search_socket+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_func_search_save_LIBS=$LIBS
--ac_cv_search_socket=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -20625,126 +20998,83 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char socket ();
- int
- main ()
- {
--socket ();
-+return socket ();
- ;
- return 0;
- }
- _ACEOF
-+for ac_lib in '' xnet bsd socket inet; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_socket="none required"
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_search_socket=$ac_res
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_socket" = no; then
-- for ac_lib in xnet bsd socket inet; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char socket ();
--int
--main ()
--{
--socket ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_socket="-l$ac_lib"
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_socket+set}" = set; then
- break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
- done
-+if test "${ac_cv_search_socket+set}" = set; then
-+ :
-+else
-+ ac_cv_search_socket=no
- fi
-+rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_search_socket" >&5
--echo "${ECHO_T}$ac_cv_search_socket" >&6
--if test "$ac_cv_search_socket" != no; then
-- test "$ac_cv_search_socket" = "none required" || LIBS="$ac_cv_search_socket $LIBS"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_socket" >&5
-+echo "${ECHO_T}$ac_cv_search_socket" >&6; }
-+ac_res=$ac_cv_search_socket
-+if test "$ac_res" != no; then
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- have_socket=yes
- fi
-
- if test x$have_socket = xyes; then
-- echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
--echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
-+echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6; }
- if test "${ac_cv_search_gethostbyname+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_func_search_save_LIBS=$LIBS
--ac_cv_search_gethostbyname=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -20752,120 +21082,78 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char gethostbyname ();
- int
- main ()
- {
--gethostbyname ();
-+return gethostbyname ();
- ;
- return 0;
- }
- _ACEOF
-+for ac_lib in '' bsd socket inet netinet; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_gethostbyname="none required"
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_search_gethostbyname=$ac_res
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_gethostbyname" = no; then
-- for ac_lib in bsd socket inet netinet; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char gethostbyname ();
--int
--main ()
--{
--gethostbyname ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_gethostbyname="-l$ac_lib"
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_gethostbyname+set}" = set; then
- break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
- done
-+if test "${ac_cv_search_gethostbyname+set}" = set; then
-+ :
-+else
-+ ac_cv_search_gethostbyname=no
- fi
-+rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_search_gethostbyname" >&6
--if test "$ac_cv_search_gethostbyname" != no; then
-- test "$ac_cv_search_gethostbyname" = "none required" || LIBS="$ac_cv_search_gethostbyname $LIBS"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_search_gethostbyname" >&6; }
-+ac_res=$ac_cv_search_gethostbyname
-+if test "$ac_res" != no; then
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
- fi
-
-- echo "$as_me:$LINENO: checking for struct linger.l_linger" >&5
--echo $ECHO_N "checking for struct linger.l_linger... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for struct linger.l_linger" >&5
-+echo $ECHO_N "checking for struct linger.l_linger... $ECHO_C" >&6; }
- if test "${ac_cv_member_struct_linger_l_linger+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -20891,27 +21179,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_linger_l_linger=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -20939,27 +21222,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_linger_l_linger=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -20967,12 +21245,14 @@
-
- ac_cv_member_struct_linger_l_linger=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_member_struct_linger_l_linger" >&5
--echo "${ECHO_T}$ac_cv_member_struct_linger_l_linger" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_linger_l_linger" >&5
-+echo "${ECHO_T}$ac_cv_member_struct_linger_l_linger" >&6; }
- if test $ac_cv_member_struct_linger_l_linger = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -20986,9 +21266,9 @@
- for ac_func in pmap_set
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -21014,56 +21294,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -21071,11 +21341,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -21083,8 +21355,8 @@
-
- else
-
-- echo "$as_me:$LINENO: checking for pmap_set in -lrpc" >&5
--echo $ECHO_N "checking for pmap_set in -lrpc... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for pmap_set in -lrpc" >&5
-+echo $ECHO_N "checking for pmap_set in -lrpc... $ECHO_C" >&6; }
- if test "${ac_cv_lib_rpc_pmap_set+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -21097,43 +21369,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char pmap_set ();
- int
- main ()
- {
--pmap_set ();
-+return pmap_set ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_rpc_pmap_set=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -21141,12 +21409,13 @@
-
- ac_cv_lib_rpc_pmap_set=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_rpc_pmap_set" >&5
--echo "${ECHO_T}$ac_cv_lib_rpc_pmap_set" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_rpc_pmap_set" >&5
-+echo "${ECHO_T}$ac_cv_lib_rpc_pmap_set" >&6; }
- if test $ac_cv_lib_rpc_pmap_set = yes; then
-
- LIBS="-lrpc $LIBS"
-@@ -21166,9 +21435,9 @@
- for ac_func in pmap_getport pmap_getmaps rresvport
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -21194,56 +21463,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -21251,11 +21510,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -21268,9 +21529,9 @@
- for ac_header in rpc/pmap_clnt.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -21290,27 +21551,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -21318,10 +21574,12 @@
-
- eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -21332,10 +21590,9 @@
- done
-
-
--# Check whether --with-mcfs or --without-mcfs was given.
-+# Check whether --with-mcfs was given.
- if test "${with_mcfs+set}" = set; then
-- withval="$with_mcfs"
-- if test "x$withval" != "xno"; then
-+ withval=$with_mcfs; if test "x$withval" != "xno"; then
-
- cat >>confdefs.h <<\_ACEOF
- #define WITH_MCFS 1
-@@ -21345,8 +21602,8 @@
- use_mcfs=yes
-
-
-- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -21359,43 +21616,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char dlopen ();
- int
- main ()
- {
--dlopen ();
-+return dlopen ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dl_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -21403,18 +21656,19 @@
-
- ac_cv_lib_dl_dlopen=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
- LIB_DL="-ldl"
- fi
-
-- echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
--echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
-+echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6; }
- if test "${ac_cv_lib_pam_pam_start+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -21427,43 +21681,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char pam_start ();
- int
- main ()
- {
--pam_start ();
-+return pam_start ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_pam_pam_start=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -21471,12 +21721,13 @@
-
- ac_cv_lib_pam_pam_start=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5
--echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5
-+echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6; }
- if test $ac_cv_lib_pam_pam_start = yes; then
-
-
-@@ -21495,9 +21746,9 @@
- for ac_func in pwdauth
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -21523,56 +21774,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -21580,11 +21821,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -21598,18 +21841,19 @@
- for ac_header in crypt.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -21620,27 +21864,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -21648,13 +21887,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -21663,24 +21903,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -21688,9 +21926,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -21714,25 +21953,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -21747,13 +21980,12 @@
- if test -n "$crypt_header"; then
- save_LIBS="$LIBS"
- LIBS=
-- echo "$as_me:$LINENO: checking for library containing crypt" >&5
--echo $ECHO_N "checking for library containing crypt... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for library containing crypt" >&5
-+echo $ECHO_N "checking for library containing crypt... $ECHO_C" >&6; }
- if test "${ac_cv_search_crypt+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_func_search_save_LIBS=$LIBS
--ac_cv_search_crypt=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -21761,115 +21993,73 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char crypt ();
- int
- main ()
- {
--crypt ();
-+return crypt ();
- ;
- return 0;
- }
- _ACEOF
-+for ac_lib in '' crypt crypt_i; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_crypt="none required"
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_search_crypt=$ac_res
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_crypt" = no; then
-- for ac_lib in crypt crypt_i; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char crypt ();
--int
--main ()
--{
--crypt ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_crypt="-l$ac_lib"
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_crypt+set}" = set; then
- break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
- done
-+if test "${ac_cv_search_crypt+set}" = set; then
-+ :
-+else
-+ ac_cv_search_crypt=no
- fi
-+rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
--echo "${ECHO_T}$ac_cv_search_crypt" >&6
--if test "$ac_cv_search_crypt" != no; then
-- test "$ac_cv_search_crypt" = "none required" || LIBS="$ac_cv_search_crypt $LIBS"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
-+echo "${ECHO_T}$ac_cv_search_crypt" >&6; }
-+ac_res=$ac_cv_search_crypt
-+if test "$ac_res" != no; then
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- mcserv_auth=crypt
- fi
-
-@@ -21887,18 +22077,19 @@
- for ac_header in shadow.h shadow/shadow.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -21909,27 +22100,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -21937,13 +22123,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -21952,24 +22139,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -21977,9 +22162,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -22003,25 +22189,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -22036,13 +22216,12 @@
- if test -n "$shadow_header"; then
- save_LIBS="$LIBS"
- LIBS="$MCSERVLIBS"
-- echo "$as_me:$LINENO: checking for library containing getspnam" >&5
--echo $ECHO_N "checking for library containing getspnam... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for library containing getspnam" >&5
-+echo $ECHO_N "checking for library containing getspnam... $ECHO_C" >&6; }
- if test "${ac_cv_search_getspnam+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_func_search_save_LIBS=$LIBS
--ac_cv_search_getspnam=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -22050,115 +22229,73 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char getspnam ();
- int
- main ()
- {
--getspnam ();
-+return getspnam ();
- ;
- return 0;
- }
- _ACEOF
-+for ac_lib in '' shadow; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_getspnam="none required"
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_search_getspnam=$ac_res
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_getspnam" = no; then
-- for ac_lib in shadow; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char getspnam ();
--int
--main ()
--{
--getspnam ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_getspnam="-l$ac_lib"
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_getspnam+set}" = set; then
- break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
- done
-+if test "${ac_cv_search_getspnam+set}" = set; then
-+ :
-+else
-+ ac_cv_search_getspnam=no
- fi
-+rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_search_getspnam" >&5
--echo "${ECHO_T}$ac_cv_search_getspnam" >&6
--if test "$ac_cv_search_getspnam" != no; then
-- test "$ac_cv_search_getspnam" = "none required" || LIBS="$ac_cv_search_getspnam $LIBS"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_getspnam" >&5
-+echo "${ECHO_T}$ac_cv_search_getspnam" >&6; }
-+ac_res=$ac_cv_search_getspnam
-+if test "$ac_res" != no; then
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- mcserv_auth=shadow
- fi
-
-@@ -22180,7 +22317,8 @@
-
- fi
-
--fi;
-+fi
-+
- vfs_flags="$vfs_flags, ftpfs, fish"
- use_net_code=true
- fi
-@@ -22188,10 +22326,9 @@
-
- use_smbfs=
-
--# Check whether --with-samba or --without-samba was given.
-+# Check whether --with-samba was given.
- if test "${with_samba+set}" = set; then
-- withval="$with_samba"
-- if test "x$withval" != "xno"; then
-+ withval=$with_samba; if test "x$withval" != "xno"; then
-
- cat >>confdefs.h <<\_ACEOF
- #define WITH_SMBFS 1
-@@ -22201,17 +22338,17 @@
- use_smbfs=yes
- fi
-
--fi;
-+fi
-+
-
- if test -n "$use_smbfs"; then
- #################################################
- # set Samba configuration directory location
- configdir="/etc"
-
--# Check whether --with-configdir or --without-configdir was given.
-+# Check whether --with-configdir was given.
- if test "${with_configdir+set}" = set; then
-- withval="$with_configdir"
-- case "$withval" in
-+ withval=$with_configdir; case "$withval" in
- yes|no)
- #
- # Just in case anybody does it
-@@ -22224,14 +22361,14 @@
- ;;
- esac
-
--fi;
-+fi
-
-
-
--# Check whether --with-codepagedir or --without-codepagedir was given.
-+
-+# Check whether --with-codepagedir was given.
- if test "${with_codepagedir+set}" = set; then
-- withval="$with_codepagedir"
-- case "$withval" in
-+ withval=$with_codepagedir; case "$withval" in
- yes|no)
- #
- # Just in case anybody does it
-@@ -22241,14 +22378,14 @@
- ;;
- esac
-
--fi;
- fi
-
-+ fi
-
--# Check whether --with-ext2undel or --without-ext2undel was given.
-+
-+# Check whether --with-ext2undel was given.
- if test "${with_ext2undel+set}" = set; then
-- withval="$with_ext2undel"
-- if test x$withval != xno; then
-+ withval=$with_ext2undel; if test x$withval != xno; then
- if test x$withval != xyes; then
- LDFLAGS="$LDFLAGS -L$withval/lib"
- CPPFLAGS="$CPPFLAGS -I$withval/include"
-@@ -22262,18 +22399,19 @@
- for ac_header in ext2fs/ext2_fs.h linux/ext2_fs.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -22284,27 +22422,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -22312,13 +22445,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -22327,24 +22461,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -22352,9 +22484,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -22378,25 +22511,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -22413,9 +22540,9 @@
- for ac_header in ext2fs/ext2fs.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -22437,27 +22564,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -22465,10 +22587,12 @@
-
- eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -22486,8 +22610,8 @@
-
- ext2fs_undel=yes
- EXT2FS_UNDEL_LIBS="-lext2fs -lcom_err"
-- echo "$as_me:$LINENO: checking for ext2_ino_t" >&5
--echo $ECHO_N "checking for ext2_ino_t... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for ext2_ino_t" >&5
-+echo $ECHO_N "checking for ext2_ino_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_ext2_ino_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -22511,39 +22635,35 @@
- #include <ext2fs/ext2fs.h>
-
-
-+typedef ext2_ino_t ac__type_new_;
- int
- main ()
- {
--if ((ext2_ino_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (ext2_ino_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_ext2_ino_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -22551,10 +22671,11 @@
-
- ac_cv_type_ext2_ino_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_ext2_ino_t" >&5
--echo "${ECHO_T}$ac_cv_type_ext2_ino_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_ext2_ino_t" >&5
-+echo "${ECHO_T}$ac_cv_type_ext2_ino_t" >&6; }
- if test $ac_cv_type_ext2_ino_t = yes; then
- :
- else
-@@ -22582,8 +22703,8 @@
- fi
- else
-
-- echo "$as_me:$LINENO: checking for ext2fs_close in -lext2fs" >&5
--echo $ECHO_N "checking for ext2fs_close in -lext2fs... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for ext2fs_close in -lext2fs" >&5
-+echo $ECHO_N "checking for ext2fs_close in -lext2fs... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ext2fs_ext2fs_close+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -22596,43 +22717,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char ext2fs_close ();
- int
- main ()
- {
--ext2fs_close ();
-+return ext2fs_close ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_ext2fs_ext2fs_close=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -22640,12 +22757,13 @@
-
- ac_cv_lib_ext2fs_ext2fs_close=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_ext2fs_ext2fs_close" >&5
--echo "${ECHO_T}$ac_cv_lib_ext2fs_ext2fs_close" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext2fs_ext2fs_close" >&5
-+echo "${ECHO_T}$ac_cv_lib_ext2fs_ext2fs_close" >&6; }
- if test $ac_cv_lib_ext2fs_ext2fs_close = yes; then
-
-
-@@ -22656,18 +22774,19 @@
- for ac_header in ext2fs/ext2_fs.h linux/ext2_fs.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -22678,27 +22797,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -22706,13 +22820,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -22721,24 +22836,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -22746,9 +22859,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -22772,25 +22886,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -22807,9 +22915,9 @@
- for ac_header in ext2fs/ext2fs.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -22831,27 +22939,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -22859,10 +22962,12 @@
-
- eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -22880,8 +22985,8 @@
-
- ext2fs_undel=yes
- EXT2FS_UNDEL_LIBS="-lext2fs -lcom_err"
-- echo "$as_me:$LINENO: checking for ext2_ino_t" >&5
--echo $ECHO_N "checking for ext2_ino_t... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for ext2_ino_t" >&5
-+echo $ECHO_N "checking for ext2_ino_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_ext2_ino_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -22905,39 +23010,35 @@
- #include <ext2fs/ext2fs.h>
-
-
-+typedef ext2_ino_t ac__type_new_;
- int
- main ()
- {
--if ((ext2_ino_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (ext2_ino_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_ext2_ino_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -22945,10 +23046,11 @@
-
- ac_cv_type_ext2_ino_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_ext2_ino_t" >&5
--echo "${ECHO_T}$ac_cv_type_ext2_ino_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_ext2_ino_t" >&5
-+echo "${ECHO_T}$ac_cv_type_ext2_ino_t" >&6; }
- if test $ac_cv_type_ext2_ino_t = yes; then
- :
- else
-@@ -22976,7 +23078,8 @@
- fi
-
-
--fi;
-+fi
-+
-
-
- cat >>confdefs.h <<\_ACEOF
-@@ -23005,17 +23108,17 @@
-
- mouse_lib="xterm only"
-
--# Check whether --with-gpm-mouse or --without-gpm-mouse was given.
-+# Check whether --with-gpm-mouse was given.
- if test "${with_gpm_mouse+set}" = set; then
-- withval="$with_gpm_mouse"
-+ withval=$with_gpm_mouse;
-+fi
-
--fi;
-
- case $host_os in
- linux*)
- if test x$with_gpm_mouse != xno; then
-- echo "$as_me:$LINENO: checking for Gpm_Repeat in -lgpm" >&5
--echo $ECHO_N "checking for Gpm_Repeat in -lgpm... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for Gpm_Repeat in -lgpm" >&5
-+echo $ECHO_N "checking for Gpm_Repeat in -lgpm... $ECHO_C" >&6; }
- if test "${ac_cv_lib_gpm_Gpm_Repeat+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23028,43 +23131,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char Gpm_Repeat ();
- int
- main ()
- {
--Gpm_Repeat ();
-+return Gpm_Repeat ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_gpm_Gpm_Repeat=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -23072,12 +23171,13 @@
-
- ac_cv_lib_gpm_Gpm_Repeat=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_gpm_Gpm_Repeat" >&5
--echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Repeat" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_gpm_Gpm_Repeat" >&5
-+echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Repeat" >&6; }
- if test $ac_cv_lib_gpm_Gpm_Repeat = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -23098,8 +23198,8 @@
-
- # Extract the first word of "nroff", so it can be a program name with args.
- set dummy nroff; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_HAVE_nroff+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23112,33 +23212,35 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_HAVE_nroff="true"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_prog_HAVE_nroff" && ac_cv_prog_HAVE_nroff="false"
- fi
- fi
- HAVE_nroff=$ac_cv_prog_HAVE_nroff
- if test -n "$HAVE_nroff"; then
-- echo "$as_me:$LINENO: result: $HAVE_nroff" >&5
--echo "${ECHO_T}$HAVE_nroff" >&6
-+ { echo "$as_me:$LINENO: result: $HAVE_nroff" >&5
-+echo "${ECHO_T}$HAVE_nroff" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-+
- MANDOC=-man
- MAN_FLAGS=
-
- if $HAVE_nroff; then
-- echo "$as_me:$LINENO: checking for manual formatting macros" >&5
--echo $ECHO_N "checking for manual formatting macros... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for manual formatting macros" >&5
-+echo $ECHO_N "checking for manual formatting macros... $ECHO_C" >&6; }
- if test "${mc_cv_mandoc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23153,11 +23255,11 @@
- fi
-
- MANDOC=$mc_cv_mandoc
-- echo "$as_me:$LINENO: result: $MANDOC" >&5
--echo "${ECHO_T}$MANDOC" >&6
-+ { echo "$as_me:$LINENO: result: $MANDOC" >&5
-+echo "${ECHO_T}$MANDOC" >&6; }
-
-- echo "$as_me:$LINENO: checking for option to disable ANSI color in manuals" >&5
--echo $ECHO_N "checking for option to disable ANSI color in manuals... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for option to disable ANSI color in manuals" >&5
-+echo $ECHO_N "checking for option to disable ANSI color in manuals... $ECHO_C" >&6; }
- if test "${mc_cv_man_nocolor+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23172,11 +23274,11 @@
- fi
-
- MAN_FLAGS=$mc_cv_man_nocolor
-- echo "$as_me:$LINENO: result: ${MAN_NOCOLOR-none}" >&5
--echo "${ECHO_T}${MAN_NOCOLOR-none}" >&6
-+ { echo "$as_me:$LINENO: result: ${MAN_NOCOLOR-none}" >&5
-+echo "${ECHO_T}${MAN_NOCOLOR-none}" >&6; }
-
-- echo "$as_me:$LINENO: checking if nroff accepts -Tlatin1 or -Tascii" >&5
--echo $ECHO_N "checking if nroff accepts -Tlatin1 or -Tascii... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking if nroff accepts -Tlatin1 or -Tascii" >&5
-+echo $ECHO_N "checking if nroff accepts -Tlatin1 or -Tascii... $ECHO_C" >&6; }
- if test "${mc_cv_nroff_tascii+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23194,8 +23296,8 @@
-
- fi
-
-- echo "$as_me:$LINENO: result: ${mc_cv_nroff_tascii-no}" >&5
--echo "${ECHO_T}${mc_cv_nroff_tascii-no}" >&6
-+ { echo "$as_me:$LINENO: result: ${mc_cv_nroff_tascii-no}" >&5
-+echo "${ECHO_T}${mc_cv_nroff_tascii-no}" >&6; }
- MAN_FLAGS="$MAN_FLAGS $mc_cv_nroff_tascii"
- fi
-
-@@ -23205,8 +23307,8 @@
-
- # Extract the first word of "file", so it can be a program name with args.
- set dummy file; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_HAVE_FILECMD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23219,29 +23321,31 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_HAVE_FILECMD="true"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_prog_HAVE_FILECMD" && ac_cv_prog_HAVE_FILECMD="false"
- fi
- fi
- HAVE_FILECMD=$ac_cv_prog_HAVE_FILECMD
- if test -n "$HAVE_FILECMD"; then
-- echo "$as_me:$LINENO: result: $HAVE_FILECMD" >&5
--echo "${ECHO_T}$HAVE_FILECMD" >&6
-+ { echo "$as_me:$LINENO: result: $HAVE_FILECMD" >&5
-+echo "${ECHO_T}$HAVE_FILECMD" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- if $HAVE_FILECMD; then
-- echo "$as_me:$LINENO: checking for -L option to file command" >&5
--echo $ECHO_N "checking for -L option to file command... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for -L option to file command" >&5
-+echo $ECHO_N "checking for -L option to file command... $ECHO_C" >&6; }
- if test "${mc_cv_filel+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23263,18 +23367,17 @@
-
- fi
- filel=$mc_cv_filel
-- echo "$as_me:$LINENO: result: $filel" >&5
--echo "${ECHO_T}$filel" >&6
-+ { echo "$as_me:$LINENO: result: $filel" >&5
-+echo "${ECHO_T}$filel" >&6; }
- fi
-
-
--echo "$as_me:$LINENO: checking for subshell support" >&5
--echo $ECHO_N "checking for subshell support... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for subshell support" >&5
-+echo $ECHO_N "checking for subshell support... $ECHO_C" >&6; }
-
--# Check whether --with-subshell or --without-subshell was given.
-+# Check whether --with-subshell was given.
- if test "${with_subshell+set}" = set; then
-- withval="$with_subshell"
-- result=no
-+ withval=$with_subshell; result=no
- if test x$withval = xoptional
- then
-
-@@ -23291,7 +23394,8 @@
- else
- result="yes"
-
--fi;
-+fi
-+
- if test "x$result" != xno; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -23299,17 +23403,17 @@
- _ACEOF
-
- fi
--echo "$as_me:$LINENO: result: $result" >&5
--echo "${ECHO_T}$result" >&6
-+{ echo "$as_me:$LINENO: result: $result" >&5
-+echo "${ECHO_T}$result" >&6; }
- subshell="$result"
-
-
-
--# Check whether --with-screen or --without-screen was given.
-+# Check whether --with-screen was given.
- if test "${with_screen+set}" = set; then
-- withval="$with_screen"
-+ withval=$with_screen;
-+fi
-
--fi;
-
- case x$with_screen in
- xslang)
-@@ -23322,18 +23426,19 @@
- for ac_header in slang.h slang/slang.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -23344,27 +23449,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -23372,13 +23472,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -23387,24 +23488,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -23412,9 +23511,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -23438,25 +23538,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -23474,8 +23568,8 @@
-
- if test x$with_screen = xslang; then
-
-- echo "$as_me:$LINENO: checking if S-Lang uses termcap" >&5
--echo $ECHO_N "checking if S-Lang uses termcap... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking if S-Lang uses termcap" >&5
-+echo $ECHO_N "checking if S-Lang uses termcap... $ECHO_C" >&6; }
- if test "${mc_cv_slang_termcap+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23504,27 +23598,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- mc_cv_slang_termcap=no
- else
- echo "$as_me: failed program was:" >&5
-@@ -23532,13 +23622,14 @@
-
- mc_cv_slang_termcap=yes
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_save_LIBS"
-
- fi
--echo "$as_me:$LINENO: result: $mc_cv_slang_termcap" >&5
--echo "${ECHO_T}$mc_cv_slang_termcap" >&6
-+{ echo "$as_me:$LINENO: result: $mc_cv_slang_termcap" >&5
-+echo "${ECHO_T}$mc_cv_slang_termcap" >&6; }
-
- if test x$mc_cv_slang_termcap = xyes; then
-
-@@ -23550,8 +23641,8 @@
- #define USE_TERMCAP 1
- _ACEOF
-
-- echo "$as_me:$LINENO: checking for tgoto in -ltermcap" >&5
--echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for tgoto in -ltermcap" >&5
-+echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6; }
- if test "${ac_cv_lib_termcap_tgoto+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23564,43 +23655,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char tgoto ();
- int
- main ()
- {
--tgoto ();
-+return tgoto ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_termcap_tgoto=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -23608,12 +23695,13 @@
-
- ac_cv_lib_termcap_tgoto=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgoto" >&5
--echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgoto" >&5
-+echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6; }
- if test $ac_cv_lib_termcap_tgoto = yes; then
- MCLIBS="$MCLIBS -ltermcap"
- fi
-@@ -23624,8 +23712,8 @@
- fi
-
- if test x$with_screen = xslang; then
-- echo "$as_me:$LINENO: checking for SLang_init_tty in -lslang" >&5
--echo $ECHO_N "checking for SLang_init_tty in -lslang... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for SLang_init_tty in -lslang" >&5
-+echo $ECHO_N "checking for SLang_init_tty in -lslang... $ECHO_C" >&6; }
- if test "${ac_cv_lib_slang_SLang_init_tty+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23638,43 +23726,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char SLang_init_tty ();
- int
- main ()
- {
--SLang_init_tty ();
-+return SLang_init_tty ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_slang_SLang_init_tty=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -23682,12 +23766,13 @@
-
- ac_cv_lib_slang_SLang_init_tty=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_slang_SLang_init_tty" >&5
--echo "${ECHO_T}$ac_cv_lib_slang_SLang_init_tty" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_slang_SLang_init_tty" >&5
-+echo "${ECHO_T}$ac_cv_lib_slang_SLang_init_tty" >&6; }
- if test $ac_cv_lib_slang_SLang_init_tty = yes; then
- MCLIBS="$MCLIBS -lslang"
- else
-@@ -23708,8 +23793,8 @@
- _ACEOF
-
-
-- echo "$as_me:$LINENO: checking if S-Lang exports private functions" >&5
--echo $ECHO_N "checking if S-Lang exports private functions... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking if S-Lang exports private functions" >&5
-+echo $ECHO_N "checking if S-Lang exports private functions... $ECHO_C" >&6; }
- if test "${mc_cv_slang_private+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23749,27 +23834,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- mc_cv_slang_private=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -23777,13 +23858,14 @@
-
- mc_cv_slang_private=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_save_LIBS"
-
- fi
--echo "$as_me:$LINENO: result: $mc_cv_slang_private" >&5
--echo "${ECHO_T}$mc_cv_slang_private" >&6
-+{ echo "$as_me:$LINENO: result: $mc_cv_slang_private" >&5
-+echo "${ECHO_T}$mc_cv_slang_private" >&6; }
-
- if test x$mc_cv_slang_private = xyes; then
-
-@@ -23818,8 +23900,8 @@
- screen_type=mcslang
- screen_msg="Included S-Lang library (mcslang)"
-
-- echo "$as_me:$LINENO: checking for short" >&5
--echo $ECHO_N "checking for short... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for short" >&5
-+echo $ECHO_N "checking for short... $ECHO_C" >&6; }
- if test "${ac_cv_type_short+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23830,39 +23912,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef short ac__type_new_;
- int
- main ()
- {
--if ((short *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (short))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_short=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -23870,21 +23948,21 @@
-
- ac_cv_type_short=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
--echo "${ECHO_T}$ac_cv_type_short" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-+echo "${ECHO_T}$ac_cv_type_short" >&6; }
-
--echo "$as_me:$LINENO: checking size of short" >&5
--echo $ECHO_N "checking size of short... $ECHO_C" >&6
--if test "${ac_cv_sizeof_short+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$ac_cv_type_short" = yes; then
-- # The cast to unsigned long works around a bug in the HP C Compiler
-+# The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of short" >&5
-+echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_short+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -23894,10 +23972,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -23905,27 +23984,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -23935,10 +24009,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -23946,27 +24021,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -23979,7 +24049,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -23992,10 +24063,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -24003,27 +24075,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -24033,10 +24100,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -24044,27 +24112,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -24077,7 +24140,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -24085,9 +24149,11 @@
-
- ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -24098,10 +24164,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -24109,27 +24176,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
-@@ -24137,23 +24199,21 @@
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_short=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-+'') if test "$ac_cv_type_short" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (short), 77
-+echo "$as_me: error: cannot compute sizeof (short)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
--esac
-+ { (exit 77); exit 77; }; }
- else
-- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ ac_cv_sizeof_short=0
-+ fi ;;
-+esac
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -24162,8 +24222,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--long longval () { return (long) (sizeof (short)); }
--unsigned long ulongval () { return (long) (sizeof (short)); }
-+ typedef short ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -24172,35 +24233,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-- if (((long) (sizeof (short))) < 0)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
-- long i = longval ();
-- if (i != ((long) (sizeof (short))))
-- exit (1);
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-- if (i != ((long) (sizeof (short))))
-- exit (1);
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -24211,29 +24281,32 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-+if test "$ac_cv_type_short" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (short), 77
-+echo "$as_me: error: cannot compute sizeof (short)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_short=0
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
-- ac_cv_sizeof_short=0
- fi
--fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
--echo "${ECHO_T}$ac_cv_sizeof_short" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_SHORT $ac_cv_sizeof_short
- _ACEOF
-
-
-- echo "$as_me:$LINENO: checking for int" >&5
--echo $ECHO_N "checking for int... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for int" >&5
-+echo $ECHO_N "checking for int... $ECHO_C" >&6; }
- if test "${ac_cv_type_int+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -24244,39 +24317,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef int ac__type_new_;
- int
- main ()
- {
--if ((int *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (int))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_int=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -24284,21 +24353,21 @@
-
- ac_cv_type_int=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
--echo "${ECHO_T}$ac_cv_type_int" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-+echo "${ECHO_T}$ac_cv_type_int" >&6; }
-
--echo "$as_me:$LINENO: checking size of int" >&5
--echo $ECHO_N "checking size of int... $ECHO_C" >&6
--if test "${ac_cv_sizeof_int+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$ac_cv_type_int" = yes; then
-- # The cast to unsigned long works around a bug in the HP C Compiler
-+# The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of int" >&5
-+echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_int+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -24308,10 +24377,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -24319,27 +24389,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -24349,10 +24414,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -24360,27 +24426,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -24393,7 +24454,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -24406,10 +24468,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -24417,27 +24480,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -24447,10 +24505,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -24458,27 +24517,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -24491,7 +24545,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -24499,9 +24554,11 @@
-
- ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -24512,10 +24569,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -24523,27 +24581,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
-@@ -24551,23 +24604,21 @@
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_int=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+'') if test "$ac_cv_type_int" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int), 77
-+echo "$as_me: error: cannot compute sizeof (int)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
--esac
-+ { (exit 77); exit 77; }; }
- else
-- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ ac_cv_sizeof_int=0
-+ fi ;;
-+esac
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -24576,8 +24627,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--long longval () { return (long) (sizeof (int)); }
--unsigned long ulongval () { return (long) (sizeof (int)); }
-+ typedef int ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -24586,35 +24638,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-- if (((long) (sizeof (int))) < 0)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
-- long i = longval ();
-- if (i != ((long) (sizeof (int))))
-- exit (1);
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-- if (i != ((long) (sizeof (int))))
-- exit (1);
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -24625,29 +24686,32 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+if test "$ac_cv_type_int" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int), 77
-+echo "$as_me: error: cannot compute sizeof (int)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_int=0
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
-- ac_cv_sizeof_int=0
- fi
--fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
--echo "${ECHO_T}$ac_cv_sizeof_int" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_INT $ac_cv_sizeof_int
- _ACEOF
-
-
-- echo "$as_me:$LINENO: checking for long" >&5
--echo $ECHO_N "checking for long... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for long" >&5
-+echo $ECHO_N "checking for long... $ECHO_C" >&6; }
- if test "${ac_cv_type_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -24658,39 +24722,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef long ac__type_new_;
- int
- main ()
- {
--if ((long *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (long))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_long=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -24698,21 +24758,21 @@
-
- ac_cv_type_long=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
--echo "${ECHO_T}$ac_cv_type_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-+echo "${ECHO_T}$ac_cv_type_long" >&6; }
-
--echo "$as_me:$LINENO: checking size of long" >&5
--echo $ECHO_N "checking size of long... $ECHO_C" >&6
--if test "${ac_cv_sizeof_long+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$ac_cv_type_long" = yes; then
-- # The cast to unsigned long works around a bug in the HP C Compiler
-+# The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of long" >&5
-+echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_long+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -24722,10 +24782,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -24733,27 +24794,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -24763,10 +24819,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -24774,27 +24831,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -24807,7 +24859,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -24820,10 +24873,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -24831,27 +24885,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -24861,10 +24910,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -24872,27 +24922,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -24905,7 +24950,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -24913,9 +24959,11 @@
-
- ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -24926,10 +24974,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -24937,27 +24986,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
-@@ -24965,23 +25009,21 @@
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_long=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+'') if test "$ac_cv_type_long" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long), 77
-+echo "$as_me: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
--esac
-+ { (exit 77); exit 77; }; }
- else
-- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ ac_cv_sizeof_long=0
-+ fi ;;
-+esac
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -24990,8 +25032,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--long longval () { return (long) (sizeof (long)); }
--unsigned long ulongval () { return (long) (sizeof (long)); }
-+ typedef long ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -25000,35 +25043,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-- if (((long) (sizeof (long))) < 0)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
-- long i = longval ();
-- if (i != ((long) (sizeof (long))))
-- exit (1);
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-- if (i != ((long) (sizeof (long))))
-- exit (1);
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -25039,29 +25091,32 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+if test "$ac_cv_type_long" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long), 77
-+echo "$as_me: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_long=0
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
-- ac_cv_sizeof_long=0
- fi
--fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
--echo "${ECHO_T}$ac_cv_sizeof_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_LONG $ac_cv_sizeof_long
- _ACEOF
-
-
-- echo "$as_me:$LINENO: checking for float" >&5
--echo $ECHO_N "checking for float... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for float" >&5
-+echo $ECHO_N "checking for float... $ECHO_C" >&6; }
- if test "${ac_cv_type_float+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -25072,39 +25127,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef float ac__type_new_;
- int
- main ()
- {
--if ((float *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (float))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_float=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -25112,21 +25163,21 @@
-
- ac_cv_type_float=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_float" >&5
--echo "${ECHO_T}$ac_cv_type_float" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_float" >&5
-+echo "${ECHO_T}$ac_cv_type_float" >&6; }
-
--echo "$as_me:$LINENO: checking size of float" >&5
--echo $ECHO_N "checking size of float... $ECHO_C" >&6
--if test "${ac_cv_sizeof_float+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$ac_cv_type_float" = yes; then
-- # The cast to unsigned long works around a bug in the HP C Compiler
-+# The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of float" >&5
-+echo $ECHO_N "checking size of float... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_float+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -25136,10 +25187,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef float ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (float))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -25147,27 +25199,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -25177,10 +25224,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef float ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (float))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -25188,27 +25236,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -25221,7 +25264,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -25234,10 +25278,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef float ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (float))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -25245,27 +25290,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -25275,10 +25315,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef float ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (float))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -25286,27 +25327,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -25319,7 +25355,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -25327,9 +25364,11 @@
-
- ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -25340,10 +25379,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef float ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (float))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -25351,27 +25391,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
-@@ -25379,23 +25414,21 @@
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_float=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (float), 77
-+'') if test "$ac_cv_type_float" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (float)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (float), 77
-+echo "$as_me: error: cannot compute sizeof (float)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
--esac
-+ { (exit 77); exit 77; }; }
- else
-- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ ac_cv_sizeof_float=0
-+ fi ;;
-+esac
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -25404,8 +25437,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--long longval () { return (long) (sizeof (float)); }
--unsigned long ulongval () { return (long) (sizeof (float)); }
-+ typedef float ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -25414,35 +25448,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-- if (((long) (sizeof (float))) < 0)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
-- long i = longval ();
-- if (i != ((long) (sizeof (float))))
-- exit (1);
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-- if (i != ((long) (sizeof (float))))
-- exit (1);
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -25453,29 +25496,32 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (float), 77
-+if test "$ac_cv_type_float" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (float)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (float), 77
-+echo "$as_me: error: cannot compute sizeof (float)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_float=0
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
-- ac_cv_sizeof_float=0
- fi
--fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_float" >&5
--echo "${ECHO_T}$ac_cv_sizeof_float" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_float" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_float" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_FLOAT $ac_cv_sizeof_float
- _ACEOF
-
-
-- echo "$as_me:$LINENO: checking for double" >&5
--echo $ECHO_N "checking for double... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for double" >&5
-+echo $ECHO_N "checking for double... $ECHO_C" >&6; }
- if test "${ac_cv_type_double+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -25486,39 +25532,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef double ac__type_new_;
- int
- main ()
- {
--if ((double *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (double))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_double=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -25526,21 +25568,21 @@
-
- ac_cv_type_double=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_double" >&5
--echo "${ECHO_T}$ac_cv_type_double" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_double" >&5
-+echo "${ECHO_T}$ac_cv_type_double" >&6; }
-
--echo "$as_me:$LINENO: checking size of double" >&5
--echo $ECHO_N "checking size of double... $ECHO_C" >&6
--if test "${ac_cv_sizeof_double+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$ac_cv_type_double" = yes; then
-- # The cast to unsigned long works around a bug in the HP C Compiler
-+# The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of double" >&5
-+echo $ECHO_N "checking size of double... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_double+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -25550,10 +25592,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef double ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (double))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -25561,27 +25604,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -25591,10 +25629,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef double ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (double))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -25602,27 +25641,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -25635,7 +25669,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -25648,10 +25683,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef double ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (double))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -25659,27 +25695,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -25689,10 +25720,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef double ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (double))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -25700,27 +25732,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -25733,7 +25760,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -25741,9 +25769,11 @@
-
- ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -25754,10 +25784,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef double ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (double))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -25765,27 +25796,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
-@@ -25793,23 +25819,21 @@
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_double=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (double), 77
-+'') if test "$ac_cv_type_double" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (double)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (double), 77
-+echo "$as_me: error: cannot compute sizeof (double)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
--esac
-+ { (exit 77); exit 77; }; }
- else
-- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ ac_cv_sizeof_double=0
-+ fi ;;
-+esac
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -25818,8 +25842,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--long longval () { return (long) (sizeof (double)); }
--unsigned long ulongval () { return (long) (sizeof (double)); }
-+ typedef double ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -25828,35 +25853,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-- if (((long) (sizeof (double))) < 0)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
-- long i = longval ();
-- if (i != ((long) (sizeof (double))))
-- exit (1);
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-- if (i != ((long) (sizeof (double))))
-- exit (1);
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -25867,29 +25901,32 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (double), 77
-+if test "$ac_cv_type_double" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (double)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (double), 77
-+echo "$as_me: error: cannot compute sizeof (double)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_double=0
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
-- ac_cv_sizeof_double=0
- fi
--fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_double" >&5
--echo "${ECHO_T}$ac_cv_sizeof_double" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_double" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_double" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_DOUBLE $ac_cv_sizeof_double
- _ACEOF
-
-
-- echo "$as_me:$LINENO: checking for off_t" >&5
--echo $ECHO_N "checking for off_t... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for off_t" >&5
-+echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_off_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -25900,39 +25937,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef off_t ac__type_new_;
- int
- main ()
- {
--if ((off_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (off_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_off_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -25940,22 +25973,23 @@
-
- ac_cv_type_off_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
--echo "${ECHO_T}$ac_cv_type_off_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-+echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
- if test $ac_cv_type_off_t = yes; then
- :
- else
-
- cat >>confdefs.h <<_ACEOF
--#define off_t long
-+#define off_t long int
- _ACEOF
-
- fi
-
-- echo "$as_me:$LINENO: checking for off_t" >&5
--echo $ECHO_N "checking for off_t... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for off_t" >&5
-+echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_off_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -25966,39 +26000,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef off_t ac__type_new_;
- int
- main ()
- {
--if ((off_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (off_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_off_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -26006,21 +26036,21 @@
-
- ac_cv_type_off_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
--echo "${ECHO_T}$ac_cv_type_off_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-+echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
-
--echo "$as_me:$LINENO: checking size of off_t" >&5
--echo $ECHO_N "checking size of off_t... $ECHO_C" >&6
--if test "${ac_cv_sizeof_off_t+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$ac_cv_type_off_t" = yes; then
-- # The cast to unsigned long works around a bug in the HP C Compiler
-+# The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of off_t" >&5
-+echo $ECHO_N "checking size of off_t... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_off_t+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -26030,10 +26060,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef off_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (off_t))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -26041,27 +26072,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -26071,10 +26097,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef off_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (off_t))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -26082,27 +26109,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -26115,7 +26137,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -26128,10 +26151,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef off_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (off_t))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -26139,27 +26163,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -26169,10 +26188,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef off_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (off_t))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -26180,27 +26200,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -26213,7 +26228,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -26221,9 +26237,11 @@
-
- ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -26234,10 +26252,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef off_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (off_t))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -26245,27 +26264,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
-@@ -26273,23 +26287,21 @@
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_off_t=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t), 77
-+'') if test "$ac_cv_type_off_t" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (off_t), 77
-+echo "$as_me: error: cannot compute sizeof (off_t)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
--esac
-+ { (exit 77); exit 77; }; }
- else
-- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ ac_cv_sizeof_off_t=0
-+ fi ;;
-+esac
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -26298,8 +26310,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--long longval () { return (long) (sizeof (off_t)); }
--unsigned long ulongval () { return (long) (sizeof (off_t)); }
-+ typedef off_t ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -26308,35 +26321,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-- if (((long) (sizeof (off_t))) < 0)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
-- long i = longval ();
-- if (i != ((long) (sizeof (off_t))))
-- exit (1);
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-- if (i != ((long) (sizeof (off_t))))
-- exit (1);
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -26347,29 +26369,32 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t), 77
-+if test "$ac_cv_type_off_t" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (off_t), 77
-+echo "$as_me: error: cannot compute sizeof (off_t)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_off_t=0
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
-- ac_cv_sizeof_off_t=0
--fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_OFF_T $ac_cv_sizeof_off_t
- _ACEOF
-
-
-- echo "$as_me:$LINENO: checking for long long" >&5
--echo $ECHO_N "checking for long long... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for long long" >&5
-+echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
- if test "${ac_cv_type_long_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -26380,39 +26405,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef long long ac__type_new_;
- int
- main ()
- {
--if ((long long *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (long long))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_long_long=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -26420,10 +26441,11 @@
-
- ac_cv_type_long_long=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
--echo "${ECHO_T}$ac_cv_type_long_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-+echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
- if test $ac_cv_type_long_long = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -26433,8 +26455,8 @@
-
- fi
-
-- echo "$as_me:$LINENO: checking for long long" >&5
--echo $ECHO_N "checking for long long... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for long long" >&5
-+echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
- if test "${ac_cv_type_long_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -26445,39 +26467,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef long long ac__type_new_;
- int
- main ()
- {
--if ((long long *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (long long))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_long_long=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -26485,21 +26503,21 @@
-
- ac_cv_type_long_long=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
--echo "${ECHO_T}$ac_cv_type_long_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-+echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
-
--echo "$as_me:$LINENO: checking size of long long" >&5
--echo $ECHO_N "checking size of long long... $ECHO_C" >&6
--if test "${ac_cv_sizeof_long_long+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$ac_cv_type_long_long" = yes; then
-- # The cast to unsigned long works around a bug in the HP C Compiler
-+# The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of long long" >&5
-+echo $ECHO_N "checking size of long long... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_long_long+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -26509,10 +26527,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -26520,27 +26539,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -26550,10 +26564,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -26561,27 +26576,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -26594,7 +26604,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -26607,10 +26618,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -26618,27 +26630,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -26648,10 +26655,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -26659,27 +26667,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -26692,7 +26695,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -26700,9 +26704,11 @@
-
- ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -26713,10 +26719,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -26724,27 +26731,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
-@@ -26752,23 +26754,21 @@
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_long_long=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
-+'') if test "$ac_cv_type_long_long" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long long), 77
-+echo "$as_me: error: cannot compute sizeof (long long)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
--esac
-+ { (exit 77); exit 77; }; }
- else
-- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ ac_cv_sizeof_long_long=0
-+ fi ;;
-+esac
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -26777,8 +26777,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--long longval () { return (long) (sizeof (long long)); }
--unsigned long ulongval () { return (long) (sizeof (long long)); }
-+ typedef long long ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -26787,35 +26788,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-- if (((long) (sizeof (long long))) < 0)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
-- long i = longval ();
-- if (i != ((long) (sizeof (long long))))
-- exit (1);
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-- if (i != ((long) (sizeof (long long))))
-- exit (1);
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -26826,22 +26836,25 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
-+if test "$ac_cv_type_long_long" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long long), 77
-+echo "$as_me: error: cannot compute sizeof (long long)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_long_long=0
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
-- ac_cv_sizeof_long_long=0
--fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
--echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
- _ACEOF
-@@ -26852,9 +26865,9 @@
- for ac_func in atexit on_exit
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -26880,56 +26893,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -26937,11 +26940,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -26980,8 +26985,8 @@
- #define USE_TERMCAP 1
- _ACEOF
-
-- echo "$as_me:$LINENO: checking for tgoto in -ltermcap" >&5
--echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for tgoto in -ltermcap" >&5
-+echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6; }
- if test "${ac_cv_lib_termcap_tgoto+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -26994,43 +26999,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char tgoto ();
- int
- main ()
- {
--tgoto ();
-+return tgoto ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_termcap_tgoto=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -27038,12 +27039,13 @@
-
- ac_cv_lib_termcap_tgoto=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgoto" >&5
--echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgoto" >&5
-+echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6; }
- if test $ac_cv_lib_termcap_tgoto = yes; then
- MCLIBS="$MCLIBS -ltermcap"
- fi
-@@ -27064,14 +27066,14 @@
- xncurses)
-
- save_LIBS="$LIBS"
-+ ncursesw_found=
- LIBS=
-- echo "$as_me:$LINENO: checking for library containing has_colors" >&5
--echo $ECHO_N "checking for library containing has_colors... $ECHO_C" >&6
--if test "${ac_cv_search_has_colors+set}" = set; then
-+ { echo "$as_me:$LINENO: checking for library containing addwstr" >&5
-+echo $ECHO_N "checking for library containing addwstr... $ECHO_C" >&6; }
-+if test "${ac_cv_search_addwstr+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_func_search_save_LIBS=$LIBS
--ac_cv_search_has_colors=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -27079,54 +27081,88 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char has_colors ();
-+char addwstr ();
- int
- main ()
- {
--has_colors ();
-+return addwstr ();
- ;
- return 0;
- }
- _ACEOF
-+for ac_lib in '' ncursesw ncurses curses; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_has_colors="none required"
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_search_addwstr=$ac_res
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_has_colors" = no; then
-- for ac_lib in ncurses curses; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_addwstr+set}" = set; then
-+ break
-+fi
-+done
-+if test "${ac_cv_search_addwstr+set}" = set; then
-+ :
-+else
-+ ac_cv_search_addwstr=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_addwstr" >&5
-+echo "${ECHO_T}$ac_cv_search_addwstr" >&6; }
-+ac_res=$ac_cv_search_addwstr
-+if test "$ac_res" != no; then
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+ MCLIBS="$MCLIBS $LIBS";ncursesw_found=yes
-+else
-+ { echo "$as_me:$LINENO: WARNING: Cannot find ncurses library, that support wide characters" >&5
-+echo "$as_me: WARNING: Cannot find ncurses library, that support wide characters" >&2;}
-+fi
-+
-+
-+ if test -z "$ncursesw_found"; then
-+ LIBS=
-+ { echo "$as_me:$LINENO: checking for library containing has_colors" >&5
-+echo $ECHO_N "checking for library containing has_colors... $ECHO_C" >&6; }
-+if test "${ac_cv_search_has_colors+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -27134,60 +27170,73 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char has_colors ();
- int
- main ()
- {
--has_colors ();
-+return has_colors ();
- ;
- return 0;
- }
- _ACEOF
-+for ac_lib in '' ncurses curses; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_has_colors="-l$ac_lib"
--break
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_search_has_colors=$ac_res
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_has_colors+set}" = set; then
-+ break
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
- done
-+if test "${ac_cv_search_has_colors+set}" = set; then
-+ :
-+else
-+ ac_cv_search_has_colors=no
- fi
-+rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_search_has_colors" >&5
--echo "${ECHO_T}$ac_cv_search_has_colors" >&6
--if test "$ac_cv_search_has_colors" != no; then
-- test "$ac_cv_search_has_colors" = "none required" || LIBS="$ac_cv_search_has_colors $LIBS"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_has_colors" >&5
-+echo "${ECHO_T}$ac_cv_search_has_colors" >&6; }
-+ac_res=$ac_cv_search_has_colors
-+if test "$ac_res" != no; then
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- MCLIBS="$MCLIBS $LIBS"
- else
- { { echo "$as_me:$LINENO: error: Cannot find ncurses library" >&5
-@@ -27195,26 +27244,29 @@
- { (exit 1); exit 1; }; }
- fi
-
-+ fi
-
- ncurses_h_found=
-
-
-
--for ac_header in ncurses/curses.h ncurses.h curses.h
-+
-+for ac_header in ncursesw/curses.h ncurses/curses.h ncurses.h curses.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -27225,27 +27277,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -27253,13 +27300,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -27268,24 +27316,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -27293,9 +27339,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27319,25 +27366,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -27364,8 +27405,8 @@
- _ACEOF
-
-
-- echo "$as_me:$LINENO: checking for ESCDELAY variable" >&5
--echo $ECHO_N "checking for ESCDELAY variable... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for ESCDELAY variable" >&5
-+echo $ECHO_N "checking for ESCDELAY variable... $ECHO_C" >&6; }
- if test "${mc_cv_ncurses_escdelay+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -27388,27 +27429,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- mc_cv_ncurses_escdelay=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -27416,12 +27453,13 @@
-
- mc_cv_ncurses_escdelay=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-
- fi
--echo "$as_me:$LINENO: result: $mc_cv_ncurses_escdelay" >&5
--echo "${ECHO_T}$mc_cv_ncurses_escdelay" >&6
-+{ echo "$as_me:$LINENO: result: $mc_cv_ncurses_escdelay" >&5
-+echo "${ECHO_T}$mc_cv_ncurses_escdelay" >&6; }
- if test "$mc_cv_ncurses_escdelay" = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -27434,9 +27472,9 @@
- for ac_func in resizeterm
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -27462,56 +27500,454 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
- #endif
--#ifdef __cplusplus
-+
-+int
-+main ()
-+{
-+return $ac_func ();
-+ ;
-+ return 0;
- }
--#endif
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ eval "$as_ac_var=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ eval "$as_ac_var=no"
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-
-+fi
-+done
-+
-+ LIBS="$save_LIBS"
-+
-+ ;;
-+xncursesw)
-+
-+ save_LIBS="$LIBS"
-+ LIBS=
-+ { echo "$as_me:$LINENO: checking for library containing has_colors" >&5
-+echo $ECHO_N "checking for library containing has_colors... $ECHO_C" >&6; }
-+if test "${ac_cv_search_has_colors+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char has_colors ();
- int
- main ()
- {
--return f != $ac_func;
-+return has_colors ();
- ;
- return 0;
- }
- _ACEOF
-+for ac_lib in '' ncursesw; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_search_has_colors=$ac_res
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_has_colors+set}" = set; then
-+ break
-+fi
-+done
-+if test "${ac_cv_search_has_colors+set}" = set; then
-+ :
-+else
-+ ac_cv_search_has_colors=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_has_colors" >&5
-+echo "${ECHO_T}$ac_cv_search_has_colors" >&6; }
-+ac_res=$ac_cv_search_has_colors
-+if test "$ac_res" != no; then
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+ MCLIBS="$MCLIBS $LIBS"
-+else
-+ { { echo "$as_me:$LINENO: error: Cannot find ncursesw library" >&5
-+echo "$as_me: error: Cannot find ncursesw library" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+
-+ ncurses_h_found=
-+
-+for ac_header in ncursesw/curses.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+else
-+ # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_compiler=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <$ac_header>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+
-+ ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+ ncursesw_h_found=yes; break
-+fi
-+
-+done
-+
-+
-+ if test -z "$ncursesw_h_found"; then
-+ { { echo "$as_me:$LINENO: error: Cannot find ncursesw header file" >&5
-+echo "$as_me: error: Cannot find ncursesw header file" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+
-+ screen_type=ncursesw
-+ screen_msg="ncursesw library"
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define USE_NCURSESW 1
-+_ACEOF
-+
-+
-+ { echo "$as_me:$LINENO: checking for ESCDELAY variable" >&5
-+echo $ECHO_N "checking for ESCDELAY variable... $ECHO_C" >&6; }
-+if test "${mc_cv_ncursesw_escdelay+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ extern int ESCDELAY;
-+ ESCDELAY = 0;
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ mc_cv_ncursesw_escdelay=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ mc_cv_ncursesw_escdelay=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $mc_cv_ncursesw_escdelay" >&5
-+echo "${ECHO_T}$mc_cv_ncursesw_escdelay" >&6; }
-+ if test "$mc_cv_ncursesw_escdelay" = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_ESCDELAY 1
-+_ACEOF
-+
-+ fi
-+
-+
-+for ac_func in resizeterm
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined __stub_$ac_func || defined __stub___$ac_func
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return $ac_func ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -27519,11 +27955,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -27545,18 +27983,19 @@
- for ac_header in slang.h slang/slang.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -27567,27 +28006,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -27595,13 +28029,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -27610,24 +28045,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -27635,9 +28068,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27661,25 +28095,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -27697,8 +28125,8 @@
-
- if test x$with_screen = xslang; then
-
-- echo "$as_me:$LINENO: checking if S-Lang uses termcap" >&5
--echo $ECHO_N "checking if S-Lang uses termcap... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking if S-Lang uses termcap" >&5
-+echo $ECHO_N "checking if S-Lang uses termcap... $ECHO_C" >&6; }
- if test "${mc_cv_slang_termcap+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -27727,27 +28155,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- mc_cv_slang_termcap=no
- else
- echo "$as_me: failed program was:" >&5
-@@ -27755,13 +28179,14 @@
-
- mc_cv_slang_termcap=yes
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_save_LIBS"
-
- fi
--echo "$as_me:$LINENO: result: $mc_cv_slang_termcap" >&5
--echo "${ECHO_T}$mc_cv_slang_termcap" >&6
-+{ echo "$as_me:$LINENO: result: $mc_cv_slang_termcap" >&5
-+echo "${ECHO_T}$mc_cv_slang_termcap" >&6; }
-
- if test x$mc_cv_slang_termcap = xyes; then
-
-@@ -27773,8 +28198,8 @@
- #define USE_TERMCAP 1
- _ACEOF
-
-- echo "$as_me:$LINENO: checking for tgoto in -ltermcap" >&5
--echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for tgoto in -ltermcap" >&5
-+echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6; }
- if test "${ac_cv_lib_termcap_tgoto+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -27787,43 +28212,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char tgoto ();
- int
- main ()
- {
--tgoto ();
-+return tgoto ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_termcap_tgoto=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -27831,12 +28252,13 @@
-
- ac_cv_lib_termcap_tgoto=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgoto" >&5
--echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgoto" >&5
-+echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6; }
- if test $ac_cv_lib_termcap_tgoto = yes; then
- MCLIBS="$MCLIBS -ltermcap"
- fi
-@@ -27847,8 +28269,8 @@
- fi
-
- if test x$with_screen = xslang; then
-- echo "$as_me:$LINENO: checking for SLang_init_tty in -lslang" >&5
--echo $ECHO_N "checking for SLang_init_tty in -lslang... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for SLang_init_tty in -lslang" >&5
-+echo $ECHO_N "checking for SLang_init_tty in -lslang... $ECHO_C" >&6; }
- if test "${ac_cv_lib_slang_SLang_init_tty+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -27861,43 +28283,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char SLang_init_tty ();
- int
- main ()
- {
--SLang_init_tty ();
-+return SLang_init_tty ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_slang_SLang_init_tty=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -27905,12 +28323,13 @@
-
- ac_cv_lib_slang_SLang_init_tty=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_slang_SLang_init_tty" >&5
--echo "${ECHO_T}$ac_cv_lib_slang_SLang_init_tty" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_slang_SLang_init_tty" >&5
-+echo "${ECHO_T}$ac_cv_lib_slang_SLang_init_tty" >&6; }
- if test $ac_cv_lib_slang_SLang_init_tty = yes; then
- MCLIBS="$MCLIBS -lslang"
- else
-@@ -27921,8 +28340,8 @@
-
- if test x$with_screen = xslang; then
- :
-- echo "$as_me:$LINENO: checking for SLsmg_write_nwchars in -lslang" >&5
--echo $ECHO_N "checking for SLsmg_write_nwchars in -lslang... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for SLsmg_write_nwchars in -lslang" >&5
-+echo $ECHO_N "checking for SLsmg_write_nwchars in -lslang... $ECHO_C" >&6; }
- if test "${ac_cv_lib_slang_SLsmg_write_nwchars+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -27935,43 +28354,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char SLsmg_write_nwchars ();
- int
- main ()
- {
--SLsmg_write_nwchars ();
-+return SLsmg_write_nwchars ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_slang_SLsmg_write_nwchars=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -27979,12 +28394,13 @@
-
- ac_cv_lib_slang_SLsmg_write_nwchars=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_slang_SLsmg_write_nwchars" >&5
--echo "${ECHO_T}$ac_cv_lib_slang_SLsmg_write_nwchars" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_slang_SLsmg_write_nwchars" >&5
-+echo "${ECHO_T}$ac_cv_lib_slang_SLsmg_write_nwchars" >&6; }
- if test $ac_cv_lib_slang_SLsmg_write_nwchars = yes; then
- { echo "$as_me:$LINENO: WARNING: Rejecting S-Lang with UTF-8 support, \
- it's not fully supported yet" >&5
-@@ -28002,8 +28418,8 @@
- _ACEOF
-
-
-- echo "$as_me:$LINENO: checking if S-Lang exports private functions" >&5
--echo $ECHO_N "checking if S-Lang exports private functions... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking if S-Lang exports private functions" >&5
-+echo $ECHO_N "checking if S-Lang exports private functions... $ECHO_C" >&6; }
- if test "${mc_cv_slang_private+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -28043,27 +28459,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- mc_cv_slang_private=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -28071,13 +28483,14 @@
-
- mc_cv_slang_private=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_save_LIBS"
-
- fi
--echo "$as_me:$LINENO: result: $mc_cv_slang_private" >&5
--echo "${ECHO_T}$mc_cv_slang_private" >&6
-+{ echo "$as_me:$LINENO: result: $mc_cv_slang_private" >&5
-+echo "${ECHO_T}$mc_cv_slang_private" >&6; }
-
- if test x$mc_cv_slang_private = xyes; then
-
-@@ -28094,8 +28507,8 @@
- screen_type=mcslang
- screen_msg="Included S-Lang library (mcslang)"
-
-- echo "$as_me:$LINENO: checking for short" >&5
--echo $ECHO_N "checking for short... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for short" >&5
-+echo $ECHO_N "checking for short... $ECHO_C" >&6; }
- if test "${ac_cv_type_short+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -28106,39 +28519,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef short ac__type_new_;
- int
- main ()
- {
--if ((short *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (short))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_short=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -28146,21 +28555,21 @@
-
- ac_cv_type_short=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
--echo "${ECHO_T}$ac_cv_type_short" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-+echo "${ECHO_T}$ac_cv_type_short" >&6; }
-
--echo "$as_me:$LINENO: checking size of short" >&5
--echo $ECHO_N "checking size of short... $ECHO_C" >&6
--if test "${ac_cv_sizeof_short+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$ac_cv_type_short" = yes; then
-- # The cast to unsigned long works around a bug in the HP C Compiler
-+# The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of short" >&5
-+echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_short+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -28170,10 +28579,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -28181,27 +28591,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -28211,10 +28616,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -28222,27 +28628,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -28255,7 +28656,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -28268,10 +28670,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -28279,27 +28682,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -28309,10 +28707,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -28320,27 +28719,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -28353,7 +28747,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -28361,9 +28756,11 @@
-
- ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -28374,10 +28771,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -28385,27 +28783,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
-@@ -28413,23 +28806,21 @@
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_short=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-+'') if test "$ac_cv_type_short" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (short), 77
-+echo "$as_me: error: cannot compute sizeof (short)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
--esac
-+ { (exit 77); exit 77; }; }
- else
-- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ ac_cv_sizeof_short=0
-+ fi ;;
-+esac
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -28438,8 +28829,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--long longval () { return (long) (sizeof (short)); }
--unsigned long ulongval () { return (long) (sizeof (short)); }
-+ typedef short ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -28448,35 +28840,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-- if (((long) (sizeof (short))) < 0)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
-- long i = longval ();
-- if (i != ((long) (sizeof (short))))
-- exit (1);
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-- if (i != ((long) (sizeof (short))))
-- exit (1);
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -28487,29 +28888,32 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-+if test "$ac_cv_type_short" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (short), 77
-+echo "$as_me: error: cannot compute sizeof (short)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_short=0
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
-- ac_cv_sizeof_short=0
- fi
--fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
--echo "${ECHO_T}$ac_cv_sizeof_short" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_SHORT $ac_cv_sizeof_short
- _ACEOF
-
-
-- echo "$as_me:$LINENO: checking for int" >&5
--echo $ECHO_N "checking for int... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for int" >&5
-+echo $ECHO_N "checking for int... $ECHO_C" >&6; }
- if test "${ac_cv_type_int+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -28520,39 +28924,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef int ac__type_new_;
- int
- main ()
- {
--if ((int *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (int))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_int=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -28560,21 +28960,21 @@
-
- ac_cv_type_int=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
--echo "${ECHO_T}$ac_cv_type_int" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-+echo "${ECHO_T}$ac_cv_type_int" >&6; }
-
--echo "$as_me:$LINENO: checking size of int" >&5
--echo $ECHO_N "checking size of int... $ECHO_C" >&6
--if test "${ac_cv_sizeof_int+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$ac_cv_type_int" = yes; then
-- # The cast to unsigned long works around a bug in the HP C Compiler
-+# The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of int" >&5
-+echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_int+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -28584,10 +28984,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -28595,27 +28996,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -28625,10 +29021,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -28636,27 +29033,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -28669,7 +29061,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -28682,10 +29075,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -28693,27 +29087,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -28723,10 +29112,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -28734,27 +29124,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -28767,7 +29152,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -28775,9 +29161,11 @@
-
- ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -28788,10 +29176,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -28799,27 +29188,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
-@@ -28827,23 +29211,21 @@
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_int=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+'') if test "$ac_cv_type_int" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int), 77
-+echo "$as_me: error: cannot compute sizeof (int)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
--esac
-+ { (exit 77); exit 77; }; }
- else
-- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ ac_cv_sizeof_int=0
-+ fi ;;
-+esac
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -28852,8 +29234,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--long longval () { return (long) (sizeof (int)); }
--unsigned long ulongval () { return (long) (sizeof (int)); }
-+ typedef int ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -28862,35 +29245,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-- if (((long) (sizeof (int))) < 0)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
-- long i = longval ();
-- if (i != ((long) (sizeof (int))))
-- exit (1);
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-- if (i != ((long) (sizeof (int))))
-- exit (1);
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -28901,29 +29293,32 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+if test "$ac_cv_type_int" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int), 77
-+echo "$as_me: error: cannot compute sizeof (int)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_int=0
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
-- ac_cv_sizeof_int=0
--fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
--echo "${ECHO_T}$ac_cv_sizeof_int" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_INT $ac_cv_sizeof_int
- _ACEOF
-
-
-- echo "$as_me:$LINENO: checking for long" >&5
--echo $ECHO_N "checking for long... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for long" >&5
-+echo $ECHO_N "checking for long... $ECHO_C" >&6; }
- if test "${ac_cv_type_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -28934,39 +29329,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef long ac__type_new_;
- int
- main ()
- {
--if ((long *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (long))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_long=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -28974,21 +29365,21 @@
-
- ac_cv_type_long=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
--echo "${ECHO_T}$ac_cv_type_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-+echo "${ECHO_T}$ac_cv_type_long" >&6; }
-
--echo "$as_me:$LINENO: checking size of long" >&5
--echo $ECHO_N "checking size of long... $ECHO_C" >&6
--if test "${ac_cv_sizeof_long+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$ac_cv_type_long" = yes; then
-- # The cast to unsigned long works around a bug in the HP C Compiler
-+# The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of long" >&5
-+echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_long+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -28998,10 +29389,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -29009,27 +29401,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -29039,10 +29426,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -29050,27 +29438,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -29083,7 +29466,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -29096,10 +29480,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -29107,27 +29492,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -29137,10 +29517,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -29148,27 +29529,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -29181,7 +29557,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -29189,9 +29566,11 @@
-
- ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -29202,10 +29581,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -29213,27 +29593,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
-@@ -29241,23 +29616,21 @@
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_long=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+'') if test "$ac_cv_type_long" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long), 77
-+echo "$as_me: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
--esac
-+ { (exit 77); exit 77; }; }
- else
-- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ ac_cv_sizeof_long=0
-+ fi ;;
-+esac
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -29266,8 +29639,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--long longval () { return (long) (sizeof (long)); }
--unsigned long ulongval () { return (long) (sizeof (long)); }
-+ typedef long ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -29276,35 +29650,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-- if (((long) (sizeof (long))) < 0)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
-- long i = longval ();
-- if (i != ((long) (sizeof (long))))
-- exit (1);
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-- if (i != ((long) (sizeof (long))))
-- exit (1);
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -29315,29 +29698,32 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+if test "$ac_cv_type_long" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long), 77
-+echo "$as_me: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_long=0
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
-- ac_cv_sizeof_long=0
--fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
--echo "${ECHO_T}$ac_cv_sizeof_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_LONG $ac_cv_sizeof_long
- _ACEOF
-
-
-- echo "$as_me:$LINENO: checking for float" >&5
--echo $ECHO_N "checking for float... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for float" >&5
-+echo $ECHO_N "checking for float... $ECHO_C" >&6; }
- if test "${ac_cv_type_float+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -29348,39 +29734,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef float ac__type_new_;
- int
- main ()
- {
--if ((float *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (float))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_float=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -29388,21 +29770,21 @@
-
- ac_cv_type_float=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_float" >&5
--echo "${ECHO_T}$ac_cv_type_float" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_float" >&5
-+echo "${ECHO_T}$ac_cv_type_float" >&6; }
-
--echo "$as_me:$LINENO: checking size of float" >&5
--echo $ECHO_N "checking size of float... $ECHO_C" >&6
--if test "${ac_cv_sizeof_float+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$ac_cv_type_float" = yes; then
-- # The cast to unsigned long works around a bug in the HP C Compiler
-+# The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of float" >&5
-+echo $ECHO_N "checking size of float... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_float+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -29412,10 +29794,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef float ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (float))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -29423,27 +29806,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -29453,10 +29831,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef float ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (float))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -29464,27 +29843,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -29497,7 +29871,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -29510,10 +29885,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef float ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (float))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -29521,27 +29897,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -29551,10 +29922,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef float ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (float))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -29562,27 +29934,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -29595,7 +29962,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -29603,9 +29971,11 @@
-
- ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -29616,10 +29986,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef float ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (float))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -29627,27 +29998,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
-@@ -29655,23 +30021,21 @@
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_float=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (float), 77
-+'') if test "$ac_cv_type_float" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (float)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (float), 77
-+echo "$as_me: error: cannot compute sizeof (float)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
--esac
-+ { (exit 77); exit 77; }; }
- else
-- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ ac_cv_sizeof_float=0
-+ fi ;;
-+esac
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -29680,8 +30044,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--long longval () { return (long) (sizeof (float)); }
--unsigned long ulongval () { return (long) (sizeof (float)); }
-+ typedef float ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -29690,35 +30055,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-- if (((long) (sizeof (float))) < 0)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
-- long i = longval ();
-- if (i != ((long) (sizeof (float))))
-- exit (1);
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-- if (i != ((long) (sizeof (float))))
-- exit (1);
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -29729,29 +30103,32 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (float), 77
-+if test "$ac_cv_type_float" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (float)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (float), 77
-+echo "$as_me: error: cannot compute sizeof (float)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_float=0
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
-- ac_cv_sizeof_float=0
--fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_float" >&5
--echo "${ECHO_T}$ac_cv_sizeof_float" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_float" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_float" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_FLOAT $ac_cv_sizeof_float
- _ACEOF
-
-
-- echo "$as_me:$LINENO: checking for double" >&5
--echo $ECHO_N "checking for double... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for double" >&5
-+echo $ECHO_N "checking for double... $ECHO_C" >&6; }
- if test "${ac_cv_type_double+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -29762,39 +30139,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef double ac__type_new_;
- int
- main ()
- {
--if ((double *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (double))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_double=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -29802,21 +30175,21 @@
-
- ac_cv_type_double=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_double" >&5
--echo "${ECHO_T}$ac_cv_type_double" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_double" >&5
-+echo "${ECHO_T}$ac_cv_type_double" >&6; }
-
--echo "$as_me:$LINENO: checking size of double" >&5
--echo $ECHO_N "checking size of double... $ECHO_C" >&6
--if test "${ac_cv_sizeof_double+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$ac_cv_type_double" = yes; then
-- # The cast to unsigned long works around a bug in the HP C Compiler
-+# The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of double" >&5
-+echo $ECHO_N "checking size of double... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_double+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -29826,10 +30199,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef double ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (double))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -29837,27 +30211,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -29867,10 +30236,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef double ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (double))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -29878,27 +30248,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -29911,7 +30276,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -29924,10 +30290,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef double ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (double))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -29935,27 +30302,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -29965,10 +30327,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef double ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (double))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -29976,27 +30339,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -30009,7 +30367,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -30017,9 +30376,11 @@
-
- ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -30030,10 +30391,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef double ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (double))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -30041,27 +30403,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
-@@ -30069,23 +30426,21 @@
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_double=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (double), 77
-+'') if test "$ac_cv_type_double" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (double)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (double), 77
-+echo "$as_me: error: cannot compute sizeof (double)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
--esac
-+ { (exit 77); exit 77; }; }
- else
-- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ ac_cv_sizeof_double=0
-+ fi ;;
-+esac
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -30094,8 +30449,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--long longval () { return (long) (sizeof (double)); }
--unsigned long ulongval () { return (long) (sizeof (double)); }
-+ typedef double ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -30104,35 +30460,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-- if (((long) (sizeof (double))) < 0)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
-- long i = longval ();
-- if (i != ((long) (sizeof (double))))
-- exit (1);
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-- if (i != ((long) (sizeof (double))))
-- exit (1);
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -30143,29 +30508,32 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (double), 77
-+if test "$ac_cv_type_double" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (double)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (double), 77
-+echo "$as_me: error: cannot compute sizeof (double)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_double=0
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
-- ac_cv_sizeof_double=0
--fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_double" >&5
--echo "${ECHO_T}$ac_cv_sizeof_double" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_double" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_double" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_DOUBLE $ac_cv_sizeof_double
- _ACEOF
-
-
-- echo "$as_me:$LINENO: checking for off_t" >&5
--echo $ECHO_N "checking for off_t... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for off_t" >&5
-+echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_off_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -30176,39 +30544,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef off_t ac__type_new_;
- int
- main ()
- {
--if ((off_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (off_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_off_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -30216,22 +30580,23 @@
-
- ac_cv_type_off_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
--echo "${ECHO_T}$ac_cv_type_off_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-+echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
- if test $ac_cv_type_off_t = yes; then
- :
- else
-
- cat >>confdefs.h <<_ACEOF
--#define off_t long
-+#define off_t long int
- _ACEOF
-
- fi
-
-- echo "$as_me:$LINENO: checking for off_t" >&5
--echo $ECHO_N "checking for off_t... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for off_t" >&5
-+echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_off_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -30242,39 +30607,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef off_t ac__type_new_;
- int
- main ()
- {
--if ((off_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (off_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_off_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -30282,21 +30643,21 @@
-
- ac_cv_type_off_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
--echo "${ECHO_T}$ac_cv_type_off_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-+echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
-
--echo "$as_me:$LINENO: checking size of off_t" >&5
--echo $ECHO_N "checking size of off_t... $ECHO_C" >&6
--if test "${ac_cv_sizeof_off_t+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$ac_cv_type_off_t" = yes; then
-- # The cast to unsigned long works around a bug in the HP C Compiler
-+# The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of off_t" >&5
-+echo $ECHO_N "checking size of off_t... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_off_t+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -30306,10 +30667,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef off_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (off_t))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -30317,27 +30679,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -30347,10 +30704,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef off_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (off_t))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -30358,27 +30716,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -30391,7 +30744,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -30404,10 +30758,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef off_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (off_t))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -30415,27 +30770,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -30445,10 +30795,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef off_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (off_t))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -30456,27 +30807,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -30489,7 +30835,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -30497,9 +30844,11 @@
-
- ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -30510,10 +30859,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef off_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (off_t))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -30521,27 +30871,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
-@@ -30549,23 +30894,21 @@
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_off_t=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t), 77
-+'') if test "$ac_cv_type_off_t" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (off_t), 77
-+echo "$as_me: error: cannot compute sizeof (off_t)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
--esac
-+ { (exit 77); exit 77; }; }
- else
-- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ ac_cv_sizeof_off_t=0
-+ fi ;;
-+esac
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -30574,8 +30917,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--long longval () { return (long) (sizeof (off_t)); }
--unsigned long ulongval () { return (long) (sizeof (off_t)); }
-+ typedef off_t ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -30584,35 +30928,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-- if (((long) (sizeof (off_t))) < 0)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
-- long i = longval ();
-- if (i != ((long) (sizeof (off_t))))
-- exit (1);
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-- if (i != ((long) (sizeof (off_t))))
-- exit (1);
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -30623,29 +30976,32 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t), 77
-+if test "$ac_cv_type_off_t" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (off_t), 77
-+echo "$as_me: error: cannot compute sizeof (off_t)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_off_t=0
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
-- ac_cv_sizeof_off_t=0
- fi
--fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_OFF_T $ac_cv_sizeof_off_t
- _ACEOF
-
-
-- echo "$as_me:$LINENO: checking for long long" >&5
--echo $ECHO_N "checking for long long... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for long long" >&5
-+echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
- if test "${ac_cv_type_long_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -30656,39 +31012,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef long long ac__type_new_;
- int
- main ()
- {
--if ((long long *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (long long))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_long_long=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -30696,10 +31048,11 @@
-
- ac_cv_type_long_long=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
--echo "${ECHO_T}$ac_cv_type_long_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-+echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
- if test $ac_cv_type_long_long = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -30709,8 +31062,8 @@
-
- fi
-
-- echo "$as_me:$LINENO: checking for long long" >&5
--echo $ECHO_N "checking for long long... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for long long" >&5
-+echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
- if test "${ac_cv_type_long_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -30721,39 +31074,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef long long ac__type_new_;
- int
- main ()
- {
--if ((long long *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (long long))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_long_long=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -30761,21 +31110,21 @@
-
- ac_cv_type_long_long=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
--echo "${ECHO_T}$ac_cv_type_long_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-+echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
-
--echo "$as_me:$LINENO: checking size of long long" >&5
--echo $ECHO_N "checking size of long long... $ECHO_C" >&6
--if test "${ac_cv_sizeof_long_long+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$ac_cv_type_long_long" = yes; then
-- # The cast to unsigned long works around a bug in the HP C Compiler
-+# The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of long long" >&5
-+echo $ECHO_N "checking size of long long... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_long_long+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -30785,10 +31134,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -30796,27 +31146,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -30826,10 +31171,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -30837,27 +31183,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -30870,7 +31211,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -30883,10 +31225,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -30894,27 +31237,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -30924,10 +31262,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -30935,27 +31274,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -30968,7 +31302,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -30976,9 +31311,11 @@
-
- ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -30989,10 +31326,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -31000,27 +31338,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
-@@ -31028,23 +31361,21 @@
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_long_long=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
-+'') if test "$ac_cv_type_long_long" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long long), 77
-+echo "$as_me: error: cannot compute sizeof (long long)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
--esac
-+ { (exit 77); exit 77; }; }
- else
-- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ ac_cv_sizeof_long_long=0
-+ fi ;;
-+esac
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -31053,8 +31384,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--long longval () { return (long) (sizeof (long long)); }
--unsigned long ulongval () { return (long) (sizeof (long long)); }
-+ typedef long long ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -31063,35 +31395,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-- if (((long) (sizeof (long long))) < 0)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
-- long i = longval ();
-- if (i != ((long) (sizeof (long long))))
-- exit (1);
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-- if (i != ((long) (sizeof (long long))))
-- exit (1);
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -31102,22 +31443,25 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
-+if test "$ac_cv_type_long_long" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long long), 77
-+echo "$as_me: error: cannot compute sizeof (long long)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_long_long=0
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
-- ac_cv_sizeof_long_long=0
- fi
--fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
--echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
- _ACEOF
-@@ -31128,9 +31472,9 @@
- for ac_func in atexit on_exit
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -31156,56 +31500,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -31213,11 +31547,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -31256,8 +31592,8 @@
- #define USE_TERMCAP 1
- _ACEOF
-
-- echo "$as_me:$LINENO: checking for tgoto in -ltermcap" >&5
--echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for tgoto in -ltermcap" >&5
-+echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6; }
- if test "${ac_cv_lib_termcap_tgoto+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -31270,43 +31606,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char tgoto ();
- int
- main ()
- {
--tgoto ();
-+return tgoto ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_termcap_tgoto=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -31314,12 +31646,13 @@
-
- ac_cv_lib_termcap_tgoto=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgoto" >&5
--echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgoto" >&5
-+echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6; }
- if test $ac_cv_lib_termcap_tgoto = yes; then
- MCLIBS="$MCLIBS -ltermcap"
- fi
-@@ -31358,24 +31691,24 @@
-
-
-
--# Check whether --with-termcap or --without-termcap was given.
-+# Check whether --with-termcap was given.
- if test "${with_termcap+set}" = set; then
-- withval="$with_termcap"
-- if test x$with_screen != xmcslang; then
-+ withval=$with_termcap; if test x$with_screen != xmcslang; then
- { { echo "$as_me:$LINENO: error: Option \`--with-termcap' only works with \`--with-screen=mcslang'" >&5
- echo "$as_me: error: Option \`--with-termcap' only works with \`--with-screen=mcslang'" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
--fi;
-+fi
-
-
-
--# Check whether --with-edit or --without-edit was given.
-+
-+# Check whether --with-edit was given.
- if test "${with_edit+set}" = set; then
-- withval="$with_edit"
-+ withval=$with_edit;
-+fi
-
--fi;
-
- if test x$with_edit != xno; then
-
-@@ -31399,11 +31732,11 @@
- esac
-
-
--# Check whether --enable-background or --disable-background was given.
-+# Check whether --enable-background was given.
- if test "${enable_background+set}" = set; then
-- enableval="$enable_background"
-+ enableval=$enable_background;
-+fi
-
--fi;
- if test "x$enable_background" != xno; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -31413,11 +31746,11 @@
- fi
-
-
--# Check whether --enable-charset or --disable-charset was given.
-+# Check whether --enable-charset was given.
- if test "${enable_charset+set}" = set; then
-- enableval="$enable_charset"
-+ enableval=$enable_charset;
-+fi
-
--fi;
- have_charset=
- charset_msg="no"
- if test "x$enable_charset" = xyes; then
-@@ -31460,14 +31793,10 @@
-
-
- if test -n "$use_smbfs"; then
--
--
- subdirs="$subdirs vfs/samba"
-
- fi
-
--
--
- if test -n "$use_edit"; then
- USE_EDIT_TRUE=
- USE_EDIT_FALSE='#'
-@@ -31476,8 +31805,6 @@
- USE_EDIT_FALSE=
- fi
-
--
--
- if test "x$use_vfs" = xyes; then
- USE_VFS_TRUE=
- USE_VFS_FALSE='#'
-@@ -31486,8 +31813,6 @@
- USE_VFS_FALSE=
- fi
-
--
--
- if test x"$use_net_code" = xtrue; then
- USE_VFS_NET_TRUE=
- USE_VFS_NET_FALSE='#'
-@@ -31496,8 +31821,6 @@
- USE_VFS_NET_FALSE=
- fi
-
--
--
- if test -n "$use_undelfs"; then
- USE_UNDEL_FS_TRUE=
- USE_UNDEL_FS_FALSE='#'
-@@ -31506,8 +31829,6 @@
- USE_UNDEL_FS_FALSE=
- fi
-
--
--
- if test -n "$use_smbfs"; then
- USE_SAMBA_FS_TRUE=
- USE_SAMBA_FS_FALSE='#'
-@@ -31516,8 +31837,6 @@
- USE_SAMBA_FS_FALSE=
- fi
-
--
--
- if test -n "$use_mcfs"; then
- USE_MCFS_TRUE=
- USE_MCFS_FALSE='#'
-@@ -31526,8 +31845,6 @@
- USE_MCFS_FALSE=
- fi
-
--
--
- if test "x$with_screen" = xmcslang; then
- INCLUDED_SLANG_TRUE=
- INCLUDED_SLANG_FALSE='#'
-@@ -31536,8 +31853,6 @@
- INCLUDED_SLANG_FALSE=
- fi
-
--
--
- if test -n "$have_charset"; then
- CHARSET_TRUE=
- CHARSET_FALSE='#'
-@@ -31546,8 +31861,6 @@
- CHARSET_FALSE=
- fi
-
--
--
- if test -n "$cons_saver"; then
- CONS_SAVER_TRUE=
- CONS_SAVER_FALSE='#'
-@@ -31578,39 +31891,58 @@
-
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--{
-+(
-+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+ eval ac_val=\$$ac_var
-+ case $ac_val in #(
-+ *${as_nl}*)
-+ case $ac_var in #(
-+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+ esac
-+ case $ac_var in #(
-+ _ | IFS | as_nl) ;; #(
-+ *) $as_unset $ac_var ;;
-+ esac ;;
-+ esac
-+ done
-+
- (set) 2>&1 |
-- case `(ac_space=' '; set | grep ac_space) 2>&1` in
-- *ac_space=\ *)
-+ case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+ *${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \).
- sed -n \
- "s/'/'\\\\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-- ;;
-+ ;; #(
- *)
- # `set' quotes correctly as required by POSIX, so do not add quotes.
-- sed -n \
-- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
-- esac;
--} |
-+ esac |
-+ sort
-+) |
- sed '
-+ /^ac_cv_env_/b end
- t clear
- : clear
- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
- t end
-- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
- : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
-- if test -w $cache_file; then
-- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+ if test -w "$cache_file"; then
-+ test "x$cache_file" != "x/dev/null" &&
-+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
- else
-- echo "not updating unwritable cache $cache_file"
-+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
- fi
- fi
- rm -f confcache
-@@ -31619,32 +31951,18 @@
- # Let make expand exec_prefix.
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
--# VPATH may cause trouble with some makes, so we remove $(srcdir),
--# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
--# trailing colons and then remove the whole line if VPATH becomes empty
--# (actually we leave an empty line to preserve line numbers).
--if test "x$srcdir" = x.; then
-- ac_vpsub='/^[ ]*VPATH[ ]*=/{
--s/:*\$(srcdir):*/:/;
--s/:*\${srcdir}:*/:/;
--s/:*@srcdir@:*/:/;
--s/^\([^=]*=[ ]*\):*/\1/;
--s/:*$//;
--s/^[^=]*=[ ]*$//;
--}'
--fi
--
- DEFS=-DHAVE_CONFIG_H
-
- ac_libobjs=
- ac_ltlibobjs=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
- # 1. Remove the extension, and $U if already installed.
-- ac_i=`echo "$ac_i" |
-- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-- # 2. Add them.
-- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-+ ac_i=`echo "$ac_i" | sed "$ac_script"`
-+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
-+ # will be set to the directory where LIBOBJS objects are built.
-+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
- done
- LIBOBJS=$ac_libobjs
-
-@@ -31759,73 +32077,26 @@
- ## M4sh Initialization. ##
- ## --------------------- ##
-
--# Be Bourne compatible
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-- set -o posix
--fi
--DUALCASE=1; export DUALCASE # for MKS sh
--
--# Support unset when possible.
--if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-- as_unset=unset
--else
-- as_unset=false
--fi
--
--
--# Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
--PS1='$ '
--PS2='> '
--PS4='+ '
--
--# NLS nuisances.
--for as_var in \
-- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-- LC_TELEPHONE LC_TIME
--do
-- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-- eval $as_var=C; export $as_var
-+ setopt NO_GLOB_SUBST
- else
-- $as_unset $as_var
-- fi
--done
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-
--# Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-- as_expr=expr
--else
-- as_expr=false
- fi
-
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-- as_basename=basename
--else
-- as_basename=false
--fi
-
-
--# Name of the executable.
--as_me=`$as_basename "$0" ||
--$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)$' \| \
-- . : '\(.\)' 2>/dev/null ||
--echo X/"$0" |
-- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-- /^X\/\(\/\/\)$/{ s//\1/; q; }
-- /^X\/\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-
--
--# PATH needs CR, and LINENO needs CR and PATH.
-+# PATH needs CR
- # Avoid depending upon Character Ranges.
- as_cr_letters='abcdefghijklmnopqrstuvwxyz'
- as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-@@ -31846,14 +32117,24 @@
- rm -f conf$$.sh
- fi
-
-+# Support unset when possible.
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+ as_unset=unset
-+else
-+ as_unset=false
-+fi
-
-- as_lineno_1=$LINENO
-- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" || {
-- # Find who we are. Look in the path if we contain no path at all
-- # relative or not.
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order. Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" "" $as_nl"
-+
-+# Find who we are. Look in the path if we contain no directory separator.
- case $0 in
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -31863,6 +32144,7 @@
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
-+IFS=$as_save_IFS
-
- ;;
- esac
-@@ -31872,100 +32154,161 @@
- as_myself=$0
- fi
- if test ! -f "$as_myself"; then
-- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
--echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-- { (exit 1); exit 1; }; }
-+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+ { (exit 1); exit 1; }
- fi
-- case $CONFIG_SHELL in
-- '')
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+
-+# Work around bugs in pre-3.0 UWIN ksh.
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
- do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for as_base in sh bash ksh sh5; do
-- case $as_dir in
-- /*)
-- if ("$as_dir/$as_base" -c '
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ eval $as_var=C; export $as_var
-+ else
-+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ fi
-+done
-+
-+# Required to use basename.
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+ as_expr=expr
-+else
-+ as_expr=false
-+fi
-+
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-+ as_basename=basename
-+else
-+ as_basename=false
-+fi
-+
-+
-+# Name of the executable.
-+as_me=`$as_basename -- "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X/"$0" |
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-+
-+# CDPATH.
-+$as_unset CDPATH
-+
-+
-+
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
-- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-- CONFIG_SHELL=$as_dir/$as_base
-- export CONFIG_SHELL
-- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-- fi;;
-- esac
-- done
--done
--;;
-- esac
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
-- # line-number line before each line; the second 'sed' does the real
-- # work. The second script uses 'N' to pair each line-number line
-- # with the numbered line, and appends trailing '-' during
-- # substitution so that $LINENO is not a special case at line end.
-+ # line-number line after each line using $LINENO; the second 'sed'
-+ # does the real work. The second script uses 'N' to pair each
-+ # line-number line with the line containing $LINENO, and appends
-+ # trailing '-' during substitution so that $LINENO is not a special
-+ # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
-- sed '=' <$as_myself |
-+ # scripts with optimization help from Paolo Bonzini. Blame Lee
-+ # E. McMahon (1931-1989) for sed's syntax. :-)
-+ sed -n '
-+ p
-+ /[$]LINENO/=
-+ ' <$as_myself |
- sed '
-+ s/[$]LINENO.*/&-/
-+ t lineno
-+ b
-+ :lineno
- N
-- s,$,-,
- : loop
-- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
-- s,-$,,
-- s,^['$as_cr_digits']*\n,,
-+ s/-\n.*//
- ' >$as_me.lineno &&
-- chmod +x $as_me.lineno ||
-- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
--echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-+ chmod +x "$as_me.lineno" ||
-+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
-- # original and so on. Autoconf is especially sensible to this).
-- . ./$as_me.lineno
-+ # original and so on. Autoconf is especially sensitive to this).
-+ . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
- }
-
-
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-- *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T=' ' ;;
-- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+ as_dirname=dirname
-+else
-+ as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+ case `echo 'x\c'` in
-+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
-+ *) ECHO_C='\c';;
-+ esac;;
-+*)
-+ ECHO_N='-n';;
- esac
-
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
- rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+ rm -f conf$$.dir/conf$$.file
-+else
-+ rm -f conf$$.dir
-+ mkdir conf$$.dir
-+fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
-- # We could just check for DJGPP; but this test a) works b) is more generic
-- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-- if test -f conf$$.exe; then
-- # Don't use ln at all; we don't have any links
-- as_ln_s='cp -p'
-- else
- as_ln_s='ln -s'
-- fi
-+ # ... but there are two gotchas:
-+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+ # In both cases, we have to default to `cp -p'.
-+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+ as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
--rm -f conf$$ conf$$.exe conf$$.file
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-
- if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
-@@ -31974,7 +32317,28 @@
- as_mkdir_p=false
- fi
-
--as_executable_p="test -f"
-+if test -x / >/dev/null 2>&1; then
-+ as_test_x='test -x'
-+else
-+ if ls -dL / >/dev/null 2>&1; then
-+ as_ls_L_option=L
-+ else
-+ as_ls_L_option=
-+ fi
-+ as_test_x='
-+ eval sh -c '\''
-+ if test -d "$1"; then
-+ test -d "$1/.";
-+ else
-+ case $1 in
-+ -*)set "./$1";;
-+ esac;
-+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-+ ???[sx]*):;;*)false;;esac;fi
-+ '\'' sh
-+ '
-+fi
-+as_executable_p=$as_test_x
-
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -31983,31 +32347,14 @@
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" $as_nl"
--
--# CDPATH.
--$as_unset CDPATH
--
- exec 6>&1
-
--# Open the log real soon, to keep \$[0] and so on meaningful, and to
-+# Save the log message, to keep $[0] and so on meaningful, and to
- # report actual input values of CONFIG_FILES etc. instead of their
--# values after options handling. Logging --version etc. is OK.
--exec 5>>config.log
--{
-- echo
-- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
--## Running $as_me. ##
--_ASBOX
--} >&5
--cat >&5 <<_CSEOF
--
-+# values after options handling.
-+ac_log="
- This file was extended by $as_me, which was
--generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.61. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -32015,30 +32362,20 @@
- CONFIG_COMMANDS = $CONFIG_COMMANDS
- $ $0 $@
-
--_CSEOF
--echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
--echo >&5
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+"
-+
- _ACEOF
-
-+cat >>$CONFIG_STATUS <<_ACEOF
- # Files that config.status was made for.
--if test -n "$ac_config_files"; then
-- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_headers"; then
-- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_links"; then
-- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
--fi
-+config_files="$ac_config_files"
-+config_headers="$ac_config_headers"
-+config_commands="$ac_config_commands"
-
--if test -n "$ac_config_commands"; then
-- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
--fi
-+_ACEOF
-
- cat >>$CONFIG_STATUS <<\_ACEOF
--
- ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
- current configuration.
-@@ -32046,7 +32383,7 @@
- Usage: $0 [OPTIONS] [FILE]...
-
- -h, --help print this help, then exit
-- -V, --version print version number, then exit
-+ -V, --version print version number and configuration settings, then exit
- -q, --quiet do not print progress messages
- -d, --debug don't remove temporary files
- --recheck update $as_me by reconfiguring in the same conditions
-@@ -32065,19 +32402,22 @@
- $config_commands
-
- Report bugs to <bug-autoconf at gnu.org>."
--_ACEOF
-
-+_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
- config.status
--configured by $0, generated by GNU Autoconf 2.59,
-- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.61,
-+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
--Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 2006 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
--srcdir=$srcdir
--INSTALL="$INSTALL"
-+
-+ac_pwd='$ac_pwd'
-+srcdir='$srcdir'
-+INSTALL='$INSTALL'
-+MKDIR_P='$MKDIR_P'
- _ACEOF
-
- cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -32088,39 +32428,24 @@
- do
- case $1 in
- --*=*)
-- ac_option=`expr "x$1" : 'x\([^=]*\)='`
-- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
- ac_shift=:
- ;;
-- -*)
-+ *)
- ac_option=$1
- ac_optarg=$2
- ac_shift=shift
- ;;
-- *) # This is not an option, so the user has probably given explicit
-- # arguments.
-- ac_option=$1
-- ac_need_defaults=false;;
- esac
-
- case $ac_option in
- # Handling of the options.
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- ac_cs_recheck=: ;;
-- --version | --vers* | -V )
-- echo "$ac_cs_version"; exit 0 ;;
-- --he | --h)
-- # Conflict between --help and --header
-- { { echo "$as_me:$LINENO: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&2;}
-- { (exit 1); exit 1; }; };;
-- --help | --hel | -h )
-- echo "$ac_cs_usage"; exit 0 ;;
-- --debug | --d* | -d )
-+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-+ echo "$ac_cs_version"; exit ;;
-+ --debug | --debu | --deb | --de | --d | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
- $ac_shift
-@@ -32130,18 +32455,24 @@
- $ac_shift
- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
- ac_need_defaults=false;;
-+ --he | --h)
-+ # Conflict between --help and --header
-+ { echo "$as_me: error: ambiguous option: $1
-+Try \`$0 --help' for more information." >&2
-+ { (exit 1); exit 1; }; };;
-+ --help | --hel | -h )
-+ echo "$ac_cs_usage"; exit ;;
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil | --si | --s)
- ac_cs_silent=: ;;
-
- # This is an error.
-- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&2;}
-+ -*) { echo "$as_me: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; } ;;
-
-- *) ac_config_targets="$ac_config_targets $1" ;;
-+ *) ac_config_targets="$ac_config_targets $1"
-+ ac_need_defaults=false ;;
-
- esac
- shift
-@@ -32157,17 +32488,28 @@
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- if \$ac_cs_recheck; then
-- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+ CONFIG_SHELL=$SHELL
-+ export CONFIG_SHELL
-+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- fi
-
- _ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+exec 5>>config.log
-+{
-+ echo
-+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-+## Running $as_me. ##
-+_ASBOX
-+ echo "$ac_log"
-+} >&5
-
-+_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- #
--# INIT-COMMANDS section.
-+# INIT-COMMANDS
- #
--
- AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
- # Capture the value of obsolete ALL_LINGUAS because we need it to compute
- # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-@@ -32179,13 +32521,15 @@
-
- _ACEOF
-
--
--
- cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+# Handling of arguments.
- for ac_config_target in $ac_config_targets
- do
-- case "$ac_config_target" in
-- # Handling of arguments.
-+ case $ac_config_target in
-+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-+ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "mc.spec" ) CONFIG_FILES="$CONFIG_FILES mc.spec" ;;
- "mc.qpg" ) CONFIG_FILES="$CONFIG_FILES mc.qpg" ;;
-@@ -32241,15 +32585,14 @@
- "doc/sr/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/sr/Makefile" ;;
- "intl/Makefile" ) CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
- "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-- "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-+
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
- esac
- done
-
-+
- # If the user did not use the arguments to specify the items to instantiate,
- # then the envvar interface is used. Set only those that are not.
- # We use the long form for the default assignment because of an extremely
-@@ -32261,414 +32604,527 @@
- fi
-
- # Have a temporary directory for convenience. Make it in the build tree
--# simply because there is no reason to put it here, and in addition,
-+# simply because there is no reason against having it here, and in addition,
- # creating and moving files from /tmp can sometimes cause problems.
--# Create a temporary directory, and hook for its removal unless debugging.
-+# Hook for its removal unless debugging.
-+# Note that there is a small window in which the directory will not be cleaned:
-+# after its creation but before its name has been assigned to `$tmp'.
- $debug ||
- {
-- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-+ tmp=
-+ trap 'exit_status=$?
-+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-+' 0
- trap '{ (exit 1); exit 1; }' 1 2 13 15
- }
--
- # Create a (secure) tmp directory for tmp files.
-
- {
-- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
- } ||
- {
-- tmp=./confstat$$-$RANDOM
-- (umask 077 && mkdir $tmp)
-+ tmp=./conf$$-$RANDOM
-+ (umask 077 && mkdir "$tmp")
- } ||
- {
- echo "$me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
- }
-
--_ACEOF
--
--cat >>$CONFIG_STATUS <<_ACEOF
--
- #
--# CONFIG_FILES section.
-+# Set up the sed scripts for CONFIG_FILES section.
- #
-
- # No need to generate the scripts if there are no CONFIG_FILES.
- # This happens for instance when ./config.status config.h
--if test -n "\$CONFIG_FILES"; then
-- # Protect against being on the right side of a sed subst in config.status.
-- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
--s, at SHELL@,$SHELL,;t t
--s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
--s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
--s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
--s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
--s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
--s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
--s, at exec_prefix@,$exec_prefix,;t t
--s, at prefix@,$prefix,;t t
--s, at program_transform_name@,$program_transform_name,;t t
--s, at bindir@,$bindir,;t t
--s, at sbindir@,$sbindir,;t t
--s, at libexecdir@,$libexecdir,;t t
--s, at datadir@,$datadir,;t t
--s, at sysconfdir@,$sysconfdir,;t t
--s, at sharedstatedir@,$sharedstatedir,;t t
--s, at localstatedir@,$localstatedir,;t t
--s, at libdir@,$libdir,;t t
--s, at includedir@,$includedir,;t t
--s, at oldincludedir@,$oldincludedir,;t t
--s, at infodir@,$infodir,;t t
--s, at mandir@,$mandir,;t t
--s, at build_alias@,$build_alias,;t t
--s, at host_alias@,$host_alias,;t t
--s, at target_alias@,$target_alias,;t t
--s, at DEFS@,$DEFS,;t t
--s, at ECHO_C@,$ECHO_C,;t t
--s, at ECHO_N@,$ECHO_N,;t t
--s, at ECHO_T@,$ECHO_T,;t t
--s, at LIBS@,$LIBS,;t t
--s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
--s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
--s, at INSTALL_DATA@,$INSTALL_DATA,;t t
--s, at CYGPATH_W@,$CYGPATH_W,;t t
--s, at PACKAGE@,$PACKAGE,;t t
--s, at VERSION@,$VERSION,;t t
--s, at ACLOCAL@,$ACLOCAL,;t t
--s, at AUTOCONF@,$AUTOCONF,;t t
--s, at AUTOMAKE@,$AUTOMAKE,;t t
--s, at AUTOHEADER@,$AUTOHEADER,;t t
--s, at MAKEINFO@,$MAKEINFO,;t t
--s, at install_sh@,$install_sh,;t t
--s, at STRIP@,$STRIP,;t t
--s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
--s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
--s, at mkdir_p@,$mkdir_p,;t t
--s, at AWK@,$AWK,;t t
--s, at SET_MAKE@,$SET_MAKE,;t t
--s, at am__leading_dot@,$am__leading_dot,;t t
--s, at AMTAR@,$AMTAR,;t t
--s, at am__tar@,$am__tar,;t t
--s, at am__untar@,$am__untar,;t t
--s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
--s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
--s, at MAINT@,$MAINT,;t t
--s, at build@,$build,;t t
--s, at build_cpu@,$build_cpu,;t t
--s, at build_vendor@,$build_vendor,;t t
--s, at build_os@,$build_os,;t t
--s, at host@,$host,;t t
--s, at host_cpu@,$host_cpu,;t t
--s, at host_vendor@,$host_vendor,;t t
--s, at host_os@,$host_os,;t t
--s, at CC@,$CC,;t t
--s, at CFLAGS@,$CFLAGS,;t t
--s, at LDFLAGS@,$LDFLAGS,;t t
--s, at CPPFLAGS@,$CPPFLAGS,;t t
--s, at ac_ct_CC@,$ac_ct_CC,;t t
--s, at EXEEXT@,$EXEEXT,;t t
--s, at OBJEXT@,$OBJEXT,;t t
--s, at DEPDIR@,$DEPDIR,;t t
--s, at am__include@,$am__include,;t t
--s, at am__quote@,$am__quote,;t t
--s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
--s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
--s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
--s, at CCDEPMODE@,$CCDEPMODE,;t t
--s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
--s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
--s, at CPP@,$CPP,;t t
--s, at EGREP@,$EGREP,;t t
--s, at PKG_CONFIG@,$PKG_CONFIG,;t t
--s, at GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
--s, at GLIB_LIBS@,$GLIB_LIBS,;t t
--s, at GLIB_CONFIG@,$GLIB_CONFIG,;t t
--s, at GMODULE_CFLAGS@,$GMODULE_CFLAGS,;t t
--s, at GMODULE_LIBS@,$GMODULE_LIBS,;t t
--s, at LN_S@,$LN_S,;t t
--s, at AR@,$AR,;t t
--s, at ac_ct_AR@,$ac_ct_AR,;t t
--s, at X11_WWW@,$X11_WWW,;t t
--s, at MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
--s, at USE_NLS@,$USE_NLS,;t t
--s, at MSGFMT@,$MSGFMT,;t t
--s, at GMSGFMT@,$GMSGFMT,;t t
--s, at XGETTEXT@,$XGETTEXT,;t t
--s, at MSGMERGE@,$MSGMERGE,;t t
--s, at GLIBC2@,$GLIBC2,;t t
--s, at RANLIB@,$RANLIB,;t t
--s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
--s, at ALLOCA@,$ALLOCA,;t t
--s, at GLIBC21@,$GLIBC21,;t t
--s, at INTL_MACOSX_LIBS@,$INTL_MACOSX_LIBS,;t t
--s, at HAVE_POSIX_PRINTF@,$HAVE_POSIX_PRINTF,;t t
--s, at HAVE_ASPRINTF@,$HAVE_ASPRINTF,;t t
--s, at HAVE_SNPRINTF@,$HAVE_SNPRINTF,;t t
--s, at HAVE_WPRINTF@,$HAVE_WPRINTF,;t t
--s, at LIBICONV@,$LIBICONV,;t t
--s, at LTLIBICONV@,$LTLIBICONV,;t t
--s, at INTLBISON@,$INTLBISON,;t t
--s, at BUILD_INCLUDED_LIBINTL@,$BUILD_INCLUDED_LIBINTL,;t t
--s, at USE_INCLUDED_LIBINTL@,$USE_INCLUDED_LIBINTL,;t t
--s, at CATOBJEXT@,$CATOBJEXT,;t t
--s, at DATADIRNAME@,$DATADIRNAME,;t t
--s, at INSTOBJEXT@,$INSTOBJEXT,;t t
--s, at GENCAT@,$GENCAT,;t t
--s, at INTLOBJS@,$INTLOBJS,;t t
--s, at INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t
--s, at INTLLIBS@,$INTLLIBS,;t t
--s, at LIBINTL@,$LIBINTL,;t t
--s, at LTLIBINTL@,$LTLIBINTL,;t t
--s, at POSUB@,$POSUB,;t t
--s, at DOC_LINGUAS@,$DOC_LINGUAS,;t t
--s, at LIBOBJS@,$LIBOBJS,;t t
--s, at X_CFLAGS@,$X_CFLAGS,;t t
--s, at X_PRE_LIBS@,$X_PRE_LIBS,;t t
--s, at X_LIBS@,$X_LIBS,;t t
--s, at X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
--s, at ZIP@,$ZIP,;t t
--s, at UNZIP@,$UNZIP,;t t
--s, at HAVE_ZIPINFO@,$HAVE_ZIPINFO,;t t
--s, at PERL@,$PERL,;t t
--s, at MCSERVLIBS@,$MCSERVLIBS,;t t
--s, at configdir@,$configdir,;t t
--s, at HAVE_nroff@,$HAVE_nroff,;t t
--s, at MANDOC@,$MANDOC,;t t
--s, at MAN_FLAGS@,$MAN_FLAGS,;t t
--s, at HAVE_FILECMD@,$HAVE_FILECMD,;t t
--s, at MCLIBS@,$MCLIBS,;t t
--s, at RPM_VERSION@,$RPM_VERSION,;t t
--s, at subdirs@,$subdirs,;t t
--s, at USE_EDIT_TRUE@,$USE_EDIT_TRUE,;t t
--s, at USE_EDIT_FALSE@,$USE_EDIT_FALSE,;t t
--s, at USE_VFS_TRUE@,$USE_VFS_TRUE,;t t
--s, at USE_VFS_FALSE@,$USE_VFS_FALSE,;t t
--s, at USE_VFS_NET_TRUE@,$USE_VFS_NET_TRUE,;t t
--s, at USE_VFS_NET_FALSE@,$USE_VFS_NET_FALSE,;t t
--s, at USE_UNDEL_FS_TRUE@,$USE_UNDEL_FS_TRUE,;t t
--s, at USE_UNDEL_FS_FALSE@,$USE_UNDEL_FS_FALSE,;t t
--s, at USE_SAMBA_FS_TRUE@,$USE_SAMBA_FS_TRUE,;t t
--s, at USE_SAMBA_FS_FALSE@,$USE_SAMBA_FS_FALSE,;t t
--s, at USE_MCFS_TRUE@,$USE_MCFS_TRUE,;t t
--s, at USE_MCFS_FALSE@,$USE_MCFS_FALSE,;t t
--s, at INCLUDED_SLANG_TRUE@,$INCLUDED_SLANG_TRUE,;t t
--s, at INCLUDED_SLANG_FALSE@,$INCLUDED_SLANG_FALSE,;t t
--s, at CHARSET_TRUE@,$CHARSET_TRUE,;t t
--s, at CHARSET_FALSE@,$CHARSET_FALSE,;t t
--s, at CONS_SAVER_TRUE@,$CONS_SAVER_TRUE,;t t
--s, at CONS_SAVER_FALSE@,$CONS_SAVER_FALSE,;t t
--s, at LTLIBOBJS@,$LTLIBOBJS,;t t
--CEOF
-+if test -n "$CONFIG_FILES"; then
-
- _ACEOF
-
-- cat >>$CONFIG_STATUS <<\_ACEOF
-- # Split the substitutions into bite-sized pieces for seds with
-- # small command number limits, like on Digital OSF/1 and HP-UX.
-- ac_max_sed_lines=48
-- ac_sed_frag=1 # Number of current file.
-- ac_beg=1 # First line for current file.
-- ac_end=$ac_max_sed_lines # Line after last line for current file.
-- ac_more_lines=:
-- ac_sed_cmds=
-- while $ac_more_lines; do
-- if test $ac_beg -gt 1; then
-- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ cat >conf$$subs.sed <<_ACEOF
-+SHELL!$SHELL$ac_delim
-+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-+exec_prefix!$exec_prefix$ac_delim
-+prefix!$prefix$ac_delim
-+program_transform_name!$program_transform_name$ac_delim
-+bindir!$bindir$ac_delim
-+sbindir!$sbindir$ac_delim
-+libexecdir!$libexecdir$ac_delim
-+datarootdir!$datarootdir$ac_delim
-+datadir!$datadir$ac_delim
-+sysconfdir!$sysconfdir$ac_delim
-+sharedstatedir!$sharedstatedir$ac_delim
-+localstatedir!$localstatedir$ac_delim
-+includedir!$includedir$ac_delim
-+oldincludedir!$oldincludedir$ac_delim
-+docdir!$docdir$ac_delim
-+infodir!$infodir$ac_delim
-+htmldir!$htmldir$ac_delim
-+dvidir!$dvidir$ac_delim
-+pdfdir!$pdfdir$ac_delim
-+psdir!$psdir$ac_delim
-+libdir!$libdir$ac_delim
-+localedir!$localedir$ac_delim
-+mandir!$mandir$ac_delim
-+DEFS!$DEFS$ac_delim
-+ECHO_C!$ECHO_C$ac_delim
-+ECHO_N!$ECHO_N$ac_delim
-+ECHO_T!$ECHO_T$ac_delim
-+LIBS!$LIBS$ac_delim
-+build_alias!$build_alias$ac_delim
-+host_alias!$host_alias$ac_delim
-+target_alias!$target_alias$ac_delim
-+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-+INSTALL_DATA!$INSTALL_DATA$ac_delim
-+am__isrc!$am__isrc$ac_delim
-+CYGPATH_W!$CYGPATH_W$ac_delim
-+PACKAGE!$PACKAGE$ac_delim
-+VERSION!$VERSION$ac_delim
-+ACLOCAL!$ACLOCAL$ac_delim
-+AUTOCONF!$AUTOCONF$ac_delim
-+AUTOMAKE!$AUTOMAKE$ac_delim
-+AUTOHEADER!$AUTOHEADER$ac_delim
-+MAKEINFO!$MAKEINFO$ac_delim
-+install_sh!$install_sh$ac_delim
-+STRIP!$STRIP$ac_delim
-+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-+mkdir_p!$mkdir_p$ac_delim
-+AWK!$AWK$ac_delim
-+SET_MAKE!$SET_MAKE$ac_delim
-+am__leading_dot!$am__leading_dot$ac_delim
-+AMTAR!$AMTAR$ac_delim
-+am__tar!$am__tar$ac_delim
-+am__untar!$am__untar$ac_delim
-+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
-+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
-+MAINT!$MAINT$ac_delim
-+build!$build$ac_delim
-+build_cpu!$build_cpu$ac_delim
-+build_vendor!$build_vendor$ac_delim
-+build_os!$build_os$ac_delim
-+host!$host$ac_delim
-+host_cpu!$host_cpu$ac_delim
-+host_vendor!$host_vendor$ac_delim
-+host_os!$host_os$ac_delim
-+CC!$CC$ac_delim
-+CFLAGS!$CFLAGS$ac_delim
-+LDFLAGS!$LDFLAGS$ac_delim
-+CPPFLAGS!$CPPFLAGS$ac_delim
-+ac_ct_CC!$ac_ct_CC$ac_delim
-+EXEEXT!$EXEEXT$ac_delim
-+OBJEXT!$OBJEXT$ac_delim
-+DEPDIR!$DEPDIR$ac_delim
-+am__include!$am__include$ac_delim
-+am__quote!$am__quote$ac_delim
-+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-+CCDEPMODE!$CCDEPMODE$ac_delim
-+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-+CPP!$CPP$ac_delim
-+GREP!$GREP$ac_delim
-+EGREP!$EGREP$ac_delim
-+PKG_CONFIG!$PKG_CONFIG$ac_delim
-+GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
-+GLIB_LIBS!$GLIB_LIBS$ac_delim
-+GLIB_CONFIG!$GLIB_CONFIG$ac_delim
-+GMODULE_CFLAGS!$GMODULE_CFLAGS$ac_delim
-+GMODULE_LIBS!$GMODULE_LIBS$ac_delim
-+LN_S!$LN_S$ac_delim
-+AR!$AR$ac_delim
-+_ACEOF
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+ break
-+ elif $ac_last_try; then
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { (exit 1); exit 1; }; }
- else
-- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-- if test ! -s $tmp/subs.frag; then
-- ac_more_lines=false
-- else
-- # The purpose of the label and of the branching condition is to
-- # speed up the sed processing (if there are no `@' at all, there
-- # is no need to browse any of the substitutions).
-- # These are the two extra sed commands mentioned above.
-- (echo ':t
-- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-- if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-- else
-- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
- fi
-- ac_sed_frag=`expr $ac_sed_frag + 1`
-- ac_beg=$ac_end
-- ac_end=`expr $ac_end + $ac_max_sed_lines`
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ cat >conf$$subs.sed <<_ACEOF
-+X11_WWW!$X11_WWW$ac_delim
-+MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
-+USE_NLS!$USE_NLS$ac_delim
-+MSGFMT!$MSGFMT$ac_delim
-+GMSGFMT!$GMSGFMT$ac_delim
-+XGETTEXT!$XGETTEXT$ac_delim
-+MSGMERGE!$MSGMERGE$ac_delim
-+GLIBC2!$GLIBC2$ac_delim
-+RANLIB!$RANLIB$ac_delim
-+ALLOCA!$ALLOCA$ac_delim
-+GLIBC21!$GLIBC21$ac_delim
-+INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
-+HAVE_POSIX_PRINTF!$HAVE_POSIX_PRINTF$ac_delim
-+HAVE_ASPRINTF!$HAVE_ASPRINTF$ac_delim
-+HAVE_SNPRINTF!$HAVE_SNPRINTF$ac_delim
-+HAVE_WPRINTF!$HAVE_WPRINTF$ac_delim
-+LIBICONV!$LIBICONV$ac_delim
-+LTLIBICONV!$LTLIBICONV$ac_delim
-+INTLBISON!$INTLBISON$ac_delim
-+BUILD_INCLUDED_LIBINTL!$BUILD_INCLUDED_LIBINTL$ac_delim
-+USE_INCLUDED_LIBINTL!$USE_INCLUDED_LIBINTL$ac_delim
-+CATOBJEXT!$CATOBJEXT$ac_delim
-+DATADIRNAME!$DATADIRNAME$ac_delim
-+INSTOBJEXT!$INSTOBJEXT$ac_delim
-+GENCAT!$GENCAT$ac_delim
-+INTLOBJS!$INTLOBJS$ac_delim
-+INTL_LIBTOOL_SUFFIX_PREFIX!$INTL_LIBTOOL_SUFFIX_PREFIX$ac_delim
-+INTLLIBS!$INTLLIBS$ac_delim
-+LIBINTL!$LIBINTL$ac_delim
-+LTLIBINTL!$LTLIBINTL$ac_delim
-+POSUB!$POSUB$ac_delim
-+DOC_LINGUAS!$DOC_LINGUAS$ac_delim
-+LIBOBJS!$LIBOBJS$ac_delim
-+XMKMF!$XMKMF$ac_delim
-+X_CFLAGS!$X_CFLAGS$ac_delim
-+X_PRE_LIBS!$X_PRE_LIBS$ac_delim
-+X_LIBS!$X_LIBS$ac_delim
-+X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
-+ZIP!$ZIP$ac_delim
-+UNZIP!$UNZIP$ac_delim
-+HAVE_ZIPINFO!$HAVE_ZIPINFO$ac_delim
-+PERL!$PERL$ac_delim
-+MCSERVLIBS!$MCSERVLIBS$ac_delim
-+configdir!$configdir$ac_delim
-+HAVE_nroff!$HAVE_nroff$ac_delim
-+MANDOC!$MANDOC$ac_delim
-+MAN_FLAGS!$MAN_FLAGS$ac_delim
-+HAVE_FILECMD!$HAVE_FILECMD$ac_delim
-+MCLIBS!$MCLIBS$ac_delim
-+RPM_VERSION!$RPM_VERSION$ac_delim
-+subdirs!$subdirs$ac_delim
-+USE_EDIT_TRUE!$USE_EDIT_TRUE$ac_delim
-+USE_EDIT_FALSE!$USE_EDIT_FALSE$ac_delim
-+USE_VFS_TRUE!$USE_VFS_TRUE$ac_delim
-+USE_VFS_FALSE!$USE_VFS_FALSE$ac_delim
-+USE_VFS_NET_TRUE!$USE_VFS_NET_TRUE$ac_delim
-+USE_VFS_NET_FALSE!$USE_VFS_NET_FALSE$ac_delim
-+USE_UNDEL_FS_TRUE!$USE_UNDEL_FS_TRUE$ac_delim
-+USE_UNDEL_FS_FALSE!$USE_UNDEL_FS_FALSE$ac_delim
-+USE_SAMBA_FS_TRUE!$USE_SAMBA_FS_TRUE$ac_delim
-+USE_SAMBA_FS_FALSE!$USE_SAMBA_FS_FALSE$ac_delim
-+USE_MCFS_TRUE!$USE_MCFS_TRUE$ac_delim
-+USE_MCFS_FALSE!$USE_MCFS_FALSE$ac_delim
-+INCLUDED_SLANG_TRUE!$INCLUDED_SLANG_TRUE$ac_delim
-+INCLUDED_SLANG_FALSE!$INCLUDED_SLANG_FALSE$ac_delim
-+CHARSET_TRUE!$CHARSET_TRUE$ac_delim
-+CHARSET_FALSE!$CHARSET_FALSE$ac_delim
-+CONS_SAVER_TRUE!$CONS_SAVER_TRUE$ac_delim
-+CONS_SAVER_FALSE!$CONS_SAVER_FALSE$ac_delim
-+LTLIBOBJS!$LTLIBOBJS$ac_delim
-+_ACEOF
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 70; then
-+ break
-+ elif $ac_last_try; then
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { (exit 1); exit 1; }; }
-+ else
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
- done
-- if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds=cat
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
- fi
--fi # test -n "$CONFIG_FILES"
-
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
- _ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+:end
-+s/|#_!!_#|//g
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-+# trailing colons and then remove the whole line if VPATH becomes empty
-+# (actually we leave an empty line to preserve line numbers).
-+if test "x$srcdir" = x.; then
-+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
-+s/:*\$(srcdir):*/:/
-+s/:*\${srcdir}:*/:/
-+s/:*@srcdir@:*/:/
-+s/^\([^=]*=[ ]*\):*/\1/
-+s/:*$//
-+s/^[^=]*=[ ]*$//
-+}'
-+fi
-+
- cat >>$CONFIG_STATUS <<\_ACEOF
--for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-- case $ac_file in
-- - | *:- | *:-:* ) # input from stdin
-- cat >$tmp/stdin
-- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-- * ) ac_file_in=$ac_file.in ;;
-+fi # test -n "$CONFIG_FILES"
-+
-+
-+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
-+do
-+ case $ac_tag in
-+ :[FHLC]) ac_mode=$ac_tag; continue;;
- esac
-+ case $ac_mode$ac_tag in
-+ :[FHL]*:*);;
-+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-+ { (exit 1); exit 1; }; };;
-+ :[FH]-) ac_tag=-:-;;
-+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-+ esac
-+ ac_save_IFS=$IFS
-+ IFS=:
-+ set x $ac_tag
-+ IFS=$ac_save_IFS
-+ shift
-+ ac_file=$1
-+ shift
-
-- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-+ case $ac_mode in
-+ :L) ac_source=$1;;
-+ :[FH])
-+ ac_file_inputs=
-+ for ac_f
-+ do
-+ case $ac_f in
-+ -) ac_f="$tmp/stdin";;
-+ *) # Look for the file first in the build tree, then in the source tree
-+ # (if the path is not absolute). The absolute path cannot be DOS-style,
-+ # because $ac_f cannot contain `:'.
-+ test -f "$ac_f" ||
-+ case $ac_f in
-+ [\\/$]*) false;;
-+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-+ esac ||
-+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-+ { (exit 1); exit 1; }; };;
-+ esac
-+ ac_file_inputs="$ac_file_inputs $ac_f"
-+ done
-+
-+ # Let's still pretend it is `configure' which instantiates (i.e., don't
-+ # use $as_me), people would be surprised to read:
-+ # /* config.h. Generated by config.status. */
-+ configure_input="Generated from "`IFS=:
-+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-+ if test x"$ac_file" != x-; then
-+ configure_input="$ac_file. $configure_input"
-+ { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+ fi
-+
-+ case $ac_tag in
-+ *:-:* | *:-) cat >"$tmp/stdin";;
-+ esac
-+ ;;
-+ esac
-+
-+ ac_dir=`$as_dirname -- "$ac_file" ||
- $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
-- X"$ac_file" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$ac_file" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
- s/.*/./; q'`
-- { if $as_mkdir_p; then
-- mkdir -p "$ac_dir"
-- else
-- as_dir="$ac_dir"
-+ { as_dir="$ac_dir"
-+ case $as_dir in #(
-+ -*) as_dir=./$as_dir;;
-+ esac
-+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
-- while test ! -d "$as_dir"; do
-- as_dirs="$as_dir $as_dirs"
-- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+ while :; do
-+ case $as_dir in #(
-+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+ *) as_qdir=$as_dir;;
-+ esac
-+ as_dirs="'$as_qdir' $as_dirs"
-+ as_dir=`$as_dirname -- "$as_dir" ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
-- X"$as_dir" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
- s/.*/./; q'`
-+ test -d "$as_dir" && break
- done
-- test ! -n "$as_dirs" || mkdir $as_dirs
-- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+ test -z "$as_dirs" || eval "mkdir $as_dirs"
-+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
--
- ac_builddir=.
-
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-- # A "../" for each directory in $ac_dir_suffix.
-- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
-- ac_dir_suffix= ac_top_builddir=
--fi
-+ # A ".." for each directory in $ac_dir_suffix.
-+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+ case $ac_top_builddir_sub in
-+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+ esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-
- case $srcdir in
-- .) # No --srcdir option. We are building in place.
-+ .) # We are building in place.
- ac_srcdir=.
-- if test -z "$ac_top_builddir"; then
-- ac_top_srcdir=.
-- else
-- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-- fi ;;
-- [\\/]* | ?:[\\/]* ) # Absolute path.
-+ ac_top_srcdir=$ac_top_builddir_sub
-+ ac_abs_top_srcdir=$ac_pwd ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
-- ac_top_srcdir=$srcdir ;;
-- *) # Relative path.
-- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+ ac_top_srcdir=$srcdir
-+ ac_abs_top_srcdir=$srcdir ;;
-+ *) # Relative name.
-+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_build_prefix$srcdir
-+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
- esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
-- case "$ac_dir" in
-- .) ac_abs_builddir=`pwd`;;
-- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-- *) ac_abs_builddir=`pwd`/"$ac_dir";;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
-- case ${ac_top_builddir}. in
-- .) ac_abs_top_builddir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
-- case $ac_srcdir in
-- .) ac_abs_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
-- case $ac_top_srcdir in
-- .) ac_abs_top_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-- esac;;
--esac
-
-+ case $ac_mode in
-+ :F)
-+ #
-+ # CONFIG_FILE
-+ #
-
- case $INSTALL in
- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-+ esac
-+ ac_MKDIR_P=$MKDIR_P
-+ case $MKDIR_P in
-+ [\\/$]* | ?:[\\/]* ) ;;
-+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
- esac
-+_ACEOF
-
-- if test x"$ac_file" != x-; then
-- { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
-- rm -f "$ac_file"
-- fi
-- # Let's still pretend it is `configure' which instantiates (i.e., don't
-- # use $as_me), people would be surprised to read:
-- # /* config.h. Generated by config.status. */
-- if test x"$ac_file" = x-; then
-- configure_input=
-- else
-- configure_input="$ac_file. "
-- fi
-- configure_input=$configure_input"Generated from `echo $ac_file_in |
-- sed 's,.*/,,'` by configure."
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If the template does not know about datarootdir, expand it.
-+# FIXME: This hack should be removed a few years after 2.60.
-+ac_datarootdir_hack=; ac_datarootdir_seen=
-
-- # First look for the input files in the build tree, otherwise in the
-- # src tree.
-- ac_file_inputs=`IFS=:
-- for f in $ac_file_in; do
-- case $f in
-- -) echo $tmp/stdin ;;
-- [\\/$]*)
-- # Absolute (can't be DOS-style, as IFS=:)
-- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
-- { (exit 1); exit 1; }; }
-- echo "$f";;
-- *) # Relative
-- if test -f "$f"; then
-- # Build tree
-- echo "$f"
-- elif test -f "$srcdir/$f"; then
-- # Source tree
-- echo "$srcdir/$f"
-- else
-- # /dev/null tree
-- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
-- { (exit 1); exit 1; }; }
-- fi;;
-+case `sed -n '/datarootdir/ {
-+ p
-+ q
-+}
-+/@datadir@/p
-+/@docdir@/p
-+/@infodir@/p
-+/@localedir@/p
-+/@mandir@/p
-+' $ac_file_inputs` in
-+*datarootdir*) ac_datarootdir_seen=yes;;
-+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+ ac_datarootdir_hack='
-+ s&@datadir@&$datadir&g
-+ s&@docdir@&$docdir&g
-+ s&@infodir@&$infodir&g
-+ s&@localedir@&$localedir&g
-+ s&@mandir@&$mandir&g
-+ s&\\\${datarootdir}&$datarootdir&g' ;;
- esac
-- done` || { (exit 1); exit 1; }
- _ACEOF
-+
-+# Neutralize VPATH when `$srcdir' = `.'.
-+# Shell code in configure.ac might set extrasub.
-+# FIXME: do we really want to maintain this feature?
- cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
- $extrasub
-@@ -32676,387 +33132,175 @@
- cat >>$CONFIG_STATUS <<\_ACEOF
- :t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--s, at configure_input@,$configure_input,;t t
--s, at srcdir@,$ac_srcdir,;t t
--s, at abs_srcdir@,$ac_abs_srcdir,;t t
--s, at top_srcdir@,$ac_top_srcdir,;t t
--s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
--s, at builddir@,$ac_builddir,;t t
--s, at abs_builddir@,$ac_abs_builddir,;t t
--s, at top_builddir@,$ac_top_builddir,;t t
--s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
--s, at INSTALL@,$ac_INSTALL,;t t
--" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-- rm -f $tmp/stdin
-- if test x"$ac_file" != x-; then
-- mv $tmp/out $ac_file
-- else
-- cat $tmp/out
-- rm -f $tmp/out
-- fi
-+s&@configure_input@&$configure_input&;t t
-+s&@top_builddir@&$ac_top_builddir_sub&;t t
-+s&@srcdir@&$ac_srcdir&;t t
-+s&@abs_srcdir@&$ac_abs_srcdir&;t t
-+s&@top_srcdir@&$ac_top_srcdir&;t t
-+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-+s&@builddir@&$ac_builddir&;t t
-+s&@abs_builddir@&$ac_abs_builddir&;t t
-+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-+s&@INSTALL@&$ac_INSTALL&;t t
-+s&@MKDIR_P@&$ac_MKDIR_P&;t t
-+$ac_datarootdir_hack
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
-
--done
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
-+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined. Please make sure it is defined." >&5
-+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined. Please make sure it is defined." >&2;}
-
-+ rm -f "$tmp/stdin"
-+ case $ac_file in
-+ -) cat "$tmp/out"; rm -f "$tmp/out";;
-+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-+ esac
-+ ;;
-+ :H)
- #
--# CONFIG_HEADER section.
-+ # CONFIG_HEADER
- #
-+_ACEOF
-
--# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
--# NAME is the cpp macro being defined and VALUE is the value it is being given.
--#
--# ac_d sets the value in "#define NAME VALUE" lines.
--ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
--ac_dB='[ ].*$,\1#\2'
-+# Transform confdefs.h into a sed script `conftest.defines', that
-+# substitutes the proper values into config.h.in to produce config.h.
-+rm -f conftest.defines conftest.tail
-+# First, append a space to every undef/define line, to ease matching.
-+echo 's/$/ /' >conftest.defines
-+# Then, protect against being on the right side of a sed subst, or in
-+# an unquoted here document, in config.status. If some macros were
-+# called several times there might be several #defines for the same
-+# symbol, which is useless. But do not sort them, since the last
-+# AC_DEFINE must be honored.
-+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-+# NAME is the cpp macro being defined, VALUE is the value it is being given.
-+# PARAMS is the parameter list in the macro definition--in most cases, it's
-+# just an empty string.
-+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
-+ac_dB='\\)[ (].*,\\1define\\2'
- ac_dC=' '
--ac_dD=',;t'
--# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
--ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
--ac_uB='$,\1#\2define\3'
--ac_uC=' '
--ac_uD=',;t'
--
--for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-- case $ac_file in
-- - | *:- | *:-:* ) # input from stdin
-- cat >$tmp/stdin
-- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-- * ) ac_file_in=$ac_file.in ;;
-- esac
--
-- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--
-- # First look for the input files in the build tree, otherwise in the
-- # src tree.
-- ac_file_inputs=`IFS=:
-- for f in $ac_file_in; do
-- case $f in
-- -) echo $tmp/stdin ;;
-- [\\/$]*)
-- # Absolute (can't be DOS-style, as IFS=:)
-- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
-- { (exit 1); exit 1; }; }
-- # Do quote $f, to prevent DOS paths from being IFS'd.
-- echo "$f";;
-- *) # Relative
-- if test -f "$f"; then
-- # Build tree
-- echo "$f"
-- elif test -f "$srcdir/$f"; then
-- # Source tree
-- echo "$srcdir/$f"
-- else
-- # /dev/null tree
-- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
-- { (exit 1); exit 1; }; }
-- fi;;
-- esac
-- done` || { (exit 1); exit 1; }
-- # Remove the trailing spaces.
-- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
--
--_ACEOF
-+ac_dD=' ,'
-
--# Transform confdefs.h into two sed scripts, `conftest.defines' and
--# `conftest.undefs', that substitutes the proper values into
--# config.h.in to produce config.h. The first handles `#define'
--# templates, and the second `#undef' templates.
--# And first: Protect against being on the right side of a sed subst in
--# config.status. Protect against being in an unquoted here document
--# in config.status.
--rm -f conftest.defines conftest.undefs
--# Using a here document instead of a string reduces the quoting nightmare.
--# Putting comments in sed scripts is not portable.
--#
--# `end' is used to avoid that the second main sed command (meant for
--# 0-ary CPP macros) applies to n-ary macro definitions.
--# See the Autoconf documentation for `clear'.
--cat >confdef2sed.sed <<\_ACEOF
-+uniq confdefs.h |
-+ sed -n '
-+ t rset
-+ :rset
-+ s/^[ ]*#[ ]*define[ ][ ]*//
-+ t ok
-+ d
-+ :ok
- s/[\\&,]/\\&/g
--s,[\\$`],\\&,g
--t clear
--: clear
--s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
--t end
--s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
--: end
--_ACEOF
--# If some macros were called several times there might be several times
--# the same #defines, which is useless. Nevertheless, we may not want to
--# sort them, since we want the *last* AC-DEFINE to be honored.
--uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
--sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
--rm -f confdef2sed.sed
-+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-+ ' >>conftest.defines
-
--# This sed command replaces #undef with comments. This is necessary, for
-+# Remove the space that was appended to ease matching.
-+# Then replace #undef with comments. This is necessary, for
- # example, in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
--cat >>conftest.undefs <<\_ACEOF
--s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
--_ACEOF
-+# (The regexp can be short, since the line contains either #define or #undef.)
-+echo 's/ $//
-+s,^[ #]*u.*,/* & */,' >>conftest.defines
-
--# Break up conftest.defines because some shells have a limit on the size
--# of here documents, and old seds have small limits too (100 cmds).
--echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
--echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
--echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
--echo ' :' >>$CONFIG_STATUS
--rm -f conftest.tail
--while grep . conftest.defines >/dev/null
-+# Break up conftest.defines:
-+ac_max_sed_lines=50
-+
-+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-+# et cetera.
-+ac_in='$ac_file_inputs'
-+ac_out='"$tmp/out1"'
-+ac_nxt='"$tmp/out2"'
-+
-+while :
- do
-- # Write a limited-size here document to $tmp/defines.sed.
-- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-- # Speed up: don't consider the non `#define' lines.
-- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
-- # Work around the forget-to-reset-the-flag bug.
-- echo 't clr' >>$CONFIG_STATUS
-- echo ': clr' >>$CONFIG_STATUS
-- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-+ # Write a here document:
-+ cat >>$CONFIG_STATUS <<_ACEOF
-+ # First, check the format of the line:
-+ cat >"\$tmp/defines.sed" <<\\CEOF
-+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
-+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
-+b
-+:def
-+_ACEOF
-+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
- echo 'CEOF
-- sed -f $tmp/defines.sed $tmp/in >$tmp/out
-- rm -f $tmp/in
-- mv $tmp/out $tmp/in
--' >>$CONFIG_STATUS
-- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-+ grep . conftest.tail >/dev/null || break
- rm -f conftest.defines
- mv conftest.tail conftest.defines
- done
--rm -f conftest.defines
--echo ' fi # grep' >>$CONFIG_STATUS
--echo >>$CONFIG_STATUS
--
--# Break up conftest.undefs because some shells have a limit on the size
--# of here documents, and old seds have small limits too (100 cmds).
--echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
--rm -f conftest.tail
--while grep . conftest.undefs >/dev/null
--do
-- # Write a limited-size here document to $tmp/undefs.sed.
-- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-- # Speed up: don't consider the non `#undef'
-- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
-- # Work around the forget-to-reset-the-flag bug.
-- echo 't clr' >>$CONFIG_STATUS
-- echo ': clr' >>$CONFIG_STATUS
-- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-- echo 'CEOF
-- sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-- rm -f $tmp/in
-- mv $tmp/out $tmp/in
--' >>$CONFIG_STATUS
-- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-- rm -f conftest.undefs
-- mv conftest.tail conftest.undefs
--done
--rm -f conftest.undefs
-+rm -f conftest.defines conftest.tail
-
-+echo "ac_result=$ac_in" >>$CONFIG_STATUS
- cat >>$CONFIG_STATUS <<\_ACEOF
-- # Let's still pretend it is `configure' which instantiates (i.e., don't
-- # use $as_me), people would be surprised to read:
-- # /* config.h. Generated by config.status. */
-- if test x"$ac_file" = x-; then
-- echo "/* Generated by configure. */" >$tmp/config.h
-- else
-- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
-- fi
-- cat $tmp/in >>$tmp/config.h
-- rm -f $tmp/in
- if test x"$ac_file" != x-; then
-- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-+ echo "/* $configure_input */" >"$tmp/config.h"
-+ cat "$ac_result" >>"$tmp/config.h"
-+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
- else
-- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
--$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$ac_file" : 'X\(//\)[^/]' \| \
-- X"$ac_file" : 'X\(//\)$' \| \
-- X"$ac_file" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
--echo X"$ac_file" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- { if $as_mkdir_p; then
-- mkdir -p "$ac_dir"
-- else
-- as_dir="$ac_dir"
-- as_dirs=
-- while test ! -d "$as_dir"; do
-- as_dirs="$as_dir $as_dirs"
-- as_dir=`(dirname "$as_dir") 2>/dev/null ||
--$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$as_dir" : 'X\(//\)[^/]' \| \
-- X"$as_dir" : 'X\(//\)$' \| \
-- X"$as_dir" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
--echo X"$as_dir" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- done
-- test ! -n "$as_dirs" || mkdir $as_dirs
-- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-- { (exit 1); exit 1; }; }; }
--
- rm -f $ac_file
-- mv $tmp/config.h $ac_file
-+ mv "$tmp/config.h" $ac_file
- fi
- else
-- cat $tmp/config.h
-- rm -f $tmp/config.h
-+ echo "/* $configure_input */"
-+ cat "$ac_result"
- fi
-+ rm -f "$tmp/out12"
- # Compute $ac_file's index in $config_headers.
-+_am_arg=$ac_file
- _am_stamp_count=1
- for _am_header in $config_headers :; do
- case $_am_header in
-- $ac_file | $ac_file:* )
-+ $_am_arg | $_am_arg:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
- done
--echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
--$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X$ac_file : 'X\(//\)[^/]' \| \
-- X$ac_file : 'X\(//\)$' \| \
-- X$ac_file : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
--echo X$ac_file |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$_am_arg" : 'X\(//\)[^/]' \| \
-+ X"$_am_arg" : 'X\(//\)$' \| \
-+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X"$_am_arg" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
- s/.*/./; q'`/stamp-h$_am_stamp_count
--done
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
--
--#
--# CONFIG_COMMANDS section.
--#
--for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-- ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
--$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$ac_dest" : 'X\(//\)[^/]' \| \
-- X"$ac_dest" : 'X\(//\)$' \| \
-- X"$ac_dest" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
--echo X"$ac_dest" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- { if $as_mkdir_p; then
-- mkdir -p "$ac_dir"
-- else
-- as_dir="$ac_dir"
-- as_dirs=
-- while test ! -d "$as_dir"; do
-- as_dirs="$as_dir $as_dirs"
-- as_dir=`(dirname "$as_dir") 2>/dev/null ||
--$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$as_dir" : 'X\(//\)[^/]' \| \
-- X"$as_dir" : 'X\(//\)$' \| \
-- X"$as_dir" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
--echo X"$as_dir" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- done
-- test ! -n "$as_dirs" || mkdir $as_dirs
-- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-- { (exit 1); exit 1; }; }; }
--
-- ac_builddir=.
--
--if test "$ac_dir" != .; then
-- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-- # A "../" for each directory in $ac_dir_suffix.
-- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
-- ac_dir_suffix= ac_top_builddir=
--fi
--
--case $srcdir in
-- .) # No --srcdir option. We are building in place.
-- ac_srcdir=.
-- if test -z "$ac_top_builddir"; then
-- ac_top_srcdir=.
-- else
-- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-- fi ;;
-- [\\/]* | ?:[\\/]* ) # Absolute path.
-- ac_srcdir=$srcdir$ac_dir_suffix;
-- ac_top_srcdir=$srcdir ;;
-- *) # Relative path.
-- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
-+ ;;
-
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
-- case "$ac_dir" in
-- .) ac_abs_builddir=`pwd`;;
-- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-- *) ac_abs_builddir=`pwd`/"$ac_dir";;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
-- case ${ac_top_builddir}. in
-- .) ac_abs_top_builddir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
-- case $ac_srcdir in
-- .) ac_abs_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
-- case $ac_top_srcdir in
-- .) ac_abs_top_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-- esac;;
-+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-+echo "$as_me: executing $ac_file commands" >&6;}
-+ ;;
- esac
-
-
-- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
--echo "$as_me: executing $ac_dest commands" >&6;}
-- case $ac_dest in
-- depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-+ case $ac_file$ac_mode in
-+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
-@@ -33064,19 +33308,31 @@
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
-- # So let's grep whole file.
-- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-- dirpart=`(dirname "$mf") 2>/dev/null ||
-+ # Grep'ing the whole file is not good either: AIX grep has a line
-+ # limit of 2048, but all sed's we know have understand at least 4000.
-+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+ dirpart=`$as_dirname -- "$mf" ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
-- X"$mf" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$mf" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
- s/.*/./; q'`
- else
- continue
-@@ -33099,49 +33355,76 @@
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
-- fdir=`(dirname "$file") 2>/dev/null ||
-+ fdir=`$as_dirname -- "$file" ||
- $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
-- X"$file" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$file" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$file" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
- s/.*/./; q'`
-- { if $as_mkdir_p; then
-- mkdir -p $dirpart/$fdir
-- else
-- as_dir=$dirpart/$fdir
-+ { as_dir=$dirpart/$fdir
-+ case $as_dir in #(
-+ -*) as_dir=./$as_dir;;
-+ esac
-+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
-- while test ! -d "$as_dir"; do
-- as_dirs="$as_dir $as_dirs"
-- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+ while :; do
-+ case $as_dir in #(
-+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+ *) as_qdir=$as_dir;;
-+ esac
-+ as_dirs="'$as_qdir' $as_dirs"
-+ as_dir=`$as_dirname -- "$as_dir" ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
-- X"$as_dir" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
- s/.*/./; q'`
-+ test -d "$as_dir" && break
- done
-- test ! -n "$as_dirs" || mkdir $as_dirs
-- fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
--echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-+ test -z "$as_dirs" || eval "mkdir $as_dirs"
-+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
--
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
- done
- ;;
-- default-1 )
-+ "default-1":C)
- for ac_file in $CONFIG_FILES; do
- # Support "outfile[:infile[:infile...]]"
- case "$ac_file" in
-@@ -33253,11 +33536,10 @@
- ;;
- esac
- done ;;
-+
- esac
--done
--_ACEOF
-+done # for ac_tag
-
--cat >>$CONFIG_STATUS <<\_ACEOF
-
- { (exit 0); exit 0; }
- _ACEOF
-@@ -33294,7 +33576,10 @@
- # Remove --cache-file and --srcdir arguments so they do not pile up.
- ac_sub_configure_args=
- ac_prev=
-- for ac_arg in $ac_configure_args; do
-+ eval "set x $ac_configure_args"
-+ shift
-+ for ac_arg
-+ do
- if test -n "$ac_prev"; then
- ac_prev=
- continue
-@@ -33317,123 +33602,123 @@
- ac_prev=prefix ;;
- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
- ;;
-- *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
-+ *)
-+ case $ac_arg in
-+ *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ esac
-+ ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;;
- esac
- done
-
- # Always prepend --prefix to ensure using the same prefix
- # in subdir configurations.
-- ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args"
-+ ac_arg="--prefix=$prefix"
-+ case $ac_arg in
-+ *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ esac
-+ ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
-+
-+ # Pass --silent
-+ if test "$silent" = yes; then
-+ ac_sub_configure_args="--silent $ac_sub_configure_args"
-+ fi
-
- ac_popdir=`pwd`
- for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
-
- # Do not complain, so a configure script can configure whichever
- # parts of a large source tree are present.
-- test -d $srcdir/$ac_dir || continue
-+ test -d "$srcdir/$ac_dir" || continue
-
-- { echo "$as_me:$LINENO: configuring in $ac_dir" >&5
--echo "$as_me: configuring in $ac_dir" >&6;}
-- { if $as_mkdir_p; then
-- mkdir -p "$ac_dir"
-- else
-- as_dir="$ac_dir"
-+ ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
-+ echo "$as_me:$LINENO: $ac_msg" >&5
-+ echo "$ac_msg" >&6
-+ { as_dir="$ac_dir"
-+ case $as_dir in #(
-+ -*) as_dir=./$as_dir;;
-+ esac
-+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
-- while test ! -d "$as_dir"; do
-- as_dirs="$as_dir $as_dirs"
-- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+ while :; do
-+ case $as_dir in #(
-+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+ *) as_qdir=$as_dir;;
-+ esac
-+ as_dirs="'$as_qdir' $as_dirs"
-+ as_dir=`$as_dirname -- "$as_dir" ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
-- X"$as_dir" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
- s/.*/./; q'`
-+ test -d "$as_dir" && break
- done
-- test ! -n "$as_dirs" || mkdir $as_dirs
-- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+ test -z "$as_dirs" || eval "mkdir $as_dirs"
-+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
--
- ac_builddir=.
-
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-- # A "../" for each directory in $ac_dir_suffix.
-- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
-- ac_dir_suffix= ac_top_builddir=
--fi
-+ # A ".." for each directory in $ac_dir_suffix.
-+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+ case $ac_top_builddir_sub in
-+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+ esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-
- case $srcdir in
-- .) # No --srcdir option. We are building in place.
-+ .) # We are building in place.
- ac_srcdir=.
-- if test -z "$ac_top_builddir"; then
-- ac_top_srcdir=.
-- else
-- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-- fi ;;
-- [\\/]* | ?:[\\/]* ) # Absolute path.
-+ ac_top_srcdir=$ac_top_builddir_sub
-+ ac_abs_top_srcdir=$ac_pwd ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
-- ac_top_srcdir=$srcdir ;;
-- *) # Relative path.
-- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
--
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
-- case "$ac_dir" in
-- .) ac_abs_builddir=`pwd`;;
-- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-- *) ac_abs_builddir=`pwd`/"$ac_dir";;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
-- case ${ac_top_builddir}. in
-- .) ac_abs_top_builddir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
-- case $ac_srcdir in
-- .) ac_abs_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
-- case $ac_top_srcdir in
-- .) ac_abs_top_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-- esac;;
-+ ac_top_srcdir=$srcdir
-+ ac_abs_top_srcdir=$srcdir ;;
-+ *) # Relative name.
-+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_build_prefix$srcdir
-+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
- esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-- cd $ac_dir
-+ cd "$ac_dir"
-
- # Check for guested configure; otherwise get Cygnus style configure.
-- if test -f $ac_srcdir/configure.gnu; then
-- ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'"
-- elif test -f $ac_srcdir/configure; then
-- ac_sub_configure="$SHELL '$ac_srcdir/configure'"
-- elif test -f $ac_srcdir/configure.in; then
-- ac_sub_configure=$ac_configure
-+ if test -f "$ac_srcdir/configure.gnu"; then
-+ ac_sub_configure=$ac_srcdir/configure.gnu
-+ elif test -f "$ac_srcdir/configure"; then
-+ ac_sub_configure=$ac_srcdir/configure
-+ elif test -f "$ac_srcdir/configure.in"; then
-+ # This should be Cygnus configure.
-+ ac_sub_configure=$ac_aux_dir/configure
- else
- { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
-@@ -33445,21 +33730,21 @@
- # Make the cache file name correct relative to the subdirectory.
- case $cache_file in
- [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
-- *) # Relative path.
-- ac_sub_cache_file=$ac_top_builddir$cache_file ;;
-+ *) # Relative name.
-+ ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
- esac
-
-- { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
--echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
-+ { echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-+echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
- # The eval makes quoting arguments work.
-- eval $ac_sub_configure $ac_sub_configure_args \
-- --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||
-+ eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
-+ --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
- { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
- echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-- cd $ac_popdir
-+ cd "$ac_popdir"
- done
- fi
-
-diff -Nurwd mc-4.6.2~pre1.orig/doc/es/Makefile.in mc-4.6.2~pre1/doc/es/Makefile.in
---- mc-4.6.2~pre1.orig/doc/es/Makefile.in 2008-02-26 18:20:31.000000000 +0100
-+++ mc-4.6.2~pre1/doc/es/Makefile.in 2008-02-26 18:24:27.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -81,8 +77,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALLOCA = @ALLOCA@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -94,10 +88,6 @@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
--CHARSET_FALSE = @CHARSET_FALSE@
--CHARSET_TRUE = @CHARSET_TRUE@
--CONS_SAVER_FALSE = @CONS_SAVER_FALSE@
--CONS_SAVER_TRUE = @CONS_SAVER_TRUE@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
-@@ -119,6 +109,7 @@
- GMODULE_CFLAGS = @GMODULE_CFLAGS@
- GMODULE_LIBS = @GMODULE_LIBS@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_ASPRINTF = @HAVE_ASPRINTF@
- HAVE_FILECMD = @HAVE_FILECMD@
- HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-@@ -126,8 +117,7 @@
- HAVE_WPRINTF = @HAVE_WPRINTF@
- HAVE_ZIPINFO = @HAVE_ZIPINFO@
- HAVE_nroff = @HAVE_nroff@
--INCLUDED_SLANG_FALSE = @INCLUDED_SLANG_FALSE@
--INCLUDED_SLANG_TRUE = @INCLUDED_SLANG_TRUE@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -148,13 +138,12 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MANDOC = @MANDOC@
- MAN_FLAGS = @MAN_FLAGS@
- MCLIBS = @MCLIBS@
- MCSERVLIBS = @MCSERVLIBS@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
- MSGMERGE = @MSGMERGE@
-@@ -175,34 +164,22 @@
- SHELL = @SHELL@
- STRIP = @STRIP@
- UNZIP = @UNZIP@
--USE_EDIT_FALSE = @USE_EDIT_FALSE@
--USE_EDIT_TRUE = @USE_EDIT_TRUE@
- USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
--USE_MCFS_FALSE = @USE_MCFS_FALSE@
--USE_MCFS_TRUE = @USE_MCFS_TRUE@
- USE_NLS = @USE_NLS@
--USE_SAMBA_FS_FALSE = @USE_SAMBA_FS_FALSE@
--USE_SAMBA_FS_TRUE = @USE_SAMBA_FS_TRUE@
--USE_UNDEL_FS_FALSE = @USE_UNDEL_FS_FALSE@
--USE_UNDEL_FS_TRUE = @USE_UNDEL_FS_TRUE@
--USE_VFS_FALSE = @USE_VFS_FALSE@
--USE_VFS_NET_FALSE = @USE_VFS_NET_FALSE@
--USE_VFS_NET_TRUE = @USE_VFS_NET_TRUE@
--USE_VFS_TRUE = @USE_VFS_TRUE@
- VERSION = @VERSION@
- X11_WWW = @X11_WWW@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- ZIP = @ZIP@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -214,30 +191,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- configdir = @configdir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@/es
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- man_MANS = mc.1
- pkgdata_DATA = mc.hlp.es
- EXTRA_DIST = xnc.hlp
-@@ -276,10 +264,9 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mc.1: $(top_builddir)/config.status $(srcdir)/mc.1.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
--uninstall-info-am:
- install-man1: $(man1_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
-- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
-+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
-@@ -324,7 +311,7 @@
- done
- install-pkgdataDATA: $(pkgdata_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
-+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -347,22 +334,21 @@
-
-
- distdir: $(DISTFILES)
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
- esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -378,7 +364,7 @@
- all-am: Makefile $(MANS) $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pkgdatadir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -425,12 +411,20 @@
-
- install-data-am: install-man install-pkgdataDATA
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man: install-man1
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -449,19 +443,23 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-man uninstall-pkgdataDATA
-+uninstall-am: uninstall-man uninstall-pkgdataDATA
-
- uninstall-man: uninstall-man1
-
-+.MAKE: install-am install-strip
-+
- .PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
-- install install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-- install-man1 install-pkgdataDATA install-strip installcheck \
-+ install install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-man1 install-pdf install-pdf-am install-pkgdataDATA \
-+ install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-- pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
-- uninstall-man uninstall-man1 uninstall-pkgdataDATA
-+ pdf-am ps ps-am uninstall uninstall-am uninstall-man \
-+ uninstall-man1 uninstall-pkgdataDATA
-
-
- mc.hlp.es: mc.1 $(srcdir)/xnc.hlp $(top_builddir)/src/man2hlp
-diff -Nurwd mc-4.6.2~pre1.orig/doc/hu/Makefile.in mc-4.6.2~pre1/doc/hu/Makefile.in
---- mc-4.6.2~pre1.orig/doc/hu/Makefile.in 2008-02-26 18:20:31.000000000 +0100
-+++ mc-4.6.2~pre1/doc/hu/Makefile.in 2008-02-26 18:24:27.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -81,8 +77,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALLOCA = @ALLOCA@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -94,10 +88,6 @@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
--CHARSET_FALSE = @CHARSET_FALSE@
--CHARSET_TRUE = @CHARSET_TRUE@
--CONS_SAVER_FALSE = @CONS_SAVER_FALSE@
--CONS_SAVER_TRUE = @CONS_SAVER_TRUE@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
-@@ -119,6 +109,7 @@
- GMODULE_CFLAGS = @GMODULE_CFLAGS@
- GMODULE_LIBS = @GMODULE_LIBS@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_ASPRINTF = @HAVE_ASPRINTF@
- HAVE_FILECMD = @HAVE_FILECMD@
- HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-@@ -126,8 +117,7 @@
- HAVE_WPRINTF = @HAVE_WPRINTF@
- HAVE_ZIPINFO = @HAVE_ZIPINFO@
- HAVE_nroff = @HAVE_nroff@
--INCLUDED_SLANG_FALSE = @INCLUDED_SLANG_FALSE@
--INCLUDED_SLANG_TRUE = @INCLUDED_SLANG_TRUE@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -148,13 +138,12 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MANDOC = @MANDOC@
- MAN_FLAGS = @MAN_FLAGS@
- MCLIBS = @MCLIBS@
- MCSERVLIBS = @MCSERVLIBS@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
- MSGMERGE = @MSGMERGE@
-@@ -175,34 +164,22 @@
- SHELL = @SHELL@
- STRIP = @STRIP@
- UNZIP = @UNZIP@
--USE_EDIT_FALSE = @USE_EDIT_FALSE@
--USE_EDIT_TRUE = @USE_EDIT_TRUE@
- USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
--USE_MCFS_FALSE = @USE_MCFS_FALSE@
--USE_MCFS_TRUE = @USE_MCFS_TRUE@
- USE_NLS = @USE_NLS@
--USE_SAMBA_FS_FALSE = @USE_SAMBA_FS_FALSE@
--USE_SAMBA_FS_TRUE = @USE_SAMBA_FS_TRUE@
--USE_UNDEL_FS_FALSE = @USE_UNDEL_FS_FALSE@
--USE_UNDEL_FS_TRUE = @USE_UNDEL_FS_TRUE@
--USE_VFS_FALSE = @USE_VFS_FALSE@
--USE_VFS_NET_FALSE = @USE_VFS_NET_FALSE@
--USE_VFS_NET_TRUE = @USE_VFS_NET_TRUE@
--USE_VFS_TRUE = @USE_VFS_TRUE@
- VERSION = @VERSION@
- X11_WWW = @X11_WWW@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- ZIP = @ZIP@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -214,30 +191,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- configdir = @configdir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@/hu
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- man_MANS = mc.1
- pkgdata_DATA = mc.hlp.hu
- EXTRA_DIST = xnc.hlp
-@@ -276,10 +264,9 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mc.1: $(top_builddir)/config.status $(srcdir)/mc.1.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
--uninstall-info-am:
- install-man1: $(man1_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
-- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
-+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
-@@ -324,7 +311,7 @@
- done
- install-pkgdataDATA: $(pkgdata_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
-+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -347,22 +334,21 @@
-
-
- distdir: $(DISTFILES)
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
- esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -378,7 +364,7 @@
- all-am: Makefile $(MANS) $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pkgdatadir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -425,12 +411,20 @@
-
- install-data-am: install-man install-pkgdataDATA
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man: install-man1
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -449,19 +443,23 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-man uninstall-pkgdataDATA
-+uninstall-am: uninstall-man uninstall-pkgdataDATA
-
- uninstall-man: uninstall-man1
-
-+.MAKE: install-am install-strip
-+
- .PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
-- install install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-- install-man1 install-pkgdataDATA install-strip installcheck \
-+ install install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-man1 install-pdf install-pdf-am install-pkgdataDATA \
-+ install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-- pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
-- uninstall-man uninstall-man1 uninstall-pkgdataDATA
-+ pdf-am ps ps-am uninstall uninstall-am uninstall-man \
-+ uninstall-man1 uninstall-pkgdataDATA
-
-
- mc.hlp.hu: mc.1 $(srcdir)/xnc.hlp $(top_builddir)/src/man2hlp
-diff -Nurwd mc-4.6.2~pre1.orig/doc/it/Makefile.in mc-4.6.2~pre1/doc/it/Makefile.in
---- mc-4.6.2~pre1.orig/doc/it/Makefile.in 2008-02-26 18:20:31.000000000 +0100
-+++ mc-4.6.2~pre1/doc/it/Makefile.in 2008-02-26 18:24:27.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -81,8 +77,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALLOCA = @ALLOCA@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -94,10 +88,6 @@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
--CHARSET_FALSE = @CHARSET_FALSE@
--CHARSET_TRUE = @CHARSET_TRUE@
--CONS_SAVER_FALSE = @CONS_SAVER_FALSE@
--CONS_SAVER_TRUE = @CONS_SAVER_TRUE@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
-@@ -119,6 +109,7 @@
- GMODULE_CFLAGS = @GMODULE_CFLAGS@
- GMODULE_LIBS = @GMODULE_LIBS@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_ASPRINTF = @HAVE_ASPRINTF@
- HAVE_FILECMD = @HAVE_FILECMD@
- HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-@@ -126,8 +117,7 @@
- HAVE_WPRINTF = @HAVE_WPRINTF@
- HAVE_ZIPINFO = @HAVE_ZIPINFO@
- HAVE_nroff = @HAVE_nroff@
--INCLUDED_SLANG_FALSE = @INCLUDED_SLANG_FALSE@
--INCLUDED_SLANG_TRUE = @INCLUDED_SLANG_TRUE@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -148,13 +138,12 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MANDOC = @MANDOC@
- MAN_FLAGS = @MAN_FLAGS@
- MCLIBS = @MCLIBS@
- MCSERVLIBS = @MCSERVLIBS@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
- MSGMERGE = @MSGMERGE@
-@@ -175,34 +164,22 @@
- SHELL = @SHELL@
- STRIP = @STRIP@
- UNZIP = @UNZIP@
--USE_EDIT_FALSE = @USE_EDIT_FALSE@
--USE_EDIT_TRUE = @USE_EDIT_TRUE@
- USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
--USE_MCFS_FALSE = @USE_MCFS_FALSE@
--USE_MCFS_TRUE = @USE_MCFS_TRUE@
- USE_NLS = @USE_NLS@
--USE_SAMBA_FS_FALSE = @USE_SAMBA_FS_FALSE@
--USE_SAMBA_FS_TRUE = @USE_SAMBA_FS_TRUE@
--USE_UNDEL_FS_FALSE = @USE_UNDEL_FS_FALSE@
--USE_UNDEL_FS_TRUE = @USE_UNDEL_FS_TRUE@
--USE_VFS_FALSE = @USE_VFS_FALSE@
--USE_VFS_NET_FALSE = @USE_VFS_NET_FALSE@
--USE_VFS_NET_TRUE = @USE_VFS_NET_TRUE@
--USE_VFS_TRUE = @USE_VFS_TRUE@
- VERSION = @VERSION@
- X11_WWW = @X11_WWW@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- ZIP = @ZIP@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -214,30 +191,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- configdir = @configdir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@/it
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- man_MANS = mc.1
- pkgdata_DATA = mc.hlp.it
- EXTRA_DIST = xnc.hlp
-@@ -276,10 +264,9 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mc.1: $(top_builddir)/config.status $(srcdir)/mc.1.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
--uninstall-info-am:
- install-man1: $(man1_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
-- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
-+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
-@@ -324,7 +311,7 @@
- done
- install-pkgdataDATA: $(pkgdata_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
-+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -347,22 +334,21 @@
-
-
- distdir: $(DISTFILES)
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
- esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -378,7 +364,7 @@
- all-am: Makefile $(MANS) $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pkgdatadir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -425,12 +411,20 @@
-
- install-data-am: install-man install-pkgdataDATA
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man: install-man1
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -449,19 +443,23 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-man uninstall-pkgdataDATA
-+uninstall-am: uninstall-man uninstall-pkgdataDATA
-
- uninstall-man: uninstall-man1
-
-+.MAKE: install-am install-strip
-+
- .PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
-- install install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-- install-man1 install-pkgdataDATA install-strip installcheck \
-+ install install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-man1 install-pdf install-pdf-am install-pkgdataDATA \
-+ install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-- pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
-- uninstall-man uninstall-man1 uninstall-pkgdataDATA
-+ pdf-am ps ps-am uninstall uninstall-am uninstall-man \
-+ uninstall-man1 uninstall-pkgdataDATA
-
-
- mc.hlp.it: mc.1 $(srcdir)/xnc.hlp $(top_builddir)/src/man2hlp
-diff -Nurwd mc-4.6.2~pre1.orig/doc/Makefile.in mc-4.6.2~pre1/doc/Makefile.in
---- mc-4.6.2~pre1.orig/doc/Makefile.in 2008-02-26 18:20:31.000000000 +0100
-+++ mc-4.6.2~pre1/doc/Makefile.in 2008-02-26 18:24:27.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -69,10 +65,11 @@
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
-- install-exec-recursive install-info-recursive \
-- install-recursive installcheck-recursive installdirs-recursive \
-- pdf-recursive ps-recursive uninstall-info-recursive \
-- uninstall-recursive
-+ install-dvi-recursive install-exec-recursive \
-+ install-html-recursive install-info-recursive \
-+ install-pdf-recursive install-ps-recursive install-recursive \
-+ installcheck-recursive installdirs-recursive pdf-recursive \
-+ ps-recursive uninstall-recursive
- man1dir = $(mandir)/man1
- am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" \
- "$(DESTDIR)$(pkgdatadir)"
-@@ -87,13 +84,13 @@
- am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- pkgdataDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(pkgdata_DATA)
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
-+ distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALLOCA = @ALLOCA@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -105,10 +102,6 @@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
--CHARSET_FALSE = @CHARSET_FALSE@
--CHARSET_TRUE = @CHARSET_TRUE@
--CONS_SAVER_FALSE = @CONS_SAVER_FALSE@
--CONS_SAVER_TRUE = @CONS_SAVER_TRUE@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
-@@ -130,6 +123,7 @@
- GMODULE_CFLAGS = @GMODULE_CFLAGS@
- GMODULE_LIBS = @GMODULE_LIBS@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_ASPRINTF = @HAVE_ASPRINTF@
- HAVE_FILECMD = @HAVE_FILECMD@
- HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-@@ -137,8 +131,7 @@
- HAVE_WPRINTF = @HAVE_WPRINTF@
- HAVE_ZIPINFO = @HAVE_ZIPINFO@
- HAVE_nroff = @HAVE_nroff@
--INCLUDED_SLANG_FALSE = @INCLUDED_SLANG_FALSE@
--INCLUDED_SLANG_TRUE = @INCLUDED_SLANG_TRUE@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -159,13 +152,12 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MANDOC = @MANDOC@
- MAN_FLAGS = @MAN_FLAGS@
- MCLIBS = @MCLIBS@
- MCSERVLIBS = @MCSERVLIBS@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
- MSGMERGE = @MSGMERGE@
-@@ -186,34 +178,22 @@
- SHELL = @SHELL@
- STRIP = @STRIP@
- UNZIP = @UNZIP@
--USE_EDIT_FALSE = @USE_EDIT_FALSE@
--USE_EDIT_TRUE = @USE_EDIT_TRUE@
- USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
--USE_MCFS_FALSE = @USE_MCFS_FALSE@
--USE_MCFS_TRUE = @USE_MCFS_TRUE@
- USE_NLS = @USE_NLS@
--USE_SAMBA_FS_FALSE = @USE_SAMBA_FS_FALSE@
--USE_SAMBA_FS_TRUE = @USE_SAMBA_FS_TRUE@
--USE_UNDEL_FS_FALSE = @USE_UNDEL_FS_FALSE@
--USE_UNDEL_FS_TRUE = @USE_UNDEL_FS_TRUE@
--USE_VFS_FALSE = @USE_VFS_FALSE@
--USE_VFS_NET_FALSE = @USE_VFS_NET_FALSE@
--USE_VFS_NET_TRUE = @USE_VFS_NET_TRUE@
--USE_VFS_TRUE = @USE_VFS_TRUE@
- VERSION = @VERSION@
- X11_WWW = @X11_WWW@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- ZIP = @ZIP@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -225,30 +205,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- configdir = @configdir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- DIST_SUBDIRS = es hu it pl ru sr
- SUBDIRS = $(DOC_LINGUAS)
- @USE_MCFS_FALSE at man_MANS = mc.1 mcedit.1 mcview.1
-@@ -296,10 +287,9 @@
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- mcserv.8: $(top_builddir)/config.status $(srcdir)/mcserv.8.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
--uninstall-info-am:
- install-man1: $(man1_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
-- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
-+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
-@@ -344,7 +334,7 @@
- done
- install-man8: $(man8_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
-- test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
-+ test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
-@@ -389,7 +379,7 @@
- done
- install-pkgdataDATA: $(pkgdata_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
-+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -436,8 +426,7 @@
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
-@@ -481,8 +470,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -507,8 +496,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -518,13 +507,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-@@ -538,22 +526,21 @@
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- distdir: $(DISTFILES)
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
- esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -567,7 +554,7 @@
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -575,6 +562,8 @@
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
-+ am__remove_distdir=: \
-+ am__skip_length_check=: \
- distdir) \
- || exit 1; \
- fi; \
-@@ -585,7 +574,7 @@
- installdirs: installdirs-recursive
- installdirs-am:
- for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(pkgdatadir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-recursive
- install-exec: install-exec-recursive
-@@ -632,12 +621,20 @@
-
- install-data-am: install-man install-pkgdataDATA
-
-+install-dvi: install-dvi-recursive
-+
- install-exec-am:
-
-+install-html: install-html-recursive
-+
- install-info: install-info-recursive
-
- install-man: install-man1 install-man8
-
-+install-pdf: install-pdf-recursive
-+
-+install-ps: install-ps-recursive
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-recursive
-@@ -656,25 +653,27 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-man uninstall-pkgdataDATA
--
--uninstall-info: uninstall-info-recursive
-+uninstall-am: uninstall-man uninstall-pkgdataDATA
-
- uninstall-man: uninstall-man1 uninstall-man8
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-- clean clean-generic clean-recursive ctags ctags-recursive \
-- distclean distclean-generic distclean-recursive distclean-tags \
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+ install-strip
-+
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+ all all-am check check-am clean clean-generic ctags \
-+ ctags-recursive distclean distclean-generic distclean-tags \
- distdir dvi dvi-am html html-am info info-am install \
-- install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-- install-man1 install-man8 install-pkgdataDATA install-strip \
-+ install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-man1 install-man8 install-pdf install-pdf-am \
-+ install-pkgdataDATA install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs installdirs-am \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am uninstall-man \
-- uninstall-man1 uninstall-man8 uninstall-pkgdataDATA
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-man uninstall-man1 \
-+ uninstall-man8 uninstall-pkgdataDATA
-
-
- mc.hlp: mc.1 $(srcdir)/xnc.hlp $(top_builddir)/src/man2hlp
-diff -Nurwd mc-4.6.2~pre1.orig/doc/pl/Makefile.in mc-4.6.2~pre1/doc/pl/Makefile.in
---- mc-4.6.2~pre1.orig/doc/pl/Makefile.in 2008-02-26 18:20:31.000000000 +0100
-+++ mc-4.6.2~pre1/doc/pl/Makefile.in 2008-02-26 18:24:27.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -81,8 +77,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALLOCA = @ALLOCA@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -94,10 +88,6 @@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
--CHARSET_FALSE = @CHARSET_FALSE@
--CHARSET_TRUE = @CHARSET_TRUE@
--CONS_SAVER_FALSE = @CONS_SAVER_FALSE@
--CONS_SAVER_TRUE = @CONS_SAVER_TRUE@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
-@@ -119,6 +109,7 @@
- GMODULE_CFLAGS = @GMODULE_CFLAGS@
- GMODULE_LIBS = @GMODULE_LIBS@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_ASPRINTF = @HAVE_ASPRINTF@
- HAVE_FILECMD = @HAVE_FILECMD@
- HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-@@ -126,8 +117,7 @@
- HAVE_WPRINTF = @HAVE_WPRINTF@
- HAVE_ZIPINFO = @HAVE_ZIPINFO@
- HAVE_nroff = @HAVE_nroff@
--INCLUDED_SLANG_FALSE = @INCLUDED_SLANG_FALSE@
--INCLUDED_SLANG_TRUE = @INCLUDED_SLANG_TRUE@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -148,13 +138,12 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MANDOC = @MANDOC@
- MAN_FLAGS = @MAN_FLAGS@
- MCLIBS = @MCLIBS@
- MCSERVLIBS = @MCSERVLIBS@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
- MSGMERGE = @MSGMERGE@
-@@ -175,34 +164,22 @@
- SHELL = @SHELL@
- STRIP = @STRIP@
- UNZIP = @UNZIP@
--USE_EDIT_FALSE = @USE_EDIT_FALSE@
--USE_EDIT_TRUE = @USE_EDIT_TRUE@
- USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
--USE_MCFS_FALSE = @USE_MCFS_FALSE@
--USE_MCFS_TRUE = @USE_MCFS_TRUE@
- USE_NLS = @USE_NLS@
--USE_SAMBA_FS_FALSE = @USE_SAMBA_FS_FALSE@
--USE_SAMBA_FS_TRUE = @USE_SAMBA_FS_TRUE@
--USE_UNDEL_FS_FALSE = @USE_UNDEL_FS_FALSE@
--USE_UNDEL_FS_TRUE = @USE_UNDEL_FS_TRUE@
--USE_VFS_FALSE = @USE_VFS_FALSE@
--USE_VFS_NET_FALSE = @USE_VFS_NET_FALSE@
--USE_VFS_NET_TRUE = @USE_VFS_NET_TRUE@
--USE_VFS_TRUE = @USE_VFS_TRUE@
- VERSION = @VERSION@
- X11_WWW = @X11_WWW@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- ZIP = @ZIP@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -214,30 +191,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- configdir = @configdir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@/pl
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- man_MANS = mc.1
- pkgdata_DATA = mc.hlp.pl
- EXTRA_DIST = xnc.hlp
-@@ -276,10 +264,9 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mc.1: $(top_builddir)/config.status $(srcdir)/mc.1.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
--uninstall-info-am:
- install-man1: $(man1_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
-- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
-+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
-@@ -324,7 +311,7 @@
- done
- install-pkgdataDATA: $(pkgdata_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
-+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -347,22 +334,21 @@
-
-
- distdir: $(DISTFILES)
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
- esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -378,7 +364,7 @@
- all-am: Makefile $(MANS) $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pkgdatadir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -425,12 +411,20 @@
-
- install-data-am: install-man install-pkgdataDATA
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man: install-man1
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -449,19 +443,23 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-man uninstall-pkgdataDATA
-+uninstall-am: uninstall-man uninstall-pkgdataDATA
-
- uninstall-man: uninstall-man1
-
-+.MAKE: install-am install-strip
-+
- .PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
-- install install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-- install-man1 install-pkgdataDATA install-strip installcheck \
-+ install install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-man1 install-pdf install-pdf-am install-pkgdataDATA \
-+ install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-- pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
-- uninstall-man uninstall-man1 uninstall-pkgdataDATA
-+ pdf-am ps ps-am uninstall uninstall-am uninstall-man \
-+ uninstall-man1 uninstall-pkgdataDATA
-
-
- mc.hlp.pl: mc.1 $(srcdir)/xnc.hlp $(top_builddir)/src/man2hlp
-diff -Nurwd mc-4.6.2~pre1.orig/doc/ru/Makefile.in mc-4.6.2~pre1/doc/ru/Makefile.in
---- mc-4.6.2~pre1.orig/doc/ru/Makefile.in 2008-02-26 18:20:31.000000000 +0100
-+++ mc-4.6.2~pre1/doc/ru/Makefile.in 2008-02-26 18:24:27.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -81,8 +77,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALLOCA = @ALLOCA@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -94,10 +88,6 @@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
--CHARSET_FALSE = @CHARSET_FALSE@
--CHARSET_TRUE = @CHARSET_TRUE@
--CONS_SAVER_FALSE = @CONS_SAVER_FALSE@
--CONS_SAVER_TRUE = @CONS_SAVER_TRUE@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
-@@ -119,6 +109,7 @@
- GMODULE_CFLAGS = @GMODULE_CFLAGS@
- GMODULE_LIBS = @GMODULE_LIBS@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_ASPRINTF = @HAVE_ASPRINTF@
- HAVE_FILECMD = @HAVE_FILECMD@
- HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-@@ -126,8 +117,7 @@
- HAVE_WPRINTF = @HAVE_WPRINTF@
- HAVE_ZIPINFO = @HAVE_ZIPINFO@
- HAVE_nroff = @HAVE_nroff@
--INCLUDED_SLANG_FALSE = @INCLUDED_SLANG_FALSE@
--INCLUDED_SLANG_TRUE = @INCLUDED_SLANG_TRUE@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -148,13 +138,12 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MANDOC = @MANDOC@
- MAN_FLAGS = @MAN_FLAGS@
- MCLIBS = @MCLIBS@
- MCSERVLIBS = @MCSERVLIBS@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
- MSGMERGE = @MSGMERGE@
-@@ -175,34 +164,22 @@
- SHELL = @SHELL@
- STRIP = @STRIP@
- UNZIP = @UNZIP@
--USE_EDIT_FALSE = @USE_EDIT_FALSE@
--USE_EDIT_TRUE = @USE_EDIT_TRUE@
- USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
--USE_MCFS_FALSE = @USE_MCFS_FALSE@
--USE_MCFS_TRUE = @USE_MCFS_TRUE@
- USE_NLS = @USE_NLS@
--USE_SAMBA_FS_FALSE = @USE_SAMBA_FS_FALSE@
--USE_SAMBA_FS_TRUE = @USE_SAMBA_FS_TRUE@
--USE_UNDEL_FS_FALSE = @USE_UNDEL_FS_FALSE@
--USE_UNDEL_FS_TRUE = @USE_UNDEL_FS_TRUE@
--USE_VFS_FALSE = @USE_VFS_FALSE@
--USE_VFS_NET_FALSE = @USE_VFS_NET_FALSE@
--USE_VFS_NET_TRUE = @USE_VFS_NET_TRUE@
--USE_VFS_TRUE = @USE_VFS_TRUE@
- VERSION = @VERSION@
- X11_WWW = @X11_WWW@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- ZIP = @ZIP@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -214,30 +191,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- configdir = @configdir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@/ru
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- man_MANS = mc.1
- pkgdata_DATA = mc.hlp.ru
- EXTRA_DIST = xnc.hlp
-@@ -276,10 +264,9 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mc.1: $(top_builddir)/config.status $(srcdir)/mc.1.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
--uninstall-info-am:
- install-man1: $(man1_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
-- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
-+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
-@@ -324,7 +311,7 @@
- done
- install-pkgdataDATA: $(pkgdata_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
-+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -347,22 +334,21 @@
-
-
- distdir: $(DISTFILES)
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
- esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -378,7 +364,7 @@
- all-am: Makefile $(MANS) $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pkgdatadir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -425,12 +411,20 @@
-
- install-data-am: install-man install-pkgdataDATA
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man: install-man1
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -449,19 +443,23 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-man uninstall-pkgdataDATA
-+uninstall-am: uninstall-man uninstall-pkgdataDATA
-
- uninstall-man: uninstall-man1
-
-+.MAKE: install-am install-strip
-+
- .PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
-- install install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-- install-man1 install-pkgdataDATA install-strip installcheck \
-+ install install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-man1 install-pdf install-pdf-am install-pkgdataDATA \
-+ install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-- pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
-- uninstall-man uninstall-man1 uninstall-pkgdataDATA
-+ pdf-am ps ps-am uninstall uninstall-am uninstall-man \
-+ uninstall-man1 uninstall-pkgdataDATA
-
-
- mc.hlp.ru: mc.1 $(srcdir)/xnc.hlp $(top_builddir)/src/man2hlp
-diff -Nurwd mc-4.6.2~pre1.orig/doc/sr/Makefile.in mc-4.6.2~pre1/doc/sr/Makefile.in
---- mc-4.6.2~pre1.orig/doc/sr/Makefile.in 2008-02-26 18:20:31.000000000 +0100
-+++ mc-4.6.2~pre1/doc/sr/Makefile.in 2008-02-26 18:24:27.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -83,8 +79,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALLOCA = @ALLOCA@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -96,10 +90,6 @@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
--CHARSET_FALSE = @CHARSET_FALSE@
--CHARSET_TRUE = @CHARSET_TRUE@
--CONS_SAVER_FALSE = @CONS_SAVER_FALSE@
--CONS_SAVER_TRUE = @CONS_SAVER_TRUE@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
-@@ -121,6 +111,7 @@
- GMODULE_CFLAGS = @GMODULE_CFLAGS@
- GMODULE_LIBS = @GMODULE_LIBS@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_ASPRINTF = @HAVE_ASPRINTF@
- HAVE_FILECMD = @HAVE_FILECMD@
- HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-@@ -128,8 +119,7 @@
- HAVE_WPRINTF = @HAVE_WPRINTF@
- HAVE_ZIPINFO = @HAVE_ZIPINFO@
- HAVE_nroff = @HAVE_nroff@
--INCLUDED_SLANG_FALSE = @INCLUDED_SLANG_FALSE@
--INCLUDED_SLANG_TRUE = @INCLUDED_SLANG_TRUE@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -150,13 +140,12 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MANDOC = @MANDOC@
- MAN_FLAGS = @MAN_FLAGS@
- MCLIBS = @MCLIBS@
- MCSERVLIBS = @MCSERVLIBS@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
- MSGMERGE = @MSGMERGE@
-@@ -177,34 +166,22 @@
- SHELL = @SHELL@
- STRIP = @STRIP@
- UNZIP = @UNZIP@
--USE_EDIT_FALSE = @USE_EDIT_FALSE@
--USE_EDIT_TRUE = @USE_EDIT_TRUE@
- USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
--USE_MCFS_FALSE = @USE_MCFS_FALSE@
--USE_MCFS_TRUE = @USE_MCFS_TRUE@
- USE_NLS = @USE_NLS@
--USE_SAMBA_FS_FALSE = @USE_SAMBA_FS_FALSE@
--USE_SAMBA_FS_TRUE = @USE_SAMBA_FS_TRUE@
--USE_UNDEL_FS_FALSE = @USE_UNDEL_FS_FALSE@
--USE_UNDEL_FS_TRUE = @USE_UNDEL_FS_TRUE@
--USE_VFS_FALSE = @USE_VFS_FALSE@
--USE_VFS_NET_FALSE = @USE_VFS_NET_FALSE@
--USE_VFS_NET_TRUE = @USE_VFS_NET_TRUE@
--USE_VFS_TRUE = @USE_VFS_TRUE@
- VERSION = @VERSION@
- X11_WWW = @X11_WWW@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- ZIP = @ZIP@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -216,30 +193,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- configdir = @configdir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@/sr
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- @USE_MCFS_FALSE at man_MANS = mc.1
- @USE_MCFS_TRUE at man_MANS = mc.1 mcserv.8
- pkgdata_DATA = mc.hlp.sr
-@@ -281,10 +269,9 @@
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- mcserv.8: $(top_builddir)/config.status $(srcdir)/mcserv.8.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
--uninstall-info-am:
- install-man1: $(man1_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
-- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
-+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
-@@ -329,7 +316,7 @@
- done
- install-man8: $(man8_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
-- test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
-+ test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
-@@ -374,7 +361,7 @@
- done
- install-pkgdataDATA: $(pkgdata_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
-+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -397,22 +384,21 @@
-
-
- distdir: $(DISTFILES)
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
- esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -428,7 +414,7 @@
- all-am: Makefile $(MANS) $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(pkgdatadir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -475,12 +461,20 @@
-
- install-data-am: install-man install-pkgdataDATA
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man: install-man1 install-man8
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -499,20 +493,23 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-man uninstall-pkgdataDATA
-+uninstall-am: uninstall-man uninstall-pkgdataDATA
-
- uninstall-man: uninstall-man1 uninstall-man8
-
-+.MAKE: install-am install-strip
-+
- .PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
-- install install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-- install-man1 install-man8 install-pkgdataDATA install-strip \
-+ install install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-man1 install-man8 install-pdf install-pdf-am \
-+ install-pkgdataDATA install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-- pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
-- uninstall-man uninstall-man1 uninstall-man8 \
-- uninstall-pkgdataDATA
-+ pdf-am ps ps-am uninstall uninstall-am uninstall-man \
-+ uninstall-man1 uninstall-man8 uninstall-pkgdataDATA
-
-
- mc.hlp.sr: mc.1 $(srcdir)/xnc.hlp $(top_builddir)/src/man2hlp
-diff -Nurwd mc-4.6.2~pre1.orig/edit/Makefile.in mc-4.6.2~pre1/edit/Makefile.in
---- mc-4.6.2~pre1.orig/edit/Makefile.in 2008-02-26 18:20:31.000000000 +0100
-+++ mc-4.6.2~pre1/edit/Makefile.in 2008-02-26 18:24:27.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -73,7 +69,7 @@
- editlock.$(OBJEXT) syntax.$(OBJEXT) usermap.$(OBJEXT) \
- wordproc.$(OBJEXT) choosesyntax.$(OBJEXT)
- libedit_a_OBJECTS = $(am_libedit_a_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/config/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -87,8 +83,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALLOCA = @ALLOCA@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -100,10 +94,6 @@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
--CHARSET_FALSE = @CHARSET_FALSE@
--CHARSET_TRUE = @CHARSET_TRUE@
--CONS_SAVER_FALSE = @CONS_SAVER_FALSE@
--CONS_SAVER_TRUE = @CONS_SAVER_TRUE@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
-@@ -125,6 +115,7 @@
- GMODULE_CFLAGS = @GMODULE_CFLAGS@
- GMODULE_LIBS = @GMODULE_LIBS@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_ASPRINTF = @HAVE_ASPRINTF@
- HAVE_FILECMD = @HAVE_FILECMD@
- HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-@@ -132,8 +123,7 @@
- HAVE_WPRINTF = @HAVE_WPRINTF@
- HAVE_ZIPINFO = @HAVE_ZIPINFO@
- HAVE_nroff = @HAVE_nroff@
--INCLUDED_SLANG_FALSE = @INCLUDED_SLANG_FALSE@
--INCLUDED_SLANG_TRUE = @INCLUDED_SLANG_TRUE@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -154,13 +144,12 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MANDOC = @MANDOC@
- MAN_FLAGS = @MAN_FLAGS@
- MCLIBS = @MCLIBS@
- MCSERVLIBS = @MCSERVLIBS@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
- MSGMERGE = @MSGMERGE@
-@@ -181,34 +170,22 @@
- SHELL = @SHELL@
- STRIP = @STRIP@
- UNZIP = @UNZIP@
--USE_EDIT_FALSE = @USE_EDIT_FALSE@
--USE_EDIT_TRUE = @USE_EDIT_TRUE@
- USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
--USE_MCFS_FALSE = @USE_MCFS_FALSE@
--USE_MCFS_TRUE = @USE_MCFS_TRUE@
- USE_NLS = @USE_NLS@
--USE_SAMBA_FS_FALSE = @USE_SAMBA_FS_FALSE@
--USE_SAMBA_FS_TRUE = @USE_SAMBA_FS_TRUE@
--USE_UNDEL_FS_FALSE = @USE_UNDEL_FS_FALSE@
--USE_UNDEL_FS_TRUE = @USE_UNDEL_FS_TRUE@
--USE_VFS_FALSE = @USE_VFS_FALSE@
--USE_VFS_NET_FALSE = @USE_VFS_NET_FALSE@
--USE_VFS_NET_TRUE = @USE_VFS_NET_TRUE@
--USE_VFS_TRUE = @USE_VFS_TRUE@
- VERSION = @VERSION@
- X11_WWW = @X11_WWW@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- ZIP = @ZIP@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -220,30 +197,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- configdir = @configdir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- AM_CFLAGS = $(GLIB_CFLAGS)
- @USE_EDIT_FALSE at noinst_LIBRARIES =
- @USE_EDIT_TRUE at noinst_LIBRARIES = libedit.a
-@@ -316,27 +304,26 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wordproc.Po at am__quote@
-
- .c.o:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
--uninstall-info-am:
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -348,8 +335,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -359,13 +346,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-@@ -379,22 +365,21 @@
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- distdir: $(DISTFILES)
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
- esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -455,12 +440,20 @@
-
- install-data-am:
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -480,18 +473,22 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-noinstLIBRARIES ctags distclean distclean-compile \
- distclean-generic distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-man install-strip installcheck \
-+ install-data-am install-dvi install-dvi-am install-exec \
-+ install-exec-am install-html install-html-am install-info \
-+ install-info-am install-man install-pdf install-pdf-am \
-+ install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-- uninstall-am uninstall-info-am
-+ uninstall-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Nurwd mc-4.6.2~pre1.orig/INSTALL mc-4.6.2~pre1/INSTALL
---- mc-4.6.2~pre1.orig/INSTALL 2008-02-26 18:20:31.000000000 +0100
-+++ mc-4.6.2~pre1/INSTALL 2008-02-26 18:24:28.000000000 +0100
-@@ -1,377 +1,237 @@
--This file contains:
--
--- Installation instructions for GNU Midnight Commander
--- Where to get more information on GNU Midnight Commander
--- Notes about GNU Midnight Commander installation
--- Obtaining related software
--
--
--Installation instructions for GNU Midnight Commander
------------------------------------------------------
--
--The `configure' shell script attempts to guess correct values for
--various system-dependent variables used during compilation, and creates
--the makefiles. It also creates a file `config.status' that you can run
--in the future to recreate the current configuration.
--
--To compile this package:
--
--1. Configure the package for your system.
--
--Normally, you just `cd' to the directory containing the package's source
--code and type `./configure'. If you're using `csh' on an old version of
--SystemV, you might need to type `sh configure' instead to prevent `csh'
--from trying to execute `configure' itself. Under AIX, you may need to
--use ksh instead of sh.
--
--Running `configure' takes a while. While it is running, it prints some
--messages that tell what it is doing. If you don't want to see any
--messages, run `configure' with the `--quiet' option.
--
--To compile the package in a different directory than the one containing
--the source code, you must use a version of `make' supporting the `VPATH'
--variable, such as GNU `make'. Change to the directory where you want
--the object files and executables to go and run the `configure' script
--with the full path. If for some reason `configure' cannot find the
--source code directory, run `configure' with the option `--srcdir=DIR',
--where DIR is the directory that contains the source code.
--
--By default, `make install' will install the package's files in
--`/usr/local/bin', `/usr/local/man', etc. You can specify an
--installation prefix other than `/usr/local' by giving `configure' the
--option `--prefix=PATH'.
--
--You can specify separate installation prefixes for architecture specific
--files and architecture-independent files. If you give `configure' the
--option `--exec-prefix=PATH', the package will use PATH as the prefix for
--installing binary programs and libraries. Data files and documentation
--will still use the regular prefix. Normally, all files are installed
--using the same prefix.
--
--If compiled on GNU/Linux, Midnight Commander detects if you have the gpm
--library installed. If you installed the gpm mouse library in a
--non-standard place, you will need to use the --with-gpm-mouse flag with
--the directory base where you installed the gpm package.
--
--`configure' recognizes the following options (the list may be
--incomplete, use `configure --help' to get the full list):
--
--`--help'
-- Print a summary of the options to `configure' and exit.
--
--`--quiet'
--`--silent'
-- Do not print messages saying which checks are being made.
--
--`--verbose'
-- Print the results of the checks.
--
--`--version'
-- Print the version of Autoconf used to generate the `configure'
-- script, and exit.
--
--`--without-edit'
-- Configure GNU Midnight Commander to be compiled without the
-- built-in file editor. The built-in editor is compiled in by
-- default.
--
--`--with-ext2undel'
-- On systems that use the ext2 or ext3 file system and have the
-- libext2fs library available, this option adds support for
-- recovering deleted files (the undel virtual file system).
--
--`--without-gpm-mouse'
-- Use this flag to disable gpm mouse support (e.g. if you want to
-- use mouse only on X terminals).
--
--`--with-glib12'
-- Force using glib 1.2.x even if glib 2.0.x is present. Use this
-- flag for testing or if you want to use the binary on systems that
-- don't have glib 2.0.x installed.
--
--`--with-glib-static'
-- Force linking against glib statically. This option is intended for
-- building binaries for distribution purposes and may not work on
-- some operating systems.
--
--`--with-mmap', `--without-mmap'
-- Force using or not using the mmap function. It is currently used
-- in the internal viewer. `--with-mmap' may be useful on some
-- versions of AIX where the `configure' script decides that mmap is
-- broken, but it's actually suitable for the internal viewer.
--
--`--with-subshell[=optional]', `--without-subshell'
-- The subshell support is by default turned on, you can disable
-- this by using the --without-subshell option. If you pass the
-- =optional parameter, then the subshell support is turned off by
-- default. To turn it on, specify the `-U' option to the program.
--
--`--without-x'
-- By default, the Midnight Commander tries to connect to the X Window
-- System events to query the status of the keyboard modifiers, such
-- as Control, Shift and Alt, when invoked in a terminal emulator
-- under X11. This is necessary (but not always sufficient) to
-- recognize some optional but handy key combinations like Ctrl-Home
-- and Shift-Cursor keys. Use `--without-x' if the dependency on
-- X11 libraries is not desired.
--
--`--without-vfs'
-- This option disables the Virtual File System switch code in the
-- Midnight Commander and uses the standard file system calls for
-- file access. If you specify this option, you won't get the
-- transparent access to archives and remote directories.
--
--`--with-mcfs'
-- This option enables mcfs - a non-standard remote filesystem
-- designed specifically for the Midnight Commander. It also enables
-- a server for that filesystem, mcserv. Please note that the
-- implementation of mcfs is not optimized for speed. There may be
-- security issues with mcserv - don't run it if you don't need it.
--
--`--with-samba'
-- This option enables remote VFS over the SMB protocol. A stripped
-- down version of samba distributed with the sources is compiled and
-- linked with the mc executable. It is recommended that you install
-- Samba client, since mc uses some files from Samba under certain
-- conditions. Please visit http://www.samba.org/ to learn more.
--
--`--disable-largefile'
-- This option disables support for large files (2 gigabytes and more)
-- on the systems where file operations use 32-bit offsets by default,
-- but support for 64-bit offsets is available. May be useful for
-- slow processors and embedded systems.
--
--`--enable-charset'
-- This option adds support for selecting character set of the text in
-- the internal viewer and editor and converting it on the fly. The
-- implementation of this option is currently incomplete.
--
--`--disable-background'
-- This option disables support for background operations. Background
-- operations allow to perform some tasks such as copying files in a
-- separate background process. Any messages from the background
-- process are forwarded to the foreground process. More advanced
-- dialogs cannot be forwarded yet, so the background process uses the
-- default. Background code is known to be less stable than the rest
-- of the code, so you may want to disable it at the compile time.
-+Installation Instructions
-+*************************
-
--`--disable-netcode'
-- This option disables support for networked virtual filesystems.
-- It's primarily used by developers to make sure that the code would
-- compile and run on operating systems that lack POSIX compatible
-- network support. But you can use it is you know that you won't be
-- accessing remote filesystems from GNU Midnight Commander.
-+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-+2006, 2007 Free Software Foundation, Inc.
-
--You may also tell configure which screen library you want to use with
--the Midnight Commander. The configure script will use S-Lang as
--default, and prefers an already installed S-Lang library over the
--included one, but you can override this by using the following flag
--(please note that since S-Lang is default, it is tested better than
--ncurses):
-+This file is free documentation; the Free Software Foundation gives
-+unlimited permission to copy, distribute and modify it.
-
--`--with-screen={slang|mcslang|ncurses}'
-- Choose the library used to manage interaction with the terminal.
-- `slang' means S-Lang library already installed on the system,
-- `mcslang' means S-Lang library included with the sources of
-- GNU Midnight Commander, `ncurses' means ncurses library already
-- installed on the system. The installed S-Lang library is used
-- by default if found, otherwise the included S-Lang library is
-- used.
-+Basic Installation
-+==================
-
--`--with-termcap'
-- If the included S-Lang library is used, this option forces it to
-- use the termcap database, as opposed to the default terminfo
-- database.
-+Briefly, the shell commands `./configure; make; make install' should
-+configure, build, and install this package. The following
-+more-detailed instructions are generic; see the `README' file for
-+instructions specific to this package.
-
--On systems that require unusual options for compilation or linking that
--the package's `configure' script does not know about, you can give
--`configure' initial values for variables by placing them in the command
--line:
-+ The `configure' shell script attempts to guess correct values for
-+various system-dependent variables used during compilation. It uses
-+those values to create a `Makefile' in each directory of the package.
-+It may also create one or more `.h' files containing system-dependent
-+definitions. Finally, it creates a shell script `config.status' that
-+you can run in the future to recreate the current configuration, and a
-+file `config.log' containing compiler output (useful mainly for
-+debugging `configure').
-
--./configure CC='gcc -traditional' LIBS=-lposix
-+ It can also use an optional file (typically called `config.cache'
-+and enabled with `--cache-file=config.cache' or simply `-C') that saves
-+the results of its tests to speed up reconfiguring. Caching is
-+disabled by default to prevent problems with accidental use of stale
-+cache files.
-
--Here are the variables that you might want to override when running
--`configure'.
-+ If you need to do unusual things to compile the package, please try
-+to figure out how `configure' could check whether to do them, and mail
-+diffs or instructions to the address given in the `README' so they can
-+be considered for the next release. If you are using the cache, and at
-+some point `config.cache' contains results you don't want to keep, you
-+may remove or edit it.
-
-- - Variable: CC
-- C compiler program. The default is `gcc' if found, otherwise `cc'.
-+ The file `configure.ac' (or `configure.in') is used to create
-+`configure' by a program called `autoconf'. You need `configure.ac' if
-+you want to change it or regenerate `configure' using a newer version
-+of `autoconf'.
-
-- - Variable: CFLAGS
-- The default flags used to build the program.
-+The simplest way to compile this package is:
-
-- - Variable: INSTALL
-- Program to use to install files. The default is `install' if you
-- have it, `cp' otherwise.
-+ 1. `cd' to the directory containing the package's source code and type
-+ `./configure' to configure the package for your system.
-
--For these variables, any value given in the command line is added to the
--value that `configure' decides to use:
-+ Running `configure' might take a while. While running, it prints
-+ some messages telling which features it is checking for.
-
-- - Variable: LIBS
-- Libraries to link with, in the form `-lfoo -lbar...'.
-+ 2. Type `make' to compile the package.
-
-- - Variable: LDFLAGS
-- Linker flags, e.g. -L<lib dir> if you have libraries in a
-- nonstandard directory <lib dir>
-+ 3. Optionally, type `make check' to run any self-tests that come with
-+ the package.
-
-- - Variable: CPPFLAGS
-- C/C++ preprocessor flags, e.g. -I<include dir> if you have
-- headers in a nonstandard directory <include dir>
-+ 4. Type `make install' to install the programs and any data files and
-+ documentation.
-
--If you need to do unusual things to compile the package, we encourage
--you to figure out how `configure' could check whether to do them, and
--mail diffs or instructions to the address given in the README so we can
--include them in the next release.
-+ 5. You can remove the program binaries and object files from the
-+ source code directory by typing `make clean'. To also remove the
-+ files that `configure' created (so you can compile the package for
-+ a different kind of computer), type `make distclean'. There is
-+ also a `make maintainer-clean' target, but that is intended mainly
-+ for the package's developers. If you use it, you may have to get
-+ all sorts of other programs in order to regenerate files that came
-+ with the distribution.
-
--2. Type `make' to compile the package.
-+ 6. Often, you can also type `make uninstall' to remove the installed
-+ files again.
-
--3. Type `make install' to install programs, data files, and the
--documentation. On GNU/Linux the console screen saver is installed as
--well.
-+Compilers and Options
-+=====================
-
--4. You can remove the program binaries and object files from the source
--directory by typing `make clean'. If you want to clean the source tree
--completely, so that it contains only those files that should be packaged
--in the archive, issue `make distclean'. If you've run configure in a
--different directory than the source tree, distclean won't remove your
--*.o and linked programs in that directory.
-+Some systems require unusual options for compilation or linking that the
-+`configure' script does not know about. Run `./configure --help' for
-+details on some of the pertinent environment variables.
-
--5. GNU Midnight Commander allows you to stay in the last current
--directory after exiting MC. This is done with a shell function, the man
--page has more information about this.
-+ You can give `configure' initial values for configuration parameters
-+by setting variables in the command line or in the environment. Here
-+is an example:
-
--The file `configure.in' is used to create `configure' by a program
--called `autoconf'. You only need it if you want to regenerate
--`configure' using a newer version of `autoconf'.
-+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-+ *Note Defining Variables::, for more details.
-
--Where to get more information on GNU Midnight Commander
---------------------------------------------------------
-+Compiling For Multiple Architectures
-+====================================
-
--There are two mailing lists for the program:
-+You can compile the package for more than one kind of computer at the
-+same time, by placing the object files for each architecture in their
-+own directory. To do this, you can use GNU `make'. `cd' to the
-+directory where you want the object files and executables to go and run
-+the `configure' script. `configure' automatically checks for the
-+source code in the directory that `configure' is in and in `..'.
-
--mc at gnome.org: Discussion on GNU Midnight Commander file manager.
--mc-devel at gnome.org: Discussion between the developers of the program.
-+ With a non-GNU `make', it is safer to compile the package for one
-+architecture at a time in the source code directory. After you have
-+installed the package for one architecture, use `make distclean' before
-+reconfiguring for another architecture.
-
--To subscribe to the mailing lists, visit their respective pages:
-+Installation Names
-+==================
-
--http://mail.gnome.org/mailman/listinfo/mc/
--http://mail.gnome.org/mailman/listinfo/mc-devel/
-+By default, `make install' installs the package's commands under
-+`/usr/local/bin', include files under `/usr/local/include', etc. You
-+can specify an installation prefix other than `/usr/local' by giving
-+`configure' the option `--prefix=PREFIX'.
-
-+ You can specify separate installation prefixes for
-+architecture-specific files and architecture-independent files. If you
-+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-+PREFIX as the prefix for installing programs and libraries.
-+Documentation and other data files still use the regular prefix.
-
--Notes about GNU Midnight Commander installation
-------------------------------------------------
-+ In addition, if you use an unusual directory layout you can give
-+options like `--bindir=DIR' to specify different values for particular
-+kinds of files. Run `configure --help' for a list of the directories
-+you can set and what kinds of files go in them.
-
--GNU Midnight Commander has been run in the following configurations:
-+ If the package supports it, you can cause programs to be installed
-+with an extra prefix or suffix on their names by giving `configure' the
-+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
--i386-*-linux
--sparc-*-linux
--alpha-*-linux
--powerpc-*-linux
--mips-dec-ultrix4.3
--mips-dec-{open,net}bsd1.0
--mips-sgi-irix5.2
--mips-sgi-irix5.3
--rs6000-ibm-aix3.2.5
--sparc-sun-sunos4.1
--sparc-sun-netbsd1.0
--sparc-sun-solaris2.3
--hppa-hp-hpux9
--hppa-hp-hpux7
--m68k-apple-aux
--mc88110-aviion-dgux5.4
--i386-*-bsdi2
--i386-*-freebsd4.3
--i386-*-openbsd2.9
-+Optional Features
-+=================
-
--Midnight Commander is written in a portable manner and uses GNU Autoconf
--for configuration, so it is expected to compile without changes on many
--other operating systems.
-+Some packages pay attention to `--enable-FEATURE' options to
-+`configure', where FEATURE indicates an optional part of the package.
-+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-+is something like `gnu-as' or `x' (for the X Window System). The
-+`README' should mention any `--enable-' and `--with-' options that the
-+package recognizes.
-
--You will need an ANSI C Compiler (such as GCC) and glib library to
--compile the source. GNU Midnight Commander now comes with the S-Lang
--screen manager, a fast screen manager, but you may want to use the
--already installed S-Lang or ncurses library.
-+ For packages that use the X Window System, `configure' can usually
-+find the X include and library files automatically, but if it doesn't,
-+you can use the `configure' options `--x-includes=DIR' and
-+`--x-libraries=DIR' to specify their locations.
-
--If you insist on using ncurses, it's recommended to use ncurses 4.1 and
--above, since the older versions don't support resizing in the xterm
--window.
-+Specifying the System Type
-+==========================
-
--GNU Midnight Commander comes with the mouse support on xterms and in the
--Linux console. In order to take advantage of the mouse support on the
--Linux console you will need the gpm mouse server (see the section
--"Obtaining related software" in this file).
-+There may be some features `configure' cannot figure out automatically,
-+but needs to determine by the type of machine the package will run on.
-+Usually, assuming the package is built to be run on the _same_
-+architectures, `configure' can figure that out, but if it prints a
-+message saying it cannot guess the machine type, give it the
-+`--build=TYPE' option. TYPE can either be a short name for the system
-+type, such as `sun4', or a canonical name which has the form:
-
--Once you get gpm, compile it and install it, then you will have to
--specify the `--with-gpm-mouse' flag to the configure program if you
--installed it in a non-standard directory. If you installed the gpm
--package under /usr or /usr/local, you don't need to specify this flag;
--configure will find gpm for you. The support for mice on xterms is
--always compiled in.
-+ CPU-COMPANY-SYSTEM
-
--We are working on further enhancements to the program, but we're not
--sure which ones must go first. If you would like to point us in the
--Right Direction we will be glad to hear from you (you could check the
--file TODO included with this distribution for the current projects).
-+where SYSTEM can have one of these forms:
-
--If you happen to find a feature that doesn't do what you expect, please
--write to mc at gnome.org telling as much as you can about the problem
--you're experiencing. Please don't send personal messages to the
--maintainers.
-+ OS KERNEL-OS
-
-+ See the file `config.sub' for the possible values of each field. If
-+`config.sub' isn't included in this package, then this package doesn't
-+need to know the machine type.
-
--Obtaining related software
----------------------------
-+ If you are _building_ compiler tools for cross-compiling, you should
-+use the option `--target=TYPE' to select the type of system they will
-+produce code for.
-
--glib
------
-+ If you want to _use_ a cross compiler, that generates code for a
-+platform different from the build platform, you should specify the
-+"host" platform (i.e., that on which the generated programs will
-+eventually be run) with `--host=TYPE'.
-
--The only "hard" dependency of GNU Midnight Commander is glib. You can
--get glib from
-+Sharing Defaults
-+================
-
--ftp://ftp.gtk.org/pub/gtk/
-+If you want to set default values for `configure' scripts to share, you
-+can create a site shell script called `config.site' that gives default
-+values for variables like `CC', `cache_file', and `prefix'.
-+`configure' looks for `PREFIX/share/config.site' if it exists, then
-+`PREFIX/etc/config.site' if it exists. Or, you can set the
-+`CONFIG_SITE' environment variable to the location of the site script.
-+A warning: not all `configure' scripts look for a site script.
-
--Note that only versions 1.2.x and 2.0.x are supported. Newer versions
--may work, but haven't been tested.
-+Defining Variables
-+==================
-
--Terminal database
-------------------
-+Variables not defined in a site shell script can be set in the
-+environment passed to `configure'. However, some packages may run
-+configure again during the build, and the customized values of these
-+variables may be lost. In order to avoid this problem, you should set
-+them in the `configure' command line, using `VAR=value'. For example:
-
--There are many incomplete terminal databases out there, however, a
--complete terminfo is bundled with ncurses. (It is simple to generate
--the termcap database using the infocmp utility in ncurses).
-+ ./configure CC=/usr/local2/bin/gcc
-
--Some terminfo data are included with the mc distribution (lib/*.ti).
--Particularly linux, xterm and vt100. Use e.g. ''tic linux.ti'' to use
--them.
-+causes the specified `gcc' to be used as the C compiler (unless it is
-+overridden in the site shell script).
-
--If you want to run mc on xterm/color_xterm/ansi_xterm (not rxvt), then
--you might read lib/README.xterm for further information.
-+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-+an Autoconf bug. Until the bug is fixed you can use this workaround:
-
--Screen libraries
------------------
-+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
--GNU Midnight Commander can use the included version of S-Lang, but you
--can get the latest version here:
-+`configure' Invocation
-+======================
-
--http://www.s-lang.org/
-+`configure' recognizes the following options to control how it operates.
-
--Alternatively, you can use ncurses:
-+`--help'
-+`-h'
-+ Print a summary of the options to `configure', and exit.
-
--http://www.gnu.org/software/ncurses/ncurses.html
-+`--version'
-+`-V'
-+ Print the version of Autoconf used to generate the `configure'
-+ script, and exit.
-
--Mouse support
---------------
-+`--cache-file=FILE'
-+ Enable the cache: use and save the results of the tests in FILE,
-+ traditionally `config.cache'. FILE defaults to `/dev/null' to
-+ disable caching.
-
--The general purpose mouse (gpm) daemon is available from
-+`--config-cache'
-+`-C'
-+ Alias for `--cache-file=config.cache'.
-
--ftp://arcana.linux.it/pub/gpm/
-+`--quiet'
-+`--silent'
-+`-q'
-+ Do not print messages saying which checks are being made. To
-+ suppress all normal output, redirect it to `/dev/null' (any error
-+ messages will still be shown).
-
--Compiler
----------
-+`--srcdir=DIR'
-+ Look for the package's source code in directory DIR. Usually
-+ `configure' can determine that directory automatically.
-
--If your C compiler is not powerful enough to compile GNU Midnight
--Commander, you should report is as a bug to the GNU Midnight Commander
--team. Sometimes there is no solution than upgrading to a modern and
--free compiler - GCC (Compiler Collection):
-+`configure' also accepts some other, not widely useful, options. Run
-+`configure --help' for more details.
-
--http://gcc.gnu.org/
-diff -Nurwd mc-4.6.2~pre1.orig/lib/Makefile.in mc-4.6.2~pre1/lib/Makefile.in
---- mc-4.6.2~pre1.orig/lib/Makefile.in 2008-02-26 18:20:31.000000000 +0100
-+++ mc-4.6.2~pre1/lib/Makefile.in 2008-02-26 18:24:27.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +15,11 @@
- @SET_MAKE@
-
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -81,8 +77,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALLOCA = @ALLOCA@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -94,10 +88,6 @@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
--CHARSET_FALSE = @CHARSET_FALSE@
--CHARSET_TRUE = @CHARSET_TRUE@
--CONS_SAVER_FALSE = @CONS_SAVER_FALSE@
--CONS_SAVER_TRUE = @CONS_SAVER_TRUE@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
-@@ -119,6 +109,7 @@
- GMODULE_CFLAGS = @GMODULE_CFLAGS@
- GMODULE_LIBS = @GMODULE_LIBS@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_ASPRINTF = @HAVE_ASPRINTF@
- HAVE_FILECMD = @HAVE_FILECMD@
- HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-@@ -126,8 +117,7 @@
- HAVE_WPRINTF = @HAVE_WPRINTF@
- HAVE_ZIPINFO = @HAVE_ZIPINFO@
- HAVE_nroff = @HAVE_nroff@
--INCLUDED_SLANG_FALSE = @INCLUDED_SLANG_FALSE@
--INCLUDED_SLANG_TRUE = @INCLUDED_SLANG_TRUE@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -148,13 +138,12 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MANDOC = @MANDOC@
- MAN_FLAGS = @MAN_FLAGS@
- MCLIBS = @MCLIBS@
- MCSERVLIBS = @MCSERVLIBS@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
- MSGMERGE = @MSGMERGE@
-@@ -175,34 +164,22 @@
- SHELL = @SHELL@
- STRIP = @STRIP@
- UNZIP = @UNZIP@
--USE_EDIT_FALSE = @USE_EDIT_FALSE@
--USE_EDIT_TRUE = @USE_EDIT_TRUE@
- USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
--USE_MCFS_FALSE = @USE_MCFS_FALSE@
--USE_MCFS_TRUE = @USE_MCFS_TRUE@
- USE_NLS = @USE_NLS@
--USE_SAMBA_FS_FALSE = @USE_SAMBA_FS_FALSE@
--USE_SAMBA_FS_TRUE = @USE_SAMBA_FS_TRUE@
--USE_UNDEL_FS_FALSE = @USE_UNDEL_FS_FALSE@
--USE_UNDEL_FS_TRUE = @USE_UNDEL_FS_TRUE@
--USE_VFS_FALSE = @USE_VFS_FALSE@
--USE_VFS_NET_FALSE = @USE_VFS_NET_FALSE@
--USE_VFS_NET_TRUE = @USE_VFS_NET_TRUE@
--USE_VFS_TRUE = @USE_VFS_TRUE@
- VERSION = @VERSION@
- X11_WWW = @X11_WWW@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- ZIP = @ZIP@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -214,30 +191,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- configdir = @configdir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- suppbindir = $(pkgdatadir)/bin
- @CHARSET_FALSE at LIBFILES_ADD =
- @CHARSET_TRUE at LIBFILES_ADD = mc.charsets
-@@ -297,7 +285,7 @@
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- install-suppbinSCRIPTS: $(suppbin_SCRIPTS)
- @$(NORMAL_INSTALL)
-- test -z "$(suppbindir)" || $(mkdir_p) "$(DESTDIR)$(suppbindir)"
-+ test -z "$(suppbindir)" || $(MKDIR_P) "$(DESTDIR)$(suppbindir)"
- @list='$(suppbin_SCRIPTS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- if test -f $$d$$p; then \
-@@ -314,10 +302,9 @@
- echo " rm -f '$(DESTDIR)$(suppbindir)/$$f'"; \
- rm -f "$(DESTDIR)$(suppbindir)/$$f"; \
- done
--uninstall-info-am:
- install-pkgdataDATA: $(pkgdata_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
-+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -340,22 +327,21 @@
-
-
- distdir: $(DISTFILES)
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
- esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -371,7 +357,7 @@
- all-am: Makefile $(SCRIPTS) $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(suppbindir)" "$(DESTDIR)$(pkgdatadir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -418,12 +404,20 @@
-
- install-data-am: install-pkgdataDATA install-suppbinSCRIPTS
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -442,18 +436,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-pkgdataDATA \
-- uninstall-suppbinSCRIPTS
-+uninstall-am: uninstall-pkgdataDATA uninstall-suppbinSCRIPTS
-+
-+.MAKE: install-am install-strip
-
- .PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
-- install install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-- install-pkgdataDATA install-strip install-suppbinSCRIPTS \
-+ install install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
-+ install-ps-am install-strip install-suppbinSCRIPTS \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-- pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
-- uninstall-pkgdataDATA uninstall-suppbinSCRIPTS
-+ pdf-am ps ps-am uninstall uninstall-am uninstall-pkgdataDATA \
-+ uninstall-suppbinSCRIPTS
-
-
- mc.csh: $(srcdir)/mc.csh.in
-diff -Nurwd mc-4.6.2~pre1.orig/m4/Makefile.in mc-4.6.2~pre1/m4/Makefile.in
---- mc-4.6.2~pre1.orig/m4/Makefile.in 2008-02-26 18:20:31.000000000 +0100
-+++ mc-4.6.2~pre1/m4/Makefile.in 2008-02-26 18:24:27.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +13,11 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,8 +63,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALLOCA = @ALLOCA@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -80,10 +74,6 @@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
--CHARSET_FALSE = @CHARSET_FALSE@
--CHARSET_TRUE = @CHARSET_TRUE@
--CONS_SAVER_FALSE = @CONS_SAVER_FALSE@
--CONS_SAVER_TRUE = @CONS_SAVER_TRUE@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
-@@ -105,6 +95,7 @@
- GMODULE_CFLAGS = @GMODULE_CFLAGS@
- GMODULE_LIBS = @GMODULE_LIBS@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_ASPRINTF = @HAVE_ASPRINTF@
- HAVE_FILECMD = @HAVE_FILECMD@
- HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-@@ -112,8 +103,7 @@
- HAVE_WPRINTF = @HAVE_WPRINTF@
- HAVE_ZIPINFO = @HAVE_ZIPINFO@
- HAVE_nroff = @HAVE_nroff@
--INCLUDED_SLANG_FALSE = @INCLUDED_SLANG_FALSE@
--INCLUDED_SLANG_TRUE = @INCLUDED_SLANG_TRUE@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -134,13 +124,12 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MANDOC = @MANDOC@
- MAN_FLAGS = @MAN_FLAGS@
- MCLIBS = @MCLIBS@
- MCSERVLIBS = @MCSERVLIBS@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
- MSGMERGE = @MSGMERGE@
-@@ -161,34 +150,22 @@
- SHELL = @SHELL@
- STRIP = @STRIP@
- UNZIP = @UNZIP@
--USE_EDIT_FALSE = @USE_EDIT_FALSE@
--USE_EDIT_TRUE = @USE_EDIT_TRUE@
- USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
--USE_MCFS_FALSE = @USE_MCFS_FALSE@
--USE_MCFS_TRUE = @USE_MCFS_TRUE@
- USE_NLS = @USE_NLS@
--USE_SAMBA_FS_FALSE = @USE_SAMBA_FS_FALSE@
--USE_SAMBA_FS_TRUE = @USE_SAMBA_FS_TRUE@
--USE_UNDEL_FS_FALSE = @USE_UNDEL_FS_FALSE@
--USE_UNDEL_FS_TRUE = @USE_UNDEL_FS_TRUE@
--USE_VFS_FALSE = @USE_VFS_FALSE@
--USE_VFS_NET_FALSE = @USE_VFS_NET_FALSE@
--USE_VFS_NET_TRUE = @USE_VFS_NET_TRUE@
--USE_VFS_TRUE = @USE_VFS_TRUE@
- VERSION = @VERSION@
- X11_WWW = @X11_WWW@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- ZIP = @ZIP@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -200,30 +177,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- configdir = @configdir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- m4files = \
- codeset.m4 \
- gettext.m4 \
-@@ -290,7 +278,6 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--uninstall-info-am:
- tags: TAGS
- TAGS:
-
-@@ -299,22 +286,21 @@
-
-
- distdir: $(DISTFILES)
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
- esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -373,12 +359,20 @@
-
- install-data-am:
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -397,16 +391,19 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
-
- .PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
-- install install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-+ install install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
-- mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
-- uninstall-info-am
-+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Nurwd mc-4.6.2~pre1.orig/Makefile.in mc-4.6.2~pre1/Makefile.in
---- mc-4.6.2~pre1.orig/Makefile.in 2008-02-26 18:20:31.000000000 +0100
-+++ mc-4.6.2~pre1/Makefile.in 2008-02-26 18:24:28.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +15,11 @@
- @SET_MAKE@
-
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = .
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -37,6 +33,7 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
-+subdir = .
- DIST_COMMON = README $(am__configure_deps) $(dist_noinst_SCRIPTS) \
- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(srcdir)/mc.qpg.in $(srcdir)/mc.spec.in \
-@@ -46,7 +43,6 @@
- config/config.guess config/config.rpath config/config.sub \
- config/depcomp config/install-sh config/missing \
- config/mkinstalldirs
--subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/fstypename.m4 $(top_srcdir)/m4/fsusage.m4 \
-@@ -70,7 +66,7 @@
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-- configure.lineno configure.status.lineno
-+ configure.lineno config.status.lineno
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES = mc.spec mc.qpg pkginfo prototype intl/Makefile
-@@ -79,11 +75,14 @@
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
-- install-exec-recursive install-info-recursive \
-- install-recursive installcheck-recursive installdirs-recursive \
-- pdf-recursive ps-recursive uninstall-info-recursive \
-- uninstall-recursive
-+ install-dvi-recursive install-exec-recursive \
-+ install-html-recursive install-info-recursive \
-+ install-pdf-recursive install-ps-recursive install-recursive \
-+ installcheck-recursive installdirs-recursive pdf-recursive \
-+ ps-recursive uninstall-recursive
- DATA = $(noinst_DATA)
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
-+ distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
-@@ -100,8 +99,6 @@
- distcleancheck_listfiles = find . -type f -print
- ACLOCAL = @ACLOCAL@
- ALLOCA = @ALLOCA@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,10 +110,6 @@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
--CHARSET_FALSE = @CHARSET_FALSE@
--CHARSET_TRUE = @CHARSET_TRUE@
--CONS_SAVER_FALSE = @CONS_SAVER_FALSE@
--CONS_SAVER_TRUE = @CONS_SAVER_TRUE@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
-@@ -138,6 +131,7 @@
- GMODULE_CFLAGS = @GMODULE_CFLAGS@
- GMODULE_LIBS = @GMODULE_LIBS@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_ASPRINTF = @HAVE_ASPRINTF@
- HAVE_FILECMD = @HAVE_FILECMD@
- HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-@@ -145,8 +139,7 @@
- HAVE_WPRINTF = @HAVE_WPRINTF@
- HAVE_ZIPINFO = @HAVE_ZIPINFO@
- HAVE_nroff = @HAVE_nroff@
--INCLUDED_SLANG_FALSE = @INCLUDED_SLANG_FALSE@
--INCLUDED_SLANG_TRUE = @INCLUDED_SLANG_TRUE@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -167,13 +160,12 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MANDOC = @MANDOC@
- MAN_FLAGS = @MAN_FLAGS@
- MCLIBS = @MCLIBS@
- MCSERVLIBS = @MCSERVLIBS@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
- MSGMERGE = @MSGMERGE@
-@@ -194,34 +186,22 @@
- SHELL = @SHELL@
- STRIP = @STRIP@
- UNZIP = @UNZIP@
--USE_EDIT_FALSE = @USE_EDIT_FALSE@
--USE_EDIT_TRUE = @USE_EDIT_TRUE@
- USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
--USE_MCFS_FALSE = @USE_MCFS_FALSE@
--USE_MCFS_TRUE = @USE_MCFS_TRUE@
- USE_NLS = @USE_NLS@
--USE_SAMBA_FS_FALSE = @USE_SAMBA_FS_FALSE@
--USE_SAMBA_FS_TRUE = @USE_SAMBA_FS_TRUE@
--USE_UNDEL_FS_FALSE = @USE_UNDEL_FS_FALSE@
--USE_UNDEL_FS_TRUE = @USE_UNDEL_FS_TRUE@
--USE_VFS_FALSE = @USE_VFS_FALSE@
--USE_VFS_NET_FALSE = @USE_VFS_NET_FALSE@
--USE_VFS_NET_TRUE = @USE_VFS_NET_TRUE@
--USE_VFS_TRUE = @USE_VFS_TRUE@
- VERSION = @VERSION@
- X11_WWW = @X11_WWW@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- ZIP = @ZIP@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -233,30 +213,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- configdir = @configdir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = 1.5
- SUBDIRS = intl po m4 vfs slang edit src lib doc syntax
- EXTRA_DIST = FAQ HACKING INSTALL.FAST MAINTAINERS README.QNX TODO pkginfo.in prototype.in mc.qpg mc.spec
-@@ -304,7 +295,7 @@
- config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
-- $(MAKE) stamp-h1; \
-+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
- else :; fi
-
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-@@ -327,7 +318,6 @@
- cd $(top_builddir) && $(SHELL) ./config.status $@
- intl/Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
--uninstall-info-am:
-
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -360,8 +350,7 @@
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
-@@ -405,8 +394,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -431,8 +420,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -442,13 +431,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-@@ -463,24 +451,22 @@
-
- distdir: $(DISTFILES)
- $(am__remove_distdir)
-- mkdir $(distdir)
-- $(mkdir_p) $(distdir)/. $(distdir)/config $(distdir)/doc $(distdir)/doc/es $(distdir)/doc/hu $(distdir)/doc/it $(distdir)/doc/pl $(distdir)/doc/ru $(distdir)/doc/sr $(distdir)/intl $(distdir)/lib $(distdir)/m4 $(distdir)/po $(distdir)/vfs/extfs
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+ test -d $(distdir) || mkdir $(distdir)
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
- esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -494,7 +480,7 @@
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -502,6 +488,8 @@
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
-+ am__remove_distdir=: \
-+ am__skip_length_check=: \
- distdir) \
- || exit 1; \
- fi; \
-@@ -509,7 +497,7 @@
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
- dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-@@ -519,6 +507,10 @@
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
-
-+dist-lzma: distdir
-+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-+ $(am__remove_distdir)
-+
- dist-tarZ: distdir
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
-@@ -545,6 +537,8 @@
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+ *.tar.lzma*) \
-+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
-@@ -585,7 +579,7 @@
- $(am__remove_distdir)
- @(echo "$(distdir) archives ready for distribution: "; \
- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
- distuninstallcheck:
- @cd $(distuninstallcheck_dir) \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-@@ -654,12 +648,20 @@
-
- install-data-am:
-
-+install-dvi: install-dvi-recursive
-+
- install-exec-am:
-
-+install-html: install-html-recursive
-+
- install-info: install-info-recursive
-
- install-man:
-
-+install-pdf: install-pdf-recursive
-+
-+install-ps: install-ps-recursive
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-recursive
-@@ -680,24 +682,25 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am
-+uninstall-am:
-
--uninstall-info: uninstall-info-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+ install-strip
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-- check-am clean clean-generic clean-recursive ctags \
-- ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
-- dist-tarZ dist-zip distcheck distclean distclean-generic \
-- distclean-hdr distclean-recursive distclean-tags \
-- distcleancheck distdir distuninstallcheck dvi dvi-am html \
-- html-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-man install-strip installcheck \
-- installcheck-am installdirs installdirs-am maintainer-clean \
-- maintainer-clean-generic maintainer-clean-recursive \
-- mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
-- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-- uninstall-info-am
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+ all all-am am--refresh check check-am clean clean-generic \
-+ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-+ dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
-+ distclean-generic distclean-hdr distclean-tags distcleancheck \
-+ distdir distuninstallcheck dvi dvi-am html html-am info \
-+ info-am install install-am install-data install-data-am \
-+ install-dvi install-dvi-am install-exec install-exec-am \
-+ install-html install-html-am install-info install-info-am \
-+ install-man install-pdf install-pdf-am install-ps \
-+ install-ps-am install-strip installcheck installcheck-am \
-+ installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-+ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Nurwd mc-4.6.2~pre1.orig/po/Makevars.template mc-4.6.2~pre1/po/Makevars.template
---- mc-4.6.2~pre1.orig/po/Makevars.template 1970-01-01 00:00:00.000000000 +0000
-+++ mc-4.6.2~pre1/po/Makevars.template 2008-02-26 18:23:53.000000000 +0100
-@@ -0,0 +1,41 @@
-+# Makefile variables for PO directory in any package using GNU gettext.
-+
-+# Usually the message domain is the same as the package name.
-+DOMAIN = $(PACKAGE)
-+
-+# These two variables depend on the location of this directory.
-+subdir = po
-+top_builddir = ..
-+
-+# These options get passed to xgettext.
-+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
-+
-+# This is the copyright holder that gets inserted into the header of the
-+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
-+# package. (Note that the msgstr strings, extracted from the package's
-+# sources, belong to the copyright holder of the package.) Translators are
-+# expected to transfer the copyright for their translations to this person
-+# or entity, or to disclaim their copyright. The empty string stands for
-+# the public domain; in this case the translators are expected to disclaim
-+# their copyright.
-+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
-+
-+# This is the email address or URL to which the translators shall report
-+# bugs in the untranslated strings:
-+# - Strings which are not entire sentences, see the maintainer guidelines
-+# in the GNU gettext documentation, section 'Preparing Strings'.
-+# - Strings which use unclear terms or require additional context to be
-+# understood.
-+# - Strings which make invalid assumptions about notation of date, time or
-+# money.
-+# - Pluralisation problems.
-+# - Incorrect English spelling.
-+# - Incorrect formatting.
-+# It can be your email address, or a mailing list address where translators
-+# can write to without being subscribed, or the URL of a web page through
-+# which the translators can contact you.
-+MSGID_BUGS_ADDRESS =
-+
-+# This is the list of locale categories, beyond LC_MESSAGES, for which the
-+# message catalogs shall be used. It is usually empty.
-+EXTRA_LOCALE_CATEGORIES =
-diff -Nurwd mc-4.6.2~pre1.orig/slang/Makefile.in mc-4.6.2~pre1/slang/Makefile.in
---- mc-4.6.2~pre1.orig/slang/Makefile.in 2008-02-26 18:20:31.000000000 +0100
-+++ mc-4.6.2~pre1/slang/Makefile.in 2008-02-26 18:24:27.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -76,7 +72,7 @@
- slutf8.$(OBJEXT) slutty.$(OBJEXT) slwcwidth.$(OBJEXT) \
- $(am__objects_1)
- libmcslang_a_OBJECTS = $(am_libmcslang_a_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/config/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -90,8 +86,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALLOCA = @ALLOCA@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -103,10 +97,6 @@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
--CHARSET_FALSE = @CHARSET_FALSE@
--CHARSET_TRUE = @CHARSET_TRUE@
--CONS_SAVER_FALSE = @CONS_SAVER_FALSE@
--CONS_SAVER_TRUE = @CONS_SAVER_TRUE@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
-@@ -128,6 +118,7 @@
- GMODULE_CFLAGS = @GMODULE_CFLAGS@
- GMODULE_LIBS = @GMODULE_LIBS@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_ASPRINTF = @HAVE_ASPRINTF@
- HAVE_FILECMD = @HAVE_FILECMD@
- HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-@@ -135,8 +126,7 @@
- HAVE_WPRINTF = @HAVE_WPRINTF@
- HAVE_ZIPINFO = @HAVE_ZIPINFO@
- HAVE_nroff = @HAVE_nroff@
--INCLUDED_SLANG_FALSE = @INCLUDED_SLANG_FALSE@
--INCLUDED_SLANG_TRUE = @INCLUDED_SLANG_TRUE@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -157,13 +147,12 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MANDOC = @MANDOC@
- MAN_FLAGS = @MAN_FLAGS@
- MCLIBS = @MCLIBS@
- MCSERVLIBS = @MCSERVLIBS@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
- MSGMERGE = @MSGMERGE@
-@@ -184,34 +173,22 @@
- SHELL = @SHELL@
- STRIP = @STRIP@
- UNZIP = @UNZIP@
--USE_EDIT_FALSE = @USE_EDIT_FALSE@
--USE_EDIT_TRUE = @USE_EDIT_TRUE@
- USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
--USE_MCFS_FALSE = @USE_MCFS_FALSE@
--USE_MCFS_TRUE = @USE_MCFS_TRUE@
- USE_NLS = @USE_NLS@
--USE_SAMBA_FS_FALSE = @USE_SAMBA_FS_FALSE@
--USE_SAMBA_FS_TRUE = @USE_SAMBA_FS_TRUE@
--USE_UNDEL_FS_FALSE = @USE_UNDEL_FS_FALSE@
--USE_UNDEL_FS_TRUE = @USE_UNDEL_FS_TRUE@
--USE_VFS_FALSE = @USE_VFS_FALSE@
--USE_VFS_NET_FALSE = @USE_VFS_NET_FALSE@
--USE_VFS_NET_TRUE = @USE_VFS_NET_TRUE@
--USE_VFS_TRUE = @USE_VFS_TRUE@
- VERSION = @VERSION@
- X11_WWW = @X11_WWW@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- ZIP = @ZIP@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -223,30 +200,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- configdir = @configdir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- AM_CFLAGS = $(GLIB_CFLAGS)
- AM_CPPFLAGS = -I$(srcdir)/include
- @INCLUDED_SLANG_FALSE at noinst_LIBRARIES =
-@@ -343,27 +331,26 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/slwcwidth.Po at am__quote@
-
- .c.o:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
--uninstall-info-am:
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -375,8 +362,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -386,13 +373,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-@@ -406,22 +392,21 @@
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- distdir: $(DISTFILES)
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
- esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -482,12 +467,20 @@
-
- install-data-am:
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -507,18 +500,22 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-noinstLIBRARIES ctags distclean distclean-compile \
- distclean-generic distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-man install-strip installcheck \
-+ install-data-am install-dvi install-dvi-am install-exec \
-+ install-exec-am install-html install-html-am install-info \
-+ install-info-am install-man install-pdf install-pdf-am \
-+ install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-- uninstall-am uninstall-info-am
-+ uninstall-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Nurwd mc-4.6.2~pre1.orig/src/Makefile.in mc-4.6.2~pre1/src/Makefile.in
---- mc-4.6.2~pre1.orig/src/Makefile.in 2008-02-26 18:20:31.000000000 +0100
-+++ mc-4.6.2~pre1/src/Makefile.in 2008-02-26 18:24:28.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,6 +35,7 @@
- bin_PROGRAMS = mc$(EXEEXT) mcmfmt$(EXEEXT)
- @CONS_SAVER_TRUE at pkglibexec_PROGRAMS = cons.saver$(EXEEXT)
- noinst_PROGRAMS = man2hlp$(EXEEXT)
-+TESTS = ecs-test$(EXEEXT)
- check_PROGRAMS = ecs-test$(EXEEXT)
- subdir = src
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
-@@ -100,7 +97,9 @@
- treestore.c treestore.h tty.c tty.h user.c user.h util.c \
- util.h utilunix.c view.c view.h vfsdummy.h widget.c widget.h \
- win.c win.h wtools.c wtools.h unixcompat.h x11conn.h x11conn.c \
-- ecs.h ecs.c charsets.c charsets.h selcodepage.c selcodepage.h
-+ ecs.h ecs.c strutil.h strutil.c strutilascii.c strutil8bit.c \
-+ strutilutf8.c charsets.c charsets.h selcodepage.c \
-+ selcodepage.h
- am__objects_1 = achown.$(OBJEXT) background.$(OBJEXT) boxes.$(OBJEXT) \
- chmod.$(OBJEXT) chown.$(OBJEXT) cmd.$(OBJEXT) color.$(OBJEXT) \
- command.$(OBJEXT) complete.$(OBJEXT) cons.handler.$(OBJEXT) \
-@@ -119,26 +118,20 @@
- textconf.$(OBJEXT) tree.$(OBJEXT) treestore.$(OBJEXT) \
- tty.$(OBJEXT) user.$(OBJEXT) util.$(OBJEXT) utilunix.$(OBJEXT) \
- view.$(OBJEXT) widget.$(OBJEXT) win.$(OBJEXT) wtools.$(OBJEXT) \
-- x11conn.$(OBJEXT) ecs.$(OBJEXT)
-+ x11conn.$(OBJEXT) ecs.$(OBJEXT) strutil.$(OBJEXT) \
-+ strutilascii.$(OBJEXT) strutil8bit.$(OBJEXT) \
-+ strutilutf8.$(OBJEXT)
- am__objects_2 = charsets.$(OBJEXT) selcodepage.$(OBJEXT)
- @CHARSET_FALSE at am_mc_OBJECTS = $(am__objects_1)
- @CHARSET_TRUE at am_mc_OBJECTS = $(am__objects_1) $(am__objects_2)
- mc_OBJECTS = $(am_mc_OBJECTS)
-- at USE_EDIT_TRUE@am__DEPENDENCIES_2 = ../edit/libedit.a
-- at INCLUDED_SLANG_TRUE@am__DEPENDENCIES_3 = ../slang/libmcslang.a
-- at USE_SAMBA_FS_FALSE@@USE_VFS_TRUE at am__DEPENDENCIES_4 = \
-- at USE_SAMBA_FS_FALSE@@USE_VFS_TRUE@ ../vfs/libvfs-mc.a
-- at USE_SAMBA_FS_TRUE@@USE_VFS_TRUE at am__DEPENDENCIES_4 = \
-- at USE_SAMBA_FS_TRUE@@USE_VFS_TRUE@ ../vfs/libvfs-mc.a \
-- at USE_SAMBA_FS_TRUE@@USE_VFS_TRUE@ ../vfs/samba/libsamba.a
--mc_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
-- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_1) \
-+mc_DEPENDENCIES = $(EDITLIB) $(SLANGLIB) $(VFSLIB) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_mcmfmt_OBJECTS = mfmt.$(OBJEXT)
- mcmfmt_OBJECTS = $(am_mcmfmt_OBJECTS)
- mcmfmt_LDADD = $(LDADD)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/config/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -154,8 +147,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALLOCA = @ALLOCA@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -167,10 +158,6 @@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
--CHARSET_FALSE = @CHARSET_FALSE@
--CHARSET_TRUE = @CHARSET_TRUE@
--CONS_SAVER_FALSE = @CONS_SAVER_FALSE@
--CONS_SAVER_TRUE = @CONS_SAVER_TRUE@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
-@@ -192,6 +179,7 @@
- GMODULE_CFLAGS = @GMODULE_CFLAGS@
- GMODULE_LIBS = @GMODULE_LIBS@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_ASPRINTF = @HAVE_ASPRINTF@
- HAVE_FILECMD = @HAVE_FILECMD@
- HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-@@ -199,8 +187,7 @@
- HAVE_WPRINTF = @HAVE_WPRINTF@
- HAVE_ZIPINFO = @HAVE_ZIPINFO@
- HAVE_nroff = @HAVE_nroff@
--INCLUDED_SLANG_FALSE = @INCLUDED_SLANG_FALSE@
--INCLUDED_SLANG_TRUE = @INCLUDED_SLANG_TRUE@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -221,13 +208,12 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MANDOC = @MANDOC@
- MAN_FLAGS = @MAN_FLAGS@
- MCLIBS = @MCLIBS@
- MCSERVLIBS = @MCSERVLIBS@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
- MSGMERGE = @MSGMERGE@
-@@ -248,34 +234,22 @@
- SHELL = @SHELL@
- STRIP = @STRIP@
- UNZIP = @UNZIP@
--USE_EDIT_FALSE = @USE_EDIT_FALSE@
--USE_EDIT_TRUE = @USE_EDIT_TRUE@
- USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
--USE_MCFS_FALSE = @USE_MCFS_FALSE@
--USE_MCFS_TRUE = @USE_MCFS_TRUE@
- USE_NLS = @USE_NLS@
--USE_SAMBA_FS_FALSE = @USE_SAMBA_FS_FALSE@
--USE_SAMBA_FS_TRUE = @USE_SAMBA_FS_TRUE@
--USE_UNDEL_FS_FALSE = @USE_UNDEL_FS_FALSE@
--USE_UNDEL_FS_TRUE = @USE_UNDEL_FS_TRUE@
--USE_VFS_FALSE = @USE_VFS_FALSE@
--USE_VFS_NET_FALSE = @USE_VFS_NET_FALSE@
--USE_VFS_NET_TRUE = @USE_VFS_NET_TRUE@
--USE_VFS_TRUE = @USE_VFS_TRUE@
- VERSION = @VERSION@
- X11_WWW = @X11_WWW@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- ZIP = @ZIP@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -287,32 +261,42 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- configdir = @configdir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = $(datadir)/locale
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- AM_CFLAGS = $(GLIB_CFLAGS)
--localedir = $(datadir)/locale
- pkglibexecdir = $(libexecdir)/@PACKAGE@
- @CONS_SAVER_FALSE at AM_CPPFLAGS = -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\"
- @CONS_SAVER_TRUE at AM_CPPFLAGS = -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" \
-@@ -350,14 +334,12 @@
- tree.c tree.h treestore.c treestore.h tty.c tty.h user.c user.h \
- util.c util.h utilunix.c view.c view.h vfsdummy.h widget.c \
- widget.h win.c win.h wtools.c wtools.h unixcompat.h \
-- x11conn.h x11conn.c ecs.h ecs.c
-+ x11conn.h x11conn.c ecs.h ecs.c \
-+ strutil.h strutil.c strutilascii.c strutil8bit.c strutilutf8.c
-
- @CHARSET_FALSE at mc_SOURCES = $(SRCS)
- @CHARSET_TRUE at mc_SOURCES = $(SRCS) $(CHARSET_SRC)
- EXTRA_DIST = ChangeLog OChangeLog man2hlp.c $(CHARSET_SRC)
--
--# automated testing
--TESTS = ecs-test
- ecs_test_SOURCES = ecs-test.c ecs.h ecs.c
- ecs_test_LDADD = $(GLIB_LIBS) $(INTLLIBS) $(MCLIBS)
- all: all-am
-@@ -395,7 +377,7 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
-- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- if test -f $$p \
-@@ -424,7 +406,7 @@
- -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
- install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS)
- @$(NORMAL_INSTALL)
-- test -z "$(pkglibexecdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibexecdir)"
-+ test -z "$(pkglibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)"
- @list='$(pkglibexec_PROGRAMS)'; for p in $$list; do \
- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- if test -f $$p \
-@@ -447,19 +429,19 @@
- -test -z "$(pkglibexec_PROGRAMS)" || rm -f $(pkglibexec_PROGRAMS)
- cons.saver$(EXEEXT): $(cons_saver_OBJECTS) $(cons_saver_DEPENDENCIES)
- @rm -f cons.saver$(EXEEXT)
-- $(LINK) $(cons_saver_LDFLAGS) $(cons_saver_OBJECTS) $(cons_saver_LDADD) $(LIBS)
-+ $(LINK) $(cons_saver_OBJECTS) $(cons_saver_LDADD) $(LIBS)
- ecs-test$(EXEEXT): $(ecs_test_OBJECTS) $(ecs_test_DEPENDENCIES)
- @rm -f ecs-test$(EXEEXT)
-- $(LINK) $(ecs_test_LDFLAGS) $(ecs_test_OBJECTS) $(ecs_test_LDADD) $(LIBS)
-+ $(LINK) $(ecs_test_OBJECTS) $(ecs_test_LDADD) $(LIBS)
- man2hlp$(EXEEXT): $(man2hlp_OBJECTS) $(man2hlp_DEPENDENCIES)
- @rm -f man2hlp$(EXEEXT)
-- $(LINK) $(man2hlp_LDFLAGS) $(man2hlp_OBJECTS) $(man2hlp_LDADD) $(LIBS)
-+ $(LINK) $(man2hlp_OBJECTS) $(man2hlp_LDADD) $(LIBS)
- mc$(EXEEXT): $(mc_OBJECTS) $(mc_DEPENDENCIES)
- @rm -f mc$(EXEEXT)
-- $(LINK) $(mc_LDFLAGS) $(mc_OBJECTS) $(mc_LDADD) $(LIBS)
-+ $(LINK) $(mc_OBJECTS) $(mc_LDADD) $(LIBS)
- mcmfmt$(EXEEXT): $(mcmfmt_OBJECTS) $(mcmfmt_DEPENDENCIES)
- @rm -f mcmfmt$(EXEEXT)
-- $(LINK) $(mcmfmt_LDFLAGS) $(mcmfmt_OBJECTS) $(mcmfmt_LDADD) $(LIBS)
-+ $(LINK) $(mcmfmt_OBJECTS) $(mcmfmt_LDADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-@@ -520,6 +502,10 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/selcodepage.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/setup.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/slint.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/strutil.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/strutil8bit.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/strutilascii.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/strutilutf8.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/subshell.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/textconf.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tree.Po at am__quote@
-@@ -535,27 +521,26 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/x11conn.Po at am__quote@
-
- .c.o:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
--uninstall-info-am:
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -567,8 +552,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -578,13 +563,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-@@ -598,7 +582,7 @@
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list='$(TESTS)'; \
- if test -n "$$list"; then \
-@@ -609,7 +593,7 @@
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *" $$tst "*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -621,7 +605,7 @@
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *" $$tst "*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -671,22 +655,21 @@
- else :; fi
-
- distdir: $(DISTFILES)
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
- esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -704,7 +687,7 @@
- all-am: Makefile $(PROGRAMS)
- installdirs:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -753,14 +736,22 @@
-
- install-data-am:
-
-+install-dvi: install-dvi-am
-+
- install-exec-am: install-binPROGRAMS install-pkglibexecPROGRAMS
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -780,24 +771,27 @@
-
- ps-am:
-
--uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
-- uninstall-pkglibexecPROGRAMS
-+uninstall-am: uninstall-binPROGRAMS uninstall-pkglibexecPROGRAMS
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
-
-+.MAKE: install-am install-exec-am install-strip uninstall-am
-+
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
- clean-noinstPROGRAMS clean-pkglibexecPROGRAMS ctags distclean \
- distclean-compile distclean-generic distclean-tags distdir dvi \
- dvi-am html html-am info info-am install install-am \
-- install-binPROGRAMS install-data install-data-am install-exec \
-- install-exec-am install-exec-hook install-info install-info-am \
-- install-man install-pkglibexecPROGRAMS install-strip \
-- installcheck installcheck-am installdirs maintainer-clean \
-- maintainer-clean-generic mostlyclean mostlyclean-compile \
-- mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-- uninstall-am uninstall-binPROGRAMS uninstall-hook \
-- uninstall-info-am uninstall-pkglibexecPROGRAMS
-+ install-binPROGRAMS install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-exec-hook \
-+ install-html install-html-am install-info install-info-am \
-+ install-man install-pdf install-pdf-am \
-+ install-pkglibexecPROGRAMS install-ps install-ps-am \
-+ install-strip installcheck installcheck-am installdirs \
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-+ tags uninstall uninstall-am uninstall-binPROGRAMS \
-+ uninstall-hook uninstall-pkglibexecPROGRAMS
-
-
- # end of automated testing
-diff -Nurwd mc-4.6.2~pre1.orig/syntax/Makefile.in mc-4.6.2~pre1/syntax/Makefile.in
---- mc-4.6.2~pre1.orig/syntax/Makefile.in 2008-02-26 18:26:11.000000000 +0100
-+++ mc-4.6.2~pre1/syntax/Makefile.in 2008-02-26 18:24:28.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -77,8 +73,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALLOCA = @ALLOCA@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -90,10 +84,6 @@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
--CHARSET_FALSE = @CHARSET_FALSE@
--CHARSET_TRUE = @CHARSET_TRUE@
--CONS_SAVER_FALSE = @CONS_SAVER_FALSE@
--CONS_SAVER_TRUE = @CONS_SAVER_TRUE@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
-@@ -115,6 +105,7 @@
- GMODULE_CFLAGS = @GMODULE_CFLAGS@
- GMODULE_LIBS = @GMODULE_LIBS@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_ASPRINTF = @HAVE_ASPRINTF@
- HAVE_FILECMD = @HAVE_FILECMD@
- HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-@@ -122,8 +113,7 @@
- HAVE_WPRINTF = @HAVE_WPRINTF@
- HAVE_ZIPINFO = @HAVE_ZIPINFO@
- HAVE_nroff = @HAVE_nroff@
--INCLUDED_SLANG_FALSE = @INCLUDED_SLANG_FALSE@
--INCLUDED_SLANG_TRUE = @INCLUDED_SLANG_TRUE@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -144,13 +134,12 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MANDOC = @MANDOC@
- MAN_FLAGS = @MAN_FLAGS@
- MCLIBS = @MCLIBS@
- MCSERVLIBS = @MCSERVLIBS@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
- MSGMERGE = @MSGMERGE@
-@@ -171,34 +160,22 @@
- SHELL = @SHELL@
- STRIP = @STRIP@
- UNZIP = @UNZIP@
--USE_EDIT_FALSE = @USE_EDIT_FALSE@
--USE_EDIT_TRUE = @USE_EDIT_TRUE@
- USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
--USE_MCFS_FALSE = @USE_MCFS_FALSE@
--USE_MCFS_TRUE = @USE_MCFS_TRUE@
- USE_NLS = @USE_NLS@
--USE_SAMBA_FS_FALSE = @USE_SAMBA_FS_FALSE@
--USE_SAMBA_FS_TRUE = @USE_SAMBA_FS_TRUE@
--USE_UNDEL_FS_FALSE = @USE_UNDEL_FS_FALSE@
--USE_UNDEL_FS_TRUE = @USE_UNDEL_FS_TRUE@
--USE_VFS_FALSE = @USE_VFS_FALSE@
--USE_VFS_NET_FALSE = @USE_VFS_NET_FALSE@
--USE_VFS_NET_TRUE = @USE_VFS_NET_TRUE@
--USE_VFS_TRUE = @USE_VFS_TRUE@
- VERSION = @VERSION@
- X11_WWW = @X11_WWW@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- ZIP = @ZIP@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -210,37 +187,48 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- configdir = @configdir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- SYNTAXFILES = \
- Syntax \
- ada95.syntax \
- aspx.syntax \
- assembler.syntax \
-- c.syntax \
- cxx.syntax \
-+ c.syntax \
- changelog.syntax \
- debian-changelog.syntax \
- debian-control.syntax \
-@@ -248,7 +236,6 @@
- cs.syntax \
- css.syntax \
- d.syntax \
-- debian-description.syntax \
- diff.syntax \
- dos.syntax \
- eiffel.syntax \
-@@ -265,7 +252,6 @@
- mail.syntax \
- makefile.syntax \
- ml.syntax \
-- named.syntax \
- nroff.syntax \
- octave.syntax \
- pascal.syntax \
-@@ -280,7 +266,6 @@
- slang.syntax \
- spec.syntax \
- sql.syntax \
-- strace.syntax \
- swig.syntax \
- syntax.syntax \
- tcl.syntax \
-@@ -323,10 +308,9 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--uninstall-info-am:
- install-syntaxDATA: $(syntax_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(syntaxdir)" || $(mkdir_p) "$(DESTDIR)$(syntaxdir)"
-+ test -z "$(syntaxdir)" || $(MKDIR_P) "$(DESTDIR)$(syntaxdir)"
- @list='$(syntax_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -349,22 +333,21 @@
-
-
- distdir: $(DISTFILES)
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
- esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -380,7 +363,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(syntaxdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -426,12 +409,20 @@
-
- install-data-am: install-syntaxDATA
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -450,16 +441,20 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-syntaxDATA
-+uninstall-am: uninstall-syntaxDATA
-+
-+.MAKE: install-am install-strip
-
- .PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
-- install install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-+ install install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-pdf install-pdf-am install-ps install-ps-am \
- install-strip install-syntaxDATA installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-- uninstall-am uninstall-info-am uninstall-syntaxDATA
-+ uninstall-am uninstall-syntaxDATA
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Nurwd mc-4.6.2~pre1.orig/vfs/extfs/Makefile.in mc-4.6.2~pre1/vfs/extfs/Makefile.in
---- mc-4.6.2~pre1.orig/vfs/extfs/Makefile.in 2008-02-26 18:20:31.000000000 +0100
-+++ mc-4.6.2~pre1/vfs/extfs/Makefile.in 2008-02-26 18:24:28.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +15,11 @@
- @SET_MAKE@
-
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -88,8 +84,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALLOCA = @ALLOCA@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -101,10 +95,6 @@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
--CHARSET_FALSE = @CHARSET_FALSE@
--CHARSET_TRUE = @CHARSET_TRUE@
--CONS_SAVER_FALSE = @CONS_SAVER_FALSE@
--CONS_SAVER_TRUE = @CONS_SAVER_TRUE@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
-@@ -126,6 +116,7 @@
- GMODULE_CFLAGS = @GMODULE_CFLAGS@
- GMODULE_LIBS = @GMODULE_LIBS@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_ASPRINTF = @HAVE_ASPRINTF@
- HAVE_FILECMD = @HAVE_FILECMD@
- HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-@@ -133,8 +124,7 @@
- HAVE_WPRINTF = @HAVE_WPRINTF@
- HAVE_ZIPINFO = @HAVE_ZIPINFO@
- HAVE_nroff = @HAVE_nroff@
--INCLUDED_SLANG_FALSE = @INCLUDED_SLANG_FALSE@
--INCLUDED_SLANG_TRUE = @INCLUDED_SLANG_TRUE@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -155,13 +145,12 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MANDOC = @MANDOC@
- MAN_FLAGS = @MAN_FLAGS@
- MCLIBS = @MCLIBS@
- MCSERVLIBS = @MCSERVLIBS@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
- MSGMERGE = @MSGMERGE@
-@@ -182,34 +171,22 @@
- SHELL = @SHELL@
- STRIP = @STRIP@
- UNZIP = @UNZIP@
--USE_EDIT_FALSE = @USE_EDIT_FALSE@
--USE_EDIT_TRUE = @USE_EDIT_TRUE@
- USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
--USE_MCFS_FALSE = @USE_MCFS_FALSE@
--USE_MCFS_TRUE = @USE_MCFS_TRUE@
- USE_NLS = @USE_NLS@
--USE_SAMBA_FS_FALSE = @USE_SAMBA_FS_FALSE@
--USE_SAMBA_FS_TRUE = @USE_SAMBA_FS_TRUE@
--USE_UNDEL_FS_FALSE = @USE_UNDEL_FS_FALSE@
--USE_UNDEL_FS_TRUE = @USE_UNDEL_FS_TRUE@
--USE_VFS_FALSE = @USE_VFS_FALSE@
--USE_VFS_NET_FALSE = @USE_VFS_NET_FALSE@
--USE_VFS_NET_TRUE = @USE_VFS_NET_TRUE@
--USE_VFS_TRUE = @USE_VFS_TRUE@
- VERSION = @VERSION@
- X11_WWW = @X11_WWW@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- ZIP = @ZIP@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -221,30 +198,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- configdir = @configdir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- extfsdir = $(pkgdatadir)/extfs
-
- # Files to install and distribute other than extfs scripts
-@@ -381,7 +369,7 @@
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- install-extfsSCRIPTS: $(extfs_SCRIPTS)
- @$(NORMAL_INSTALL)
-- test -z "$(extfsdir)" || $(mkdir_p) "$(DESTDIR)$(extfsdir)"
-+ test -z "$(extfsdir)" || $(MKDIR_P) "$(DESTDIR)$(extfsdir)"
- @list='$(extfs_SCRIPTS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- if test -f $$d$$p; then \
-@@ -398,10 +386,9 @@
- echo " rm -f '$(DESTDIR)$(extfsdir)/$$f'"; \
- rm -f "$(DESTDIR)$(extfsdir)/$$f"; \
- done
--uninstall-info-am:
- install-extfsDATA: $(extfs_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(extfsdir)" || $(mkdir_p) "$(DESTDIR)$(extfsdir)"
-+ test -z "$(extfsdir)" || $(MKDIR_P) "$(DESTDIR)$(extfsdir)"
- @list='$(extfs_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -424,22 +411,21 @@
-
-
- distdir: $(DISTFILES)
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
- esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -455,7 +441,7 @@
- all-am: Makefile $(SCRIPTS) $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(extfsdir)" "$(DESTDIR)$(extfsdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -501,12 +487,20 @@
-
- install-data-am: install-extfsDATA install-extfsSCRIPTS
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -525,18 +519,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-extfsDATA uninstall-extfsSCRIPTS \
-- uninstall-info-am
-+uninstall-am: uninstall-extfsDATA uninstall-extfsSCRIPTS
-+
-+.MAKE: install-am install-strip
-
- .PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
-- install install-am install-data install-data-am install-exec \
-- install-exec-am install-extfsDATA install-extfsSCRIPTS \
-- install-info install-info-am install-man install-strip \
-- installcheck installcheck-am installdirs maintainer-clean \
-+ install install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-extfsDATA \
-+ install-extfsSCRIPTS install-html install-html-am install-info \
-+ install-info-am install-man install-pdf install-pdf-am \
-+ install-ps install-ps-am install-strip installcheck \
-+ installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am uninstall-extfsDATA \
-- uninstall-extfsSCRIPTS uninstall-info-am
-+ uninstall-extfsSCRIPTS
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Nurwd mc-4.6.2~pre1.orig/vfs/Makefile.in mc-4.6.2~pre1/vfs/Makefile.in
---- mc-4.6.2~pre1.orig/vfs/Makefile.in 2008-02-26 18:20:31.000000000 +0100
-+++ mc-4.6.2~pre1/vfs/Makefile.in 2008-02-26 18:24:28.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +15,11 @@
- @SET_MAKE@
-
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -94,7 +90,7 @@
- mcserv_OBJECTS = $(am_mcserv_OBJECTS)
- am__DEPENDENCIES_1 =
- mcserv_DEPENDENCIES = $(am__DEPENDENCIES_1)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/config/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -105,17 +101,18 @@
- DIST_SOURCES = $(am__libvfs_mc_a_SOURCES_DIST) $(mcserv_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
-- install-exec-recursive install-info-recursive \
-- install-recursive installcheck-recursive installdirs-recursive \
-- pdf-recursive ps-recursive uninstall-info-recursive \
-- uninstall-recursive
-+ install-dvi-recursive install-exec-recursive \
-+ install-html-recursive install-info-recursive \
-+ install-pdf-recursive install-ps-recursive install-recursive \
-+ installcheck-recursive installdirs-recursive pdf-recursive \
-+ ps-recursive uninstall-recursive
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
-+ distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALLOCA = @ALLOCA@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -127,10 +124,6 @@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
--CHARSET_FALSE = @CHARSET_FALSE@
--CHARSET_TRUE = @CHARSET_TRUE@
--CONS_SAVER_FALSE = @CONS_SAVER_FALSE@
--CONS_SAVER_TRUE = @CONS_SAVER_TRUE@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
-@@ -152,6 +145,7 @@
- GMODULE_CFLAGS = @GMODULE_CFLAGS@
- GMODULE_LIBS = @GMODULE_LIBS@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_ASPRINTF = @HAVE_ASPRINTF@
- HAVE_FILECMD = @HAVE_FILECMD@
- HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-@@ -159,8 +153,7 @@
- HAVE_WPRINTF = @HAVE_WPRINTF@
- HAVE_ZIPINFO = @HAVE_ZIPINFO@
- HAVE_nroff = @HAVE_nroff@
--INCLUDED_SLANG_FALSE = @INCLUDED_SLANG_FALSE@
--INCLUDED_SLANG_TRUE = @INCLUDED_SLANG_TRUE@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -181,13 +174,12 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MANDOC = @MANDOC@
- MAN_FLAGS = @MAN_FLAGS@
- MCLIBS = @MCLIBS@
- MCSERVLIBS = @MCSERVLIBS@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
- MSGMERGE = @MSGMERGE@
-@@ -208,34 +200,22 @@
- SHELL = @SHELL@
- STRIP = @STRIP@
- UNZIP = @UNZIP@
--USE_EDIT_FALSE = @USE_EDIT_FALSE@
--USE_EDIT_TRUE = @USE_EDIT_TRUE@
- USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
--USE_MCFS_FALSE = @USE_MCFS_FALSE@
--USE_MCFS_TRUE = @USE_MCFS_TRUE@
- USE_NLS = @USE_NLS@
--USE_SAMBA_FS_FALSE = @USE_SAMBA_FS_FALSE@
--USE_SAMBA_FS_TRUE = @USE_SAMBA_FS_TRUE@
--USE_UNDEL_FS_FALSE = @USE_UNDEL_FS_FALSE@
--USE_UNDEL_FS_TRUE = @USE_UNDEL_FS_TRUE@
--USE_VFS_FALSE = @USE_VFS_FALSE@
--USE_VFS_NET_FALSE = @USE_VFS_NET_FALSE@
--USE_VFS_NET_TRUE = @USE_VFS_NET_TRUE@
--USE_VFS_TRUE = @USE_VFS_TRUE@
- VERSION = @VERSION@
- X11_WWW = @X11_WWW@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- ZIP = @ZIP@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -247,30 +227,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- configdir = @configdir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- @USE_SAMBA_FS_FALSE at SUBDIRS = extfs
- @USE_SAMBA_FS_TRUE at SUBDIRS = samba extfs
- DIST_SUBDIRS = extfs
-@@ -405,7 +396,7 @@
- $(RANLIB) libvfs-mc.a
- install-sbinPROGRAMS: $(sbin_PROGRAMS)
- @$(NORMAL_INSTALL)
-- test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
-+ test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
- @list='$(sbin_PROGRAMS)'; for p in $$list; do \
- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- if test -f $$p \
-@@ -428,7 +419,7 @@
- -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
- mcserv$(EXEEXT): $(mcserv_OBJECTS) $(mcserv_DEPENDENCIES)
- @rm -f mcserv$(EXEEXT)
-- $(LINK) $(mcserv_LDFLAGS) $(mcserv_OBJECTS) $(mcserv_LDADD) $(LIBS)
-+ $(LINK) $(mcserv_OBJECTS) $(mcserv_LDADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-@@ -455,19 +446,18 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vfs.Po at am__quote@
-
- .c.o:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
--uninstall-info-am:
-
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -500,8 +490,7 @@
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
-@@ -545,8 +534,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -571,8 +560,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -582,13 +571,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-@@ -602,22 +590,21 @@
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- distdir: $(DISTFILES)
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
- esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -631,7 +618,7 @@
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -639,6 +626,8 @@
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
-+ am__remove_distdir=: \
-+ am__skip_length_check=: \
- distdir) \
- || exit 1; \
- fi; \
-@@ -652,7 +641,7 @@
- installdirs: installdirs-recursive
- installdirs-am:
- for dir in "$(DESTDIR)$(sbindir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-recursive
- install-exec: install-exec-recursive
-@@ -701,12 +690,20 @@
-
- install-data-am:
-
-+install-dvi: install-dvi-recursive
-+
- install-exec-am: install-sbinPROGRAMS
-
-+install-html: install-html-recursive
-+
- install-info: install-info-recursive
-
- install-man:
-
-+install-pdf: install-pdf-recursive
-+
-+install-ps: install-ps-recursive
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-recursive
-@@ -727,24 +724,25 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-sbinPROGRAMS
-+uninstall-am: uninstall-sbinPROGRAMS
-
--uninstall-info: uninstall-info-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+ install-strip
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-- clean clean-generic clean-local clean-noinstLIBRARIES \
-- clean-recursive clean-sbinPROGRAMS ctags ctags-recursive \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+ all all-am check check-am clean clean-generic clean-local \
-+ clean-noinstLIBRARIES clean-sbinPROGRAMS ctags ctags-recursive \
- dist-hook distclean distclean-compile distclean-generic \
-- distclean-local distclean-recursive distclean-tags distdir dvi \
-- dvi-am html html-am info info-am install install-am \
-- install-data install-data-am install-exec install-exec-am \
-- install-info install-info-am install-man install-sbinPROGRAMS \
-- install-strip installcheck installcheck-am installdirs \
-- installdirs-am maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-compile \
-- mostlyclean-generic mostlyclean-local mostlyclean-recursive \
-- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-- uninstall-info-am uninstall-sbinPROGRAMS
-+ distclean-local distclean-tags distdir dvi dvi-am html html-am \
-+ info info-am install install-am install-data install-data-am \
-+ install-dvi install-dvi-am install-exec install-exec-am \
-+ install-html install-html-am install-info install-info-am \
-+ install-man install-pdf install-pdf-am install-ps \
-+ install-ps-am install-sbinPROGRAMS install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic mostlyclean mostlyclean-compile \
-+ mostlyclean-generic mostlyclean-local pdf pdf-am ps ps-am tags \
-+ tags-recursive uninstall uninstall-am uninstall-sbinPROGRAMS
-
-
- dist-hook:
-diff -Nurwd mc-4.6.2~pre1.orig/vfs/samba/configure mc-4.6.2~pre1/vfs/samba/configure
---- mc-4.6.2~pre1.orig/vfs/samba/configure 2008-02-26 18:20:31.000000000 +0100
-+++ mc-4.6.2~pre1/vfs/samba/configure 2008-02-26 18:24:11.000000000 +0100
-@@ -1,25 +1,54 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.61.
- #
--# Copyright (C) 2003 Free Software Foundation, Inc.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
- ## M4sh Initialization. ##
- ## --------------------- ##
-
--# Be Bourne compatible
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-- set -o posix
-+ setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+
-+
-+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+ PATH_SEPARATOR=';'
-+ else
-+ PATH_SEPARATOR=:
-+ fi
-+ rm -f conf$$.sh
- fi
--DUALCASE=1; export DUALCASE # for MKS sh
-
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -29,8 +58,43 @@
- fi
-
-
-+# IFS
-+# We need space, tab and new line, in precisely that order. Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" "" $as_nl"
-+
-+# Find who we are. Look in the path if we contain no directory separator.
-+case $0 in
-+ *[\\/]* ) as_myself=$0 ;;
-+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+ as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+ { (exit 1); exit 1; }
-+fi
-+
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -44,18 +108,19 @@
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
-- $as_unset $as_var
-+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
- done
-
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
- else
- as_basename=false
-@@ -63,157 +128,388 @@
-
-
- # Name of the executable.
--as_me=`$as_basename "$0" ||
-+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)$' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
-- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-- /^X\/\(\/\/\)$/{ s//\1/; q; }
-- /^X\/\(\/\).*/{ s//\1/; q; }
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\).*/{
-+ s//\1/
-+ q
-+ }
- s/.*/./; q'`
-
-+# CDPATH.
-+$as_unset CDPATH
-
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
-
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
-- echo "#! /bin/sh" >conf$$.sh
-- echo "exit 0" >>conf$$.sh
-- chmod +x conf$$.sh
-- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-- PATH_SEPARATOR=';'
-+if test "x$CONFIG_SHELL" = x; then
-+ if (eval ":") 2>/dev/null; then
-+ as_have_required=yes
- else
-- PATH_SEPARATOR=:
-+ as_have_required=no
- fi
-- rm -f conf$$.sh
-+
-+ if test $as_have_required = yes && (eval ":
-+(as_func_return () {
-+ (exit \$1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
- fi
-
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-
-- as_lineno_1=$LINENO
-- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" || {
-- # Find who we are. Look in the path if we contain no path at all
-- # relative or not.
-- case $0 in
-- *[\\/]* ) as_myself=$0 ;;
-- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-
-- ;;
-- esac
-- # We did not find ourselves, most probably we were run as `sh COMMAND'
-- # in which case we are not to be found in the path.
-- if test "x$as_myself" = x; then
-- as_myself=$0
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
- fi
-- if test ! -f "$as_myself"; then
-- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-- { (exit 1); exit 1; }; }
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
- fi
-- case $CONFIG_SHELL in
-- '')
-+
-+test \$exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-+ as_lineno_1=\$LINENO
-+ as_lineno_2=\$LINENO
-+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-+") 2> /dev/null; then
-+ :
-+else
-+ as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for as_base in sh bash ksh sh5; do
- case $as_dir in
- /*)
-- if ("$as_dir/$as_base" -c '
-+ for as_base in sh bash ksh sh5; do
-+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-+ done;;
-+ esac
-+done
-+IFS=$as_save_IFS
-+
-+
-+ for as_shell in $as_candidate_shells $SHELL; do
-+ # Try only shells that exist, to save several forks.
-+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-+ { ("$as_shell") 2> /dev/null <<\_ASEOF
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '${1+"$@"}'='"$@"'
-+ setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+:
-+_ASEOF
-+}; then
-+ CONFIG_SHELL=$as_shell
-+ as_have_required=yes
-+ if { "$as_shell" 2> /dev/null <<\_ASEOF
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '${1+"$@"}'='"$@"'
-+ setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+:
-+(as_func_return () {
-+ (exit $1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = "$1" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test $exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
-- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-- CONFIG_SHELL=$as_dir/$as_base
-- export CONFIG_SHELL
-- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-- fi;;
-- esac
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-+
-+_ASEOF
-+}; then
-+ break
-+fi
-+
-+fi
-+
- done
-+
-+ if test "x$CONFIG_SHELL" != x; then
-+ for as_var in BASH_ENV ENV
-+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
--;;
-- esac
-+ export CONFIG_SHELL
-+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+fi
-+
-+
-+ if test $as_have_required = no; then
-+ echo This script requires a shell more modern than all the
-+ echo shells that I found on your system. Please install a
-+ echo modern shell, or manually run the script under such a
-+ echo shell if you do have one.
-+ { (exit 1); exit 1; }
-+fi
-+
-+
-+fi
-+
-+fi
-+
-+
-+
-+(eval "as_func_return () {
-+ (exit \$1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0") || {
-+ echo No shell found that supports shell functions.
-+ echo Please tell autoconf at gnu.org about your system,
-+ echo including any error possibly output before this
-+ echo message
-+}
-+
-+
-+
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
-- # line-number line before each line; the second 'sed' does the real
-- # work. The second script uses 'N' to pair each line-number line
-- # with the numbered line, and appends trailing '-' during
-- # substitution so that $LINENO is not a special case at line end.
-+ # line-number line after each line using $LINENO; the second 'sed'
-+ # does the real work. The second script uses 'N' to pair each
-+ # line-number line with the line containing $LINENO, and appends
-+ # trailing '-' during substitution so that $LINENO is not a special
-+ # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
-- sed '=' <$as_myself |
-+ # scripts with optimization help from Paolo Bonzini. Blame Lee
-+ # E. McMahon (1931-1989) for sed's syntax. :-)
-+ sed -n '
-+ p
-+ /[$]LINENO/=
-+ ' <$as_myself |
- sed '
-+ s/[$]LINENO.*/&-/
-+ t lineno
-+ b
-+ :lineno
- N
-- s,$,-,
- : loop
-- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
-- s,-$,,
-- s,^['$as_cr_digits']*\n,,
-+ s/-\n.*//
- ' >$as_me.lineno &&
-- chmod +x $as_me.lineno ||
-+ chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
-- # original and so on. Autoconf is especially sensible to this).
-- . ./$as_me.lineno
-+ # original and so on. Autoconf is especially sensitive to this).
-+ . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
- }
-
-
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-- *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T=' ' ;;
-- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+ as_dirname=dirname
-+else
-+ as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+ case `echo 'x\c'` in
-+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
-+ *) ECHO_C='\c';;
-+ esac;;
-+*)
-+ ECHO_N='-n';;
- esac
-
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
- rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+ rm -f conf$$.dir/conf$$.file
-+else
-+ rm -f conf$$.dir
-+ mkdir conf$$.dir
-+fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
-- # We could just check for DJGPP; but this test a) works b) is more generic
-- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-- if test -f conf$$.exe; then
-- # Don't use ln at all; we don't have any links
-- as_ln_s='cp -p'
-- else
- as_ln_s='ln -s'
-- fi
-+ # ... but there are two gotchas:
-+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+ # In both cases, we have to default to `cp -p'.
-+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+ as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
--rm -f conf$$ conf$$.exe conf$$.file
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-
- if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
-@@ -222,7 +518,28 @@
- as_mkdir_p=false
- fi
-
--as_executable_p="test -f"
-+if test -x / >/dev/null 2>&1; then
-+ as_test_x='test -x'
-+else
-+ if ls -dL / >/dev/null 2>&1; then
-+ as_ls_L_option=L
-+ else
-+ as_ls_L_option=
-+ fi
-+ as_test_x='
-+ eval sh -c '\''
-+ if test -d "$1"; then
-+ test -d "$1/.";
-+ else
-+ case $1 in
-+ -*)set "./$1";;
-+ esac;
-+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-+ ???[sx]*):;;*)false;;esac;fi
-+ '\'' sh
-+ '
-+fi
-+as_executable_p=$as_test_x
-
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -231,39 +548,27 @@
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" $as_nl"
--
--# CDPATH.
--$as_unset CDPATH
-
-+exec 7<&0 </dev/null 6>&1
-
- # Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
- # so uname gets run too.
- ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
--exec 6>&1
--
- #
- # Initializations.
- #
- ac_default_prefix=/usr/local
-+ac_clean_files=
- ac_config_libobj_dir=.
-+LIBOBJS=
- cross_compiling=no
- subdirs=
- MFLAGS=
- MAKEFLAGS=
- SHELL=${CONFIG_SHELL-/bin/sh}
-
--# Maximum number of lines to put in a shell here document.
--# This variable seems obsolete. It should probably be removed, and
--# only ac_max_sed_lines should be used.
--: ${ac_max_here_lines=38}
--
- # Identity of this package.
- PACKAGE_NAME=
- PACKAGE_TARNAME=
-@@ -276,42 +581,129 @@
- # Factoring default headers for most tests.
- ac_includes_default="\
- #include <stdio.h>
--#if HAVE_SYS_TYPES_H
-+#ifdef HAVE_SYS_TYPES_H
- # include <sys/types.h>
- #endif
--#if HAVE_SYS_STAT_H
-+#ifdef HAVE_SYS_STAT_H
- # include <sys/stat.h>
- #endif
--#if STDC_HEADERS
-+#ifdef STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
- #else
--# if HAVE_STDLIB_H
-+# ifdef HAVE_STDLIB_H
- # include <stdlib.h>
- # endif
- #endif
--#if HAVE_STRING_H
--# if !STDC_HEADERS && HAVE_MEMORY_H
-+#ifdef HAVE_STRING_H
-+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
- # include <memory.h>
- # endif
- # include <string.h>
- #endif
--#if HAVE_STRINGS_H
-+#ifdef HAVE_STRINGS_H
- # include <strings.h>
- #endif
--#if HAVE_INTTYPES_H
-+#ifdef HAVE_INTTYPES_H
- # include <inttypes.h>
--#else
--# if HAVE_STDINT_H
--# include <stdint.h>
- # endif
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
- #endif
--#if HAVE_UNISTD_H
-+#ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif"
-
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPROGS LDSHFLAGS HOST_OS WRAP WRAP32 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK AR ac_ct_AR BROKEN_CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os MAINT AUTOCONF AUTOHEADER CPP EGREP LIBOBJS ROFF builddir configdir codepagedir LTLIBOBJS'
-+ac_subst_vars='SHELL
-+PATH_SEPARATOR
-+PACKAGE_NAME
-+PACKAGE_TARNAME
-+PACKAGE_VERSION
-+PACKAGE_STRING
-+PACKAGE_BUGREPORT
-+exec_prefix
-+prefix
-+program_transform_name
-+bindir
-+sbindir
-+libexecdir
-+datarootdir
-+datadir
-+sysconfdir
-+sharedstatedir
-+localstatedir
-+includedir
-+oldincludedir
-+docdir
-+infodir
-+htmldir
-+dvidir
-+pdfdir
-+psdir
-+libdir
-+localedir
-+mandir
-+DEFS
-+ECHO_C
-+ECHO_N
-+ECHO_T
-+LIBS
-+build_alias
-+host_alias
-+target_alias
-+CC
-+CFLAGS
-+LDFLAGS
-+CPPFLAGS
-+ac_ct_CC
-+EXEEXT
-+OBJEXT
-+MPROGS
-+LDSHFLAGS
-+HOST_OS
-+WRAP
-+WRAP32
-+INSTALL_PROGRAM
-+INSTALL_SCRIPT
-+INSTALL_DATA
-+AWK
-+AR
-+BROKEN_CC
-+build
-+build_cpu
-+build_vendor
-+build_os
-+host
-+host_cpu
-+host_vendor
-+host_os
-+target
-+target_cpu
-+target_vendor
-+target_os
-+MAINT
-+AUTOCONF
-+AUTOHEADER
-+CPP
-+GREP
-+EGREP
-+LIBOBJS
-+ROFF
-+builddir
-+configdir
-+codepagedir
-+LTLIBOBJS'
- ac_subst_files=''
-+ ac_precious_vars='build_alias
-+host_alias
-+target_alias
-+CC
-+CFLAGS
-+LDFLAGS
-+LIBS
-+CPPFLAGS
-+CPP'
-+
-
- # Initialize some variables set by options.
- ac_init_help=
-@@ -338,34 +730,48 @@
- # and all the variables that are supposed to be based on exec_prefix
- # by default will actually change.
- # Use braces instead of parens because sh, perl, etc. also accept them.
-+# (The list follows the same order as the GNU Coding Standards.)
- bindir='${exec_prefix}/bin'
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
--datadir='${prefix}/share'
-+datarootdir='${prefix}/share'
-+datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
--libdir='${exec_prefix}/lib'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
--infodir='${prefix}/info'
--mandir='${prefix}/man'
-+docdir='${datarootdir}/doc/${PACKAGE}'
-+infodir='${datarootdir}/info'
-+htmldir='${docdir}'
-+dvidir='${docdir}'
-+pdfdir='${docdir}'
-+psdir='${docdir}'
-+libdir='${exec_prefix}/lib'
-+localedir='${datarootdir}/locale'
-+mandir='${datarootdir}/man'
-
- ac_prev=
-+ac_dashdash=
- for ac_option
- do
- # If the previous option needs an argument, assign it.
- if test -n "$ac_prev"; then
-- eval "$ac_prev=\$ac_option"
-+ eval $ac_prev=\$ac_option
- ac_prev=
- continue
- fi
-
-- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-+ case $ac_option in
-+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+ *) ac_optarg=yes ;;
-+ esac
-
- # Accept the important Cygnus configure options, so we can diagnose typos.
-
-- case $ac_option in
-+ case $ac_dashdash$ac_option in
-+ --)
-+ ac_dashdash=yes ;;
-
- -bindir | --bindir | --bindi | --bind | --bin | --bi)
- ac_prev=bindir ;;
-@@ -387,33 +793,45 @@
- --config-cache | -C)
- cache_file=config.cache ;;
-
-- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-+ -datadir | --datadir | --datadi | --datad)
- ac_prev=datadir ;;
-- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-- | --da=*)
-+ -datadir=* | --datadir=* | --datadi=* | --datad=*)
- datadir=$ac_optarg ;;
-
-+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-+ | --dataroo | --dataro | --datar)
-+ ac_prev=datarootdir ;;
-+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-+ datarootdir=$ac_optarg ;;
-+
- -disable-* | --disable-*)
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
-- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-- eval "enable_$ac_feature=no" ;;
-+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+ eval enable_$ac_feature=no ;;
-+
-+ -docdir | --docdir | --docdi | --doc | --do)
-+ ac_prev=docdir ;;
-+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-+ docdir=$ac_optarg ;;
-+
-+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-+ ac_prev=dvidir ;;
-+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-+ dvidir=$ac_optarg ;;
-
- -enable-* | --enable-*)
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
-- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-- case $ac_option in
-- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-- *) ac_optarg=yes ;;
-- esac
-- eval "enable_$ac_feature='$ac_optarg'" ;;
-+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+ eval enable_$ac_feature=\$ac_optarg ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -440,6 +858,12 @@
- -host=* | --host=* | --hos=* | --ho=*)
- host_alias=$ac_optarg ;;
-
-+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-+ ac_prev=htmldir ;;
-+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-+ | --ht=*)
-+ htmldir=$ac_optarg ;;
-+
- -includedir | --includedir | --includedi | --included | --include \
- | --includ | --inclu | --incl | --inc)
- ac_prev=includedir ;;
-@@ -464,13 +888,16 @@
- | --libexe=* | --libex=* | --libe=*)
- libexecdir=$ac_optarg ;;
-
-+ -localedir | --localedir | --localedi | --localed | --locale)
-+ ac_prev=localedir ;;
-+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-+ localedir=$ac_optarg ;;
-+
- -localstatedir | --localstatedir | --localstatedi | --localstated \
-- | --localstate | --localstat | --localsta | --localst \
-- | --locals | --local | --loca | --loc | --lo)
-+ | --localstate | --localstat | --localsta | --localst | --locals)
- ac_prev=localstatedir ;;
- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
- localstatedir=$ac_optarg ;;
-
- -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -535,6 +962,16 @@
- | --progr-tra=* | --program-tr=* | --program-t=*)
- program_transform_name=$ac_optarg ;;
-
-+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-+ ac_prev=pdfdir ;;
-+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-+ pdfdir=$ac_optarg ;;
-+
-+ -psdir | --psdir | --psdi | --psd | --ps)
-+ ac_prev=psdir ;;
-+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-+ psdir=$ac_optarg ;;
-+
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- silent=yes ;;
-@@ -587,24 +1024,20 @@
- -with-* | --with-*)
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
-- ac_package=`echo $ac_package| sed 's/-/_/g'`
-- case $ac_option in
-- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-- *) ac_optarg=yes ;;
-- esac
-- eval "with_$ac_package='$ac_optarg'" ;;
-+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+ eval with_$ac_package=\$ac_optarg ;;
-
- -without-* | --without-*)
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
-- ac_package=`echo $ac_package | sed 's/-/_/g'`
-- eval "with_$ac_package=no" ;;
-+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+ eval with_$ac_package=no ;;
-
- --x)
- # Obsolete; use --with-x.
-@@ -635,8 +1068,7 @@
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
-- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-- eval "$ac_envvar='$ac_optarg'"
-+ eval $ac_envvar=\$ac_optarg
- export $ac_envvar ;;
-
- *)
-@@ -656,27 +1088,19 @@
- { (exit 1); exit 1; }; }
- fi
-
--# Be sure to have absolute paths.
--for ac_var in exec_prefix prefix
--do
-- eval ac_val=$`echo $ac_var`
-- case $ac_val in
-- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-- { (exit 1); exit 1; }; };;
-- esac
--done
--
--# Be sure to have absolute paths.
--for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-- localstatedir libdir includedir oldincludedir infodir mandir
-+# Be sure to have absolute directory names.
-+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
-+ datadir sysconfdir sharedstatedir localstatedir includedir \
-+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-+ libdir localedir mandir
- do
-- eval ac_val=$`echo $ac_var`
-+ eval ac_val=\$$ac_var
- case $ac_val in
-- [\\/$]* | ?:[\\/]* ) ;;
-- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-- { (exit 1); exit 1; }; };;
-+ [\\/$]* | ?:[\\/]* ) continue;;
-+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
- esac
-+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+ { (exit 1); exit 1; }; }
- done
-
- # There might be people who depend on the old broken behavior: `$host'
-@@ -703,74 +1127,76 @@
- test "$silent" = yes && exec 6>/dev/null
-
-
-+ac_pwd=`pwd` && test -n "$ac_pwd" &&
-+ac_ls_di=`ls -di .` &&
-+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-+ { echo "$as_me: error: Working directory cannot be determined" >&2
-+ { (exit 1); exit 1; }; }
-+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-+ { echo "$as_me: error: pwd does not report name of working directory" >&2
-+ { (exit 1); exit 1; }; }
-+
-+
- # Find the source files, if location was not specified.
- if test -z "$srcdir"; then
- ac_srcdir_defaulted=yes
-- # Try the directory containing this script, then its parent.
-- ac_confdir=`(dirname "$0") 2>/dev/null ||
-+ # Try the directory containing this script, then the parent directory.
-+ ac_confdir=`$as_dirname -- "$0" ||
- $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$0" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
- s/.*/./; q'`
- srcdir=$ac_confdir
-- if test ! -r $srcdir/$ac_unique_file; then
-+ if test ! -r "$srcdir/$ac_unique_file"; then
- srcdir=..
- fi
- else
- ac_srcdir_defaulted=no
- fi
--if test ! -r $srcdir/$ac_unique_file; then
-- if test "$ac_srcdir_defaulted" = yes; then
-- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-- { (exit 1); exit 1; }; }
-- else
-+if test ! -r "$srcdir/$ac_unique_file"; then
-+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
- fi
--fi
--(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-+ac_abs_confdir=`(
-+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
- { (exit 1); exit 1; }; }
--srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
--ac_env_build_alias_set=${build_alias+set}
--ac_env_build_alias_value=$build_alias
--ac_cv_env_build_alias_set=${build_alias+set}
--ac_cv_env_build_alias_value=$build_alias
--ac_env_host_alias_set=${host_alias+set}
--ac_env_host_alias_value=$host_alias
--ac_cv_env_host_alias_set=${host_alias+set}
--ac_cv_env_host_alias_value=$host_alias
--ac_env_target_alias_set=${target_alias+set}
--ac_env_target_alias_value=$target_alias
--ac_cv_env_target_alias_set=${target_alias+set}
--ac_cv_env_target_alias_value=$target_alias
--ac_env_CC_set=${CC+set}
--ac_env_CC_value=$CC
--ac_cv_env_CC_set=${CC+set}
--ac_cv_env_CC_value=$CC
--ac_env_CFLAGS_set=${CFLAGS+set}
--ac_env_CFLAGS_value=$CFLAGS
--ac_cv_env_CFLAGS_set=${CFLAGS+set}
--ac_cv_env_CFLAGS_value=$CFLAGS
--ac_env_LDFLAGS_set=${LDFLAGS+set}
--ac_env_LDFLAGS_value=$LDFLAGS
--ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
--ac_cv_env_LDFLAGS_value=$LDFLAGS
--ac_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_env_CPPFLAGS_value=$CPPFLAGS
--ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_cv_env_CPPFLAGS_value=$CPPFLAGS
--ac_env_CPP_set=${CPP+set}
--ac_env_CPP_value=$CPP
--ac_cv_env_CPP_set=${CPP+set}
--ac_cv_env_CPP_value=$CPP
-+ pwd)`
-+# When building in place, set srcdir=.
-+if test "$ac_abs_confdir" = "$ac_pwd"; then
-+ srcdir=.
-+fi
-+# Remove unnecessary trailing slashes from srcdir.
-+# Double slashes in file names in object file debugging info
-+# mess up M-x gdb in Emacs.
-+case $srcdir in
-+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-+esac
-+for ac_var in $ac_precious_vars; do
-+ eval ac_env_${ac_var}_set=\${${ac_var}+set}
-+ eval ac_env_${ac_var}_value=\$${ac_var}
-+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-+ eval ac_cv_env_${ac_var}_value=\$${ac_var}
-+done
-
- #
- # Report the --help message.
-@@ -799,9 +1225,6 @@
- -n, --no-create do not create output files
- --srcdir=DIR find the sources in DIR [configure dir or \`..']
-
--_ACEOF
--
-- cat <<_ACEOF
- Installation directories:
- --prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
-@@ -819,15 +1242,22 @@
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
-- --datadir=DIR read-only architecture-independent data [PREFIX/share]
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
-- --infodir=DIR info documentation [PREFIX/info]
-- --mandir=DIR man documentation [PREFIX/man]
-+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
-+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
-+ --infodir=DIR info documentation [DATAROOTDIR/info]
-+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
-+ --mandir=DIR man documentation [DATAROOTDIR/man]
-+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
-+ --htmldir=DIR html documentation [DOCDIR]
-+ --dvidir=DIR dvi documentation [DOCDIR]
-+ --pdfdir=DIR pdf documentation [DOCDIR]
-+ --psdir=DIR ps documentation [DOCDIR]
- _ACEOF
-
- cat <<\_ACEOF
-@@ -869,126 +1299,95 @@
- CFLAGS C compiler flags
- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
- nonstandard directory <lib dir>
-- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
-- headers in a nonstandard directory <include dir>
-+ LIBS libraries to pass to the linker, e.g. -l<library>
-+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-+ you have headers in a nonstandard directory <include dir>
- CPP C preprocessor
-
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-
- _ACEOF
-+ac_status=$?
- fi
-
- if test "$ac_init_help" = "recursive"; then
- # If there are subdirs, report their specific --help.
-- ac_popdir=`pwd`
- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-- test -d $ac_dir || continue
-+ test -d "$ac_dir" || continue
- ac_builddir=.
-
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-- # A "../" for each directory in $ac_dir_suffix.
-- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
-- ac_dir_suffix= ac_top_builddir=
--fi
-+ # A ".." for each directory in $ac_dir_suffix.
-+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+ case $ac_top_builddir_sub in
-+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+ esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-
- case $srcdir in
-- .) # No --srcdir option. We are building in place.
-+ .) # We are building in place.
- ac_srcdir=.
-- if test -z "$ac_top_builddir"; then
-- ac_top_srcdir=.
-- else
-- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-- fi ;;
-- [\\/]* | ?:[\\/]* ) # Absolute path.
-+ ac_top_srcdir=$ac_top_builddir_sub
-+ ac_abs_top_srcdir=$ac_pwd ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
-- ac_top_srcdir=$srcdir ;;
-- *) # Relative path.
-- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
--
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
-- case "$ac_dir" in
-- .) ac_abs_builddir=`pwd`;;
-- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-- *) ac_abs_builddir=`pwd`/"$ac_dir";;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
-- case ${ac_top_builddir}. in
-- .) ac_abs_top_builddir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
-- case $ac_srcdir in
-- .) ac_abs_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
-- case $ac_top_srcdir in
-- .) ac_abs_top_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-- esac;;
-+ ac_top_srcdir=$srcdir
-+ ac_abs_top_srcdir=$srcdir ;;
-+ *) # Relative name.
-+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_build_prefix$srcdir
-+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
- esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-- cd $ac_dir
-- # Check for guested configure; otherwise get Cygnus style configure.
-- if test -f $ac_srcdir/configure.gnu; then
-- echo
-- $SHELL $ac_srcdir/configure.gnu --help=recursive
-- elif test -f $ac_srcdir/configure; then
-- echo
-- $SHELL $ac_srcdir/configure --help=recursive
-- elif test -f $ac_srcdir/configure.ac ||
-- test -f $ac_srcdir/configure.in; then
-- echo
-- $ac_configure --help
-+ cd "$ac_dir" || { ac_status=$?; continue; }
-+ # Check for guested configure.
-+ if test -f "$ac_srcdir/configure.gnu"; then
-+ echo &&
-+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-+ elif test -f "$ac_srcdir/configure"; then
-+ echo &&
-+ $SHELL "$ac_srcdir/configure" --help=recursive
- else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-- fi
-- cd $ac_popdir
-+ fi || ac_status=$?
-+ cd "$ac_pwd" || { ac_status=$?; break; }
- done
- fi
-
--test -n "$ac_init_help" && exit 0
-+test -n "$ac_init_help" && exit $ac_status
- if $ac_init_version; then
- cat <<\_ACEOF
-+configure
-+generated by GNU Autoconf 2.61
-
--Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-- exit 0
-+ exit
- fi
--exec 5>config.log
--cat >&5 <<_ACEOF
-+cat >config.log <<_ACEOF
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
-
- It was created by $as_me, which was
--generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.61. Invocation command line was
-
- $ $0 $@
-
- _ACEOF
-+exec 5>>config.log
- {
- cat <<_ASUNAME
- ## --------- ##
-@@ -1007,7 +1406,7 @@
- /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
- /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
- /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
--hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
-+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
- /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
- /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
- /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-@@ -1021,6 +1420,7 @@
- test -z "$as_dir" && as_dir=.
- echo "PATH: $as_dir"
- done
-+IFS=$as_save_IFS
-
- } >&5
-
-@@ -1042,7 +1442,6 @@
- ac_configure_args=
- ac_configure_args0=
- ac_configure_args1=
--ac_sep=
- ac_must_keep_next=false
- for ac_pass in 1 2
- do
-@@ -1053,7 +1452,7 @@
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- continue ;;
-- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-+ *\'*)
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- case $ac_pass in
-@@ -1075,9 +1474,7 @@
- -* ) ac_must_keep_next=true ;;
- esac
- fi
-- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-- # Get rid of the leading space.
-- ac_sep=" "
-+ ac_configure_args="$ac_configure_args '$ac_arg'"
- ;;
- esac
- done
-@@ -1088,8 +1485,8 @@
- # When interrupted or exit'd, cleanup temporary files, and complete
- # config.log. We remove comments because anyway the quotes in there
- # would cause problems or look ugly.
--# WARNING: Be sure not to use single quotes in there, as some shells,
--# such as our DU 5.0 friend, will then `close' the trap.
-+# WARNING: Use '\'' to represent an apostrophe within the trap.
-+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
- trap 'exit_status=$?
- # Save into config.log some information that might help in debugging.
- {
-@@ -1102,20 +1499,34 @@
- _ASBOX
- echo
- # The following way of writing the cache mishandles newlines in values,
--{
-+(
-+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-+ eval ac_val=\$$ac_var
-+ case $ac_val in #(
-+ *${as_nl}*)
-+ case $ac_var in #(
-+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+ esac
-+ case $ac_var in #(
-+ _ | IFS | as_nl) ;; #(
-+ *) $as_unset $ac_var ;;
-+ esac ;;
-+ esac
-+ done
- (set) 2>&1 |
-- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-- *ac_space=\ *)
-+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-+ *${as_nl}ac_space=\ *)
- sed -n \
-- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-- ;;
-+ "s/'\''/'\''\\\\'\'''\''/g;
-+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-+ ;; #(
- *)
-- sed -n \
-- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
-- esac;
--}
-+ esac |
-+ sort
-+)
- echo
-
- cat <<\_ASBOX
-@@ -1126,22 +1537,28 @@
- echo
- for ac_var in $ac_subst_vars
- do
-- eval ac_val=$`echo $ac_var`
-- echo "$ac_var='"'"'$ac_val'"'"'"
-+ eval ac_val=\$$ac_var
-+ case $ac_val in
-+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ esac
-+ echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
-
- if test -n "$ac_subst_files"; then
- cat <<\_ASBOX
--## ------------- ##
--## Output files. ##
--## ------------- ##
-+## ------------------- ##
-+## File substitutions. ##
-+## ------------------- ##
- _ASBOX
- echo
- for ac_var in $ac_subst_files
- do
-- eval ac_val=$`echo $ac_var`
-- echo "$ac_var='"'"'$ac_val'"'"'"
-+ eval ac_val=\$$ac_var
-+ case $ac_val in
-+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ esac
-+ echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
- fi
-@@ -1153,15 +1570,15 @@
- ## ----------- ##
- _ASBOX
- echo
-- sed "/^$/d" confdefs.h | sort
-+ cat confdefs.h
- echo
- fi
- test "$ac_signal" != 0 &&
- echo "$as_me: caught signal $ac_signal"
- echo "$as_me: exit $exit_status"
- } >&5
-- rm -f core *.core &&
-- rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-+ rm -f core *.core core.conftest.* &&
-+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
- exit $exit_status
- ' 0
- for ac_signal in 1 2 13 15; do
-@@ -1170,9 +1587,7 @@
- ac_signal=0
-
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
--rm -rf conftest* confdefs.h
--# AIX cpp loses on an empty file, so make sure it contains at least a newline.
--echo >confdefs.h
-+rm -f -r conftest* confdefs.h
-
- # Predefined preprocessor variables.
-
-@@ -1203,14 +1618,17 @@
-
- # Let the site file select an alternate cache file if it wants to.
- # Prefer explicitly selected file to automatically selected ones.
--if test -z "$CONFIG_SITE"; then
-- if test "x$prefix" != xNONE; then
-- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-+if test -n "$CONFIG_SITE"; then
-+ set x "$CONFIG_SITE"
-+elif test "x$prefix" != xNONE; then
-+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
- else
-- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-- fi
-+ set x "$ac_default_prefix/share/config.site" \
-+ "$ac_default_prefix/etc/config.site"
- fi
--for ac_site_file in $CONFIG_SITE; do
-+shift
-+for ac_site_file
-+do
- if test -r "$ac_site_file"; then
- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
- echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1226,8 +1644,8 @@
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
-- [\\/]* | ?:[\\/]* ) . $cache_file;;
-- *) . ./$cache_file;;
-+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
-+ *) . "./$cache_file";;
- esac
- fi
- else
-@@ -1239,12 +1657,11 @@
- # Check that the precious variables saved in the cache have kept the same
- # value.
- ac_cache_corrupted=false
--for ac_var in `(set) 2>&1 |
-- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-+for ac_var in $ac_precious_vars; do
- eval ac_old_set=\$ac_cv_env_${ac_var}_set
- eval ac_new_set=\$ac_env_${ac_var}_set
-- eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-- eval ac_new_val="\$ac_env_${ac_var}_value"
-+ eval ac_old_val=\$ac_cv_env_${ac_var}_value
-+ eval ac_new_val=\$ac_env_${ac_var}_value
- case $ac_old_set,$ac_new_set in
- set,)
- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1269,8 +1686,7 @@
- # Pass precious variables to config.status.
- if test "$ac_new_set" = set; then
- case $ac_new_val in
-- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
- *) ac_arg=$ac_var=$ac_new_val ;;
- esac
- case " $ac_configure_args " in
-@@ -1287,12 +1703,6 @@
- { (exit 1); exit 1; }; }
- fi
-
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
-
-
-
-@@ -1309,35 +1719,46 @@
-
-
-
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
- ac_config_headers="$ac_config_headers include/config.h"
-
- ac_aux_dir=
--for ac_dir in ../../config $srcdir/../../config; do
-- if test -f $ac_dir/install-sh; then
-+for ac_dir in ../../config "$srcdir"/../../config; do
-+ if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
-- elif test -f $ac_dir/install.sh; then
-+ elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
-- elif test -f $ac_dir/shtool; then
-+ elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
- done
- if test -z "$ac_aux_dir"; then
-- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ../../config $srcdir/../../config" >&5
--echo "$as_me: error: cannot find install-sh or install.sh in ../../config $srcdir/../../config" >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ../../config \"$srcdir\"/../../config" >&5
-+echo "$as_me: error: cannot find install-sh or install.sh in ../../config \"$srcdir\"/../../config" >&2;}
- { (exit 1); exit 1; }; }
- fi
--ac_config_guess="$SHELL $ac_aux_dir/config.guess"
--ac_config_sub="$SHELL $ac_aux_dir/config.sub"
--ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-+
-+# These three variables are undocumented and unsupported,
-+# and are intended to be withdrawn in a future Autoconf release.
-+# They can cause serious problems if a builder's source tree is in a directory
-+# whose full name contains unusual characters.
-+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
-+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
-+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-+
-
- # we want to be compatibe with older versions of Samba
-
-@@ -1349,8 +1770,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1363,32 +1784,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1401,26 +1824,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
- CC=$ac_ct_CC
-+ fi
- else
- CC="$ac_cv_prog_CC"
- fi
-@@ -1429,8 +1867,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1443,74 +1881,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--fi
--if test -z "$ac_cv_prog_CC"; then
-- ac_ct_CC=$CC
-- # Extract the first word of "cc", so it can be a program name with args.
--set dummy cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test -n "$ac_ct_CC"; then
-- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_ac_ct_CC="cc"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--done
--done
-
--fi
--fi
--ac_ct_CC=$ac_cv_prog_ac_ct_CC
--if test -n "$ac_ct_CC"; then
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
-
-- CC=$ac_ct_CC
--else
-- CC="$ac_cv_prog_CC"
- fi
--
- fi
- 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 "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1524,7 +1922,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
-@@ -1535,6 +1933,7 @@
- fi
- done
- done
-+IFS=$as_save_IFS
-
- if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
-@@ -1552,22 +1951,23 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
-- for ac_prog in cl
-+ for ac_prog in cl.exe
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1580,36 +1980,38 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$CC" && break
- done
- fi
- if test -z "$CC"; then
- ac_ct_CC=$CC
-- for ac_prog in cl
-+ for ac_prog in cl.exe
- 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 "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1622,30 +2024,46 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$ac_ct_CC" && break
- done
-
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
- CC=$ac_ct_CC
- fi
-+fi
-
- fi
-
-@@ -1657,21 +2075,35 @@
- { (exit 1); exit 1; }; }
-
- # Provide some information about the compiler.
--echo "$as_me:$LINENO:" \
-- "checking for C compiler version" >&5
-+echo "$as_me:$LINENO: checking for C compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-- (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler --version >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-- (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -v >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-- (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -V >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-@@ -1696,47 +2128,77 @@
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
--echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
- ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-- (eval $ac_link_default) 2>&5
-+#
-+# List of possible output files, starting from the most likely.
-+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-+# only as a last resort. b.out is created by i960 compilers.
-+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-+#
-+# The IRIX 6 linker writes into existing files which may not be
-+# executable, retaining their permissions. Remove them first so a
-+# subsequent execution test works.
-+ac_rmfiles=
-+for ac_file in $ac_files
-+do
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-+ esac
-+done
-+rm -f $ac_rmfiles
-+
-+if { (ac_try="$ac_link_default"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link_default") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- # Find the output, starting from the most likely. This scheme is
--# not robust to junk in `.', hence go to wildcards (a.*) only as a last
--# resort.
--
--# Be careful to initialize this variable, since it used to be cached.
--# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
--ac_cv_exeext=
--# b.out is created by i960 compilers.
--for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-+# in a Makefile. We should not override ac_cv_exeext if it was cached,
-+# so that the user can short-circuit this test for compilers unknown to
-+# Autoconf.
-+for ac_file in $ac_files ''
- do
- test -f "$ac_file" || continue
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-- ;;
-- conftest.$ac_ext )
-- # This is the source file.
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
- ;;
- [ab].out )
- # We found the default executable, but exeext='' is most
- # certainly right.
- break;;
- *.* )
-+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-+ then :; else
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-- # FIXME: I believe we export ac_cv_exeext for Libtool,
-- # but it would be cool to find out if it's true. Does anybody
-- # maintain Libtool? --akim.
-- export ac_cv_exeext
-+ fi
-+ # We set ac_cv_exeext here because the later test for it is not
-+ # safe: cross compilers may not add the suffix if given an `-o'
-+ # argument, so we may need to know it at that point already.
-+ # Even if this section looks crufty: it has the advantage of
-+ # actually working.
- break;;
- * )
- break;;
- esac
- done
-+test "$ac_cv_exeext" = no && ac_cv_exeext=
-+
- else
-+ ac_file=''
-+fi
-+
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
-+if test -z "$ac_file"; then
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-@@ -1748,19 +2210,21 @@
- fi
-
- ac_exeext=$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_file" >&5
--echo "${ECHO_T}$ac_file" >&6
-
--# Check the compiler produces executables we can run. If not, either
-+# Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether the C compiler works" >&5
--echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
- # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -1779,22 +2243,27 @@
- fi
- fi
- fi
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- rm -f a.out a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check the compiler produces executables we can run. If not, either
-+# Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
--echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
--echo "$as_me:$LINENO: result: $cross_compiling" >&5
--echo "${ECHO_T}$cross_compiling" >&6
-+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+echo "${ECHO_T}$cross_compiling" >&6; }
-
--echo "$as_me:$LINENO: checking for suffix of executables" >&5
--echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-@@ -1805,9 +2274,8 @@
- for ac_file in conftest.exe conftest conftest.*; do
- test -f "$ac_file" || continue
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-- export ac_cv_exeext
- break;;
- * ) break;;
- esac
-@@ -1821,14 +2289,14 @@
- fi
-
- rm -f conftest$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--echo "${ECHO_T}$ac_cv_exeext" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+echo "${ECHO_T}$ac_cv_exeext" >&6; }
-
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--echo "$as_me:$LINENO: checking for suffix of object files" >&5
--echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
- if test "${ac_cv_objext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1848,14 +2316,20 @@
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-+ for ac_file in conftest.o conftest.obj conftest.*; do
-+ test -f "$ac_file" || continue;
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
- break;;
- esac
-@@ -1873,12 +2347,12 @@
-
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
--echo "${ECHO_T}$ac_cv_objext" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+echo "${ECHO_T}$ac_cv_objext" >&6; }
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1901,27 +2375,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -1929,21 +2398,25 @@
-
- ac_compiler_gnu=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
- GCC=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--CFLAGS="-g"
--echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-+ ac_save_c_werror_flag=$ac_c_werror_flag
-+ ac_c_werror_flag=yes
-+ ac_cv_prog_cc_g=no
-+ CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -1960,38 +2433,118 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_g=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ CFLAGS=""
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_g=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_prog_cc_g=no
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
- if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
-@@ -2007,12 +2560,12 @@
- CFLAGS=
- fi
- fi
--echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
--echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
--if test "${ac_cv_prog_cc_stdc+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_prog_cc_stdc=no
-+ ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -2046,12 +2599,17 @@
- /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
-- as 'x'. The following induces an error, until -std1 is added to get
-+ as 'x'. The following induces an error, until -std is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
-- that's true only with -std1. */
-+ that's true only with -std. */
- int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+ inside strings and character constants. */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+
- int test (int i, double x);
- struct s1 {int (*f) (int a);};
- struct s2 {int (*f) (double a);};
-@@ -2066,205 +2624,57 @@
- return 0;
- }
- _ACEOF
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX -qlanglvl=ansi
--# Ultrix and OSF/1 -std1
--# HP-UX 10.20 and later -Ae
--# HP-UX older versions -Aa -D_HPUX_SOURCE
--# SVR4 -Xc -D__EXTENSIONS__
--for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
- do
- CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_prog_cc_stdc=$ac_arg
--break
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_c89=$ac_arg
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext
-+
-+rm -f core conftest.err conftest.$ac_objext
-+ test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
--rm -f conftest.$ac_ext conftest.$ac_objext
-+rm -f conftest.$ac_ext
- CC=$ac_save_CC
-
- fi
--
--case "x$ac_cv_prog_cc_stdc" in
-- x|xno)
-- echo "$as_me:$LINENO: result: none needed" >&5
--echo "${ECHO_T}none needed" >&6 ;;
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+ x)
-+ { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+ xno)
-+ { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
- *)
-- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-- CC="$CC $ac_cv_prog_cc_stdc" ;;
-+ CC="$CC $ac_cv_prog_cc_c89"
-+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
- esac
-
--# Some people use a C++ compiler to compile C. Since we use `exit',
--# in C++ we need to declare it. In case someone uses the same compiler
--# for both compiling C and C++ we need to have the C++ compiler decide
--# the declaration of exit, since it's the most demanding environment.
--cat >conftest.$ac_ext <<_ACEOF
--#ifndef __cplusplus
-- choke me
--#endif
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- for ac_declaration in \
-- '' \
-- 'extern "C" void std::exit (int) throw (); using std::exit;' \
-- 'extern "C" void std::exit (int); using std::exit;' \
-- 'extern "C" void exit (int) throw ();' \
-- 'extern "C" void exit (int);' \
-- 'void exit (int);'
--do
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_declaration
--#include <stdlib.h>
--int
--main ()
--{
--exit (42);
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- :
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-
--continue
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_declaration
--int
--main ()
--{
--exit (42);
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--rm -f conftest*
--if test -n "$ac_declaration"; then
-- echo '#ifdef __cplusplus' >>confdefs.h
-- echo $ac_declaration >>confdefs.h
-- echo '#endif' >>confdefs.h
--fi
--
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2272,15 +2682,15 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
--# Check whether --enable-largefile or --disable-largefile was given.
-+# Check whether --enable-largefile was given.
- if test "${enable_largefile+set}" = set; then
-- enableval="$enable_largefile"
-+ enableval=$enable_largefile;
-+fi
-
--fi;
- if test "$enable_largefile" != no; then
-
-- echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
--echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
-+echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; }
- if test "${ac_cv_sys_largefile_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2314,83 +2724,76 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext
-+
-+rm -f core conftest.err conftest.$ac_objext
- CC="$CC -n32"
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_sys_largefile_CC=' -n32'; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext
-+
-+rm -f core conftest.err conftest.$ac_objext
- break
- done
- CC=$ac_save_CC
- rm -f conftest.$ac_ext
- fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
--echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
-+echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; }
- if test "$ac_cv_sys_largefile_CC" != no; then
- CC=$CC$ac_cv_sys_largefile_CC
- fi
-
-- echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
--echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; }
- if test "${ac_cv_sys_file_offset_bits+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- while :; do
-- ac_cv_sys_file_offset_bits=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -2415,34 +2818,31 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- break
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_sys_file_offset_bits=no; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -2468,54 +2868,53 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_sys_file_offset_bits=64; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_cv_sys_file_offset_bits=unknown
- break
- done
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
--echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
--if test "$ac_cv_sys_file_offset_bits" != no; then
--
-+{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; }
-+case $ac_cv_sys_file_offset_bits in #(
-+ no | unknown) ;;
-+ *)
- cat >>confdefs.h <<_ACEOF
- #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
- _ACEOF
--
--fi
-+;;
-+esac
- rm -f conftest*
-- echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
--echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
-+ if test $ac_cv_sys_file_offset_bits = unknown; then
-+ { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
-+echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
- if test "${ac_cv_sys_large_files+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- while :; do
-- ac_cv_sys_large_files=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -2540,34 +2939,31 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- break
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_sys_large_files=no; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -2593,48 +2989,48 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_sys_large_files=1; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_cv_sys_large_files=unknown
- break
- done
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
--echo "${ECHO_T}$ac_cv_sys_large_files" >&6
--if test "$ac_cv_sys_large_files" != no; then
--
-+{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
-+echo "${ECHO_T}$ac_cv_sys_large_files" >&6; }
-+case $ac_cv_sys_large_files in #(
-+ no | unknown) ;;
-+ *)
- cat >>confdefs.h <<_ACEOF
- #define _LARGE_FILES $ac_cv_sys_large_files
- _ACEOF
--
--fi
-+;;
-+esac
- rm -f conftest*
- fi
-+fi
-
-
-
-@@ -2655,8 +3051,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2669,32 +3065,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2707,26 +3105,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
- CC=$ac_ct_CC
-+ fi
- else
- CC="$ac_cv_prog_CC"
- fi
-@@ -2735,8 +3148,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2749,74 +3162,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--fi
--if test -z "$ac_cv_prog_CC"; then
-- ac_ct_CC=$CC
-- # Extract the first word of "cc", so it can be a program name with args.
--set dummy cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test -n "$ac_ct_CC"; then
-- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_ac_ct_CC="cc"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--done
--done
-
--fi
--fi
--ac_ct_CC=$ac_cv_prog_ac_ct_CC
--if test -n "$ac_ct_CC"; then
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
-
-- CC=$ac_ct_CC
--else
-- CC="$ac_cv_prog_CC"
- fi
--
- fi
- 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 "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2830,7 +3203,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
-@@ -2841,6 +3214,7 @@
- fi
- done
- done
-+IFS=$as_save_IFS
-
- if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
-@@ -2858,22 +3232,23 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
-- for ac_prog in cl
-+ for ac_prog in cl.exe
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2886,36 +3261,38 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$CC" && break
- done
- fi
- if test -z "$CC"; then
- ac_ct_CC=$CC
-- for ac_prog in cl
-+ for ac_prog in cl.exe
- 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 "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2928,30 +3305,46 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$ac_ct_CC" && break
- done
-
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
- CC=$ac_ct_CC
- fi
-+fi
-
- fi
-
-@@ -2963,27 +3356,41 @@
- { (exit 1); exit 1; }; }
-
- # Provide some information about the compiler.
--echo "$as_me:$LINENO:" \
-- "checking for C compiler version" >&5
-+echo "$as_me:$LINENO: checking for C compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-- (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler --version >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-- (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -v >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-- (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -V >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-
--echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3006,27 +3413,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -3034,21 +3436,25 @@
-
- ac_compiler_gnu=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
- GCC=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--CFLAGS="-g"
--echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-+ ac_save_c_werror_flag=$ac_c_werror_flag
-+ ac_c_werror_flag=yes
-+ ac_cv_prog_cc_g=no
-+ CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -3065,38 +3471,118 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_g=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ CFLAGS=""
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_g=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_prog_cc_g=no
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
- if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
-@@ -3112,12 +3598,12 @@
- CFLAGS=
- fi
- fi
--echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
--echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
--if test "${ac_cv_prog_cc_stdc+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_prog_cc_stdc=no
-+ ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -3151,12 +3637,17 @@
- /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
-- as 'x'. The following induces an error, until -std1 is added to get
-+ as 'x'. The following induces an error, until -std is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
-- that's true only with -std1. */
-+ that's true only with -std. */
- int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+ inside strings and character constants. */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+
- int test (int i, double x);
- struct s1 {int (*f) (int a);};
- struct s2 {int (*f) (double a);};
-@@ -3171,205 +3662,57 @@
- return 0;
- }
- _ACEOF
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX -qlanglvl=ansi
--# Ultrix and OSF/1 -std1
--# HP-UX 10.20 and later -Ae
--# HP-UX older versions -Aa -D_HPUX_SOURCE
--# SVR4 -Xc -D__EXTENSIONS__
--for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
- do
- CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_prog_cc_stdc=$ac_arg
--break
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_c89=$ac_arg
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext
-+
-+rm -f core conftest.err conftest.$ac_objext
-+ test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
--rm -f conftest.$ac_ext conftest.$ac_objext
-+rm -f conftest.$ac_ext
- CC=$ac_save_CC
-
- fi
--
--case "x$ac_cv_prog_cc_stdc" in
-- x|xno)
-- echo "$as_me:$LINENO: result: none needed" >&5
--echo "${ECHO_T}none needed" >&6 ;;
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+ x)
-+ { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+ xno)
-+ { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
- *)
-- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-- CC="$CC $ac_cv_prog_cc_stdc" ;;
-+ CC="$CC $ac_cv_prog_cc_c89"
-+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
- esac
-
--# Some people use a C++ compiler to compile C. Since we use `exit',
--# in C++ we need to declare it. In case someone uses the same compiler
--# for both compiling C and C++ we need to have the C++ compiler decide
--# the declaration of exit, since it's the most demanding environment.
--cat >conftest.$ac_ext <<_ACEOF
--#ifndef __cplusplus
-- choke me
--#endif
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- for ac_declaration in \
-- '' \
-- 'extern "C" void std::exit (int) throw (); using std::exit;' \
-- 'extern "C" void std::exit (int); using std::exit;' \
-- 'extern "C" void exit (int) throw ();' \
-- 'extern "C" void exit (int);' \
-- 'void exit (int);'
--do
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_declaration
--#include <stdlib.h>
--int
--main ()
--{
--exit (42);
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- :
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--continue
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_declaration
--int
--main ()
--{
--exit (42);
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--rm -f conftest*
--if test -n "$ac_declaration"; then
-- echo '#ifdef __cplusplus' >>confdefs.h
-- echo $ac_declaration >>confdefs.h
-- echo '#endif' >>confdefs.h
--fi
--
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3389,8 +3732,8 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
--echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
--echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3412,7 +3755,7 @@
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
-@@ -3431,21 +3774,22 @@
- ;;
- esac
- done
-+IFS=$as_save_IFS
-
-
- fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
-- # As a last resort, use the slow shell script. We don't cache a
-- # path for INSTALL within a source directory, because that will
-+ # As a last resort, use the slow shell script. Don't cache a
-+ # value for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
-- # removed, or if the path is relative.
-+ # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
- fi
--echo "$as_me:$LINENO: result: $INSTALL" >&5
--echo "${ECHO_T}$INSTALL" >&6
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6; }
-
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-@@ -3459,8 +3803,8 @@
- 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 "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AWK+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3473,33 +3817,35 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AWK="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
-- echo "$as_me:$LINENO: result: $AWK" >&5
--echo "${ECHO_T}$AWK" >&6
-+ { echo "$as_me:$LINENO: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$AWK" && break
- done
-
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3512,32 +3858,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AR="${ac_tool_prefix}ar"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
-- echo "$as_me:$LINENO: result: $AR" >&5
--echo "${ECHO_T}$AR" >&6
-+ { echo "$as_me:$LINENO: result: $AR" >&5
-+echo "${ECHO_T}$AR" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_prog_AR"; then
- ac_ct_AR=$AR
- # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3550,42 +3898,56 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_AR="ar"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="ar"
- fi
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
-- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
--echo "${ECHO_T}$ac_ct_AR" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-+echo "${ECHO_T}$ac_ct_AR" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+ if test "x$ac_ct_AR" = x; then
-+ AR="ar"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
- AR=$ac_ct_AR
-+ fi
- else
- AR="$ac_cv_prog_AR"
- fi
-
-
- if test "x$CC" != xcc; then
-- echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
--echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
-+echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
- else
-- echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
--echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
-+echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
- fi
- set dummy $CC; ac_cc=`echo $2 |
- sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
--if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\" = set"; then
-+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -3606,14 +3968,23 @@
- # Make sure it works both with $CC and with simple cc.
- # We do the test twice because some compilers refuse to overwrite an
- # existing .o file with -o, though they will create one.
--ac_try='$CC -c conftest.$ac_ext -o conftest.$ac_objext >&5'
--if { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-+rm -f conftest2.*
-+if { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- test -f conftest.$ac_objext && { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ test -f conftest2.$ac_objext && { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); };
-@@ -3622,19 +3993,32 @@
- if test "x$CC" != xcc; then
- # Test first that cc exists at all.
- if { ac_try='cc -c conftest.$ac_ext >&5'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_try='cc -c conftest.$ac_ext -o conftest.$ac_objext >&5'
-- if { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-+ rm -f conftest2.*
-+ if { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- test -f conftest.$ac_objext && { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ test -f conftest2.$ac_objext && { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); };
-@@ -3650,15 +4034,15 @@
- else
- eval ac_cv_prog_cc_${ac_cc}_c_o=no
- fi
--rm -f conftest*
-+rm -f core conftest*
-
- fi
--if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-
- cat >>confdefs.h <<\_ACEOF
- #define NO_MINUS_C_MINUS_O 1
-@@ -3674,79 +4058,123 @@
-
-
- # Make sure we can run config.sub.
--$ac_config_sub sun4 >/dev/null 2>&1 ||
-- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
--echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
- { (exit 1); exit 1; }; }
-
--echo "$as_me:$LINENO: checking build system type" >&5
--echo $ECHO_N "checking build system type... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking build system type" >&5
-+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
- if test "${ac_cv_build+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_build_alias=$build_alias
--test -z "$ac_cv_build_alias" &&
-- ac_cv_build_alias=`$ac_config_guess`
--test -z "$ac_cv_build_alias" &&
-+ ac_build_alias=$build_alias
-+test "x$ac_build_alias" = x &&
-+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-+test "x$ac_build_alias" = x &&
- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
- echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }
--ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_build" >&5
--echo "${ECHO_T}$ac_cv_build" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+echo "${ECHO_T}$ac_cv_build" >&6; }
-+case $ac_cv_build in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-+echo "$as_me: error: invalid value of canonical build" >&2;}
-+ { (exit 1); exit 1; }; };;
-+esac
- build=$ac_cv_build
--build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_build
-+shift
-+build_cpu=$1
-+build_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+build_os=$*
-+IFS=$ac_save_IFS
-+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
--echo "$as_me:$LINENO: checking host system type" >&5
--echo $ECHO_N "checking host system type... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking host system type" >&5
-+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
- if test "${ac_cv_host+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_host_alias=$host_alias
--test -z "$ac_cv_host_alias" &&
-- ac_cv_host_alias=$ac_cv_build_alias
--ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-+ if test "x$host_alias" = x; then
-+ ac_cv_host=$ac_cv_build
-+else
-+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-+fi
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_host" >&5
--echo "${ECHO_T}$ac_cv_host" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+echo "${ECHO_T}$ac_cv_host" >&6; }
-+case $ac_cv_host in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-+echo "$as_me: error: invalid value of canonical host" >&2;}
-+ { (exit 1); exit 1; }; };;
-+esac
- host=$ac_cv_host
--host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_host
-+shift
-+host_cpu=$1
-+host_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+host_os=$*
-+IFS=$ac_save_IFS
-+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
--echo "$as_me:$LINENO: checking target system type" >&5
--echo $ECHO_N "checking target system type... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking target system type" >&5
-+echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
- if test "${ac_cv_target+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_target_alias=$target_alias
--test "x$ac_cv_target_alias" = "x" &&
-- ac_cv_target_alias=$ac_cv_host_alias
--ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-+ if test "x$target_alias" = x; then
-+ ac_cv_target=$ac_cv_host
-+else
-+ ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-+fi
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_target" >&5
--echo "${ECHO_T}$ac_cv_target" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-+echo "${ECHO_T}$ac_cv_target" >&6; }
-+case $ac_cv_target in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-+echo "$as_me: error: invalid value of canonical target" >&2;}
-+ { (exit 1); exit 1; }; };;
-+esac
- target=$ac_cv_target
--target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_target
-+shift
-+target_cpu=$1
-+target_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+target_os=$*
-+IFS=$ac_save_IFS
-+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-
-
- # The aliases save the names the user supplied, while $host etc.
-@@ -3757,41 +4185,41 @@
- program_prefix=${target_alias}-
-
-
-- echo "$as_me:$LINENO: checking config.cache system type" >&5
--echo $ECHO_N "checking config.cache system type... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking config.cache system type" >&5
-+echo $ECHO_N "checking config.cache system type... $ECHO_C" >&6; }
- if { test x"${ac_cv_host_system_type+set}" = x"set" &&
- test x"$ac_cv_host_system_type" != x"$host"; } ||
- { test x"${ac_cv_build_system_type+set}" = x"set" &&
- test x"$ac_cv_build_system_type" != x"$build"; } ||
- { test x"${ac_cv_target_system_type+set}" = x"set" &&
- test x"$ac_cv_target_system_type" != x"$target"; }; then
-- echo "$as_me:$LINENO: result: different" >&5
--echo "${ECHO_T}different" >&6
-+ { echo "$as_me:$LINENO: result: different" >&5
-+echo "${ECHO_T}different" >&6; }
- { { echo "$as_me:$LINENO: error: you must remove config.cache and restart configure" >&5
- echo "$as_me: error: you must remove config.cache and restart configure" >&2;}
- { (exit 1); exit 1; }; }
- else
-- echo "$as_me:$LINENO: result: same" >&5
--echo "${ECHO_T}same" >&6
-+ { echo "$as_me:$LINENO: result: same" >&5
-+echo "${ECHO_T}same" >&6; }
- fi
- ac_cv_host_system_type="$host"
- ac_cv_build_system_type="$build"
- ac_cv_target_system_type="$target"
-
-
-- # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-+ # Check whether --enable-maintainer-mode was given.
- if test "${enable_maintainer_mode+set}" = set; then
-- enableval="$enable_maintainer_mode"
-- maint_mode=$enableval
-+ enableval=$enable_maintainer_mode; maint_mode=$enableval
- else
- maint_mode=no
--fi;
-+fi
-+
- if test x"$maint_mode" = x"yes"; then MAINT=; else MAINT='#'; fi
-
- # Extract the first word of "autoconf", so it can be a program name with args.
- set dummy autoconf; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_AUTOCONF+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3806,33 +4234,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_AUTOCONF="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_path_AUTOCONF" && ac_cv_path_AUTOCONF="autoconf"
- ;;
- esac
- fi
- AUTOCONF=$ac_cv_path_AUTOCONF
--
- if test -n "$AUTOCONF"; then
-- echo "$as_me:$LINENO: result: $AUTOCONF" >&5
--echo "${ECHO_T}$AUTOCONF" >&6
-+ { echo "$as_me:$LINENO: result: $AUTOCONF" >&5
-+echo "${ECHO_T}$AUTOCONF" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-+
- # Extract the first word of "autoheader", so it can be a program name with args.
- set dummy autoheader; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_AUTOHEADER+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3847,33 +4276,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_AUTOHEADER="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_path_AUTOHEADER" && ac_cv_path_AUTOHEADER="autoheader"
- ;;
- esac
- fi
- AUTOHEADER=$ac_cv_path_AUTOHEADER
--
- if test -n "$AUTOHEADER"; then
-- echo "$as_me:$LINENO: result: $AUTOHEADER" >&5
--echo "${ECHO_T}$AUTOHEADER" >&6
-+ { echo "$as_me:$LINENO: result: $AUTOHEADER" >&5
-+echo "${ECHO_T}$AUTOHEADER" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-
-
--echo "$as_me:$LINENO: checking for inline" >&5
--echo $ECHO_N "checking for inline... $ECHO_C" >&6
-+
-+{ echo "$as_me:$LINENO: checking for inline" >&5
-+echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
- if test "${ac_cv_c_inline+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3893,39 +4323,37 @@
-
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_c_inline=$ac_kw; break
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_c_inline=$ac_kw
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ test "$ac_cv_c_inline" != no && break
- done
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
--echo "${ECHO_T}$ac_cv_c_inline" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-+echo "${ECHO_T}$ac_cv_c_inline" >&6; }
-
-
- case $ac_cv_c_inline in
-@@ -3948,8 +4376,8 @@
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
--echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
--echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-@@ -3983,24 +4411,22 @@
- #endif
- Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- :
- else
- echo "$as_me: failed program was:" >&5
-@@ -4009,9 +4435,10 @@
- # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
-- # OK, works on sane cases. Now check whether non-existent headers
-+ # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -4021,24 +4448,22 @@
- /* end confdefs.h. */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- # Broken: success on invalid input.
- continue
- else
-@@ -4049,6 +4474,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
- done
-@@ -4066,8 +4492,8 @@
- else
- ac_cv_prog_CPP=$CPP
- fi
--echo "$as_me:$LINENO: result: $CPP" >&5
--echo "${ECHO_T}$CPP" >&6
-+{ echo "$as_me:$LINENO: result: $CPP" >&5
-+echo "${ECHO_T}$CPP" >&6; }
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
- do
-@@ -4090,24 +4516,22 @@
- #endif
- Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- :
- else
- echo "$as_me: failed program was:" >&5
-@@ -4116,9 +4540,10 @@
- # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
-- # OK, works on sane cases. Now check whether non-existent headers
-+ # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -4128,24 +4553,22 @@
- /* end confdefs.h. */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- # Broken: success on invalid input.
- continue
- else
-@@ -4156,6 +4579,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
- done
-@@ -4178,23 +4602,170 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-+if test "${ac_cv_path_GREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-- then ac_cv_prog_egrep='grep -E'
-- else ac_cv_prog_egrep='egrep'
-+ # Extract the first word of "grep ggrep" to use in msg output
-+if test -z "$GREP"; then
-+set dummy grep ggrep; ac_prog_name=$2
-+if test "${ac_cv_path_GREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_path_GREP_found=false
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_prog in grep ggrep; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-+ # Check for GNU ac_path_GREP and select it if it is found.
-+ # Check for GNU $ac_path_GREP
-+case `"$ac_path_GREP" --version 2>&1` in
-+*GNU*)
-+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-+*)
-+ ac_count=0
-+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+ while :
-+ do
-+ cat "conftest.in" "conftest.in" >"conftest.tmp"
-+ mv "conftest.tmp" "conftest.in"
-+ cp "conftest.in" "conftest.nl"
-+ echo 'GREP' >> "conftest.nl"
-+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+ ac_count=`expr $ac_count + 1`
-+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
-+ # Best one so far, save it but keep looking for a better one
-+ ac_cv_path_GREP="$ac_path_GREP"
-+ ac_path_GREP_max=$ac_count
- fi
-+ # 10*(2^10) chars as input seems more than enough
-+ test $ac_count -gt 10 && break
-+ done
-+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+
-+ $ac_path_GREP_found && break 3
-+ done
-+done
-+
-+done
-+IFS=$as_save_IFS
-+
-+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
-
-+GREP="$ac_cv_path_GREP"
-+if test -z "$GREP"; then
-+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-
--echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-+else
-+ ac_cv_path_GREP=$GREP
-+fi
-+
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
-+ GREP="$ac_cv_path_GREP"
-+
-+
-+{ echo "$as_me:$LINENO: checking for egrep" >&5
-+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-+ then ac_cv_path_EGREP="$GREP -E"
-+ else
-+ # Extract the first word of "egrep" to use in msg output
-+if test -z "$EGREP"; then
-+set dummy egrep; ac_prog_name=$2
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_path_EGREP_found=false
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_prog in egrep; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-+ # Check for GNU ac_path_EGREP and select it if it is found.
-+ # Check for GNU $ac_path_EGREP
-+case `"$ac_path_EGREP" --version 2>&1` in
-+*GNU*)
-+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-+*)
-+ ac_count=0
-+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+ while :
-+ do
-+ cat "conftest.in" "conftest.in" >"conftest.tmp"
-+ mv "conftest.tmp" "conftest.in"
-+ cp "conftest.in" "conftest.nl"
-+ echo 'EGREP' >> "conftest.nl"
-+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+ ac_count=`expr $ac_count + 1`
-+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-+ # Best one so far, save it but keep looking for a better one
-+ ac_cv_path_EGREP="$ac_path_EGREP"
-+ ac_path_EGREP_max=$ac_count
-+ fi
-+ # 10*(2^10) chars as input seems more than enough
-+ test $ac_count -gt 10 && break
-+ done
-+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+
-+ $ac_path_EGREP_found && break 3
-+ done
-+done
-+
-+done
-+IFS=$as_save_IFS
-+
-+
-+fi
-+
-+EGREP="$ac_cv_path_EGREP"
-+if test -z "$EGREP"; then
-+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+else
-+ ac_cv_path_EGREP=$EGREP
-+fi
-+
-+
-+ fi
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
-+ EGREP="$ac_cv_path_EGREP"
-+
-+
-+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4218,27 +4789,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_header_stdc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -4246,7 +4812,8 @@
-
- ac_cv_header_stdc=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -4302,6 +4869,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <ctype.h>
-+#include <stdlib.h>
- #if ((' ' & 0x0FF) == 0x020)
- # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
- # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -4321,18 +4889,27 @@
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
-- exit(2);
-- exit (0);
-+ return 2;
-+ return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -4345,12 +4922,14 @@
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -4367,9 +4946,9 @@
- ac_header_dirent=no
- for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
- as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
--echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-+echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -4391,27 +4970,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -4419,10 +4993,12 @@
-
- eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -4434,13 +5010,12 @@
- done
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
-- echo "$as_me:$LINENO: checking for library containing opendir" >&5
--echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
- if test "${ac_cv_search_opendir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_func_search_save_LIBS=$LIBS
--ac_cv_search_opendir=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -4448,126 +5023,83 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char opendir ();
- int
- main ()
- {
--opendir ();
-+return opendir ();
- ;
- return 0;
- }
- _ACEOF
-+for ac_lib in '' dir; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="none required"
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_search_opendir=$ac_res
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_opendir" = no; then
-- for ac_lib in dir; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char opendir ();
--int
--main ()
--{
--opendir ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="-l$ac_lib"
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_opendir+set}" = set; then
- break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
- done
-+if test "${ac_cv_search_opendir+set}" = set; then
-+ :
-+else
-+ ac_cv_search_opendir=no
- fi
-+rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
--echo "${ECHO_T}$ac_cv_search_opendir" >&6
--if test "$ac_cv_search_opendir" != no; then
-- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
-+if test "$ac_res" != no; then
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
- fi
-
- else
-- echo "$as_me:$LINENO: checking for library containing opendir" >&5
--echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
- if test "${ac_cv_search_opendir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_func_search_save_LIBS=$LIBS
--ac_cv_search_opendir=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -4575,122 +5107,80 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char opendir ();
- int
- main ()
- {
--opendir ();
-+return opendir ();
- ;
- return 0;
- }
- _ACEOF
-+for ac_lib in '' x; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="none required"
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_search_opendir=$ac_res
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_opendir" = no; then
-- for ac_lib in x; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char opendir ();
--int
--main ()
--{
--opendir ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="-l$ac_lib"
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_opendir+set}" = set; then
- break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
- done
-+if test "${ac_cv_search_opendir+set}" = set; then
-+ :
-+else
-+ ac_cv_search_opendir=no
- fi
-+rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
--echo "${ECHO_T}$ac_cv_search_opendir" >&6
--if test "$ac_cv_search_opendir" != no; then
-- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
-+if test "$ac_res" != no; then
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
- fi
-
- fi
-
--echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
--echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-+echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
- if test "${ac_cv_header_time+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4714,27 +5204,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_header_time=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -4742,10 +5227,11 @@
-
- ac_cv_header_time=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
--echo "${ECHO_T}$ac_cv_header_time" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-+echo "${ECHO_T}$ac_cv_header_time" >&6; }
- if test $ac_cv_header_time = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -4754,8 +5240,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
--echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
-+echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; }
- if test "${ac_cv_header_sys_wait_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4768,7 +5254,7 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- #ifndef WEXITSTATUS
--# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
-+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
- #endif
- #ifndef WIFEXITED
- # define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-@@ -4785,27 +5271,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_header_sys_wait_h=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -4813,10 +5294,11 @@
-
- ac_cv_header_sys_wait_h=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
--echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; }
- if test $ac_cv_header_sys_wait_h = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -4839,9 +5321,9 @@
- inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -4855,27 +5337,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -4883,10 +5360,12 @@
-
- eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -4906,18 +5385,19 @@
- for ac_header in arpa/inet.h sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -4928,27 +5408,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -4956,13 +5431,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -4971,24 +5447,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -4996,9 +5470,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -5022,25 +5497,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -5062,18 +5531,19 @@
- for ac_header in unistd.h utime.h grp.h sys/id.h limits.h memory.h net/if.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5084,27 +5554,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -5112,13 +5577,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5127,24 +5593,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -5152,9 +5616,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -5178,25 +5643,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -5216,18 +5675,19 @@
- for ac_header in compat.h rpc/rpc.h rpcsvc/nis.h rpcsvc/yp_prot.h rpcsvc/ypclnt.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5238,27 +5698,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -5266,13 +5721,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5281,24 +5737,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -5306,9 +5760,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -5332,25 +5787,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -5371,18 +5820,19 @@
- for ac_header in sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/mode.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5393,27 +5843,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -5421,13 +5866,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5436,24 +5882,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -5461,9 +5905,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -5487,25 +5932,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -5527,18 +5966,19 @@
- for ac_header in sys/mman.h sys/filio.h sys/priv.h string.h strings.h stdlib.h sys/socket.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5549,27 +5989,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -5577,13 +6012,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5592,24 +6028,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -5617,9 +6051,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -5643,25 +6078,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -5682,18 +6111,19 @@
- for ac_header in sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5704,27 +6134,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -5732,13 +6157,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5747,24 +6173,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -5772,9 +6196,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -5798,25 +6223,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -5837,18 +6256,19 @@
- for ac_header in sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h sys/sockio.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5859,27 +6279,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -5887,13 +6302,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5902,24 +6318,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -5927,9 +6341,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -5953,25 +6368,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -5989,18 +6398,19 @@
- for ac_header in netinet/tcp.h netinet/in_systm.h netinet/in_ip.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -6011,27 +6421,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -6039,13 +6444,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -6054,24 +6460,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -6079,9 +6483,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -6105,25 +6510,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -6140,18 +6539,19 @@
- for ac_header in sys/security.h security/pam_appl.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -6162,27 +6562,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -6190,13 +6585,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -6205,24 +6601,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -6230,9 +6624,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -6256,25 +6651,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -6293,18 +6682,19 @@
- for ac_header in stropts.h poll.h syscall.h sys/syscall.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -6315,27 +6705,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -6343,13 +6728,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -6358,24 +6744,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -6383,9 +6767,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -6409,25 +6794,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -6445,18 +6824,19 @@
- for ac_header in sys/acl.h sys/cdefs.h glob.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -6467,27 +6847,22 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -6495,13 +6870,14 @@
-
- ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -6510,24 +6886,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -6535,9 +6909,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -6561,25 +6936,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -6592,8 +6961,8 @@
- done
-
-
--echo "$as_me:$LINENO: checking for int" >&5
--echo $ECHO_N "checking for int... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for int" >&5
-+echo $ECHO_N "checking for int... $ECHO_C" >&6; }
- if test "${ac_cv_type_int+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6604,39 +6973,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef int ac__type_new_;
- int
- main ()
- {
--if ((int *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (int))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_int=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -6644,21 +7009,21 @@
-
- ac_cv_type_int=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
--echo "${ECHO_T}$ac_cv_type_int" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-+echo "${ECHO_T}$ac_cv_type_int" >&6; }
-
--echo "$as_me:$LINENO: checking size of int" >&5
--echo $ECHO_N "checking size of int... $ECHO_C" >&6
--if test "${ac_cv_sizeof_int+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$ac_cv_type_int" = yes; then
-- # The cast to unsigned long works around a bug in the HP C Compiler
-+# The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of int" >&5
-+echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_int+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -6668,10 +7033,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -6679,27 +7045,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -6709,10 +7070,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -6720,27 +7082,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -6753,7 +7110,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -6766,10 +7124,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -6777,27 +7136,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -6807,10 +7161,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -6818,27 +7173,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -6851,7 +7201,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -6859,9 +7210,11 @@
-
- ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -6872,10 +7225,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -6883,27 +7237,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
-@@ -6911,23 +7260,21 @@
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_int=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+'') if test "$ac_cv_type_int" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int), 77
-+echo "$as_me: error: cannot compute sizeof (int)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
--esac
-+ { (exit 77); exit 77; }; }
- else
-- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ ac_cv_sizeof_int=0
-+ fi ;;
-+esac
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -6936,8 +7283,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--long longval () { return (long) (sizeof (int)); }
--unsigned long ulongval () { return (long) (sizeof (int)); }
-+ typedef int ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -6946,35 +7294,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-- if (((long) (sizeof (int))) < 0)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
-- long i = longval ();
-- if (i != ((long) (sizeof (int))))
-- exit (1);
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-- if (i != ((long) (sizeof (int))))
-- exit (1);
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -6985,29 +7342,32 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+if test "$ac_cv_type_int" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int), 77
-+echo "$as_me: error: cannot compute sizeof (int)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_int=0
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
-- ac_cv_sizeof_int=0
--fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
--echo "${ECHO_T}$ac_cv_sizeof_int" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_INT $ac_cv_sizeof_int
- _ACEOF
-
-
--echo "$as_me:$LINENO: checking for long" >&5
--echo $ECHO_N "checking for long... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for long" >&5
-+echo $ECHO_N "checking for long... $ECHO_C" >&6; }
- if test "${ac_cv_type_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7018,39 +7378,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef long ac__type_new_;
- int
- main ()
- {
--if ((long *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (long))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_long=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -7058,21 +7414,21 @@
-
- ac_cv_type_long=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
--echo "${ECHO_T}$ac_cv_type_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-+echo "${ECHO_T}$ac_cv_type_long" >&6; }
-
--echo "$as_me:$LINENO: checking size of long" >&5
--echo $ECHO_N "checking size of long... $ECHO_C" >&6
--if test "${ac_cv_sizeof_long+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$ac_cv_type_long" = yes; then
-- # The cast to unsigned long works around a bug in the HP C Compiler
-+# The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of long" >&5
-+echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_long+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7082,10 +7438,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -7093,27 +7450,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7123,10 +7475,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -7134,27 +7487,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -7167,7 +7515,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -7180,10 +7529,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -7191,27 +7541,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7221,10 +7566,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -7232,27 +7578,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -7265,7 +7606,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -7273,9 +7615,11 @@
-
- ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -7286,10 +7630,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -7297,27 +7642,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
-@@ -7325,23 +7665,21 @@
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_long=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+'') if test "$ac_cv_type_long" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long), 77
-+echo "$as_me: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
--esac
-+ { (exit 77); exit 77; }; }
- else
-- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ ac_cv_sizeof_long=0
-+ fi ;;
-+esac
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -7350,8 +7688,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--long longval () { return (long) (sizeof (long)); }
--unsigned long ulongval () { return (long) (sizeof (long)); }
-+ typedef long ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -7360,35 +7699,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-- if (((long) (sizeof (long))) < 0)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
-- long i = longval ();
-- if (i != ((long) (sizeof (long))))
-- exit (1);
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-- if (i != ((long) (sizeof (long))))
-- exit (1);
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -7399,29 +7747,32 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+if test "$ac_cv_type_long" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long), 77
-+echo "$as_me: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_long=0
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
-- ac_cv_sizeof_long=0
- fi
--fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
--echo "${ECHO_T}$ac_cv_sizeof_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_LONG $ac_cv_sizeof_long
- _ACEOF
-
-
--echo "$as_me:$LINENO: checking for short" >&5
--echo $ECHO_N "checking for short... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for short" >&5
-+echo $ECHO_N "checking for short... $ECHO_C" >&6; }
- if test "${ac_cv_type_short+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7432,39 +7783,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef short ac__type_new_;
- int
- main ()
- {
--if ((short *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (short))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_short=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -7472,21 +7819,21 @@
-
- ac_cv_type_short=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
--echo "${ECHO_T}$ac_cv_type_short" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-+echo "${ECHO_T}$ac_cv_type_short" >&6; }
-
--echo "$as_me:$LINENO: checking size of short" >&5
--echo $ECHO_N "checking size of short... $ECHO_C" >&6
--if test "${ac_cv_sizeof_short+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$ac_cv_type_short" = yes; then
-- # The cast to unsigned long works around a bug in the HP C Compiler
-+# The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of short" >&5
-+echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_short+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7496,10 +7843,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -7507,27 +7855,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7537,10 +7880,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -7548,27 +7892,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -7581,7 +7920,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -7594,10 +7934,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -7605,27 +7946,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7635,10 +7971,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -7646,27 +7983,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -7679,7 +8011,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -7687,9 +8020,11 @@
-
- ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -7700,10 +8035,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -7711,27 +8047,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
-@@ -7739,23 +8070,21 @@
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_short=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-+'') if test "$ac_cv_type_short" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (short), 77
-+echo "$as_me: error: cannot compute sizeof (short)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
--esac
-+ { (exit 77); exit 77; }; }
- else
-- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ ac_cv_sizeof_short=0
-+ fi ;;
-+esac
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -7764,8 +8093,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--long longval () { return (long) (sizeof (short)); }
--unsigned long ulongval () { return (long) (sizeof (short)); }
-+ typedef short ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -7774,35 +8104,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-- if (((long) (sizeof (short))) < 0)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
-- long i = longval ();
-- if (i != ((long) (sizeof (short))))
-- exit (1);
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-- if (i != ((long) (sizeof (short))))
-- exit (1);
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -7813,29 +8152,32 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-+if test "$ac_cv_type_short" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (short), 77
-+echo "$as_me: error: cannot compute sizeof (short)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_short=0
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
-- ac_cv_sizeof_short=0
--fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
--echo "${ECHO_T}$ac_cv_sizeof_short" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_SHORT $ac_cv_sizeof_short
- _ACEOF
-
-
--echo "$as_me:$LINENO: checking for off_t" >&5
--echo $ECHO_N "checking for off_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for off_t" >&5
-+echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_off_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7846,39 +8188,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef off_t ac__type_new_;
- int
- main ()
- {
--if ((off_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (off_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_off_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -7886,21 +8224,21 @@
-
- ac_cv_type_off_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
--echo "${ECHO_T}$ac_cv_type_off_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-+echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
-
--echo "$as_me:$LINENO: checking size of off_t" >&5
--echo $ECHO_N "checking size of off_t... $ECHO_C" >&6
--if test "${ac_cv_sizeof_off_t+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$ac_cv_type_off_t" = yes; then
-- # The cast to unsigned long works around a bug in the HP C Compiler
-+# The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of off_t" >&5
-+echo $ECHO_N "checking size of off_t... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_off_t+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7910,10 +8248,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef off_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (off_t))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -7921,27 +8260,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7951,10 +8285,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef off_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (off_t))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -7962,27 +8297,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -7995,7 +8325,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -8008,10 +8339,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef off_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (off_t))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -8019,27 +8351,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8049,10 +8376,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef off_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (off_t))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -8060,27 +8388,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -8093,7 +8416,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -8101,9 +8425,11 @@
-
- ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -8114,10 +8440,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef off_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (off_t))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -8125,27 +8452,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
-@@ -8153,23 +8475,21 @@
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_off_t=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t), 77
-+'') if test "$ac_cv_type_off_t" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (off_t), 77
-+echo "$as_me: error: cannot compute sizeof (off_t)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
--esac
-+ { (exit 77); exit 77; }; }
- else
-- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ ac_cv_sizeof_off_t=0
-+ fi ;;
-+esac
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -8178,8 +8498,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--long longval () { return (long) (sizeof (off_t)); }
--unsigned long ulongval () { return (long) (sizeof (off_t)); }
-+ typedef off_t ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -8188,35 +8509,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-- if (((long) (sizeof (off_t))) < 0)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
-- long i = longval ();
-- if (i != ((long) (sizeof (off_t))))
-- exit (1);
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-- if (i != ((long) (sizeof (off_t))))
-- exit (1);
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -8227,29 +8557,32 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t), 77
-+if test "$ac_cv_type_off_t" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (off_t), 77
-+echo "$as_me: error: cannot compute sizeof (off_t)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_off_t=0
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
-- ac_cv_sizeof_off_t=0
--fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_OFF_T $ac_cv_sizeof_off_t
- _ACEOF
-
-
--echo "$as_me:$LINENO: checking for ino_t" >&5
--echo $ECHO_N "checking for ino_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for ino_t" >&5
-+echo $ECHO_N "checking for ino_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_ino_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8260,39 +8593,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef ino_t ac__type_new_;
- int
- main ()
- {
--if ((ino_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (ino_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_ino_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -8300,21 +8629,21 @@
-
- ac_cv_type_ino_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5
--echo "${ECHO_T}$ac_cv_type_ino_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5
-+echo "${ECHO_T}$ac_cv_type_ino_t" >&6; }
-
--echo "$as_me:$LINENO: checking size of ino_t" >&5
--echo $ECHO_N "checking size of ino_t... $ECHO_C" >&6
--if test "${ac_cv_sizeof_ino_t+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$ac_cv_type_ino_t" = yes; then
-- # The cast to unsigned long works around a bug in the HP C Compiler
-+# The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of ino_t" >&5
-+echo $ECHO_N "checking size of ino_t... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_ino_t+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8324,10 +8653,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef ino_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (ino_t))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -8335,27 +8665,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8365,10 +8690,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef ino_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (ino_t))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -8376,27 +8702,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -8409,7 +8730,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -8422,10 +8744,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef ino_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (ino_t))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -8433,27 +8756,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8463,10 +8781,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef ino_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (ino_t))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -8474,27 +8793,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
-@@ -8507,7 +8821,8 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
-@@ -8515,9 +8830,11 @@
-
- ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -8528,10 +8845,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef ino_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (ino_t))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -8539,27 +8857,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
-@@ -8567,23 +8880,21 @@
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_ino_t=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (ino_t), 77
-+'') if test "$ac_cv_type_ino_t" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (ino_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (ino_t), 77
-+echo "$as_me: error: cannot compute sizeof (ino_t)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
--esac
-+ { (exit 77); exit 77; }; }
- else
-- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ ac_cv_sizeof_ino_t=0
-+ fi ;;
-+esac
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -8592,8 +8903,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--long longval () { return (long) (sizeof (ino_t)); }
--unsigned long ulongval () { return (long) (sizeof (ino_t)); }
-+ typedef ino_t ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -8602,35 +8914,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-- if (((long) (sizeof (ino_t))) < 0)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
-- long i = longval ();
-- if (i != ((long) (sizeof (ino_t))))
-- exit (1);
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-- if (i != ((long) (sizeof (ino_t))))
-- exit (1);
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -8641,30 +8962,33 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (ino_t), 77
-+if test "$ac_cv_type_ino_t" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (ino_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (ino_t), 77
-+echo "$as_me: error: cannot compute sizeof (ino_t)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_ino_t=0
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
-- ac_cv_sizeof_ino_t=0
- fi
--fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_ino_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_ino_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_ino_t" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_ino_t" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_INO_T $ac_cv_sizeof_ino_t
- _ACEOF
-
-
-
--echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
--echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
- if test "${ac_cv_c_const+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8682,10 +9006,10 @@
- #ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
- typedef int charset[2];
-- const charset x;
-+ const charset cs;
- /* SunOS 4.1.1 cc rejects this. */
-- char const *const *ccp;
-- char **p;
-+ char const *const *pcpcc;
-+ char **ppc;
- /* NEC SVR4.0.2 mips cc rejects this. */
- struct point {int x, y;};
- static struct point const zero = {0,0};
-@@ -8694,16 +9018,17 @@
- an arm of an if-expression whose if-part is not a constant
- expression */
- const char *g = "string";
-- ccp = &g + (g ? g-g : 0);
-+ pcpcc = &g + (g ? g-g : 0);
- /* HPUX 7.0 cc rejects these. */
-- ++ccp;
-- p = (char**) ccp;
-- ccp = (char const *const *) p;
-+ ++pcpcc;
-+ ppc = (char**) pcpcc;
-+ pcpcc = (char const *const *) ppc;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
- char const *s = 0 ? (char *) 0 : (char const *) 0;
-
- *t++ = 0;
-+ if (s) return 0;
- }
- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
- int x[] = {25, 17};
-@@ -8722,7 +9047,9 @@
- }
- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
- const int foo = 10;
-+ if (!foo) return 0;
- }
-+ return !cs[0] && !zero.x;
- #endif
-
- ;
-@@ -8730,27 +9057,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_c_const=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -8758,10 +9080,11 @@
-
- ac_cv_c_const=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
--echo "${ECHO_T}$ac_cv_c_const" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-+echo "${ECHO_T}$ac_cv_c_const" >&6; }
- if test $ac_cv_c_const = no; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -8770,8 +9093,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for inline" >&5
--echo $ECHO_N "checking for inline... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for inline" >&5
-+echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
- if test "${ac_cv_c_inline+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8791,39 +9114,37 @@
-
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_c_inline=$ac_kw; break
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_c_inline=$ac_kw
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ test "$ac_cv_c_inline" != no && break
- done
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
--echo "${ECHO_T}$ac_cv_c_inline" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-+echo "${ECHO_T}$ac_cv_c_inline" >&6; }
-
-
- case $ac_cv_c_inline in
-@@ -8841,8 +9162,8 @@
- ;;
- esac
-
--echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
--echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
- if test "${ac_cv_c_bigendian+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8859,7 +9180,8 @@
- int
- main ()
- {
--#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
-+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
-+ && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
- bogus endian macros
- #endif
-
-@@ -8868,27 +9190,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- # It does; now see whether it defined to BIG_ENDIAN or not.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -8911,27 +9228,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_c_bigendian=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -8939,7 +9251,8 @@
-
- ac_cv_c_bigendian=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -8954,11 +9267,11 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
--short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-+short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-+short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
- void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
--short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
--short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-+short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-+short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
- void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
- int
- main ()
-@@ -8969,27 +9282,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
- ac_cv_c_bigendian=yes
- fi
-@@ -9005,8 +9313,10 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -9014,27 +9324,41 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+$ac_includes_default
- int
- main ()
- {
-+
- /* Are we little or big endian? From Harbison&Steele. */
- union
- {
-- long l;
-- char c[sizeof (long)];
-+ long int l;
-+ char c[sizeof (long int)];
- } u;
- u.l = 1;
-- exit (u.c[sizeof (long) - 1] == 1);
-+ return u.c[sizeof (long int) - 1] == 1;
-+
-+ ;
-+ return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -9047,13 +9371,16 @@
- ( exit $ac_status )
- ac_cv_c_bigendian=yes
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
--echo "${ECHO_T}$ac_cv_c_bigendian" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-+echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in
- yes)
-
-@@ -9072,8 +9399,8 @@
- esac
-
-
--echo "$as_me:$LINENO: checking whether char is unsigned" >&5
--echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether char is unsigned" >&5
-+echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6; }
- if test "${ac_cv_c_char_unsigned+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9095,27 +9422,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_c_char_unsigned=no
- else
- echo "$as_me: failed program was:" >&5
-@@ -9123,10 +9445,11 @@
-
- ac_cv_c_char_unsigned=yes
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_char_unsigned" >&5
--echo "${ECHO_T}$ac_cv_c_char_unsigned" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_char_unsigned" >&5
-+echo "${ECHO_T}$ac_cv_c_char_unsigned" >&6; }
- if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
- cat >>confdefs.h <<\_ACEOF
- #define __CHAR_UNSIGNED__ 1
-@@ -9135,8 +9458,8 @@
- fi
-
-
--echo "$as_me:$LINENO: checking return type of signal handlers" >&5
--echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-+echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
- if test "${ac_cv_type_signal+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9148,64 +9471,52 @@
- /* end confdefs.h. */
- #include <sys/types.h>
- #include <signal.h>
--#ifdef signal
--# undef signal
--#endif
--#ifdef __cplusplus
--extern "C" void (*signal (int, void (*)(int)))(int);
--#else
--void (*signal ()) ();
--#endif
-
- int
- main ()
- {
--int i;
-+return *(signal (0, 0)) (0) == 1;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_type_signal=void
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_type_signal=int
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_type_signal=int
-+ ac_cv_type_signal=void
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
--echo "${ECHO_T}$ac_cv_type_signal" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-+echo "${ECHO_T}$ac_cv_type_signal" >&6; }
-
- cat >>confdefs.h <<_ACEOF
- #define RETSIGTYPE $ac_cv_type_signal
- _ACEOF
-
-
--echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
--echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
-+echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }
- if test "${ac_cv_type_uid_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9227,8 +9538,8 @@
- rm -f conftest*
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
--echo "${ECHO_T}$ac_cv_type_uid_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-+echo "${ECHO_T}$ac_cv_type_uid_t" >&6; }
- if test $ac_cv_type_uid_t = no; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -9242,8 +9553,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for mode_t" >&5
--echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for mode_t" >&5
-+echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_mode_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9254,39 +9565,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef mode_t ac__type_new_;
- int
- main ()
- {
--if ((mode_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (mode_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_mode_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -9294,10 +9601,11 @@
-
- ac_cv_type_mode_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
--echo "${ECHO_T}$ac_cv_type_mode_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
-+echo "${ECHO_T}$ac_cv_type_mode_t" >&6; }
- if test $ac_cv_type_mode_t = yes; then
- :
- else
-@@ -9308,8 +9616,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for off_t" >&5
--echo $ECHO_N "checking for off_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for off_t" >&5
-+echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_off_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9320,39 +9628,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef off_t ac__type_new_;
- int
- main ()
- {
--if ((off_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (off_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_off_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -9360,22 +9664,23 @@
-
- ac_cv_type_off_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
--echo "${ECHO_T}$ac_cv_type_off_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-+echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
- if test $ac_cv_type_off_t = yes; then
- :
- else
-
- cat >>confdefs.h <<_ACEOF
--#define off_t long
-+#define off_t long int
- _ACEOF
-
- fi
-
--echo "$as_me:$LINENO: checking for size_t" >&5
--echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for size_t" >&5
-+echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_size_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9386,39 +9691,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef size_t ac__type_new_;
- int
- main ()
- {
--if ((size_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (size_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_size_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -9426,22 +9727,23 @@
-
- ac_cv_type_size_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
--echo "${ECHO_T}$ac_cv_type_size_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-+echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
- if test $ac_cv_type_size_t = yes; then
- :
- else
-
- cat >>confdefs.h <<_ACEOF
--#define size_t unsigned
-+#define size_t unsigned int
- _ACEOF
-
- fi
-
--echo "$as_me:$LINENO: checking for pid_t" >&5
--echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for pid_t" >&5
-+echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_pid_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9452,39 +9754,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef pid_t ac__type_new_;
- int
- main ()
- {
--if ((pid_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (pid_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_pid_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -9492,10 +9790,11 @@
-
- ac_cv_type_pid_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
--echo "${ECHO_T}$ac_cv_type_pid_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-+echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }
- if test $ac_cv_type_pid_t = yes; then
- :
- else
-@@ -9506,8 +9805,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for ino_t" >&5
--echo $ECHO_N "checking for ino_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for ino_t" >&5
-+echo $ECHO_N "checking for ino_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_ino_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9518,39 +9817,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef ino_t ac__type_new_;
- int
- main ()
- {
--if ((ino_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (ino_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_ino_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -9558,10 +9853,11 @@
-
- ac_cv_type_ino_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5
--echo "${ECHO_T}$ac_cv_type_ino_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5
-+echo "${ECHO_T}$ac_cv_type_ino_t" >&6; }
- if test $ac_cv_type_ino_t = yes; then
- :
- else
-@@ -9572,8 +9868,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for loff_t" >&5
--echo $ECHO_N "checking for loff_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for loff_t" >&5
-+echo $ECHO_N "checking for loff_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_loff_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9584,39 +9880,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef loff_t ac__type_new_;
- int
- main ()
- {
--if ((loff_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (loff_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_loff_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -9624,10 +9916,11 @@
-
- ac_cv_type_loff_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_loff_t" >&5
--echo "${ECHO_T}$ac_cv_type_loff_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_loff_t" >&5
-+echo "${ECHO_T}$ac_cv_type_loff_t" >&6; }
- if test $ac_cv_type_loff_t = yes; then
- :
- else
-@@ -9638,8 +9931,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for offset_t" >&5
--echo $ECHO_N "checking for offset_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for offset_t" >&5
-+echo $ECHO_N "checking for offset_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_offset_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9650,39 +9943,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef offset_t ac__type_new_;
- int
- main ()
- {
--if ((offset_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (offset_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_offset_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -9690,10 +9979,11 @@
-
- ac_cv_type_offset_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_offset_t" >&5
--echo "${ECHO_T}$ac_cv_type_offset_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_offset_t" >&5
-+echo "${ECHO_T}$ac_cv_type_offset_t" >&6; }
- if test $ac_cv_type_offset_t = yes; then
- :
- else
-@@ -9704,8 +9994,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for ssize_t" >&5
--echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for ssize_t" >&5
-+echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_ssize_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9716,39 +10006,35 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef ssize_t ac__type_new_;
- int
- main ()
- {
--if ((ssize_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (ssize_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_ssize_t=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -9756,10 +10042,11 @@
-
- ac_cv_type_ssize_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
--echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
-+echo "${ECHO_T}$ac_cv_type_ssize_t" >&6; }
- if test $ac_cv_type_ssize_t = yes; then
- :
- else
-@@ -9773,8 +10060,8 @@
-
- # we need libdl for PAM and the new VFS code
-
--echo "$as_me:$LINENO: checking for main in -ldl" >&5
--echo $ECHO_N "checking for main in -ldl... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for main in -ldl" >&5
-+echo $ECHO_N "checking for main in -ldl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_main+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9791,33 +10078,29 @@
- int
- main ()
- {
--main ();
-+return main ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dl_main=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -9825,12 +10108,13 @@
-
- ac_cv_lib_dl_main=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_main" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_main" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_main" >&6; }
- if test $ac_cv_lib_dl_main = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBDL 1
-@@ -9841,8 +10125,8 @@
- fi
-
-
--echo "$as_me:$LINENO: checking for errno in errno.h" >&5
--echo $ECHO_N "checking for errno in errno.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for errno in errno.h" >&5
-+echo $ECHO_N "checking for errno in errno.h... $ECHO_C" >&6; }
- if test "${samba_cv_errno+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9863,27 +10147,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- samba_cv_errno=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -9891,10 +10170,11 @@
-
- samba_cv_have_errno=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $samba_cv_errno" >&5
--echo "${ECHO_T}$samba_cv_errno" >&6
-+{ echo "$as_me:$LINENO: result: $samba_cv_errno" >&5
-+echo "${ECHO_T}$samba_cv_errno" >&6; }
- if test x"$samba_cv_errno" = x"yes"; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -9904,8 +10184,8 @@
- fi
-
- # stupid glibc has the functions but no declaration. grrrr.
--echo "$as_me:$LINENO: checking for crypt declaration" >&5
--echo $ECHO_N "checking for crypt declaration... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for crypt declaration" >&5
-+echo $ECHO_N "checking for crypt declaration... $ECHO_C" >&6; }
- if test "${samba_cv_have_crypt_decl+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9926,27 +10206,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- samba_cv_have_crypt_decl=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -9954,10 +10229,11 @@
-
- samba_cv_have_crypt_decl=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $samba_cv_have_crypt_decl" >&5
--echo "${ECHO_T}$samba_cv_have_crypt_decl" >&6
-+{ echo "$as_me:$LINENO: result: $samba_cv_have_crypt_decl" >&5
-+echo "${ECHO_T}$samba_cv_have_crypt_decl" >&6; }
- if test x"$samba_cv_have_crypt_decl" = x"yes"; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -9966,8 +10242,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for working memcmp" >&5
--echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for working memcmp" >&5
-+echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6; }
- if test "${ac_cv_func_memcmp_working+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9986,9 +10262,9 @@
- {
-
- /* Some versions of memcmp are not 8-bit clean. */
-- char c0 = 0x40, c1 = 0x80, c2 = 0x81;
-+ char c0 = '\100', c1 = '\200', c2 = '\201';
- if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
-- exit (1);
-+ return 1;
-
- /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
- or more and with at least one buffer not starting on a 4-byte boundary.
-@@ -10004,9 +10280,9 @@
- strcpy (a, "--------01111111");
- strcpy (b, "--------10000000");
- if (memcmp (a, b, 16) >= 0)
-- exit (1);
-+ return 1;
- }
-- exit (0);
-+ return 0;
- }
-
- ;
-@@ -10014,13 +10290,22 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -10033,17 +10318,17 @@
- ( exit $ac_status )
- ac_cv_func_memcmp_working=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
--echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6
--test $ac_cv_func_memcmp_working = no && case $LIBOBJS in
-- "memcmp.$ac_objext" | \
-- *" memcmp.$ac_objext" | \
-- "memcmp.$ac_objext "* | \
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
-+echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6; }
-+test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
- *" memcmp.$ac_objext "* ) ;;
-- *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" ;;
-+ *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
-+ ;;
- esac
-
-
-@@ -10054,9 +10339,9 @@
- for ac_func in crypt
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -10082,56 +10367,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -10139,11 +10414,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -10153,8 +10430,8 @@
- done
-
- if test x"$ac_cv_func_crypt" = x"no"; then
-- echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
--echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-+echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; }
- if test "${ac_cv_lib_crypt_crypt+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10167,43 +10444,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char crypt ();
- int
- main ()
- {
--crypt ();
-+return crypt ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_crypt_crypt=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -10211,12 +10484,13 @@
-
- ac_cv_lib_crypt_crypt=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
--echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
-+echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; }
- if test $ac_cv_lib_crypt_crypt = yes; then
- LIBS="$LIBS -lcrypt";
- cat >>confdefs.h <<\_ACEOF
-@@ -10238,9 +10512,9 @@
- for ac_func in connect
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -10266,56 +10540,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -10323,11 +10587,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -10340,8 +10606,8 @@
- case "$LIBS" in
- *-lnsl*) ;;
- *)
--echo "$as_me:$LINENO: checking for printf in -lnsl_s" >&5
--echo $ECHO_N "checking for printf in -lnsl_s... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for printf in -lnsl_s" >&5
-+echo $ECHO_N "checking for printf in -lnsl_s... $ECHO_C" >&6; }
- if test "${ac_cv_lib_nsl_s_printf+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10354,43 +10620,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char printf ();
- int
- main ()
- {
--printf ();
-+return printf ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_nsl_s_printf=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -10398,12 +10660,13 @@
-
- ac_cv_lib_nsl_s_printf=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_s_printf" >&5
--echo "${ECHO_T}$ac_cv_lib_nsl_s_printf" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_s_printf" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_s_printf" >&6; }
- if test $ac_cv_lib_nsl_s_printf = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBNSL_S 1
-@@ -10417,8 +10680,8 @@
- case "$LIBS" in
- *-lnsl*) ;;
- *)
--echo "$as_me:$LINENO: checking for printf in -lnsl" >&5
--echo $ECHO_N "checking for printf in -lnsl... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for printf in -lnsl" >&5
-+echo $ECHO_N "checking for printf in -lnsl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_nsl_printf+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10431,43 +10694,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char printf ();
- int
- main ()
- {
--printf ();
-+return printf ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_nsl_printf=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -10475,12 +10734,13 @@
-
- ac_cv_lib_nsl_printf=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_printf" >&5
--echo "${ECHO_T}$ac_cv_lib_nsl_printf" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_printf" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_printf" >&6; }
- if test $ac_cv_lib_nsl_printf = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBNSL 1
-@@ -10494,8 +10754,8 @@
- case "$LIBS" in
- *-lsocket*) ;;
- *)
--echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
--echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
- if test "${ac_cv_lib_socket_connect+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10508,43 +10768,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char connect ();
- int
- main ()
- {
--connect ();
-+return connect ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_socket_connect=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -10552,12 +10808,13 @@
-
- ac_cv_lib_socket_connect=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
--echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
- if test $ac_cv_lib_socket_connect = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBSOCKET 1
-@@ -10571,8 +10828,8 @@
- case "$LIBS" in
- *-linet*) ;;
- *)
--echo "$as_me:$LINENO: checking for connect in -linet" >&5
--echo $ECHO_N "checking for connect in -linet... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for connect in -linet" >&5
-+echo $ECHO_N "checking for connect in -linet... $ECHO_C" >&6; }
- if test "${ac_cv_lib_inet_connect+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10585,43 +10842,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char connect ();
- int
- main ()
- {
--connect ();
-+return connect ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_inet_connect=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -10629,12 +10882,13 @@
-
- ac_cv_lib_inet_connect=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_inet_connect" >&5
--echo "${ECHO_T}$ac_cv_lib_inet_connect" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_inet_connect" >&5
-+echo "${ECHO_T}$ac_cv_lib_inet_connect" >&6; }
- if test $ac_cv_lib_inet_connect = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBINET 1
-@@ -10666,9 +10920,9 @@
- for ac_func in waitpid getcwd strdup strtoul strerror chown chmod
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -10694,56 +10948,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -10751,11 +10995,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -10775,9 +11021,9 @@
- for ac_func in fstat strchr utime utimes getrlimit fsync bzero memset
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -10803,56 +11049,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -10860,11 +11096,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -10884,9 +11122,9 @@
- for ac_func in memmove vsnprintf snprintf setsid glob pipe crypt16 getauthuid
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -10912,56 +11150,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -10969,11 +11197,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -10993,9 +11223,9 @@
- for ac_func in strftime sigprocmask sigblock sigaction innetgr setnetgrent getnetgrent endnetgrent
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -11021,56 +11251,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -11078,11 +11298,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -11099,9 +11321,9 @@
- for ac_func in initgroups select rdchk getgrnam pathconf
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -11127,56 +11349,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -11184,11 +11396,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -11207,9 +11421,9 @@
- for ac_func in setpriv setgidx setuidx setgroups mktime rename ftruncate
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -11235,56 +11449,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -11292,11 +11496,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -11312,9 +11518,9 @@
- for ac_func in grantpt dup2 yp_get_default_domain getpwanam
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -11340,56 +11546,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -11397,11 +11593,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -11420,9 +11618,9 @@
- for ac_func in srandom random srand rand setenv usleep strcasecmp
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -11448,56 +11646,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -11505,11 +11693,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -11523,9 +11713,9 @@
- for ac_func in getdents
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -11551,56 +11741,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -11608,11 +11788,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -11625,9 +11807,9 @@
- for ac_func in llseek
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -11653,56 +11835,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -11710,11 +11882,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -11731,8 +11905,8 @@
- #
-
- if test x$ac_cv_func_strcasecmp = xno ; then
-- echo "$as_me:$LINENO: checking for strcasecmp in -lresolv" >&5
--echo $ECHO_N "checking for strcasecmp in -lresolv... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for strcasecmp in -lresolv" >&5
-+echo $ECHO_N "checking for strcasecmp in -lresolv... $ECHO_C" >&6; }
- if test "${ac_cv_lib_resolv_strcasecmp+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11745,43 +11919,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char strcasecmp ();
- int
- main ()
- {
--strcasecmp ();
-+return strcasecmp ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_resolv_strcasecmp=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -11789,12 +11959,13 @@
-
- ac_cv_lib_resolv_strcasecmp=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_strcasecmp" >&5
--echo "${ECHO_T}$ac_cv_lib_resolv_strcasecmp" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_strcasecmp" >&5
-+echo "${ECHO_T}$ac_cv_lib_resolv_strcasecmp" >&6; }
- if test $ac_cv_lib_resolv_strcasecmp = yes; then
- LIBS="$LIBS -lresolv"
- cat >>confdefs.h <<\_ACEOF
-@@ -11816,9 +11987,9 @@
- for ac_func in putprpwnam
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -11844,56 +12015,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -11901,11 +12062,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -11915,8 +12078,8 @@
- done
- ;;
- *)
--echo "$as_me:$LINENO: checking for putprpwnam in -lsecurity" >&5
--echo $ECHO_N "checking for putprpwnam in -lsecurity... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for putprpwnam in -lsecurity" >&5
-+echo $ECHO_N "checking for putprpwnam in -lsecurity... $ECHO_C" >&6; }
- if test "${ac_cv_lib_security_putprpwnam+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11929,43 +12092,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char putprpwnam ();
- int
- main ()
- {
--putprpwnam ();
-+return putprpwnam ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_security_putprpwnam=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -11973,12 +12132,13 @@
-
- ac_cv_lib_security_putprpwnam=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_security_putprpwnam" >&5
--echo "${ECHO_T}$ac_cv_lib_security_putprpwnam" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_security_putprpwnam" >&5
-+echo "${ECHO_T}$ac_cv_lib_security_putprpwnam" >&6; }
- if test $ac_cv_lib_security_putprpwnam = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBSECURITY 1
-@@ -11992,9 +12152,9 @@
- for ac_func in putprpwnam
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -12020,56 +12180,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -12077,11 +12227,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -12098,9 +12250,9 @@
- for ac_func in putprpwnam
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -12126,56 +12278,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -12183,11 +12325,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -12197,8 +12341,8 @@
- done
- ;;
- *)
--echo "$as_me:$LINENO: checking for putprpwnam in -lsec" >&5
--echo $ECHO_N "checking for putprpwnam in -lsec... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for putprpwnam in -lsec" >&5
-+echo $ECHO_N "checking for putprpwnam in -lsec... $ECHO_C" >&6; }
- if test "${ac_cv_lib_sec_putprpwnam+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12211,43 +12355,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char putprpwnam ();
- int
- main ()
- {
--putprpwnam ();
-+return putprpwnam ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_sec_putprpwnam=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -12255,12 +12395,13 @@
-
- ac_cv_lib_sec_putprpwnam=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_sec_putprpwnam" >&5
--echo "${ECHO_T}$ac_cv_lib_sec_putprpwnam" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_sec_putprpwnam" >&5
-+echo "${ECHO_T}$ac_cv_lib_sec_putprpwnam" >&6; }
- if test $ac_cv_lib_sec_putprpwnam = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBSEC 1
-@@ -12274,9 +12415,9 @@
- for ac_func in putprpwnam
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -12302,56 +12443,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -12359,11 +12490,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -12381,9 +12514,9 @@
- for ac_func in set_auth_parameters
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -12409,56 +12542,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -12466,11 +12589,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -12480,8 +12605,8 @@
- done
- ;;
- *)
--echo "$as_me:$LINENO: checking for set_auth_parameters in -lsecurity" >&5
--echo $ECHO_N "checking for set_auth_parameters in -lsecurity... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for set_auth_parameters in -lsecurity" >&5
-+echo $ECHO_N "checking for set_auth_parameters in -lsecurity... $ECHO_C" >&6; }
- if test "${ac_cv_lib_security_set_auth_parameters+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12494,43 +12619,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char set_auth_parameters ();
- int
- main ()
- {
--set_auth_parameters ();
-+return set_auth_parameters ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_security_set_auth_parameters=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -12538,12 +12659,13 @@
-
- ac_cv_lib_security_set_auth_parameters=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_security_set_auth_parameters" >&5
--echo "${ECHO_T}$ac_cv_lib_security_set_auth_parameters" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_security_set_auth_parameters" >&5
-+echo "${ECHO_T}$ac_cv_lib_security_set_auth_parameters" >&6; }
- if test $ac_cv_lib_security_set_auth_parameters = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBSECURITY 1
-@@ -12557,9 +12679,9 @@
- for ac_func in set_auth_parameters
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -12585,56 +12707,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -12642,11 +12754,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -12663,9 +12777,9 @@
- for ac_func in set_auth_parameters
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -12691,56 +12805,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -12748,11 +12852,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -12762,8 +12868,8 @@
- done
- ;;
- *)
--echo "$as_me:$LINENO: checking for set_auth_parameters in -lsec" >&5
--echo $ECHO_N "checking for set_auth_parameters in -lsec... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for set_auth_parameters in -lsec" >&5
-+echo $ECHO_N "checking for set_auth_parameters in -lsec... $ECHO_C" >&6; }
- if test "${ac_cv_lib_sec_set_auth_parameters+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12776,43 +12882,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char set_auth_parameters ();
- int
- main ()
- {
--set_auth_parameters ();
-+return set_auth_parameters ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_sec_set_auth_parameters=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -12820,12 +12922,13 @@
-
- ac_cv_lib_sec_set_auth_parameters=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_sec_set_auth_parameters" >&5
--echo "${ECHO_T}$ac_cv_lib_sec_set_auth_parameters" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_sec_set_auth_parameters" >&5
-+echo "${ECHO_T}$ac_cv_lib_sec_set_auth_parameters" >&6; }
- if test $ac_cv_lib_sec_set_auth_parameters = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBSEC 1
-@@ -12839,9 +12942,9 @@
- for ac_func in set_auth_parameters
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -12867,56 +12970,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -12924,11 +13017,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -12946,9 +13041,9 @@
- for ac_func in getspnam
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -12974,56 +13069,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -13031,11 +13116,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -13045,8 +13132,8 @@
- done
- ;;
- *)
--echo "$as_me:$LINENO: checking for getspnam in -lsecurity" >&5
--echo $ECHO_N "checking for getspnam in -lsecurity... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for getspnam in -lsecurity" >&5
-+echo $ECHO_N "checking for getspnam in -lsecurity... $ECHO_C" >&6; }
- if test "${ac_cv_lib_security_getspnam+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13059,43 +13146,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char getspnam ();
- int
- main ()
- {
--getspnam ();
-+return getspnam ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_security_getspnam=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -13103,12 +13186,13 @@
-
- ac_cv_lib_security_getspnam=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_security_getspnam" >&5
--echo "${ECHO_T}$ac_cv_lib_security_getspnam" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_security_getspnam" >&5
-+echo "${ECHO_T}$ac_cv_lib_security_getspnam" >&6; }
- if test $ac_cv_lib_security_getspnam = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBSECURITY 1
-@@ -13122,9 +13206,9 @@
- for ac_func in getspnam
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -13150,56 +13234,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -13207,11 +13281,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -13228,9 +13304,9 @@
- for ac_func in getspnam
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -13256,56 +13332,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -13313,11 +13379,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -13327,8 +13395,8 @@
- done
- ;;
- *)
--echo "$as_me:$LINENO: checking for getspnam in -lsec" >&5
--echo $ECHO_N "checking for getspnam in -lsec... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for getspnam in -lsec" >&5
-+echo $ECHO_N "checking for getspnam in -lsec... $ECHO_C" >&6; }
- if test "${ac_cv_lib_sec_getspnam+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13341,43 +13409,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char getspnam ();
- int
- main ()
- {
--getspnam ();
-+return getspnam ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_sec_getspnam=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -13385,12 +13449,13 @@
-
- ac_cv_lib_sec_getspnam=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getspnam" >&5
--echo "${ECHO_T}$ac_cv_lib_sec_getspnam" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getspnam" >&5
-+echo "${ECHO_T}$ac_cv_lib_sec_getspnam" >&6; }
- if test $ac_cv_lib_sec_getspnam = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBSEC 1
-@@ -13404,9 +13469,9 @@
- for ac_func in getspnam
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -13432,56 +13497,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -13489,11 +13544,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -13511,9 +13568,9 @@
- for ac_func in bigcrypt
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -13539,56 +13596,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -13596,11 +13643,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -13610,8 +13659,8 @@
- done
- ;;
- *)
--echo "$as_me:$LINENO: checking for bigcrypt in -lsecurity" >&5
--echo $ECHO_N "checking for bigcrypt in -lsecurity... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for bigcrypt in -lsecurity" >&5
-+echo $ECHO_N "checking for bigcrypt in -lsecurity... $ECHO_C" >&6; }
- if test "${ac_cv_lib_security_bigcrypt+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13624,43 +13673,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char bigcrypt ();
- int
- main ()
- {
--bigcrypt ();
-+return bigcrypt ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_security_bigcrypt=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -13668,12 +13713,13 @@
-
- ac_cv_lib_security_bigcrypt=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_security_bigcrypt" >&5
--echo "${ECHO_T}$ac_cv_lib_security_bigcrypt" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_security_bigcrypt" >&5
-+echo "${ECHO_T}$ac_cv_lib_security_bigcrypt" >&6; }
- if test $ac_cv_lib_security_bigcrypt = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBSECURITY 1
-@@ -13687,9 +13733,9 @@
- for ac_func in bigcrypt
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -13715,56 +13761,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -13772,11 +13808,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -13793,9 +13831,9 @@
- for ac_func in bigcrypt
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -13821,56 +13859,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -13878,11 +13906,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -13892,8 +13922,8 @@
- done
- ;;
- *)
--echo "$as_me:$LINENO: checking for bigcrypt in -lsec" >&5
--echo $ECHO_N "checking for bigcrypt in -lsec... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for bigcrypt in -lsec" >&5
-+echo $ECHO_N "checking for bigcrypt in -lsec... $ECHO_C" >&6; }
- if test "${ac_cv_lib_sec_bigcrypt+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13906,43 +13936,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char bigcrypt ();
- int
- main ()
- {
--bigcrypt ();
-+return bigcrypt ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_sec_bigcrypt=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -13950,12 +13976,13 @@
-
- ac_cv_lib_sec_bigcrypt=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_sec_bigcrypt" >&5
--echo "${ECHO_T}$ac_cv_lib_sec_bigcrypt" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_sec_bigcrypt" >&5
-+echo "${ECHO_T}$ac_cv_lib_sec_bigcrypt" >&6; }
- if test $ac_cv_lib_sec_bigcrypt = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBSEC 1
-@@ -13969,9 +13996,9 @@
- for ac_func in bigcrypt
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -13997,56 +14024,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -14054,11 +14071,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -14076,9 +14095,9 @@
- for ac_func in getprpwnam
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -14104,56 +14123,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -14161,11 +14170,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -14175,8 +14186,8 @@
- done
- ;;
- *)
--echo "$as_me:$LINENO: checking for getprpwnam in -lsecurity" >&5
--echo $ECHO_N "checking for getprpwnam in -lsecurity... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for getprpwnam in -lsecurity" >&5
-+echo $ECHO_N "checking for getprpwnam in -lsecurity... $ECHO_C" >&6; }
- if test "${ac_cv_lib_security_getprpwnam+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14189,43 +14200,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char getprpwnam ();
- int
- main ()
- {
--getprpwnam ();
-+return getprpwnam ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_security_getprpwnam=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -14233,12 +14240,13 @@
-
- ac_cv_lib_security_getprpwnam=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_security_getprpwnam" >&5
--echo "${ECHO_T}$ac_cv_lib_security_getprpwnam" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_security_getprpwnam" >&5
-+echo "${ECHO_T}$ac_cv_lib_security_getprpwnam" >&6; }
- if test $ac_cv_lib_security_getprpwnam = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBSECURITY 1
-@@ -14252,9 +14260,9 @@
- for ac_func in getprpwnam
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -14280,56 +14288,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -14337,11 +14335,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -14358,9 +14358,9 @@
- for ac_func in getprpwnam
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -14386,56 +14386,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -14443,11 +14433,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -14457,8 +14449,8 @@
- done
- ;;
- *)
--echo "$as_me:$LINENO: checking for getprpwnam in -lsec" >&5
--echo $ECHO_N "checking for getprpwnam in -lsec... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for getprpwnam in -lsec" >&5
-+echo $ECHO_N "checking for getprpwnam in -lsec... $ECHO_C" >&6; }
- if test "${ac_cv_lib_sec_getprpwnam+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14471,43 +14463,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char getprpwnam ();
- int
- main ()
- {
--getprpwnam ();
-+return getprpwnam ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_sec_getprpwnam=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -14515,12 +14503,13 @@
-
- ac_cv_lib_sec_getprpwnam=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getprpwnam" >&5
--echo "${ECHO_T}$ac_cv_lib_sec_getprpwnam" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getprpwnam" >&5
-+echo "${ECHO_T}$ac_cv_lib_sec_getprpwnam" >&6; }
- if test $ac_cv_lib_sec_getprpwnam = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBSEC 1
-@@ -14534,9 +14523,9 @@
- for ac_func in getprpwnam
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -14562,56 +14551,46 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -14619,11 +14598,13 @@
-
- eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -14714,8 +14695,8 @@
- ;;
- *dgux*) # Extract the first word of "groff", so it can be a program name with args.
- set dummy groff; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ROFF+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14728,24 +14709,26 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ROFF="groff -etpsR -Tascii -man"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- ROFF=$ac_cv_prog_ROFF
- if test -n "$ROFF"; then
-- echo "$as_me:$LINENO: result: $ROFF" >&5
--echo "${ECHO_T}$ROFF" >&6
-+ { echo "$as_me:$LINENO: result: $ROFF" >&5
-+echo "${ECHO_T}$ROFF" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-+
- ;;
- *sysv4*)
- case "$host" in
-@@ -14772,8 +14755,8 @@
-
- ################
-
--echo "$as_me:$LINENO: checking for long long" >&5
--echo $ECHO_N "checking for long long... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for long long" >&5
-+echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
- if test "${samba_cv_have_longlong+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14791,13 +14774,22 @@
- main() { long long x = 1000000; x *= x; exit(((x/1000000) == 1000000)? 0: 1); }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -14810,11 +14802,13 @@
- ( exit $ac_status )
- samba_cv_have_longlong=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
--echo "$as_me:$LINENO: result: $samba_cv_have_longlong" >&5
--echo "${ECHO_T}$samba_cv_have_longlong" >&6
-+{ echo "$as_me:$LINENO: result: $samba_cv_have_longlong" >&5
-+echo "${ECHO_T}$samba_cv_have_longlong" >&6; }
- if test x"$samba_cv_have_longlong" = x"yes"; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -14823,8 +14817,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for sin_len in sock" >&5
--echo $ECHO_N "checking for sin_len in sock... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for sin_len in sock" >&5
-+echo $ECHO_N "checking for sin_len in sock... $ECHO_C" >&6; }
- if test "${samba_cv_HAVE_SOCK_SIN_LEN+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14847,27 +14841,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- samba_cv_HAVE_SOCK_SIN_LEN=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -14875,10 +14864,11 @@
-
- samba_cv_HAVE_SOCK_SIN_LEN=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $samba_cv_HAVE_SOCK_SIN_LEN" >&5
--echo "${ECHO_T}$samba_cv_HAVE_SOCK_SIN_LEN" >&6
-+{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_SOCK_SIN_LEN" >&5
-+echo "${ECHO_T}$samba_cv_HAVE_SOCK_SIN_LEN" >&6; }
- if test x"$samba_cv_HAVE_SOCK_SIN_LEN" = x"yes"; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -14887,8 +14877,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for __FILE__ macro" >&5
--echo $ECHO_N "checking for __FILE__ macro... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for __FILE__ macro" >&5
-+echo $ECHO_N "checking for __FILE__ macro... $ECHO_C" >&6; }
- if test "${samba_cv_HAVE_FILE_MACRO+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14909,27 +14899,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- samba_cv_HAVE_FILE_MACRO=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -14937,10 +14922,11 @@
-
- samba_cv_HAVE_FILE_MACRO=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $samba_cv_HAVE_FILE_MACRO" >&5
--echo "${ECHO_T}$samba_cv_HAVE_FILE_MACRO" >&6
-+{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_FILE_MACRO" >&5
-+echo "${ECHO_T}$samba_cv_HAVE_FILE_MACRO" >&6; }
- if test x"$samba_cv_HAVE_FILE_MACRO" = x"yes"; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -14949,8 +14935,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for __FUNCTION__ macro" >&5
--echo $ECHO_N "checking for __FUNCTION__ macro... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for __FUNCTION__ macro" >&5
-+echo $ECHO_N "checking for __FUNCTION__ macro... $ECHO_C" >&6; }
- if test "${samba_cv_HAVE_FUNCTION_MACRO+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14971,27 +14957,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- samba_cv_HAVE_FUNCTION_MACRO=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -14999,10 +14980,11 @@
-
- samba_cv_HAVE_FUNCTION_MACRO=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $samba_cv_HAVE_FUNCTION_MACRO" >&5
--echo "${ECHO_T}$samba_cv_HAVE_FUNCTION_MACRO" >&6
-+{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_FUNCTION_MACRO" >&5
-+echo "${ECHO_T}$samba_cv_HAVE_FUNCTION_MACRO" >&6; }
- if test x"$samba_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -15011,8 +14993,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking if gettimeofday takes tz argument" >&5
--echo $ECHO_N "checking if gettimeofday takes tz argument... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if gettimeofday takes tz argument" >&5
-+echo $ECHO_N "checking if gettimeofday takes tz argument... $ECHO_C" >&6; }
- if test "${samba_cv_HAVE_GETTIMEOFDAY_TZ+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15032,13 +15014,22 @@
- main() { struct timeval tv; exit(gettimeofday(&tv, NULL));}
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -15051,11 +15042,13 @@
- ( exit $ac_status )
- samba_cv_HAVE_GETTIMEOFDAY_TZ=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
--echo "$as_me:$LINENO: result: $samba_cv_HAVE_GETTIMEOFDAY_TZ" >&5
--echo "${ECHO_T}$samba_cv_HAVE_GETTIMEOFDAY_TZ" >&6
-+{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_GETTIMEOFDAY_TZ" >&5
-+echo "${ECHO_T}$samba_cv_HAVE_GETTIMEOFDAY_TZ" >&6; }
- if test x"$samba_cv_HAVE_GETTIMEOFDAY_TZ" = x"yes"; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -15065,8 +15058,8 @@
- fi
-
-
--echo "$as_me:$LINENO: checking for broken readdir" >&5
--echo $ECHO_N "checking for broken readdir... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for broken readdir" >&5
-+echo $ECHO_N "checking for broken readdir... $ECHO_C" >&6; }
- if test "${samba_cv_HAVE_BROKEN_READDIR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15087,13 +15080,22 @@
- di->d_name[0] == 0) exit(0); exit(1);}
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -15106,11 +15108,13 @@
- ( exit $ac_status )
- samba_cv_HAVE_BROKEN_READDIR=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
--echo "$as_me:$LINENO: result: $samba_cv_HAVE_BROKEN_READDIR" >&5
--echo "${ECHO_T}$samba_cv_HAVE_BROKEN_READDIR" >&6
-+{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_BROKEN_READDIR" >&5
-+echo "${ECHO_T}$samba_cv_HAVE_BROKEN_READDIR" >&6; }
- if test x"$samba_cv_HAVE_BROKEN_READDIR" = x"yes"; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -15119,8 +15123,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for kernel oplock type definitions" >&5
--echo $ECHO_N "checking for kernel oplock type definitions... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for kernel oplock type definitions" >&5
-+echo $ECHO_N "checking for kernel oplock type definitions... $ECHO_C" >&6; }
- if test "${samba_cv_HAVE_KERNEL_OPLOCKS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15142,27 +15146,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- samba_cv_HAVE_KERNEL_OPLOCKS=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -15170,10 +15169,11 @@
-
- samba_cv_HAVE_KERNEL_OPLOCKS=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $samba_cv_HAVE_KERNEL_OPLOCKS" >&5
--echo "${ECHO_T}$samba_cv_HAVE_KERNEL_OPLOCKS" >&6
-+{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_KERNEL_OPLOCKS" >&5
-+echo "${ECHO_T}$samba_cv_HAVE_KERNEL_OPLOCKS" >&6; }
- if test x"$samba_cv_HAVE_KERNEL_OPLOCKS" = x"yes"; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -15187,8 +15187,8 @@
- # This is *really* broken but some systems (DEC OSF1) do this.... JRA.
- #
-
--echo "$as_me:$LINENO: checking for int16 typedef included by rpc/rpc.h" >&5
--echo $ECHO_N "checking for int16 typedef included by rpc/rpc.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for int16 typedef included by rpc/rpc.h" >&5
-+echo $ECHO_N "checking for int16 typedef included by rpc/rpc.h... $ECHO_C" >&6; }
- if test "${samba_cv_HAVE_INT16_FROM_RPC_RPC_H+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15212,27 +15212,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- samba_cv_HAVE_INT16_FROM_RPC_RPC_H=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -15240,10 +15235,11 @@
-
- samba_cv_HAVE_INT16_FROM_RPC_RPC_H=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $samba_cv_HAVE_INT16_FROM_RPC_RPC_H" >&5
--echo "${ECHO_T}$samba_cv_HAVE_INT16_FROM_RPC_RPC_H" >&6
-+{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_INT16_FROM_RPC_RPC_H" >&5
-+echo "${ECHO_T}$samba_cv_HAVE_INT16_FROM_RPC_RPC_H" >&6; }
- if test x"$samba_cv_HAVE_INT16_FROM_RPC_RPC_H" = x"yes"; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -15252,8 +15248,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for uint16 typedef included by rpc/rpc.h" >&5
--echo $ECHO_N "checking for uint16 typedef included by rpc/rpc.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for uint16 typedef included by rpc/rpc.h" >&5
-+echo $ECHO_N "checking for uint16 typedef included by rpc/rpc.h... $ECHO_C" >&6; }
- if test "${samba_cv_HAVE_UINT16_FROM_RPC_RPC_H+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15277,27 +15273,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- samba_cv_HAVE_UINT16_FROM_RPC_RPC_H=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -15305,10 +15296,11 @@
-
- samba_cv_HAVE_UINT16_FROM_RPC_RPC_H=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $samba_cv_HAVE_UINT16_FROM_RPC_RPC_H" >&5
--echo "${ECHO_T}$samba_cv_HAVE_UINT16_FROM_RPC_RPC_H" >&6
-+{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_UINT16_FROM_RPC_RPC_H" >&5
-+echo "${ECHO_T}$samba_cv_HAVE_UINT16_FROM_RPC_RPC_H" >&6; }
- if test x"$samba_cv_HAVE_UINT16_FROM_RPC_RPC_H" = x"yes"; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -15317,8 +15309,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for int32 typedef included by rpc/rpc.h" >&5
--echo $ECHO_N "checking for int32 typedef included by rpc/rpc.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for int32 typedef included by rpc/rpc.h" >&5
-+echo $ECHO_N "checking for int32 typedef included by rpc/rpc.h... $ECHO_C" >&6; }
- if test "${samba_cv_HAVE_INT32_FROM_RPC_RPC_H+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15342,27 +15334,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- samba_cv_HAVE_INT32_FROM_RPC_RPC_H=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -15370,10 +15357,11 @@
-
- samba_cv_HAVE_INT32_FROM_RPC_RPC_H=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $samba_cv_HAVE_INT32_FROM_RPC_RPC_H" >&5
--echo "${ECHO_T}$samba_cv_HAVE_INT32_FROM_RPC_RPC_H" >&6
-+{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_INT32_FROM_RPC_RPC_H" >&5
-+echo "${ECHO_T}$samba_cv_HAVE_INT32_FROM_RPC_RPC_H" >&6; }
- if test x"$samba_cv_HAVE_INT32_FROM_RPC_RPC_H" = x"yes"; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -15382,8 +15370,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for uint32 typedef included by rpc/rpc.h" >&5
--echo $ECHO_N "checking for uint32 typedef included by rpc/rpc.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for uint32 typedef included by rpc/rpc.h" >&5
-+echo $ECHO_N "checking for uint32 typedef included by rpc/rpc.h... $ECHO_C" >&6; }
- if test "${samba_cv_HAVE_UINT32_FROM_RPC_RPC_H+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15407,27 +15395,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- samba_cv_HAVE_UINT32_FROM_RPC_RPC_H=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -15435,10 +15418,11 @@
-
- samba_cv_HAVE_UINT32_FROM_RPC_RPC_H=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $samba_cv_HAVE_UINT32_FROM_RPC_RPC_H" >&5
--echo "${ECHO_T}$samba_cv_HAVE_UINT32_FROM_RPC_RPC_H" >&6
-+{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_UINT32_FROM_RPC_RPC_H" >&5
-+echo "${ECHO_T}$samba_cv_HAVE_UINT32_FROM_RPC_RPC_H" >&6; }
- if test x"$samba_cv_HAVE_UINT32_FROM_RPC_RPC_H" = x"yes"; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -15448,8 +15432,8 @@
- fi
-
-
--echo "$as_me:$LINENO: checking for conflicting AUTH_ERROR define in rpc/rpc.h" >&5
--echo $ECHO_N "checking for conflicting AUTH_ERROR define in rpc/rpc.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for conflicting AUTH_ERROR define in rpc/rpc.h" >&5
-+echo $ECHO_N "checking for conflicting AUTH_ERROR define in rpc/rpc.h... $ECHO_C" >&6; }
- if test "${samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15477,27 +15461,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT=no
- else
- echo "$as_me: failed program was:" >&5
-@@ -15505,10 +15484,11 @@
-
- samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT=yes
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT" >&5
--echo "${ECHO_T}$samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT" >&6
-+{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT" >&5
-+echo "${ECHO_T}$samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT" >&6; }
- if test x"$samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT" = x"yes"; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -15518,8 +15498,8 @@
- fi
-
- netmask=no;
--echo "$as_me:$LINENO: checking for netmask ifconf" >&5
--echo $ECHO_N "checking for netmask ifconf... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for netmask ifconf" >&5
-+echo $ECHO_N "checking for netmask ifconf... $ECHO_C" >&6; }
- if test "${samba_cv_HAVE_NETMASK_IFCONF+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15540,13 +15520,22 @@
- #include "${srcdir-.}/lib/netmask.c"
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -15559,11 +15548,13 @@
- ( exit $ac_status )
- samba_cv_HAVE_NETMASK_IFCONF=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
--echo "$as_me:$LINENO: result: $samba_cv_HAVE_NETMASK_IFCONF" >&5
--echo "${ECHO_T}$samba_cv_HAVE_NETMASK_IFCONF" >&6
-+{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_NETMASK_IFCONF" >&5
-+echo "${ECHO_T}$samba_cv_HAVE_NETMASK_IFCONF" >&6; }
- if test x"$samba_cv_HAVE_NETMASK_IFCONF" = x"yes"; then
- netmask=yes;
- cat >>confdefs.h <<\_ACEOF
-@@ -15573,8 +15564,8 @@
- fi
-
- if test $netmask = no; then
--echo "$as_me:$LINENO: checking for netmask ifreq" >&5
--echo $ECHO_N "checking for netmask ifreq... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for netmask ifreq" >&5
-+echo $ECHO_N "checking for netmask ifreq... $ECHO_C" >&6; }
- if test "${samba_cv_HAVE_NETMASK_IFREQ+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15595,13 +15586,22 @@
- #include "${srcdir-.}/lib/netmask.c"
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -15614,11 +15614,13 @@
- ( exit $ac_status )
- samba_cv_HAVE_NETMASK_IFREQ=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
--echo "$as_me:$LINENO: result: $samba_cv_HAVE_NETMASK_IFREQ" >&5
--echo "${ECHO_T}$samba_cv_HAVE_NETMASK_IFREQ" >&6
-+{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_NETMASK_IFREQ" >&5
-+echo "${ECHO_T}$samba_cv_HAVE_NETMASK_IFREQ" >&6; }
- if test x"$samba_cv_HAVE_NETMASK_IFREQ" = x"yes"; then
- netmask=yes;
- cat >>confdefs.h <<\_ACEOF
-@@ -15629,8 +15631,8 @@
- fi
-
- if test $netmask = no; then
--echo "$as_me:$LINENO: checking for netmask AIX" >&5
--echo $ECHO_N "checking for netmask AIX... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for netmask AIX" >&5
-+echo $ECHO_N "checking for netmask AIX... $ECHO_C" >&6; }
- if test "${samba_cv_HAVE_NETMASK_AIX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15651,13 +15653,22 @@
- #include "${srcdir-.}/lib/netmask.c"
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -15670,11 +15681,13 @@
- ( exit $ac_status )
- samba_cv_HAVE_NETMASK_AIX=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
--echo "$as_me:$LINENO: result: $samba_cv_HAVE_NETMASK_AIX" >&5
--echo "${ECHO_T}$samba_cv_HAVE_NETMASK_AIX" >&6
-+{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_NETMASK_AIX" >&5
-+echo "${ECHO_T}$samba_cv_HAVE_NETMASK_AIX" >&6; }
- if test x"$samba_cv_HAVE_NETMASK_AIX" = x"yes"; then
- netmask=yes;
- cat >>confdefs.h <<\_ACEOF
-@@ -15685,8 +15698,8 @@
- fi
-
-
--echo "$as_me:$LINENO: checking for broken nisplus include files" >&5
--echo $ECHO_N "checking for broken nisplus include files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for broken nisplus include files" >&5
-+echo $ECHO_N "checking for broken nisplus include files... $ECHO_C" >&6; }
- if test "${samba_cv_BROKEN_NISPLUS_INCLUDE_FILES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15710,27 +15723,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- samba_cv_BROKEN_NISPLUS_INCLUDE_FILES=no
- else
- echo "$as_me: failed program was:" >&5
-@@ -15738,10 +15746,11 @@
-
- samba_cv_BROKEN_NISPLUS_INCLUDE_FILES=yes
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $samba_cv_BROKEN_NISPLUS_INCLUDE_FILES" >&5
--echo "${ECHO_T}$samba_cv_BROKEN_NISPLUS_INCLUDE_FILES" >&6
-+{ echo "$as_me:$LINENO: result: $samba_cv_BROKEN_NISPLUS_INCLUDE_FILES" >&5
-+echo "${ECHO_T}$samba_cv_BROKEN_NISPLUS_INCLUDE_FILES" >&6; }
- if test x"$samba_cv_BROKEN_NISPLUS_INCLUDE_FILES" = x"yes"; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -15753,16 +15762,15 @@
-
- #################################################
- # check for a LDAP password database
--echo "$as_me:$LINENO: checking whether to use LDAP password database" >&5
--echo $ECHO_N "checking whether to use LDAP password database... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether to use LDAP password database" >&5
-+echo $ECHO_N "checking whether to use LDAP password database... $ECHO_C" >&6; }
-
--# Check whether --with-ldap or --without-ldap was given.
-+# Check whether --with-ldap was given.
- if test "${with_ldap+set}" = set; then
-- withval="$with_ldap"
-- case "$withval" in
-+ withval=$with_ldap; case "$withval" in
- yes)
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- cat >>confdefs.h <<\_ACEOF
- #define WITH_LDAP 1
-@@ -15770,28 +15778,28 @@
-
- ;;
- *)
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- ;;
- esac
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+fi
-
--fi;
-
- #################################################
- # check for a NISPLUS password database
--echo "$as_me:$LINENO: checking whether to use NISPLUS password database" >&5
--echo $ECHO_N "checking whether to use NISPLUS password database... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether to use NISPLUS password database" >&5
-+echo $ECHO_N "checking whether to use NISPLUS password database... $ECHO_C" >&6; }
-
--# Check whether --with-nisplus or --without-nisplus was given.
-+# Check whether --with-nisplus was given.
- if test "${with_nisplus+set}" = set; then
-- withval="$with_nisplus"
-- case "$withval" in
-+ withval=$with_nisplus; case "$withval" in
- yes)
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- cat >>confdefs.h <<\_ACEOF
- #define WITH_NISPLUS 1
-@@ -15799,28 +15807,28 @@
-
- ;;
- *)
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- ;;
- esac
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+fi
-
--fi;
-
- #################################################
- # check for a NISPLUS_HOME support
--echo "$as_me:$LINENO: checking whether to use NISPLUS_HOME" >&5
--echo $ECHO_N "checking whether to use NISPLUS_HOME... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether to use NISPLUS_HOME" >&5
-+echo $ECHO_N "checking whether to use NISPLUS_HOME... $ECHO_C" >&6; }
-
--# Check whether --with-nisplus-home or --without-nisplus-home was given.
-+# Check whether --with-nisplus-home was given.
- if test "${with_nisplus_home+set}" = set; then
-- withval="$with_nisplus_home"
-- case "$withval" in
-+ withval=$with_nisplus_home; case "$withval" in
- yes)
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- cat >>confdefs.h <<\_ACEOF
- #define WITH_NISPLUS_HOME 1
-@@ -15828,28 +15836,28 @@
-
- ;;
- *)
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- ;;
- esac
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+fi
-
--fi;
-
- #################################################
- # check for the secure socket layer
--echo "$as_me:$LINENO: checking whether to use SSL" >&5
--echo $ECHO_N "checking whether to use SSL... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether to use SSL" >&5
-+echo $ECHO_N "checking whether to use SSL... $ECHO_C" >&6; }
-
--# Check whether --with-ssl or --without-ssl was given.
-+# Check whether --with-ssl was given.
- if test "${with_ssl+set}" = set; then
-- withval="$with_ssl"
-- case "$withval" in
-+ withval=$with_ssl; case "$withval" in
- yes)
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- cat >>confdefs.h <<\_ACEOF
- #define WITH_SSL 1
-@@ -15893,25 +15901,25 @@
-
- ;;
- *)
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- ;;
- esac
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+fi
-
--fi;
-
-
- #################################################
- # set configuration directory location
- configdir="\$(LIBDIR)"
-
--# Check whether --with-configdir or --without-configdir was given.
-+# Check whether --with-configdir was given.
- if test "${with_configdir+set}" = set; then
-- withval="$with_configdir"
-- case "$withval" in
-+ withval=$with_configdir; case "$withval" in
- yes|no)
- #
- # Just in case anybody does it
-@@ -15924,17 +15932,17 @@
- ;;
- esac
-
--fi;
-+fi
-+
-
-
- #################################################
- # set codepage directory location
- codepagedir="\$(LIBDIR)/codepages"
-
--# Check whether --with-codepagedir or --without-codepagedir was given.
-+# Check whether --with-codepagedir was given.
- if test "${with_codepagedir+set}" = set; then
-- withval="$with_codepagedir"
-- case "$withval" in
-+ withval=$with_codepagedir; case "$withval" in
- yes|no)
- #
- # Just in case anybody does it
-@@ -15946,10 +15954,11 @@
- codepagedir="$withval"
- ;;
- esac
--fi;
-+fi
-
--echo "$as_me:$LINENO: checking configure summary" >&5
--echo $ECHO_N "checking configure summary... $ECHO_C" >&6
-+
-+{ echo "$as_me:$LINENO: checking configure summary" >&5
-+echo $ECHO_N "checking configure summary... $ECHO_C" >&6; }
- if test "$cross_compiling" = yes; then
- :
- else
-@@ -15978,39 +15987,51 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- echo "$as_me:$LINENO: result: OK" >&5
--echo "${ECHO_T}OK" >&6;
-+ { echo "$as_me:$LINENO: result: OK" >&5
-+echo "${ECHO_T}OK" >&6; };
- else
- echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--echo "$as_me:$LINENO: result: failure" >&5
--echo "${ECHO_T}failure" >&6
-+{ echo "$as_me:$LINENO: result: failure" >&5
-+echo "${ECHO_T}failure" >&6; }
- { { echo "$as_me:$LINENO: error: Aborting config" >&5
- echo "$as_me: error: Aborting config" >&2;}
- { (exit 1); exit 1; }; }
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-
-+
-+
- builddir=`pwd`
-
-
-
-
- ac_config_files="$ac_config_files include/stamp-h Makefile"
-+
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
-@@ -16029,39 +16050,58 @@
-
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--{
-+(
-+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+ eval ac_val=\$$ac_var
-+ case $ac_val in #(
-+ *${as_nl}*)
-+ case $ac_var in #(
-+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+ esac
-+ case $ac_var in #(
-+ _ | IFS | as_nl) ;; #(
-+ *) $as_unset $ac_var ;;
-+ esac ;;
-+ esac
-+ done
-+
- (set) 2>&1 |
-- case `(ac_space=' '; set | grep ac_space) 2>&1` in
-- *ac_space=\ *)
-+ case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+ *${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \).
- sed -n \
- "s/'/'\\\\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-- ;;
-+ ;; #(
- *)
- # `set' quotes correctly as required by POSIX, so do not add quotes.
-- sed -n \
-- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
-- esac;
--} |
-+ esac |
-+ sort
-+) |
- sed '
-+ /^ac_cv_env_/b end
- t clear
- : clear
- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
- t end
-- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
- : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
-- if test -w $cache_file; then
-- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+ if test -w "$cache_file"; then
-+ test "x$cache_file" != "x/dev/null" &&
-+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
- else
-- echo "not updating unwritable cache $cache_file"
-+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
- fi
- fi
- rm -f confcache
-@@ -16070,32 +16110,18 @@
- # Let make expand exec_prefix.
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
--# VPATH may cause trouble with some makes, so we remove $(srcdir),
--# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
--# trailing colons and then remove the whole line if VPATH becomes empty
--# (actually we leave an empty line to preserve line numbers).
--if test "x$srcdir" = x.; then
-- ac_vpsub='/^[ ]*VPATH[ ]*=/{
--s/:*\$(srcdir):*/:/;
--s/:*\${srcdir}:*/:/;
--s/:*@srcdir@:*/:/;
--s/^\([^=]*=[ ]*\):*/\1/;
--s/:*$//;
--s/^[^=]*=[ ]*$//;
--}'
--fi
--
- DEFS=-DHAVE_CONFIG_H
-
- ac_libobjs=
- ac_ltlibobjs=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
- # 1. Remove the extension, and $U if already installed.
-- ac_i=`echo "$ac_i" |
-- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-- # 2. Add them.
-- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-+ ac_i=`echo "$ac_i" | sed "$ac_script"`
-+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
-+ # will be set to the directory where LIBOBJS objects are built.
-+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
- done
- LIBOBJS=$ac_libobjs
-
-@@ -16126,73 +16152,26 @@
- ## M4sh Initialization. ##
- ## --------------------- ##
-
--# Be Bourne compatible
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-- set -o posix
--fi
--DUALCASE=1; export DUALCASE # for MKS sh
--
--# Support unset when possible.
--if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-- as_unset=unset
--else
-- as_unset=false
--fi
--
--
--# Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
--PS1='$ '
--PS2='> '
--PS4='+ '
--
--# NLS nuisances.
--for as_var in \
-- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-- LC_TELEPHONE LC_TIME
--do
-- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-- eval $as_var=C; export $as_var
-- else
-- $as_unset $as_var
-- fi
--done
--
--# Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-- as_expr=expr
-+ setopt NO_GLOB_SUBST
- else
-- as_expr=false
--fi
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-- as_basename=basename
--else
-- as_basename=false
- fi
-
-
--# Name of the executable.
--as_me=`$as_basename "$0" ||
--$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)$' \| \
-- . : '\(.\)' 2>/dev/null ||
--echo X/"$0" |
-- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-- /^X\/\(\/\/\)$/{ s//\1/; q; }
-- /^X\/\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-
-
--# PATH needs CR, and LINENO needs CR and PATH.
-+# PATH needs CR
- # Avoid depending upon Character Ranges.
- as_cr_letters='abcdefghijklmnopqrstuvwxyz'
- as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-@@ -16213,14 +16192,24 @@
- rm -f conf$$.sh
- fi
-
-+# Support unset when possible.
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+ as_unset=unset
-+else
-+ as_unset=false
-+fi
-
-- as_lineno_1=$LINENO
-- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" || {
-- # Find who we are. Look in the path if we contain no path at all
-- # relative or not.
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order. Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" "" $as_nl"
-+
-+# Find who we are. Look in the path if we contain no directory separator.
- case $0 in
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -16230,6 +16219,7 @@
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
-+IFS=$as_save_IFS
-
- ;;
- esac
-@@ -16239,100 +16229,161 @@
- as_myself=$0
- fi
- if test ! -f "$as_myself"; then
-- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
--echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-- { (exit 1); exit 1; }; }
-+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+ { (exit 1); exit 1; }
- fi
-- case $CONFIG_SHELL in
-- '')
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+
-+# Work around bugs in pre-3.0 UWIN ksh.
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
- do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for as_base in sh bash ksh sh5; do
-- case $as_dir in
-- /*)
-- if ("$as_dir/$as_base" -c '
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ eval $as_var=C; export $as_var
-+ else
-+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ fi
-+done
-+
-+# Required to use basename.
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+ as_expr=expr
-+else
-+ as_expr=false
-+fi
-+
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-+ as_basename=basename
-+else
-+ as_basename=false
-+fi
-+
-+
-+# Name of the executable.
-+as_me=`$as_basename -- "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X/"$0" |
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-+
-+# CDPATH.
-+$as_unset CDPATH
-+
-+
-+
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
-- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-- CONFIG_SHELL=$as_dir/$as_base
-- export CONFIG_SHELL
-- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-- fi;;
-- esac
-- done
--done
--;;
-- esac
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
-- # line-number line before each line; the second 'sed' does the real
-- # work. The second script uses 'N' to pair each line-number line
-- # with the numbered line, and appends trailing '-' during
-- # substitution so that $LINENO is not a special case at line end.
-+ # line-number line after each line using $LINENO; the second 'sed'
-+ # does the real work. The second script uses 'N' to pair each
-+ # line-number line with the line containing $LINENO, and appends
-+ # trailing '-' during substitution so that $LINENO is not a special
-+ # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
-- sed '=' <$as_myself |
-+ # scripts with optimization help from Paolo Bonzini. Blame Lee
-+ # E. McMahon (1931-1989) for sed's syntax. :-)
-+ sed -n '
-+ p
-+ /[$]LINENO/=
-+ ' <$as_myself |
- sed '
-+ s/[$]LINENO.*/&-/
-+ t lineno
-+ b
-+ :lineno
- N
-- s,$,-,
- : loop
-- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
-- s,-$,,
-- s,^['$as_cr_digits']*\n,,
-+ s/-\n.*//
- ' >$as_me.lineno &&
-- chmod +x $as_me.lineno ||
-- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
--echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-+ chmod +x "$as_me.lineno" ||
-+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
-- # original and so on. Autoconf is especially sensible to this).
-- . ./$as_me.lineno
-+ # original and so on. Autoconf is especially sensitive to this).
-+ . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
- }
-
-
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-- *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T=' ' ;;
-- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+ as_dirname=dirname
-+else
-+ as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+ case `echo 'x\c'` in
-+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
-+ *) ECHO_C='\c';;
-+ esac;;
-+*)
-+ ECHO_N='-n';;
- esac
-
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
- rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+ rm -f conf$$.dir/conf$$.file
-+else
-+ rm -f conf$$.dir
-+ mkdir conf$$.dir
-+fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
-- # We could just check for DJGPP; but this test a) works b) is more generic
-- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-- if test -f conf$$.exe; then
-- # Don't use ln at all; we don't have any links
-- as_ln_s='cp -p'
-- else
- as_ln_s='ln -s'
-- fi
-+ # ... but there are two gotchas:
-+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+ # In both cases, we have to default to `cp -p'.
-+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+ as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
--rm -f conf$$ conf$$.exe conf$$.file
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-
- if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
-@@ -16341,7 +16392,28 @@
- as_mkdir_p=false
- fi
-
--as_executable_p="test -f"
-+if test -x / >/dev/null 2>&1; then
-+ as_test_x='test -x'
-+else
-+ if ls -dL / >/dev/null 2>&1; then
-+ as_ls_L_option=L
-+ else
-+ as_ls_L_option=
-+ fi
-+ as_test_x='
-+ eval sh -c '\''
-+ if test -d "$1"; then
-+ test -d "$1/.";
-+ else
-+ case $1 in
-+ -*)set "./$1";;
-+ esac;
-+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-+ ???[sx]*):;;*)false;;esac;fi
-+ '\'' sh
-+ '
-+fi
-+as_executable_p=$as_test_x
-
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -16350,31 +16422,14 @@
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" $as_nl"
--
--# CDPATH.
--$as_unset CDPATH
--
- exec 6>&1
-
--# Open the log real soon, to keep \$[0] and so on meaningful, and to
-+# Save the log message, to keep $[0] and so on meaningful, and to
- # report actual input values of CONFIG_FILES etc. instead of their
--# values after options handling. Logging --version etc. is OK.
--exec 5>>config.log
--{
-- echo
-- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
--## Running $as_me. ##
--_ASBOX
--} >&5
--cat >&5 <<_CSEOF
--
-+# values after options handling.
-+ac_log="
- This file was extended by $as_me, which was
--generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.61. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -16382,30 +16437,19 @@
- CONFIG_COMMANDS = $CONFIG_COMMANDS
- $ $0 $@
-
--_CSEOF
--echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
--echo >&5
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+"
-+
- _ACEOF
-
-+cat >>$CONFIG_STATUS <<_ACEOF
- # Files that config.status was made for.
--if test -n "$ac_config_files"; then
-- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_headers"; then
-- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_links"; then
-- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
--fi
-+config_files="$ac_config_files"
-+config_headers="$ac_config_headers"
-
--if test -n "$ac_config_commands"; then
-- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
--fi
-+_ACEOF
-
- cat >>$CONFIG_STATUS <<\_ACEOF
--
- ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
- current configuration.
-@@ -16413,7 +16457,7 @@
- Usage: $0 [OPTIONS] [FILE]...
-
- -h, --help print this help, then exit
-- -V, --version print version number, then exit
-+ -V, --version print version number and configuration settings, then exit
- -q, --quiet do not print progress messages
- -d, --debug don't remove temporary files
- --recheck update $as_me by reconfiguring in the same conditions
-@@ -16429,19 +16473,21 @@
- $config_headers
-
- Report bugs to <bug-autoconf at gnu.org>."
--_ACEOF
-
-+_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
- config.status
--configured by $0, generated by GNU Autoconf 2.59,
-- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.61,
-+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
--Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 2006 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
--srcdir=$srcdir
--INSTALL="$INSTALL"
-+
-+ac_pwd='$ac_pwd'
-+srcdir='$srcdir'
-+INSTALL='$INSTALL'
- _ACEOF
-
- cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -16452,39 +16498,24 @@
- do
- case $1 in
- --*=*)
-- ac_option=`expr "x$1" : 'x\([^=]*\)='`
-- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
- ac_shift=:
- ;;
-- -*)
-+ *)
- ac_option=$1
- ac_optarg=$2
- ac_shift=shift
- ;;
-- *) # This is not an option, so the user has probably given explicit
-- # arguments.
-- ac_option=$1
-- ac_need_defaults=false;;
- esac
-
- case $ac_option in
- # Handling of the options.
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- ac_cs_recheck=: ;;
-- --version | --vers* | -V )
-- echo "$ac_cs_version"; exit 0 ;;
-- --he | --h)
-- # Conflict between --help and --header
-- { { echo "$as_me:$LINENO: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&2;}
-- { (exit 1); exit 1; }; };;
-- --help | --hel | -h )
-- echo "$ac_cs_usage"; exit 0 ;;
-- --debug | --d* | -d )
-+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-+ echo "$ac_cs_version"; exit ;;
-+ --debug | --debu | --deb | --de | --d | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
- $ac_shift
-@@ -16494,18 +16525,24 @@
- $ac_shift
- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
- ac_need_defaults=false;;
-+ --he | --h)
-+ # Conflict between --help and --header
-+ { echo "$as_me: error: ambiguous option: $1
-+Try \`$0 --help' for more information." >&2
-+ { (exit 1); exit 1; }; };;
-+ --help | --hel | -h )
-+ echo "$ac_cs_usage"; exit ;;
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil | --si | --s)
- ac_cs_silent=: ;;
-
- # This is an error.
-- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&2;}
-+ -*) { echo "$as_me: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; } ;;
-
-- *) ac_config_targets="$ac_config_targets $1" ;;
-+ *) ac_config_targets="$ac_config_targets $1"
-+ ac_need_defaults=false ;;
-
- esac
- shift
-@@ -16521,30 +16558,44 @@
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- if \$ac_cs_recheck; then
-- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+ CONFIG_SHELL=$SHELL
-+ export CONFIG_SHELL
-+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- fi
-
- _ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+exec 5>>config.log
-+{
-+ echo
-+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-+## Running $as_me. ##
-+_ASBOX
-+ echo "$ac_log"
-+} >&5
-
--
--
--
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+_ACEOF
-
- cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+# Handling of arguments.
- for ac_config_target in $ac_config_targets
- do
-- case "$ac_config_target" in
-- # Handling of arguments.
-+ case $ac_config_target in
-+ "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;;
- "include/stamp-h" ) CONFIG_FILES="$CONFIG_FILES include/stamp-h" ;;
- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-- "include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;;
-+
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
- esac
- done
-
-+
- # If the user did not use the arguments to specify the items to instantiate,
- # then the envvar interface is used. Set only those that are not.
- # We use the long form for the default assignment because of an extremely
-@@ -16555,326 +16606,393 @@
- fi
-
- # Have a temporary directory for convenience. Make it in the build tree
--# simply because there is no reason to put it here, and in addition,
-+# simply because there is no reason against having it here, and in addition,
- # creating and moving files from /tmp can sometimes cause problems.
--# Create a temporary directory, and hook for its removal unless debugging.
-+# Hook for its removal unless debugging.
-+# Note that there is a small window in which the directory will not be cleaned:
-+# after its creation but before its name has been assigned to `$tmp'.
- $debug ||
- {
-- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-+ tmp=
-+ trap 'exit_status=$?
-+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-+' 0
- trap '{ (exit 1); exit 1; }' 1 2 13 15
- }
--
- # Create a (secure) tmp directory for tmp files.
-
- {
-- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
- } ||
- {
-- tmp=./confstat$$-$RANDOM
-- (umask 077 && mkdir $tmp)
-+ tmp=./conf$$-$RANDOM
-+ (umask 077 && mkdir "$tmp")
- } ||
- {
- echo "$me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
- }
-
--_ACEOF
--
--cat >>$CONFIG_STATUS <<_ACEOF
--
- #
--# CONFIG_FILES section.
-+# Set up the sed scripts for CONFIG_FILES section.
- #
-
- # No need to generate the scripts if there are no CONFIG_FILES.
- # This happens for instance when ./config.status config.h
--if test -n "\$CONFIG_FILES"; then
-- # Protect against being on the right side of a sed subst in config.status.
-- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
--s, at SHELL@,$SHELL,;t t
--s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
--s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
--s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
--s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
--s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
--s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
--s, at exec_prefix@,$exec_prefix,;t t
--s, at prefix@,$prefix,;t t
--s, at program_transform_name@,$program_transform_name,;t t
--s, at bindir@,$bindir,;t t
--s, at sbindir@,$sbindir,;t t
--s, at libexecdir@,$libexecdir,;t t
--s, at datadir@,$datadir,;t t
--s, at sysconfdir@,$sysconfdir,;t t
--s, at sharedstatedir@,$sharedstatedir,;t t
--s, at localstatedir@,$localstatedir,;t t
--s, at libdir@,$libdir,;t t
--s, at includedir@,$includedir,;t t
--s, at oldincludedir@,$oldincludedir,;t t
--s, at infodir@,$infodir,;t t
--s, at mandir@,$mandir,;t t
--s, at build_alias@,$build_alias,;t t
--s, at host_alias@,$host_alias,;t t
--s, at target_alias@,$target_alias,;t t
--s, at DEFS@,$DEFS,;t t
--s, at ECHO_C@,$ECHO_C,;t t
--s, at ECHO_N@,$ECHO_N,;t t
--s, at ECHO_T@,$ECHO_T,;t t
--s, at LIBS@,$LIBS,;t t
--s, at CC@,$CC,;t t
--s, at CFLAGS@,$CFLAGS,;t t
--s, at LDFLAGS@,$LDFLAGS,;t t
--s, at CPPFLAGS@,$CPPFLAGS,;t t
--s, at ac_ct_CC@,$ac_ct_CC,;t t
--s, at EXEEXT@,$EXEEXT,;t t
--s, at OBJEXT@,$OBJEXT,;t t
--s, at MPROGS@,$MPROGS,;t t
--s, at LDSHFLAGS@,$LDSHFLAGS,;t t
--s, at HOST_OS@,$HOST_OS,;t t
--s, at WRAP@,$WRAP,;t t
--s, at WRAP32@,$WRAP32,;t t
--s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
--s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
--s, at INSTALL_DATA@,$INSTALL_DATA,;t t
--s, at AWK@,$AWK,;t t
--s, at AR@,$AR,;t t
--s, at ac_ct_AR@,$ac_ct_AR,;t t
--s, at BROKEN_CC@,$BROKEN_CC,;t t
--s, at build@,$build,;t t
--s, at build_cpu@,$build_cpu,;t t
--s, at build_vendor@,$build_vendor,;t t
--s, at build_os@,$build_os,;t t
--s, at host@,$host,;t t
--s, at host_cpu@,$host_cpu,;t t
--s, at host_vendor@,$host_vendor,;t t
--s, at host_os@,$host_os,;t t
--s, at target@,$target,;t t
--s, at target_cpu@,$target_cpu,;t t
--s, at target_vendor@,$target_vendor,;t t
--s, at target_os@,$target_os,;t t
--s, at MAINT@,$MAINT,;t t
--s, at AUTOCONF@,$AUTOCONF,;t t
--s, at AUTOHEADER@,$AUTOHEADER,;t t
--s, at CPP@,$CPP,;t t
--s, at EGREP@,$EGREP,;t t
--s, at LIBOBJS@,$LIBOBJS,;t t
--s, at ROFF@,$ROFF,;t t
--s, at builddir@,$builddir,;t t
--s, at configdir@,$configdir,;t t
--s, at codepagedir@,$codepagedir,;t t
--s, at LTLIBOBJS@,$LTLIBOBJS,;t t
--CEOF
-+if test -n "$CONFIG_FILES"; then
-
- _ACEOF
-
-- cat >>$CONFIG_STATUS <<\_ACEOF
-- # Split the substitutions into bite-sized pieces for seds with
-- # small command number limits, like on Digital OSF/1 and HP-UX.
-- ac_max_sed_lines=48
-- ac_sed_frag=1 # Number of current file.
-- ac_beg=1 # First line for current file.
-- ac_end=$ac_max_sed_lines # Line after last line for current file.
-- ac_more_lines=:
-- ac_sed_cmds=
-- while $ac_more_lines; do
-- if test $ac_beg -gt 1; then
-- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-- else
-- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-- fi
-- if test ! -s $tmp/subs.frag; then
-- ac_more_lines=false
-- else
-- # The purpose of the label and of the branching condition is to
-- # speed up the sed processing (if there are no `@' at all, there
-- # is no need to browse any of the substitutions).
-- # These are the two extra sed commands mentioned above.
-- (echo ':t
-- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-- if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ cat >conf$$subs.sed <<_ACEOF
-+SHELL!$SHELL$ac_delim
-+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-+exec_prefix!$exec_prefix$ac_delim
-+prefix!$prefix$ac_delim
-+program_transform_name!$program_transform_name$ac_delim
-+bindir!$bindir$ac_delim
-+sbindir!$sbindir$ac_delim
-+libexecdir!$libexecdir$ac_delim
-+datarootdir!$datarootdir$ac_delim
-+datadir!$datadir$ac_delim
-+sysconfdir!$sysconfdir$ac_delim
-+sharedstatedir!$sharedstatedir$ac_delim
-+localstatedir!$localstatedir$ac_delim
-+includedir!$includedir$ac_delim
-+oldincludedir!$oldincludedir$ac_delim
-+docdir!$docdir$ac_delim
-+infodir!$infodir$ac_delim
-+htmldir!$htmldir$ac_delim
-+dvidir!$dvidir$ac_delim
-+pdfdir!$pdfdir$ac_delim
-+psdir!$psdir$ac_delim
-+libdir!$libdir$ac_delim
-+localedir!$localedir$ac_delim
-+mandir!$mandir$ac_delim
-+DEFS!$DEFS$ac_delim
-+ECHO_C!$ECHO_C$ac_delim
-+ECHO_N!$ECHO_N$ac_delim
-+ECHO_T!$ECHO_T$ac_delim
-+LIBS!$LIBS$ac_delim
-+build_alias!$build_alias$ac_delim
-+host_alias!$host_alias$ac_delim
-+target_alias!$target_alias$ac_delim
-+CC!$CC$ac_delim
-+CFLAGS!$CFLAGS$ac_delim
-+LDFLAGS!$LDFLAGS$ac_delim
-+CPPFLAGS!$CPPFLAGS$ac_delim
-+ac_ct_CC!$ac_ct_CC$ac_delim
-+EXEEXT!$EXEEXT$ac_delim
-+OBJEXT!$OBJEXT$ac_delim
-+MPROGS!$MPROGS$ac_delim
-+LDSHFLAGS!$LDSHFLAGS$ac_delim
-+HOST_OS!$HOST_OS$ac_delim
-+WRAP!$WRAP$ac_delim
-+WRAP32!$WRAP32$ac_delim
-+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-+INSTALL_DATA!$INSTALL_DATA$ac_delim
-+AWK!$AWK$ac_delim
-+AR!$AR$ac_delim
-+BROKEN_CC!$BROKEN_CC$ac_delim
-+build!$build$ac_delim
-+build_cpu!$build_cpu$ac_delim
-+build_vendor!$build_vendor$ac_delim
-+build_os!$build_os$ac_delim
-+host!$host$ac_delim
-+host_cpu!$host_cpu$ac_delim
-+host_vendor!$host_vendor$ac_delim
-+host_os!$host_os$ac_delim
-+target!$target$ac_delim
-+target_cpu!$target_cpu$ac_delim
-+target_vendor!$target_vendor$ac_delim
-+target_os!$target_os$ac_delim
-+MAINT!$MAINT$ac_delim
-+AUTOCONF!$AUTOCONF$ac_delim
-+AUTOHEADER!$AUTOHEADER$ac_delim
-+CPP!$CPP$ac_delim
-+GREP!$GREP$ac_delim
-+EGREP!$EGREP$ac_delim
-+LIBOBJS!$LIBOBJS$ac_delim
-+ROFF!$ROFF$ac_delim
-+builddir!$builddir$ac_delim
-+configdir!$configdir$ac_delim
-+codepagedir!$codepagedir$ac_delim
-+LTLIBOBJS!$LTLIBOBJS$ac_delim
-+_ACEOF
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 79; then
-+ break
-+ elif $ac_last_try; then
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { (exit 1); exit 1; }; }
- else
-- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-- fi
-- ac_sed_frag=`expr $ac_sed_frag + 1`
-- ac_beg=$ac_end
-- ac_end=`expr $ac_end + $ac_max_sed_lines`
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
- done
-- if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds=cat
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
- fi
--fi # test -n "$CONFIG_FILES"
-
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+:end
-+s/|#_!!_#|//g
-+CEOF$ac_eof
- _ACEOF
-+
-+
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-+# trailing colons and then remove the whole line if VPATH becomes empty
-+# (actually we leave an empty line to preserve line numbers).
-+if test "x$srcdir" = x.; then
-+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
-+s/:*\$(srcdir):*/:/
-+s/:*\${srcdir}:*/:/
-+s/:*@srcdir@:*/:/
-+s/^\([^=]*=[ ]*\):*/\1/
-+s/:*$//
-+s/^[^=]*=[ ]*$//
-+}'
-+fi
-+
- cat >>$CONFIG_STATUS <<\_ACEOF
--for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-- case $ac_file in
-- - | *:- | *:-:* ) # input from stdin
-- cat >$tmp/stdin
-- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-- * ) ac_file_in=$ac_file.in ;;
-+fi # test -n "$CONFIG_FILES"
-+
-+
-+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS
-+do
-+ case $ac_tag in
-+ :[FHLC]) ac_mode=$ac_tag; continue;;
-+ esac
-+ case $ac_mode$ac_tag in
-+ :[FHL]*:*);;
-+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-+ { (exit 1); exit 1; }; };;
-+ :[FH]-) ac_tag=-:-;;
-+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
- esac
-+ ac_save_IFS=$IFS
-+ IFS=:
-+ set x $ac_tag
-+ IFS=$ac_save_IFS
-+ shift
-+ ac_file=$1
-+ shift
-
-- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-+ case $ac_mode in
-+ :L) ac_source=$1;;
-+ :[FH])
-+ ac_file_inputs=
-+ for ac_f
-+ do
-+ case $ac_f in
-+ -) ac_f="$tmp/stdin";;
-+ *) # Look for the file first in the build tree, then in the source tree
-+ # (if the path is not absolute). The absolute path cannot be DOS-style,
-+ # because $ac_f cannot contain `:'.
-+ test -f "$ac_f" ||
-+ case $ac_f in
-+ [\\/$]*) false;;
-+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-+ esac ||
-+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-+ { (exit 1); exit 1; }; };;
-+ esac
-+ ac_file_inputs="$ac_file_inputs $ac_f"
-+ done
-+
-+ # Let's still pretend it is `configure' which instantiates (i.e., don't
-+ # use $as_me), people would be surprised to read:
-+ # /* config.h. Generated by config.status. */
-+ configure_input="Generated from "`IFS=:
-+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-+ if test x"$ac_file" != x-; then
-+ configure_input="$ac_file. $configure_input"
-+ { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+ fi
-+
-+ case $ac_tag in
-+ *:-:* | *:-) cat >"$tmp/stdin";;
-+ esac
-+ ;;
-+ esac
-+
-+ ac_dir=`$as_dirname -- "$ac_file" ||
- $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
-- X"$ac_file" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$ac_file" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
- s/.*/./; q'`
-- { if $as_mkdir_p; then
-- mkdir -p "$ac_dir"
-- else
-- as_dir="$ac_dir"
-+ { as_dir="$ac_dir"
-+ case $as_dir in #(
-+ -*) as_dir=./$as_dir;;
-+ esac
-+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
-- while test ! -d "$as_dir"; do
-- as_dirs="$as_dir $as_dirs"
-- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+ while :; do
-+ case $as_dir in #(
-+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+ *) as_qdir=$as_dir;;
-+ esac
-+ as_dirs="'$as_qdir' $as_dirs"
-+ as_dir=`$as_dirname -- "$as_dir" ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
-- X"$as_dir" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
- s/.*/./; q'`
-+ test -d "$as_dir" && break
- done
-- test ! -n "$as_dirs" || mkdir $as_dirs
-- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+ test -z "$as_dirs" || eval "mkdir $as_dirs"
-+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
--
- ac_builddir=.
-
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-- # A "../" for each directory in $ac_dir_suffix.
-- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
-- ac_dir_suffix= ac_top_builddir=
--fi
-+ # A ".." for each directory in $ac_dir_suffix.
-+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+ case $ac_top_builddir_sub in
-+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+ esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-
- case $srcdir in
-- .) # No --srcdir option. We are building in place.
-+ .) # We are building in place.
- ac_srcdir=.
-- if test -z "$ac_top_builddir"; then
-- ac_top_srcdir=.
-- else
-- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-- fi ;;
-- [\\/]* | ?:[\\/]* ) # Absolute path.
-+ ac_top_srcdir=$ac_top_builddir_sub
-+ ac_abs_top_srcdir=$ac_pwd ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
-- ac_top_srcdir=$srcdir ;;
-- *) # Relative path.
-- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+ ac_top_srcdir=$srcdir
-+ ac_abs_top_srcdir=$srcdir ;;
-+ *) # Relative name.
-+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_build_prefix$srcdir
-+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
- esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
-- case "$ac_dir" in
-- .) ac_abs_builddir=`pwd`;;
-- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-- *) ac_abs_builddir=`pwd`/"$ac_dir";;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
-- case ${ac_top_builddir}. in
-- .) ac_abs_top_builddir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
-- case $ac_srcdir in
-- .) ac_abs_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
-- case $ac_top_srcdir in
-- .) ac_abs_top_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-- esac;;
--esac
-
-+ case $ac_mode in
-+ :F)
-+ #
-+ # CONFIG_FILE
-+ #
-
- case $INSTALL in
- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
- esac
-+_ACEOF
-
-- if test x"$ac_file" != x-; then
-- { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
-- rm -f "$ac_file"
-- fi
-- # Let's still pretend it is `configure' which instantiates (i.e., don't
-- # use $as_me), people would be surprised to read:
-- # /* config.h. Generated by config.status. */
-- if test x"$ac_file" = x-; then
-- configure_input=
-- else
-- configure_input="$ac_file. "
-- fi
-- configure_input=$configure_input"Generated from `echo $ac_file_in |
-- sed 's,.*/,,'` by configure."
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If the template does not know about datarootdir, expand it.
-+# FIXME: This hack should be removed a few years after 2.60.
-+ac_datarootdir_hack=; ac_datarootdir_seen=
-
-- # First look for the input files in the build tree, otherwise in the
-- # src tree.
-- ac_file_inputs=`IFS=:
-- for f in $ac_file_in; do
-- case $f in
-- -) echo $tmp/stdin ;;
-- [\\/$]*)
-- # Absolute (can't be DOS-style, as IFS=:)
-- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
-- { (exit 1); exit 1; }; }
-- echo "$f";;
-- *) # Relative
-- if test -f "$f"; then
-- # Build tree
-- echo "$f"
-- elif test -f "$srcdir/$f"; then
-- # Source tree
-- echo "$srcdir/$f"
-- else
-- # /dev/null tree
-- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
-- { (exit 1); exit 1; }; }
-- fi;;
-+case `sed -n '/datarootdir/ {
-+ p
-+ q
-+}
-+/@datadir@/p
-+/@docdir@/p
-+/@infodir@/p
-+/@localedir@/p
-+/@mandir@/p
-+' $ac_file_inputs` in
-+*datarootdir*) ac_datarootdir_seen=yes;;
-+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+ ac_datarootdir_hack='
-+ s&@datadir@&$datadir&g
-+ s&@docdir@&$docdir&g
-+ s&@infodir@&$infodir&g
-+ s&@localedir@&$localedir&g
-+ s&@mandir@&$mandir&g
-+ s&\\\${datarootdir}&$datarootdir&g' ;;
- esac
-- done` || { (exit 1); exit 1; }
- _ACEOF
-+
-+# Neutralize VPATH when `$srcdir' = `.'.
-+# Shell code in configure.ac might set extrasub.
-+# FIXME: do we really want to maintain this feature?
- cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
- $extrasub
-@@ -16882,252 +17000,137 @@
- cat >>$CONFIG_STATUS <<\_ACEOF
- :t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--s, at configure_input@,$configure_input,;t t
--s, at srcdir@,$ac_srcdir,;t t
--s, at abs_srcdir@,$ac_abs_srcdir,;t t
--s, at top_srcdir@,$ac_top_srcdir,;t t
--s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
--s, at builddir@,$ac_builddir,;t t
--s, at abs_builddir@,$ac_abs_builddir,;t t
--s, at top_builddir@,$ac_top_builddir,;t t
--s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
--s, at INSTALL@,$ac_INSTALL,;t t
--" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-- rm -f $tmp/stdin
-- if test x"$ac_file" != x-; then
-- mv $tmp/out $ac_file
-- else
-- cat $tmp/out
-- rm -f $tmp/out
-- fi
-+s&@configure_input@&$configure_input&;t t
-+s&@top_builddir@&$ac_top_builddir_sub&;t t
-+s&@srcdir@&$ac_srcdir&;t t
-+s&@abs_srcdir@&$ac_abs_srcdir&;t t
-+s&@top_srcdir@&$ac_top_srcdir&;t t
-+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-+s&@builddir@&$ac_builddir&;t t
-+s&@abs_builddir@&$ac_abs_builddir&;t t
-+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-+s&@INSTALL@&$ac_INSTALL&;t t
-+$ac_datarootdir_hack
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
-
--done
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
-+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined. Please make sure it is defined." >&5
-+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined. Please make sure it is defined." >&2;}
-
-+ rm -f "$tmp/stdin"
-+ case $ac_file in
-+ -) cat "$tmp/out"; rm -f "$tmp/out";;
-+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-+ esac
-+ ;;
-+ :H)
- #
--# CONFIG_HEADER section.
-+ # CONFIG_HEADER
- #
-+_ACEOF
-
--# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
--# NAME is the cpp macro being defined and VALUE is the value it is being given.
--#
--# ac_d sets the value in "#define NAME VALUE" lines.
--ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
--ac_dB='[ ].*$,\1#\2'
-+# Transform confdefs.h into a sed script `conftest.defines', that
-+# substitutes the proper values into config.h.in to produce config.h.
-+rm -f conftest.defines conftest.tail
-+# First, append a space to every undef/define line, to ease matching.
-+echo 's/$/ /' >conftest.defines
-+# Then, protect against being on the right side of a sed subst, or in
-+# an unquoted here document, in config.status. If some macros were
-+# called several times there might be several #defines for the same
-+# symbol, which is useless. But do not sort them, since the last
-+# AC_DEFINE must be honored.
-+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-+# NAME is the cpp macro being defined, VALUE is the value it is being given.
-+# PARAMS is the parameter list in the macro definition--in most cases, it's
-+# just an empty string.
-+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
-+ac_dB='\\)[ (].*,\\1define\\2'
- ac_dC=' '
--ac_dD=',;t'
--# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
--ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
--ac_uB='$,\1#\2define\3'
--ac_uC=' '
--ac_uD=',;t'
--
--for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-- case $ac_file in
-- - | *:- | *:-:* ) # input from stdin
-- cat >$tmp/stdin
-- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-- * ) ac_file_in=$ac_file.in ;;
-- esac
--
-- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--
-- # First look for the input files in the build tree, otherwise in the
-- # src tree.
-- ac_file_inputs=`IFS=:
-- for f in $ac_file_in; do
-- case $f in
-- -) echo $tmp/stdin ;;
-- [\\/$]*)
-- # Absolute (can't be DOS-style, as IFS=:)
-- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
-- { (exit 1); exit 1; }; }
-- # Do quote $f, to prevent DOS paths from being IFS'd.
-- echo "$f";;
-- *) # Relative
-- if test -f "$f"; then
-- # Build tree
-- echo "$f"
-- elif test -f "$srcdir/$f"; then
-- # Source tree
-- echo "$srcdir/$f"
-- else
-- # /dev/null tree
-- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
-- { (exit 1); exit 1; }; }
-- fi;;
-- esac
-- done` || { (exit 1); exit 1; }
-- # Remove the trailing spaces.
-- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
--
--_ACEOF
-+ac_dD=' ,'
-
--# Transform confdefs.h into two sed scripts, `conftest.defines' and
--# `conftest.undefs', that substitutes the proper values into
--# config.h.in to produce config.h. The first handles `#define'
--# templates, and the second `#undef' templates.
--# And first: Protect against being on the right side of a sed subst in
--# config.status. Protect against being in an unquoted here document
--# in config.status.
--rm -f conftest.defines conftest.undefs
--# Using a here document instead of a string reduces the quoting nightmare.
--# Putting comments in sed scripts is not portable.
--#
--# `end' is used to avoid that the second main sed command (meant for
--# 0-ary CPP macros) applies to n-ary macro definitions.
--# See the Autoconf documentation for `clear'.
--cat >confdef2sed.sed <<\_ACEOF
-+uniq confdefs.h |
-+ sed -n '
-+ t rset
-+ :rset
-+ s/^[ ]*#[ ]*define[ ][ ]*//
-+ t ok
-+ d
-+ :ok
- s/[\\&,]/\\&/g
--s,[\\$`],\\&,g
--t clear
--: clear
--s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
--t end
--s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
--: end
--_ACEOF
--# If some macros were called several times there might be several times
--# the same #defines, which is useless. Nevertheless, we may not want to
--# sort them, since we want the *last* AC-DEFINE to be honored.
--uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
--sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
--rm -f confdef2sed.sed
-+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-+ ' >>conftest.defines
-
--# This sed command replaces #undef with comments. This is necessary, for
-+# Remove the space that was appended to ease matching.
-+# Then replace #undef with comments. This is necessary, for
- # example, in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
--cat >>conftest.undefs <<\_ACEOF
--s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
--_ACEOF
-+# (The regexp can be short, since the line contains either #define or #undef.)
-+echo 's/ $//
-+s,^[ #]*u.*,/* & */,' >>conftest.defines
-
--# Break up conftest.defines because some shells have a limit on the size
--# of here documents, and old seds have small limits too (100 cmds).
--echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
--echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
--echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
--echo ' :' >>$CONFIG_STATUS
--rm -f conftest.tail
--while grep . conftest.defines >/dev/null
-+# Break up conftest.defines:
-+ac_max_sed_lines=50
-+
-+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-+# et cetera.
-+ac_in='$ac_file_inputs'
-+ac_out='"$tmp/out1"'
-+ac_nxt='"$tmp/out2"'
-+
-+while :
- do
-- # Write a limited-size here document to $tmp/defines.sed.
-- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-- # Speed up: don't consider the non `#define' lines.
-- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
-- # Work around the forget-to-reset-the-flag bug.
-- echo 't clr' >>$CONFIG_STATUS
-- echo ': clr' >>$CONFIG_STATUS
-- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-+ # Write a here document:
-+ cat >>$CONFIG_STATUS <<_ACEOF
-+ # First, check the format of the line:
-+ cat >"\$tmp/defines.sed" <<\\CEOF
-+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
-+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
-+b
-+:def
-+_ACEOF
-+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
- echo 'CEOF
-- sed -f $tmp/defines.sed $tmp/in >$tmp/out
-- rm -f $tmp/in
-- mv $tmp/out $tmp/in
--' >>$CONFIG_STATUS
-- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-+ grep . conftest.tail >/dev/null || break
- rm -f conftest.defines
- mv conftest.tail conftest.defines
- done
--rm -f conftest.defines
--echo ' fi # grep' >>$CONFIG_STATUS
--echo >>$CONFIG_STATUS
--
--# Break up conftest.undefs because some shells have a limit on the size
--# of here documents, and old seds have small limits too (100 cmds).
--echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
--rm -f conftest.tail
--while grep . conftest.undefs >/dev/null
--do
-- # Write a limited-size here document to $tmp/undefs.sed.
-- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-- # Speed up: don't consider the non `#undef'
-- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
-- # Work around the forget-to-reset-the-flag bug.
-- echo 't clr' >>$CONFIG_STATUS
-- echo ': clr' >>$CONFIG_STATUS
-- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-- echo 'CEOF
-- sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-- rm -f $tmp/in
-- mv $tmp/out $tmp/in
--' >>$CONFIG_STATUS
-- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-- rm -f conftest.undefs
-- mv conftest.tail conftest.undefs
--done
--rm -f conftest.undefs
-+rm -f conftest.defines conftest.tail
-
-+echo "ac_result=$ac_in" >>$CONFIG_STATUS
- cat >>$CONFIG_STATUS <<\_ACEOF
-- # Let's still pretend it is `configure' which instantiates (i.e., don't
-- # use $as_me), people would be surprised to read:
-- # /* config.h. Generated by config.status. */
-- if test x"$ac_file" = x-; then
-- echo "/* Generated by configure. */" >$tmp/config.h
-- else
-- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
-- fi
-- cat $tmp/in >>$tmp/config.h
-- rm -f $tmp/in
- if test x"$ac_file" != x-; then
-- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-+ echo "/* $configure_input */" >"$tmp/config.h"
-+ cat "$ac_result" >>"$tmp/config.h"
-+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
- else
-- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
--$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$ac_file" : 'X\(//\)[^/]' \| \
-- X"$ac_file" : 'X\(//\)$' \| \
-- X"$ac_file" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
--echo X"$ac_file" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- { if $as_mkdir_p; then
-- mkdir -p "$ac_dir"
-- else
-- as_dir="$ac_dir"
-- as_dirs=
-- while test ! -d "$as_dir"; do
-- as_dirs="$as_dir $as_dirs"
-- as_dir=`(dirname "$as_dir") 2>/dev/null ||
--$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$as_dir" : 'X\(//\)[^/]' \| \
-- X"$as_dir" : 'X\(//\)$' \| \
-- X"$as_dir" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
--echo X"$as_dir" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- done
-- test ! -n "$as_dirs" || mkdir $as_dirs
-- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-- { (exit 1); exit 1; }; }; }
--
- rm -f $ac_file
-- mv $tmp/config.h $ac_file
-+ mv "$tmp/config.h" $ac_file
- fi
- else
-- cat $tmp/config.h
-- rm -f $tmp/config.h
-+ echo "/* $configure_input */"
-+ cat "$ac_result"
- fi
--done
--_ACEOF
-+ rm -f "$tmp/out12"
-+ ;;
-+
-+
-+ esac
-+
-+done # for ac_tag
-
--cat >>$CONFIG_STATUS <<\_ACEOF
-
- { (exit 0); exit 0; }
- _ACEOF
-diff -Nurwd mc-4.6.2~pre1.orig/vfs/samba/include/config.h.in mc-4.6.2~pre1/vfs/samba/include/config.h.in
---- mc-4.6.2~pre1.orig/vfs/samba/include/config.h.in 2008-02-26 18:20:31.000000000 +0100
-+++ mc-4.6.2~pre1/vfs/samba/include/config.h.in 2008-02-26 18:24:14.000000000 +0100
-@@ -504,19 +504,19 @@
- /* Define on SCO */
- #undef SCO
-
--/* The size of a `ino_t', as computed by sizeof. */
-+/* The size of `ino_t', as computed by sizeof. */
- #undef SIZEOF_INO_T
-
--/* The size of a `int', as computed by sizeof. */
-+/* The size of `int', as computed by sizeof. */
- #undef SIZEOF_INT
-
--/* The size of a `long', as computed by sizeof. */
-+/* The size of `long', as computed by sizeof. */
- #undef SIZEOF_LONG
-
--/* The size of a `off_t', as computed by sizeof. */
-+/* The size of `off_t', as computed by sizeof. */
- #undef SIZEOF_OFF_T
-
--/* The size of a `short', as computed by sizeof. */
-+/* The size of `short', as computed by sizeof. */
- #undef SIZEOF_SHORT
-
- /* Define to 1 if you have the ANSI C header files. */
-@@ -579,7 +579,7 @@
- /* Define to `int' if <sys/types.h> does not define. */
- #undef mode_t
-
--/* Define to `long' if <sys/types.h> does not define. */
-+/* Define to `long int' if <sys/types.h> does not define. */
- #undef off_t
-
- /* Define to `off_t' if <sys/types.h> does not define. */
-@@ -588,7 +588,7 @@
- /* Define to `int' if <sys/types.h> does not define. */
- #undef pid_t
-
--/* Define to `unsigned' if <sys/types.h> does not define. */
-+/* Define to `unsigned int' if <sys/types.h> does not define. */
- #undef size_t
-
- /* Define to `int' if <sys/types.h> does not define. */
Copied: trunk/debian/patches/32_c-vs-cxx.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/32_c-vs-cxx.patch)
===================================================================
--- trunk/debian/patches/32_c-vs-cxx.patch (rev 0)
+++ trunk/debian/patches/32_c-vs-cxx.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,66 @@
+diff -Nurwd mc-4.6.2~pre1/syntax/c.syntax mc-4.6.2~pre1.patched/syntax/c.syntax
+--- mc-4.6.2~pre1/syntax/c.syntax 2006-06-22 14:49:24.000000000 +0200
++++ mc-4.6.2~pre1/syntax/c.syntax 2008-01-25 08:19:52.000000000 +0100
+@@ -33,34 +33,7 @@
+ keyword whole volatile yellow
+ keyword whole while yellow
+ keyword whole asm yellow
+- keyword whole catch yellow
+- keyword whole class yellow
+- keyword whole friend yellow
+- keyword whole delete yellow
+ keyword whole inline yellow
+- keyword whole new yellow
+- keyword whole operator yellow
+- keyword whole private yellow
+- keyword whole protected yellow
+- keyword whole public yellow
+- keyword whole this yellow
+- keyword whole throw yellow
+- keyword whole template yellow
+- keyword whole try yellow
+- keyword whole virtual yellow
+- keyword whole bool yellow
+- keyword whole const_cast yellow
+- keyword whole dynamic_cast yellow
+- keyword whole explicit yellow
+- keyword whole false yellow
+- keyword whole mutable yellow
+- keyword whole namespace yellow
+- keyword whole reinterpret_cast yellow
+- keyword whole static_cast yellow
+- keyword whole true yellow
+- keyword whole typeid yellow
+- keyword whole typename yellow
+- keyword whole using yellow
+ keyword whole wchar_t yellow
+ keyword whole ... yellow
+ keyword whole linestart \{\s\t\}\[\s\t\]#*\n brightmagenta
+diff -Nurwd mc-4.6.2~pre1/syntax/Makefile.am mc-4.6.2~pre1.patched/syntax/Makefile.am
+--- mc-4.6.2~pre1/syntax/Makefile.am 2007-08-27 08:56:47.000000000 +0200
++++ mc-4.6.2~pre1/syntax/Makefile.am 2008-01-25 08:19:52.000000000 +0100
+@@ -3,6 +3,7 @@
+ ada95.syntax \
+ aspx.syntax \
+ assembler.syntax \
++ cxx.syntax \
+ c.syntax \
+ changelog.syntax \
+ cs.syntax \
+diff -Nurwd mc-4.6.2~pre1/syntax/Syntax mc-4.6.2~pre1.patched/syntax/Syntax
+--- mc-4.6.2~pre1/syntax/Syntax 2007-08-27 08:56:47.000000000 +0200
++++ mc-4.6.2~pre1/syntax/Syntax 2008-01-25 08:19:52.000000000 +0100
+@@ -76,9 +76,12 @@
+ file ..\*\.(texi|texinfo|TEXI|TEXINFO)$ Texinfo\sDocument
+ include texinfo.syntax
+
+-file ..\*\\.([chC]|CC|cxx|cc|cpp|CPP|CXX|hxx|h\.in)$ C/C\+\+\sProgram
++file ..\*\\.c$ C\sProgram
+ include c.syntax
+
++file ..\*\\.([hC]|CC|cxx|cc|cpp|CPP|CXX|hxx|h\.in)$ C/C\+\+\sProgram
++include cxx.syntax
++
+ file ..\*\\.d$ D\sProgram
+ include d.syntax
+
Deleted: trunk/debian/patches/32_show_hostname.patch
===================================================================
--- trunk/debian/patches/32_show_hostname.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/32_show_hostname.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,32 +0,0 @@
-diff -Nurwd mc-4.6.2~pre1.orig/src/main.c mc-4.6.2~pre1/src/main.c
---- mc-4.6.2~pre1.orig/src/main.c 2008-02-26 23:24:15.000000000 +0100
-+++ mc-4.6.2~pre1/src/main.c 2008-02-26 23:22:53.000000000 +0100
-@@ -1606,15 +1606,26 @@
- }
- }
-
--/* Show current directory in the xterm title */
-+/* Show hostname and current directory in the xterm title */
- void
- update_xterm_title_path (void)
- {
- const char *p;
-+ char *output, h[64];
-
- if (xterm_flag && xterm_title) {
-+ //current path
- p = strip_home_and_password (current_panel->cwd);
-- fprintf (stdout, "\33]0;mc - %s\7", str_term_form (p));
-+ if ( gethostname(h,63) ) {
-+ output = p;
-+ } else {
-+ output = g_malloc( strlen(p) + strlen(h) + 1 );
-+ strcpy(output,h);
-+ strcat(output,":");
-+ strcat(output,p);
-+ }
-+
-+ fprintf (stdout, "\33]0;mc - %s\7", str_term_form (output));
- fflush (stdout);
- }
- }
Deleted: trunk/debian/patches/33_escaping.patch
===================================================================
--- trunk/debian/patches/33_escaping.patch 2008-02-27 11:46:10 UTC (rev 79)
+++ trunk/debian/patches/33_escaping.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -1,114 +0,0 @@
-diff -Nurwd mc-4.6.2~pre1.orig/src/command.c mc-4.6.2~pre1/src/command.c
---- mc-4.6.2~pre1.orig/src/command.c 2008-02-27 01:21:56.000000000 +0100
-+++ mc-4.6.2~pre1/src/command.c 2008-02-27 01:22:17.000000000 +0100
-@@ -44,6 +44,33 @@
- /* This holds the command line */
- WInput *cmdline;
-
-+/* We'll get escaped strings now.. so we have to unescape them */
-+char *
-+unescape_string ( char * in ) {
-+ char * local = NULL;
-+ int i = 0;
-+ int j = 20;
-+ int k = 0;
-+
-+ local = g_malloc(j);
-+
-+ for (i=0;i<=strlen(in);i++) {
-+ if (i-k >= j ) {
-+ j = j + 20;
-+ local = g_realloc(local,j);
-+ }
-+ if ( (strchr(" \t*|;<>",in[i])) && ( strchr("\\",in[i-1])) ) {
-+ k++;
-+ local[i-k] = in[i];
-+ } else {
-+ local[i-k] = in[i];
-+ }
-+ }
-+ local[i-k] = '\0';
-+
-+ return local;
-+}
-+
- /*
- * Expand the argument to "cd" and change directory. First try tilde
- * expansion, then variable substitution. If the CDPATH variable is set
-@@ -63,6 +90,7 @@
- const char *t;
-
- /* Tilde expansion */
-+ path = unescape_string(path);
- path_tilde = tilde_expand (path);
-
- /* Leave space for further expansion */
-diff -Nurwd mc-4.6.2~pre1.orig/src/complete.c mc-4.6.2~pre1/src/complete.c
---- mc-4.6.2~pre1.orig/src/complete.c 2008-02-27 01:26:38.000000000 +0100
-+++ mc-4.6.2~pre1/src/complete.c 2008-02-27 01:26:01.000000000 +0100
-@@ -962,6 +962,34 @@
- }
- }
-
-+char *
-+escape_string ( char * in ) {
-+ char * local = NULL;
-+ int i = 0;
-+ int j = 20;
-+ int k = 0;
-+
-+ local = g_malloc(j);
-+
-+ for (i=0;i<strlen(in);i++) {
-+ if (i+k >= j ) { //If 20 chars is too low for the path
-+ j = j + 20;
-+ local = g_realloc(local,j);
-+ }
-+ if ( (strchr(" \t*|;<>",in[i])) && (! strchr("\\",in[i-1])) ) {
-+ local[i+k] = 92; // Ascii for "\"
-+ k = k+1;
-+ local[i+k] = in[i];
-+ } else {
-+ local[i+k] = in[i];
-+ }
-+ }
-+ local[i+k] = '\0';
-+
-+ return local;
-+}
-+
-+
- #define DO_INSERTION 1
- #define DO_QUERY 2
- /* Returns 1 if the user would like to see us again */
-@@ -969,6 +997,7 @@
- complete_engine (WInput *in, int what_to_do)
- {
- int s;
-+ char *complete = NULL;
-
- if (in->completions && (str_offset_to_pos (in->buffer, in->point)) != end)
- free_completions (in);
-@@ -985,7 +1014,8 @@
- }
- if (in->completions){
- if (what_to_do & DO_INSERTION || ((what_to_do & DO_QUERY) && !in->completions[1])) {
-- if (insert_text (in, in->completions [0], strlen (in->completions [0]))){
-+ complete = escape_string(in->completions [0]);
-+ if (insert_text (in, complete, strlen (complete))){
- if (in->completions [1])
- beep ();
- else
-@@ -1001,9 +1031,11 @@
- Dlg_head *query_dlg;
- WListbox *query_list;
-
-- for (p=in->completions + 1; *p; count++, p++)
-+ for (p=in->completions + 1; *p; count++, p++) {
-+ *p = escape_string(*p);
- if ((i = str_term_width1 (*p)) > maxlen)
- maxlen = i;
-+ }
- start_x = in->widget.x;
- start_y = in->widget.y;
- if (start_y - 2 >= count) {
Copied: trunk/debian/patches/45_ftpfs_symlink2.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/45_ftpfs_symlink2.patch)
===================================================================
--- trunk/debian/patches/45_ftpfs_symlink2.patch (rev 0)
+++ trunk/debian/patches/45_ftpfs_symlink2.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,32 @@
+--- vfs/direntry.c 22 Feb 2005 18:35:23 -0000 1.116
++++ vfs/direntry.c 6 Apr 2005 14:04:54 -0000
+@@ -251,7 +251,13 @@ vfs_s_find_entry_tree (struct vfs_class
+ char * const pathref = g_strdup (a_path);
+ char *path = pathref;
+
+- canonicalize_pathname (path);
++ if (strncmp(me->name, "ftpfs", 5) != 0)
++ canonicalize_pathname (path);
++ else {
++ char *p = path + strlen (path) - 1;
++ while (p > path && *p == PATH_SEP)
++ *p-- = 0;
++ }
+
+ while (root) {
+ while (*path == PATH_SEP) /* Strip leading '/' */
+@@ -324,7 +330,13 @@ vfs_s_find_entry_linear (struct vfs_clas
+ if (root->super->root != root)
+ vfs_die ("We have to use _real_ root. Always. Sorry.");
+
+- canonicalize_pathname (path);
++ if (strncmp (me->name, "ftpfs", 5) != 0)
++ canonicalize_pathname (path);
++ else {
++ char *p = path + strlen (path) - 1;
++ while (p > path && *p == PATH_SEP)
++ *p-- = 0;
++ }
+
+ if (!(flags & FL_DIR)) {
+ char *dirname, *name, *save;
Copied: trunk/debian/patches/47_mc.menu.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/47_mc.menu.patch)
===================================================================
--- trunk/debian/patches/47_mc.menu.patch (rev 0)
+++ trunk/debian/patches/47_mc.menu.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,32 @@
+diff -Nurwd mc-4.6.2~pre1/lib/mc.menu mc-4.6.2~pre1.patched/lib/mc.menu
+--- mc-4.6.2~pre1/lib/mc.menu 2005-09-06 08:01:07.000000000 +0200
++++ mc-4.6.2~pre1.patched/lib/mc.menu 2008-01-25 10:06:19.000000000 +0100
+@@ -15,7 +15,7 @@
+
+ 0 Edit a bug report and send it to root
+ I=`mktemp ${MC_TMPDIR:-/tmp}/mail.XXXXXX` || exit 1
+- ${EDITOR-vi} $I
++ ${EDITOR-editor} $I
+ test -r $I && mail root < $I
+ rm -f $I
+
+@@ -330,3 +330,7 @@
+ o Open next a free console
+ open -s -- sh
+
++=+ f \.dsc$ & t r
++x Extract the contents of a Debian source package
++ dpkg-source -x %f
++
+diff -Nurwd mc-4.6.2~pre1/src/util.h mc-4.6.2~pre1.patched/src/util.h
+--- mc-4.6.2~pre1/src/util.h 2006-02-03 18:04:17.000000000 +0100
++++ mc-4.6.2~pre1.patched/src/util.h 2008-01-25 10:06:19.000000000 +0100
+@@ -222,7 +222,7 @@
+ #define PATH_ENV_SEP ':'
+ #define TMPDIR_DEFAULT "/tmp"
+ #define SCRIPT_SUFFIX ""
+-#define get_default_editor() "vi"
++#define get_default_editor() "editor"
+ #define OS_SORT_CASE_SENSITIVE_DEFAULT 1
+ #define STRCOMP strcmp
+ #define STRNCOMP strncmp
Copied: trunk/debian/patches/48_utf8-slang2.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/48_utf8-slang2.patch)
===================================================================
--- trunk/debian/patches/48_utf8-slang2.patch (rev 0)
+++ trunk/debian/patches/48_utf8-slang2.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,5360 @@
+--- mc-4.6.2-pre1/acinclude.m4
++++ mc-4.6.2-pre1/acinclude.m4
+@@ -399,14 +399,14 @@
+ fi
+
+ dnl Unless external S-Lang was requested, reject S-Lang with UTF-8 hacks
+- if test x$with_screen = xslang; then
+- :
+- m4_if([$1], strict, ,
+- [AC_CHECK_LIB([slang], [SLsmg_write_nwchars],
+- [AC_MSG_WARN([Rejecting S-Lang with UTF-8 support, \
+-it's not fully supported yet])
+- with_screen=mcslang])])
+- fi
++dnl if test x$with_screen = xslang; then
++dnl :
++dnl m4_if([$1], strict, ,
++dnl [AC_CHECK_LIB([slang], [SLsmg_write_nwchars],
++dnl [AC_MSG_WARN([Rejecting S-Lang with UTF-8 support, \
++dnl it's not fully supported yet])
++dnl with_screen=mcslang])])
++dnl fi
+
+ if test x$with_screen = xslang; then
+ AC_DEFINE(HAVE_SYSTEM_SLANG, 1,
+--- mc-4.6.2-pre1/edit/edit-widget.h
++++ mc-4.6.2-pre1/edit/edit-widget.h
+@@ -30,6 +30,11 @@
+ long command;
+ } edit_key_map_type;
+
++struct action {
++ mc_wchar_t ch;
++ long flags;
++};
++
+ struct WEdit {
+ Widget widget;
+
+@@ -42,8 +47,17 @@
+ /* dynamic buffers and cursor position for editor: */
+ long curs1; /* position of the cursor from the beginning of the file. */
+ long curs2; /* position from the end of the file */
++#ifndef UTF8
+ unsigned char *buffers1[MAXBUFF + 1]; /* all data up to curs1 */
+ unsigned char *buffers2[MAXBUFF + 1]; /* all data from end of file down to curs2 */
++#else /* UTF8 */
++ mc_wchar_t *buffers1[MAXBUFF + 1]; /* all data up to curs1 */
++ mc_wchar_t *buffers2[MAXBUFF + 1]; /* all data from end of file down to curs2 */
++
++ unsigned char charbuf[MB_LEN_MAX];
++ int charpoint;
++#endif /* UTF8 */
++
+
+ /* search variables */
+ long search_start; /* First character to start searching from */
+@@ -87,7 +101,7 @@
+
+ /* undo stack and pointers */
+ unsigned long stack_pointer;
+- long *undo_stack;
++ struct action *undo_stack;
+ unsigned long stack_size;
+ unsigned long stack_size_mask;
+ unsigned long stack_bottom;
+--- mc-4.6.2-pre1/edit/edit.c
++++ mc-4.6.2-pre1/edit/edit.c
+@@ -102,7 +102,11 @@
+
+ static void user_menu (WEdit *edit);
+
++#ifndef UTF8
+ int edit_get_byte (WEdit * edit, long byte_index)
++#else
++mc_wchar_t edit_get_byte (WEdit * edit, long byte_index)
++#endif
+ {
+ unsigned long p;
+ if (byte_index >= (edit->curs1 + edit->curs2) || byte_index < 0)
+@@ -131,7 +135,7 @@
+
+ edit->curs1 = 0;
+ edit->curs2 = 0;
+- edit->buffers2[0] = g_malloc (EDIT_BUF_SIZE);
++ edit->buffers2[0] = g_malloc (EDIT_BUF_SIZE * sizeof(mc_wchar_t));
+ }
+
+ /*
+@@ -156,7 +160,7 @@
+ }
+
+ if (!edit->buffers2[buf2])
+- edit->buffers2[buf2] = g_malloc (EDIT_BUF_SIZE);
++ edit->buffers2[buf2] = g_malloc (EDIT_BUF_SIZE * sizeof(mc_wchar_t));
+
+ mc_read (file,
+ (char *) edit->buffers2[buf2] + EDIT_BUF_SIZE -
+@@ -166,7 +170,7 @@
+ for (buf = buf2 - 1; buf >= 0; buf--) {
+ /* edit->buffers2[0] is already allocated */
+ if (!edit->buffers2[buf])
+- edit->buffers2[buf] = g_malloc (EDIT_BUF_SIZE);
++ edit->buffers2[buf] = g_malloc (EDIT_BUF_SIZE * sizeof(mc_wchar_t));
+ mc_read (file, (char *) edit->buffers2[buf], EDIT_BUF_SIZE);
+ }
+
+@@ -239,9 +243,44 @@
+ {
+ int c;
+ long i = 0;
+- while ((c = fgetc (f)) >= 0) {
++#ifndef UTF8
++ while ((c = fgetc (f)) != EOF) {
+ edit_insert (edit, c);
+ i++;
++#else /* UTF8 */
++ unsigned char buf[MB_LEN_MAX];
++ int charpos = 0;
++ mbstate_t mbs;
++
++ while ((c = fgetc (f)) != EOF) {
++ mc_wchar_t wc;
++ int size;
++ int j;
++
++ buf[charpos++] = c;
++
++ memset (&mbs, 0, sizeof (mbs));
++ size = mbrtowc(&wc, (char *)buf, charpos, &mbs);
++
++ if (size == -2)
++ continue; /* incomplete */
++
++ else if (size >= 0) {
++ edit_insert (edit, wc);
++ i++;
++ charpos = 0;
++ continue;
++ }
++ else {
++
++ /* invalid */
++#ifdef __STDC_ISO_10646__
++ for (j=0; j<charpos; j++)
++ edit_insert (edit, BINARY_CHAR_OFFSET + (mc_wchar_t)buf[j]);
++#endif
++ charpos = 0;
++ }
++#endif /* UTF8 */
+ }
+ return i;
+ }
+@@ -249,9 +288,32 @@
+ long edit_write_stream (WEdit * edit, FILE * f)
+ {
+ long i;
++#ifndef UTF8
+ for (i = 0; i < edit->last_byte; i++)
+ if (fputc (edit_get_byte (edit, i), f) < 0)
+ break;
++#else /* UTF8 */
++ for (i = 0; i < edit->last_byte; i++) {
++ mc_wchar_t wc = edit_get_byte (edit, i);
++ int res;
++ char tmpbuf[MB_LEN_MAX];
++ mbstate_t mbs;
++
++ memset (&mbs, 0, sizeof (mbs));
++
++#ifdef __STDC_ISO_10646__
++ if (wc >= BINARY_CHAR_OFFSET && wc < (BINARY_CHAR_OFFSET + 256)) {
++ res = 1;
++ tmpbuf[0] = (char) (wc - BINARY_CHAR_OFFSET);
++ } else
++#endif
++ res = wcrtomb(tmpbuf, wc, &mbs);
++ if (res > 0) {
++ if (fwrite(tmpbuf, res, 1, f) != 1)
++ break;
++ }
++ }
++#endif /* UTF8 */
+ return i;
+ }
+
+@@ -290,12 +352,46 @@
+ int i, file, blocklen;
+ long current = edit->curs1;
+ unsigned char *buf;
++#ifdef UTF8
++ mbstate_t mbs;
++ int bufstart = 0;
++
++ memset (&mbs, 0, sizeof (mbs));
++#endif /* UTF8 */
+ if ((file = mc_open (filename, O_RDONLY | O_BINARY)) == -1)
+ return 0;
+ buf = g_malloc (TEMP_BUF_LEN);
++#ifndef UTF8
+ while ((blocklen = mc_read (file, (char *) buf, TEMP_BUF_LEN)) > 0) {
+ for (i = 0; i < blocklen; i++)
+ edit_insert (edit, buf[i]);
++#else /* UTF8 */
++ while ((blocklen = mc_read (file, (char *) buf + bufstart, TEMP_BUF_LEN - bufstart)) > 0) {
++ blocklen += bufstart;
++ bufstart = 0;
++ for (i = 0; i < blocklen; ) {
++ mc_wchar_t wc;
++ int j;
++ int size = mbrtowc(&wc, (char *)buf + i, blocklen - i, &mbs);
++ if (size == -2) { /*incomplete char*/
++ bufstart = blocklen - i;
++ memcpy(buf, buf+i, bufstart);
++ i = blocklen;
++ memset (&mbs, 0, sizeof (mbs));
++ }
++ else if (size <= 0) {
++#ifdef __STDC_ISO_10646__
++ edit_insert (edit, BINARY_CHAR_OFFSET + (mc_wchar_t)buf[i]);
++#endif
++ memset (&mbs, 0, sizeof (mbs));
++ i++; /* skip broken char */
++ }
++ else {
++ edit_insert (edit, wc);
++ i+=size;
++ }
++ }
++#endif /* UTF8 */
+ }
+ edit_cursor_move (edit, current - edit->curs1);
+ g_free (buf);
+@@ -385,7 +481,11 @@
+ static int
+ edit_load_file (WEdit *edit)
+ {
++#ifndef UTF8
+ int fast_load = 1;
++#else /* UTF8 */
++ int fast_load = 0; /* can't be used with multibyte characters */
++#endif /* UTF8 */
+
+ /* Cannot do fast load if a filter is used */
+ if (edit_find_filter (edit->filename) >= 0)
+@@ -451,6 +551,7 @@
+ edit->prev_col = column;
+ edit_move_to_prev_col (edit, edit_bol (edit, edit->curs1));
+ edit_move_display (edit, line - (edit->num_widget_lines / 2));
++ edit->charpoint = 0;
+ }
+
+ /* Save cursor position in the file */
+@@ -534,7 +635,7 @@
+ edit_set_filename (edit, filename);
+ edit->stack_size = START_STACK_SIZE;
+ edit->stack_size_mask = START_STACK_SIZE - 1;
+- edit->undo_stack = g_malloc ((edit->stack_size + 10) * sizeof (long));
++ edit->undo_stack = g_malloc ((edit->stack_size + 10) * sizeof (struct action));
+ if (edit_load_file (edit)) {
+ /* edit_load_file already gives an error message */
+ if (to_free)
+@@ -689,14 +790,23 @@
+ {
+ unsigned long sp = edit->stack_pointer;
+ unsigned long spm1;
+- long *t;
++
++ struct action *t;
++ mc_wchar_t ch = 0;
++
++ if (c == CHAR_INSERT || c == CHAR_INSERT_AHEAD) {
++ va_list ap;
++ va_start (ap, c);
++ ch = va_arg (ap, mc_wint_t);
++ va_end (ap);
++ }
+
+ /* first enlarge the stack if necessary */
+ if (sp > edit->stack_size - 10) { /* say */
+ if (option_max_undo < 256)
+ option_max_undo = 256;
+ if (edit->stack_size < (unsigned long) option_max_undo) {
+- t = g_realloc (edit->undo_stack, (edit->stack_size * 2 + 10) * sizeof (long));
++ t = g_realloc (edit->undo_stack, (edit->stack_size * 2 + 10) * sizeof (struct action));
+ if (t) {
+ edit->undo_stack = t;
+ edit->stack_size <<= 1;
+@@ -711,7 +821,7 @@
+ #ifdef FAST_MOVE_CURSOR
+ if (c == CURS_LEFT_LOTS || c == CURS_RIGHT_LOTS) {
+ va_list ap;
+- edit->undo_stack[sp] = c == CURS_LEFT_LOTS ? CURS_LEFT : CURS_RIGHT;
++ edit->undo_stack[sp].flags = c == CURS_LEFT_LOTS ? CURS_LEFT : CURS_RIGHT;
+ edit->stack_pointer = (edit->stack_pointer + 1) & edit->stack_size_mask;
+ va_start (ap, c);
+ c = -(va_arg (ap, int));
+@@ -722,12 +832,14 @@
+ && spm1 != edit->stack_bottom
+ && ((sp - 2) & edit->stack_size_mask) != edit->stack_bottom) {
+ int d;
+- if (edit->undo_stack[spm1] < 0) {
+- d = edit->undo_stack[(sp - 2) & edit->stack_size_mask];
+- if (d == c) {
+- if (edit->undo_stack[spm1] > -1000000000) {
++ mc_wchar_t d_ch;
++ if (edit->undo_stack[spm1].flags < 0) {
++ d = edit->undo_stack[(sp - 2) & edit->stack_size_mask].flags;
++ d_ch = edit->undo_stack[(sp - 2) & edit->stack_size_mask].ch;
++ if (d == c && d_ch == ch) {
++ if (edit->undo_stack[spm1].flags > -1000000000) {
+ if (c < KEY_PRESS) /* --> no need to push multiple do-nothings */
+- edit->undo_stack[spm1]--;
++ edit->undo_stack[spm1].flags--;
+ return;
+ }
+ }
+@@ -735,19 +847,20 @@
+ #ifndef NO_STACK_CURSMOVE_ANIHILATION
+ else if ((c == CURS_LEFT && d == CURS_RIGHT)
+ || (c == CURS_RIGHT && d == CURS_LEFT)) { /* a left then a right anihilate each other */
+- if (edit->undo_stack[spm1] == -2)
++ if (edit->undo_stack[spm1].flags == -2)
+ edit->stack_pointer = spm1;
+ else
+- edit->undo_stack[spm1]++;
++ edit->undo_stack[spm1].flags++;
+ return;
+ }
+ #endif
+ } else {
+- d = edit->undo_stack[spm1];
+- if (d == c) {
++ d = edit->undo_stack[spm1].flags;
++ d_ch = edit->undo_stack[spm1].ch;
++ if (d == c && d_ch == ch) {
+ if (c >= KEY_PRESS)
+ return; /* --> no need to push multiple do-nothings */
+- edit->undo_stack[sp] = -2;
++ edit->undo_stack[sp].flags = -2;
+ goto check_bottom;
+ }
+ #ifndef NO_STACK_CURSMOVE_ANIHILATION
+@@ -759,7 +872,9 @@
+ #endif
+ }
+ }
+- edit->undo_stack[sp] = c;
++ edit->undo_stack[sp].flags = c;
++ edit->undo_stack[sp].ch = ch;
++
+ check_bottom:
+
+ edit->stack_pointer = (edit->stack_pointer + 1) & edit->stack_size_mask;
+@@ -772,10 +887,10 @@
+ (((unsigned long) c + 1) & edit->stack_size_mask) == edit->stack_bottom)
+ do {
+ edit->stack_bottom = (edit->stack_bottom + 1) & edit->stack_size_mask;
+- } while (edit->undo_stack[edit->stack_bottom] < KEY_PRESS && edit->stack_bottom != edit->stack_pointer);
++ } while (edit->undo_stack[edit->stack_bottom].flags < KEY_PRESS && edit->stack_bottom != edit->stack_pointer);
+
+ /*If a single key produced enough pushes to wrap all the way round then we would notice that the [stack_bottom] does not contain KEY_PRESS. The stack is then initialised: */
+- if (edit->stack_pointer != edit->stack_bottom && edit->undo_stack[edit->stack_bottom] < KEY_PRESS)
++ if (edit->stack_pointer != edit->stack_bottom && edit->undo_stack[edit->stack_bottom].flags < KEY_PRESS)
+ edit->stack_bottom = edit->stack_pointer = 0;
+ }
+
+@@ -784,30 +899,30 @@
+ then the file should be as it was when he loaded up. Then set edit->modified to 0.
+ */
+ static long
+-pop_action (WEdit * edit)
++pop_action (WEdit * edit, struct action *c)
+ {
+- long c;
+ unsigned long sp = edit->stack_pointer;
+ if (sp == edit->stack_bottom) {
+- return STACK_BOTTOM;
++ c->flags = STACK_BOTTOM;
++ return c->flags;
+ }
+ sp = (sp - 1) & edit->stack_size_mask;
+- if ((c = edit->undo_stack[sp]) >= 0) {
+-/* edit->undo_stack[sp] = '@'; */
++ *c = edit->undo_stack[sp];
++ if (edit->undo_stack[sp].flags >= 0) {
+ edit->stack_pointer = (edit->stack_pointer - 1) & edit->stack_size_mask;
+- return c;
++ return c->flags;
+ }
+ if (sp == edit->stack_bottom) {
+ return STACK_BOTTOM;
+ }
+- c = edit->undo_stack[(sp - 1) & edit->stack_size_mask];
+- if (edit->undo_stack[sp] == -2) {
+-/* edit->undo_stack[sp] = '@'; */
++ *c = edit->undo_stack[(sp - 1) & edit->stack_size_mask];
++
++ if (edit->undo_stack[sp].flags == -2) {
+ edit->stack_pointer = sp;
+ } else
+- edit->undo_stack[sp]++;
++ edit->undo_stack[sp].flags++;
+
+- return c;
++ return c->flags;
+ }
+
+ /* is called whenever a modification is made by one of the four routines below */
+@@ -828,7 +943,7 @@
+ */
+
+ void
+-edit_insert (WEdit *edit, int c)
++edit_insert (WEdit *edit, mc_wchar_t c)
+ {
+ /* check if file has grown to large */
+ if (edit->last_byte >= SIZE_LIMIT)
+@@ -866,12 +981,11 @@
+ /* add a new buffer if we've reached the end of the last one */
+ if (!(edit->curs1 & M_EDIT_BUF_SIZE))
+ edit->buffers1[edit->curs1 >> S_EDIT_BUF_SIZE] =
+- g_malloc (EDIT_BUF_SIZE);
++ g_malloc (EDIT_BUF_SIZE * sizeof(mc_wchar_t));
+
+ /* perform the insertion */
+- edit->buffers1[edit->curs1 >> S_EDIT_BUF_SIZE][edit->
+- curs1 & M_EDIT_BUF_SIZE]
+- = (unsigned char) c;
++ edit->buffers1[edit->curs1 >> S_EDIT_BUF_SIZE]
++ [edit->curs1 & M_EDIT_BUF_SIZE] = c;
+
+ /* update file length */
+ edit->last_byte++;
+@@ -882,7 +996,7 @@
+
+
+ /* same as edit_insert and move left */
+-void edit_insert_ahead (WEdit * edit, int c)
++void edit_insert_ahead (WEdit * edit, mc_wchar_t c)
+ {
+ if (edit->last_byte >= SIZE_LIMIT)
+ return;
+@@ -905,7 +1019,7 @@
+ edit->last_get_rule += (edit->last_get_rule >= edit->curs1);
+
+ if (!((edit->curs2 + 1) & M_EDIT_BUF_SIZE))
+- edit->buffers2[(edit->curs2 + 1) >> S_EDIT_BUF_SIZE] = g_malloc (EDIT_BUF_SIZE);
++ edit->buffers2[(edit->curs2 + 1) >> S_EDIT_BUF_SIZE] = g_malloc (EDIT_BUF_SIZE * sizeof(mc_wchar_t));
+ edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE][EDIT_BUF_SIZE - (edit->curs2 & M_EDIT_BUF_SIZE) - 1] = c;
+
+ edit->last_byte++;
+@@ -915,7 +1029,7 @@
+
+ int edit_delete (WEdit * edit)
+ {
+- int p;
++ mc_wint_t p;
+ if (!edit->curs2)
+ return 0;
+
+@@ -939,7 +1053,7 @@
+ edit->total_lines--;
+ edit->force |= REDRAW_AFTER_CURSOR;
+ }
+- edit_push_action (edit, p + 256);
++ edit_push_action (edit, CHAR_INSERT_AHEAD, p);
+ if (edit->curs1 < edit->start_display) {
+ edit->start_display--;
+ if (p == '\n')
+@@ -953,7 +1067,7 @@
+ static int
+ edit_backspace (WEdit * edit)
+ {
+- int p;
++ mc_wint_t p;
+ if (!edit->curs1)
+ return 0;
+
+@@ -977,7 +1091,7 @@
+ edit->total_lines--;
+ edit->force |= REDRAW_AFTER_CURSOR;
+ }
+- edit_push_action (edit, p);
++ edit_push_action (edit, CHAR_INSERT, p);
+
+ if (edit->curs1 < edit->start_display) {
+ edit->start_display--;
+@@ -990,10 +1104,18 @@
+
+ #ifdef FAST_MOVE_CURSOR
+
+-static void memqcpy (WEdit * edit, unsigned char *dest, unsigned char *src, int n)
++static void memqcpy (WEdit * edit, mc_wchar_t *dest, mc_wchar_t *src, int n)
+ {
+ unsigned long next;
++#ifndef UTF8
+ while ((next = (unsigned long) memccpy (dest, src, '\n', n))) {
++#else /* UTF8 */
++ while (n) {
++ next = 0;
++ while (next < n && src[next]!='\n') next++;
++ if (next < n) next++;
++ wmemcpy (dest, src, next)
++#endif /* UTF8 */
+ edit->curs_line--;
+ next -= (unsigned long) dest;
+ n -= next;
+@@ -1006,7 +1128,7 @@
+ edit_move_backward_lots (WEdit *edit, long increment)
+ {
+ int r, s, t;
+- unsigned char *p;
++ mc_wchar_t *p;
+
+ if (increment > edit->curs1)
+ increment = edit->curs1;
+@@ -1046,7 +1168,7 @@
+ edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] = p;
+ else
+ edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] =
+- g_malloc (EDIT_BUF_SIZE);
++ g_malloc (EDIT_BUF_SIZE * sizeof(mc_wchar_t));
+ } else {
+ g_free (p);
+ }
+@@ -1084,7 +1206,7 @@
+ edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] = p;
+ else
+ edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] =
+- g_malloc (EDIT_BUF_SIZE);
++ g_malloc (EDIT_BUF_SIZE * sizeof(mc_wchar_t));
+ } else {
+ g_free (p);
+ }
+@@ -1116,7 +1238,7 @@
+
+ c = edit_get_byte (edit, edit->curs1 - 1);
+ if (!((edit->curs2 + 1) & M_EDIT_BUF_SIZE))
+- edit->buffers2[(edit->curs2 + 1) >> S_EDIT_BUF_SIZE] = g_malloc (EDIT_BUF_SIZE);
++ edit->buffers2[(edit->curs2 + 1) >> S_EDIT_BUF_SIZE] = g_malloc (EDIT_BUF_SIZE * sizeof(mc_wchar_t));
+ edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE][EDIT_BUF_SIZE - (edit->curs2 & M_EDIT_BUF_SIZE) - 1] = c;
+ edit->curs2++;
+ c = edit->buffers1[(edit->curs1 - 1) >> S_EDIT_BUF_SIZE][(edit->curs1 - 1) & M_EDIT_BUF_SIZE];
+@@ -1141,7 +1263,7 @@
+
+ c = edit_get_byte (edit, edit->curs1);
+ if (!(edit->curs1 & M_EDIT_BUF_SIZE))
+- edit->buffers1[edit->curs1 >> S_EDIT_BUF_SIZE] = g_malloc (EDIT_BUF_SIZE);
++ edit->buffers1[edit->curs1 >> S_EDIT_BUF_SIZE] = g_malloc (EDIT_BUF_SIZE * sizeof(mc_wchar_t));
+ edit->buffers1[edit->curs1 >> S_EDIT_BUF_SIZE][edit->curs1 & M_EDIT_BUF_SIZE] = c;
+ edit->curs1++;
+ c = edit->buffers2[(edit->curs2 - 1) >> S_EDIT_BUF_SIZE][EDIT_BUF_SIZE - ((edit->curs2 - 1) & M_EDIT_BUF_SIZE) - 1];
+@@ -1248,7 +1370,7 @@
+ q = edit->last_byte + 2;
+
+ for (col = 0, p = current; p < q; p++) {
+- int c;
++ mc_wchar_t c;
+ if (cols != -10) {
+ if (col == cols)
+ return p;
+@@ -1266,7 +1388,7 @@
+ } else if (c < 32 || c == 127)
+ col += 2; /* Caret notation for control characters */
+ else
+- col++;
++ col += wcwidth(c);
+ }
+ return col;
+ }
+@@ -1399,12 +1521,16 @@
+ is_blank (WEdit *edit, long offset)
+ {
+ long s, f;
+- int c;
++ mc_wchar_t c;
+ s = edit_bol (edit, offset);
+ f = edit_eol (edit, offset) - 1;
+ while (s <= f) {
+ c = edit_get_byte (edit, s++);
++#ifndef UTF8
+ if (!isspace (c))
++#else
++ if (!iswspace (c))
++#endif /* UTF8 */
+ return 0;
+ }
+ return 1;
+@@ -1659,6 +1785,7 @@
+ return 2;
+ return 0x80000000UL;
+ }
++#ifndef UTF8
+ if (isupper (c))
+ c = 'A';
+ else if (islower (c))
+@@ -1669,6 +1796,18 @@
+ c = '0';
+ else if (isspace (c))
+ c = ' ';
++#else
++ if (iswupper (c))
++ c = 'A';
++ else if (iswlower (c))
++ c = 'a';
++ else if (iswalpha (c))
++ c = 'a';
++ else if (iswdigit (c))
++ c = '0';
++ else if (iswspace (c))
++ c = ' ';
++#endif /* UTF8 */
+ q = strchr (option_chars_move_whole_word, c);
+ if (!q)
+ return 0xFFFFFFFFUL;
+@@ -1693,10 +1832,18 @@
+ c2 = edit_get_byte (edit, edit->curs1);
+ if (!(my_type_of (c1) & my_type_of (c2)))
+ break;
++#ifndef UTF8
+ if (isspace (c1) && !isspace (c2))
++#else
++ if (iswspace (c1) && !iswspace (c2))
++#endif /* UTF8 */
+ break;
+ if (s)
++#ifndef UTF8
+ if (!isspace (c1) && isspace (c2))
++#else
++ if (!iswspace (c1) && iswspace (c2))
++#endif /* UTF8 */
+ break;
+ }
+ }
+@@ -1719,10 +1866,18 @@
+ c2 = edit_get_byte (edit, edit->curs1);
+ if (!(my_type_of (c1) & my_type_of (c2)))
+ break;
++#ifndef UTF8
+ if (isspace (c1) && !isspace (c2))
++#else
++ if (iswspace (c1) && !iswspace (c2))
++#endif /* UTF8 */
+ break;
+ if (s)
++#ifndef UTF8
+ if (!isspace (c1) && isspace (c2))
++#else
++ if (!iswspace (c1) && iswspace (c2))
++#endif /* UTF8 */
+ break;
+ }
+ }
+@@ -1742,7 +1897,11 @@
+ break;
+ c1 = edit_delete (edit);
+ c2 = edit_get_byte (edit, edit->curs1);
++#ifndef UTF8
+ if ((isspace (c1) == 0) != (isspace (c2) == 0))
++#else
++ if ((iswspace (c1) == 0) != (iswspace (c2) == 0))
++#endif /* UTF8 */
+ break;
+ if (!(my_type_of (c1) & my_type_of (c2)))
+ break;
+@@ -1757,7 +1916,11 @@
+ break;
+ c1 = edit_backspace (edit);
+ c2 = edit_get_byte (edit, edit->curs1 - 1);
++#ifndef UTF8
+ if ((isspace (c1) == 0) != (isspace (c2) == 0))
++#else
++ if ((iswspace (c1) == 0) != (iswspace (c2) == 0))
++#endif /* UTF8 */
+ break;
+ if (!(my_type_of (c1) & my_type_of (c2)))
+ break;
+@@ -1771,13 +1934,13 @@
+ static void
+ edit_do_undo (WEdit * edit)
+ {
+- long ac;
++ struct action ac;
+ long count = 0;
+
+ edit->stack_disable = 1; /* don't record undo's onto undo stack! */
+
+- while ((ac = pop_action (edit)) < KEY_PRESS) {
+- switch ((int) ac) {
++ while (pop_action (edit, &ac) < KEY_PRESS) {
++ switch ((int) ac.flags) {
+ case STACK_BOTTOM:
+ goto done_undo;
+ case CURS_RIGHT:
+@@ -1798,31 +1961,33 @@
+ case COLUMN_OFF:
+ column_highlighting = 0;
+ break;
++ case CHAR_INSERT:
++ edit_insert (edit, ac.ch);
++ break;
++ case CHAR_INSERT_AHEAD:
++ edit_insert_ahead (edit, ac.ch);
++ break;
+ }
+- if (ac >= 256 && ac < 512)
+- edit_insert_ahead (edit, ac - 256);
+- if (ac >= 0 && ac < 256)
+- edit_insert (edit, ac);
+
+- if (ac >= MARK_1 - 2 && ac < MARK_2 - 2) {
+- edit->mark1 = ac - MARK_1;
++ if (ac.flags >= MARK_1 - 2 && ac.flags < MARK_2 - 2) {
++ edit->mark1 = ac.flags - MARK_1;
+ edit->column1 = edit_move_forward3 (edit, edit_bol (edit, edit->mark1), 0, edit->mark1);
+- } else if (ac >= MARK_2 - 2 && ac < KEY_PRESS) {
+- edit->mark2 = ac - MARK_2;
++ } else if (ac.flags >= MARK_2 - 2 && ac.flags < KEY_PRESS) {
++ edit->mark2 = ac.flags - MARK_2;
+ edit->column2 = edit_move_forward3 (edit, edit_bol (edit, edit->mark2), 0, edit->mark2);
+ }
+ if (count++)
+ edit->force |= REDRAW_PAGE; /* more than one pop usually means something big */
+ }
+
+- if (edit->start_display > ac - KEY_PRESS) {
+- edit->start_line -= edit_count_lines (edit, ac - KEY_PRESS, edit->start_display);
++ if (edit->start_display > ac.flags - KEY_PRESS) {
++ edit->start_line -= edit_count_lines (edit, ac.flags - KEY_PRESS, edit->start_display);
+ edit->force |= REDRAW_PAGE;
+- } else if (edit->start_display < ac - KEY_PRESS) {
+- edit->start_line += edit_count_lines (edit, edit->start_display, ac - KEY_PRESS);
++ } else if (edit->start_display < ac.flags - KEY_PRESS) {
++ edit->start_line += edit_count_lines (edit, edit->start_display, ac.flags - KEY_PRESS);
+ edit->force |= REDRAW_PAGE;
+ }
+- edit->start_display = ac - KEY_PRESS; /* see push and pop above */
++ edit->start_display = ac.flags - KEY_PRESS; /* see push and pop above */
+ edit_update_curs_row (edit);
+
+ done_undo:;
+@@ -2102,7 +2267,7 @@
+ * passed as -1. Commands are executed, and char_for_insertion is
+ * inserted at the cursor.
+ */
+-void edit_execute_key_command (WEdit *edit, int command, int char_for_insertion)
++void edit_execute_key_command (WEdit *edit, int command, mc_wint_t char_for_insertion)
+ {
+ if (command == CK_Begin_Record_Macro) {
+ edit->macro_i = 0;
+@@ -2137,7 +2302,7 @@
+ all of them. It also does not check for the Undo command.
+ */
+ void
+-edit_execute_cmd (WEdit *edit, int command, int char_for_insertion)
++edit_execute_cmd (WEdit *edit, int command, mc_wint_t char_for_insertion)
+ {
+ edit->force |= REDRAW_LINE;
+
+@@ -2170,7 +2335,7 @@
+ }
+
+ /* An ordinary key press */
+- if (char_for_insertion >= 0) {
++ if (char_for_insertion != (mc_wint_t) -1) {
+ if (edit->overwrite) {
+ if (edit_get_byte (edit, edit->curs1) != '\n')
+ edit_delete (edit);
+--- mc-4.6.2-pre1/edit/edit.h
++++ mc-4.6.2-pre1/edit/edit.h
+@@ -25,6 +25,27 @@
+
+ #include <stdio.h>
+
++#include "src/tty.h"
++
++#ifdef UTF8
++#include <wchar.h>
++#include <wctype.h>
++
++#define mc_wchar_t wchar_t
++#define mc_wint_t wint_t
++
++#else
++
++#define mc_wchar_t unsigned char
++#define mc_wint_t int
++
++#endif
++
++
++/* unicode private use area */
++#define BINARY_CHAR_OFFSET 0xFFE00
++
++
+ #define N_menus 5
+
+ #define SEARCH_DIALOG_OPTION_NO_SCANF (1 << 0)
+@@ -86,6 +107,8 @@
+ #define START_STACK_SIZE 32
+
+ /* Some codes that may be pushed onto or returned from the undo stack */
++#define CHAR_INSERT 65
++#define CHAR_INSERT_AHEAD 66
+ #define CURS_LEFT 601
+ #define CURS_RIGHT 602
+ #define DELCHAR 603
+@@ -105,7 +128,7 @@
+
+ struct macro {
+ short command;
+- short ch;
++ mc_wchar_t ch;
+ };
+
+ struct WEdit;
+@@ -120,8 +143,12 @@
+ void menu_save_mode_cmd (void);
+ int edit_raw_key_query (const char *heading, const char *query, int cancel);
+ int edit_file (const char *_file, int line);
+-int edit_translate_key (WEdit *edit, long x_key, int *cmd, int *ch);
++int edit_translate_key (WEdit *edit, long x_key, int *cmd, mc_wint_t *ch);
++#ifndef UTF8
+ int edit_get_byte (WEdit * edit, long byte_index);
++#else /* UTF8 */
++mc_wchar_t edit_get_byte (WEdit * edit, long byte_index);
++#endif /* UTF8 */
+ int edit_count_lines (WEdit * edit, long current, int upto);
+ long edit_move_forward (WEdit * edit, long current, int lines, long upto);
+ long edit_move_forward3 (WEdit * edit, long current, int cols, long upto);
+@@ -148,11 +175,11 @@
+ void edit_delete_line (WEdit * edit);
+
+ int edit_delete (WEdit * edit);
+-void edit_insert (WEdit * edit, int c);
++void edit_insert (WEdit * edit, mc_wchar_t c);
+ int edit_cursor_move (WEdit * edit, long increment);
+ void edit_push_action (WEdit * edit, long c, ...);
+ void edit_push_key_press (WEdit * edit);
+-void edit_insert_ahead (WEdit * edit, int c);
++void edit_insert_ahead (WEdit * edit, mc_wchar_t c);
+ long edit_write_stream (WEdit * edit, FILE * f);
+ char *edit_get_write_filter (const char *writename, const char *filename);
+ int edit_save_confirm_cmd (WEdit * edit);
+@@ -183,7 +210,7 @@
+ int eval_marks (WEdit * edit, long *start_mark, long *end_mark);
+ void edit_status (WEdit * edit);
+ void edit_execute_key_command (WEdit *edit, int command,
+- int char_for_insertion);
++ mc_wint_t char_for_insertion);
+ void edit_update_screen (WEdit * edit);
+ int edit_print_string (WEdit * e, const char *s);
+ void edit_move_to_line (WEdit * e, long line);
+@@ -233,7 +260,7 @@
+ void format_paragraph (WEdit *edit, int force);
+
+ /* either command or char_for_insertion must be passed as -1 */
+-void edit_execute_cmd (WEdit *edit, int command, int char_for_insertion);
++void edit_execute_cmd (WEdit *edit, int command, mc_wint_t char_for_insertion);
+
+ #define get_sys_error(s) (s)
+
+--- mc-4.6.2-pre1/edit/editcmd.c
++++ mc-4.6.2-pre1/edit/editcmd.c
+@@ -61,7 +61,7 @@
+ #define edit_get_save_file(f,h) input_expand_dialog (h, _(" Enter file name: "), f)
+
+ struct selection {
+- unsigned char * text;
++ mc_wchar_t *text;
+ int len;
+ };
+
+@@ -84,12 +84,16 @@
+ #define MAX_REPL_LEN 1024
+
+ static int edit_save_cmd (WEdit *edit);
+-static unsigned char *edit_get_block (WEdit *edit, long start,
++static mc_wchar_t *edit_get_block (WEdit *edit, long start,
+ long finish, int *l);
+
+-static inline int my_lower_case (int c)
++static inline mc_wchar_t my_lower_case (mc_wchar_t c)
+ {
++#ifndef UTF8
+ return tolower(c & 0xFF);
++#else
++ return towlower(c);
++#endif
+ }
+
+ static const char *
+@@ -124,11 +128,11 @@
+ #endif /* !HAVE_MEMMOVE */
+
+ /* #define itoa MY_itoa <---- this line is now in edit.h */
+-static char *
++static mc_wchar_t *
+ MY_itoa (int i)
+ {
+- static char t[14];
+- char *s = t + 13;
++ static mc_wchar_t t[14];
++ mc_wchar_t *s = t + 13;
+ int j = i;
+ *s-- = 0;
+ do {
+@@ -213,6 +217,48 @@
+ doupdate();
+ }
+
++#ifdef UTF8
++
++static size_t
++wchar_write(int fd, mc_wchar_t *buf, size_t len)
++{
++ char *tmpbuf = g_malloc(len + MB_LEN_MAX);
++ mbstate_t mbs;
++ size_t i;
++ size_t outlen = 0;
++ size_t res;
++
++ for (i = 0; i < len; i++) {
++ if (outlen >= len) {
++ if ((res = mc_write(fd, tmpbuf, outlen)) != outlen) {
++ g_free(tmpbuf);
++ return -1;
++ }
++ outlen = 0;
++ }
++ memset (&mbs, 0, sizeof (mbs));
++#ifdef __STDC_ISO_10646__
++ if (buf[i] >= BINARY_CHAR_OFFSET && buf[i] < (BINARY_CHAR_OFFSET + 256)) {
++ res = 1;
++ tmpbuf[outlen] = (char) (buf[i] - BINARY_CHAR_OFFSET);
++
++ } else
++#endif
++ res = wcrtomb(tmpbuf + outlen, buf[i], &mbs);
++ if (res > 0) {
++ outlen += res;
++ }
++ }
++ if ((res = mc_write(fd, tmpbuf, outlen)) != outlen) {
++ g_free(tmpbuf);
++ return -1;
++ }
++ g_free(tmpbuf);
++ return len;
++}
++
++#endif /* UTF8 */
++
+ /* If 0 (quick save) then a) create/truncate <filename> file,
+ b) save to <filename>;
+ if 1 (safe save) then a) save to <tempnam>,
+@@ -360,32 +406,48 @@
+ buf = 0;
+ filelen = edit->last_byte;
+ while (buf <= (edit->curs1 >> S_EDIT_BUF_SIZE) - 1) {
++#ifndef UTF8
+ if (mc_write (fd, (char *) edit->buffers1[buf], EDIT_BUF_SIZE)
++#else /* UTF8 */
++ if (wchar_write (fd, edit->buffers1[buf], EDIT_BUF_SIZE)
++#endif /* UTF8 */
+ != EDIT_BUF_SIZE) {
+ mc_close (fd);
+ goto error_save;
+ }
+ buf++;
+ }
++#ifndef UTF8
+ if (mc_write
+ (fd, (char *) edit->buffers1[buf],
++#else /* UTF8 */
++ if (wchar_write
++ (fd, edit->buffers1[buf],
++#endif /* UTF8 */
+ edit->curs1 & M_EDIT_BUF_SIZE) !=
+ (edit->curs1 & M_EDIT_BUF_SIZE)) {
+ filelen = -1;
+ } else if (edit->curs2) {
+ edit->curs2--;
+ buf = (edit->curs2 >> S_EDIT_BUF_SIZE);
+- if (mc_write
+- (fd,
+- (char *) edit->buffers2[buf] + EDIT_BUF_SIZE -
++#ifndef UTF8
++ if (mc_write(fd, (char *) edit->buffers2[buf] + EDIT_BUF_SIZE -
++#else /* UTF8 */
++ if (wchar_write(fd, edit->buffers2[buf] + EDIT_BUF_SIZE -
++#endif /* UTF8 */
+ (edit->curs2 & M_EDIT_BUF_SIZE) - 1,
+ 1 + (edit->curs2 & M_EDIT_BUF_SIZE)) !=
+ 1 + (edit->curs2 & M_EDIT_BUF_SIZE)) {
+ filelen = -1;
+ } else {
+ while (--buf >= 0) {
++#ifndef UTF8
+ if (mc_write
+ (fd, (char *) edit->buffers2[buf],
++#else /* UTF8 */
++ if (wchar_write
++ (fd, edit->buffers2[buf],
++#endif /* UTF8 */
+ EDIT_BUF_SIZE) != EDIT_BUF_SIZE) {
+ filelen = -1;
+ break;
+@@ -705,13 +767,21 @@
+ if (!n || n == EOF)
+ break;
+ n = 0;
++#ifndef UTF8
+ while (fscanf (f, "%hd %hd, ", ¯o[n].command, ¯o[n].ch))
++#else /* UTF8 */
++ while (fscanf (f, "%hd %lu, ", ¯o[n].command, ¯o[n].ch))
++#endif /* UTF8 */
+ n++;
+ fscanf (f, ";\n");
+ if (s != k) {
+ fprintf (g, ("key '%d 0': "), s);
+ for (i = 0; i < n; i++)
++#ifndef UTF8
+ fprintf (g, "%hd %hd, ", macro[i].command, macro[i].ch);
++#else /* UTF8 */
++ fprintf (g, "%hd %lu, ", macro[i].command, macro[i].ch);
++#endif /* UTF8 */
+ fprintf (g, ";\n");
+ }
+ }
+@@ -744,7 +814,11 @@
+ if (f) {
+ fprintf (f, ("key '%d 0': "), s);
+ for (i = 0; i < n; i++)
++#ifndef UTF8
+ fprintf (f, "%hd %hd, ", macro[i].command, macro[i].ch);
++#else /* UTF8 */
++ fprintf (f, "%hd %lu, ", macro[i].command, macro[i].ch);
++#endif /* UTF8 */
+ fprintf (f, ";\n");
+ fclose (f);
+ if (saved_macros_loaded) {
+@@ -794,10 +868,18 @@
+ saved_macro[i++] = s;
+ if (!found) {
+ *n = 0;
++#ifndef UTF8
+ while (*n < MAX_MACRO_LENGTH && 2 == fscanf (f, "%hd %hd, ", ¯o[*n].command, ¯o[*n].ch))
++#else /* UTF8 */
++ while (*n < MAX_MACRO_LENGTH && 2 == fscanf (f, "%hd %lu, ", ¯o[*n].command, ¯o[*n].ch))
++#endif /* UTF8 */
+ (*n)++;
+ } else {
++#ifndef UTF8
+ while (2 == fscanf (f, "%hd %hd, ", &dummy.command, &dummy.ch));
++#else /* UTF8 */
++ while (2 == fscanf (f, "%hd %lu, ", &dummy.command, &dummy.ch));
++#endif /* UTF8 */
+ }
+ fscanf (f, ";\n");
+ if (s == k)
+@@ -944,7 +1026,7 @@
+ #define space_width 1
+
+ static void
+-edit_insert_column_of_text (WEdit * edit, unsigned char *data, int size, int width)
++edit_insert_column_of_text (WEdit * edit, mc_wchar_t *data, int size, int width)
+ {
+ long cursor;
+ int i, col;
+@@ -992,7 +1074,7 @@
+ {
+ long start_mark, end_mark, current = edit->curs1;
+ int size;
+- unsigned char *copy_buf;
++ mc_wchar_t *copy_buf;
+
+ edit_update_curs_col (edit);
+ if (eval_marks (edit, &start_mark, &end_mark))
+@@ -1032,7 +1114,7 @@
+ {
+ long count;
+ long current;
+- unsigned char *copy_buf;
++ mc_wchar_t *copy_buf;
+ long start_mark, end_mark;
+ int deleted = 0;
+ int x = 0;
+@@ -1093,7 +1175,7 @@
+ edit_push_action (edit, COLUMN_ON);
+ column_highlighting = 0;
+ } else {
+- copy_buf = g_malloc (end_mark - start_mark);
++ copy_buf = g_malloc ((end_mark - start_mark) * sizeof(mc_wchar_t));
+ edit_cursor_move (edit, start_mark - edit->curs1);
+ edit_scroll_screen_over_cursor (edit);
+ count = start_mark;
+@@ -1432,7 +1514,11 @@
+ /* This function is a modification of mc-3.2.10/src/view.c:regexp_view_search() */
+ /* returns -3 on error in pattern, -1 on not found, found_len = 0 if either */
+ static int
++#ifndef UTF8
+ string_regexp_search (char *pattern, char *string, int match_type,
++#else /* UTF8 */
++string_regexp_search (char *pattern, mc_wchar_t *wstring, int match_type,
++#endif /* UTF8 */
+ int match_bol, int icase, int *found_len, void *d)
+ {
+ static regex_t r;
+@@ -1441,6 +1527,11 @@
+ regmatch_t *pmatch;
+ static regmatch_t s[1];
+
++#ifdef UTF8
++ char *string;
++ int i;
++#endif /* UTF8 */
++
+ pmatch = (regmatch_t *) d;
+ if (!pmatch)
+ pmatch = s;
+@@ -1460,13 +1551,51 @@
+ old_type = match_type;
+ old_icase = icase;
+ }
++
++#ifdef UTF8
++ string = wchar_to_mbstr(wstring);
++ if (string == NULL)
++ return -1;
++#endif /* UTF8 */
++
+ if (regexec
+ (&r, string, d ? NUM_REPL_ARGS : 1, pmatch,
+ ((match_bol
+ || match_type != match_normal) ? 0 : REG_NOTBOL)) != 0) {
+ *found_len = 0;
++
++#ifdef UTF8
++ g_free(string);
++#endif /* UTF8 */
++
+ return -1;
+ }
++
++#ifdef UTF8
++ for (i = 0; i < (d ? NUM_REPL_ARGS : 1); i++) {
++ char tmp;
++ int new_o;
++
++ if (pmatch[i].rm_so < 0)
++ continue;
++ tmp = string[pmatch[i].rm_so];
++ string[pmatch[i].rm_so] = 0;
++ new_o = mbstrlen(string);
++ string[pmatch[i].rm_so] = tmp;
++ pmatch[i].rm_so = new_o;
++
++ if (pmatch[i].rm_eo < 0)
++ continue;
++ tmp = string[pmatch[i].rm_eo];
++ string[pmatch[i].rm_eo] = 0;
++ new_o = mbstrlen(string);
++ string[pmatch[i].rm_eo] = tmp;
++ pmatch[i].rm_eo = new_o;
++ }
++
++ g_free(string);
++#endif /* UTF8 */
++
+ *found_len = pmatch[0].rm_eo - pmatch[0].rm_so;
+ return (pmatch[0].rm_so);
+ }
+@@ -1474,13 +1603,29 @@
+ /* thanks to Liviu Daia <daia at stoilow.imar.ro> for getting this
+ (and the above) routines to work properly - paul */
+
++#ifndef UTF8
+ typedef int (*edit_getbyte_fn) (WEdit *, long);
++#else /* UTF8 */
++typedef mc_wchar_t (*edit_getbyte_fn) (WEdit *, long);
++#endif /* UTF8 */
+
+ static long
++#ifndef UTF8
+ edit_find_string (long start, unsigned char *exp, int *len, long last_byte, edit_getbyte_fn get_byte, void *data, int once_only, void *d)
++#else /* UTF8 */
++edit_find_string (long start, unsigned char *exp_mb, int *len, long last_byte, edit_getbyte_fn get_byte, void *data, int once_only, void *d)
++#endif /* UTF8 */
+ {
+ long p, q = 0;
+- long l = strlen ((char *) exp), f = 0;
++ long f = 0;
++
++#ifndef UTF8
++ long l = strlen ((char *) exp);
++#else /* UTF8 */
++ mc_wchar_t *exp = mbstr_to_wchar((char *)exp_mb);
++ mc_wchar_t *exp_backup = exp;
++ long l = wcslen(exp);
++#endif /* UTF8 */
+ int n = 0;
+
+ for (p = 0; p < l; p++) /* count conversions... */
+@@ -1489,19 +1634,22 @@
+ n++;
+
+ if (replace_scanf || replace_regexp) {
+- int c;
+- unsigned char *buf;
+- unsigned char mbuf[MAX_REPL_LEN * 2 + 3];
++ mc_wint_t c;
++ mc_wchar_t *buf;
++ mc_wchar_t mbuf[MAX_REPL_LEN * 2 + 3];
+
+ replace_scanf = (!replace_regexp); /* can't have both */
+
+ buf = mbuf;
+
+ if (replace_scanf) {
+- unsigned char e[MAX_REPL_LEN];
+- if (n >= NUM_REPL_ARGS)
+- return -3;
+-
++ mc_wchar_t e[MAX_REPL_LEN];
++ if (n >= NUM_REPL_ARGS) {
++#ifdef UTF8
++ g_free(exp_backup);
++#endif /* UTF8 */
++ return -3;
++ }
+ if (replace_case) {
+ for (p = start; p < last_byte && p < start + MAX_REPL_LEN; p++)
+ buf[p - start] = (*get_byte) (data, p);
+@@ -1515,20 +1663,36 @@
+ }
+
+ buf[(q = p - start)] = 0;
++#ifndef UTF8
+ strcpy ((char *) e, (char *) exp);
+ strcat ((char *) e, "%n");
++#else /* UTF8 */
++ wcscpy (e, exp);
++ wcscat (e, L"%n");
++#endif /* UTF8 */
+ exp = e;
+
+ while (q) {
+ *((int *) sargs[n]) = 0; /* --> here was the problem - now fixed: good */
++#ifndef UTF8
+ if (n == sscanf ((char *) buf, (char *) exp, SCANF_ARGS)) {
++#else /* UTF8 */
++ if (n == swscanf (buf, exp, SCANF_ARGS)) {
++#endif /* UTF8 */
+ if (*((int *) sargs[n])) {
+ *len = *((int *) sargs[n]);
++#ifdef UTF8
++ g_free(exp_backup);
++#endif /* UTF8 */
+ return start;
+ }
+ }
+- if (once_only)
++ if (once_only) {
++#ifdef UTF8
++ g_free(exp_backup);
++#endif /* UTF8 */
+ return -2;
++ }
+ if (q + start < last_byte) {
+ if (replace_case) {
+ buf[q] = (*get_byte) (data, q + start);
+@@ -1542,7 +1706,11 @@
+ start++;
+ buf++; /* move the window along */
+ if (buf == mbuf + MAX_REPL_LEN) { /* the window is about to go past the end of array, so... */
++#ifndef UTF8
+ memmove (mbuf, buf, strlen ((char *) buf) + 1); /* reset it */
++#else /* UTF8 */
++ wmemmove (mbuf, buf, (wcslen (buf) + 1)); /* reset it */
++#endif /* UTF8 */
+ buf = mbuf;
+ }
+ q--;
+@@ -1569,10 +1737,16 @@
+
+ buf = mbuf;
+ while (q) {
++#ifndef UTF8
+ found_start = string_regexp_search ((char *) exp, (char *) buf, match_normal, match_bol, !replace_case, len, d);
+-
++#else /* UTF8 */
++ found_start = string_regexp_search ((char *) exp_mb, buf, match_normal, match_bol, !replace_case, len, d);
++#endif /* UTF8 */
+ if (found_start <= -2) { /* regcomp/regexec error */
+ *len = 0;
++#ifdef UTF8
++ g_free (exp_backup);
++#endif /* UTF8 */
+ return -3;
+ }
+ else if (found_start == -1) /* not found: try next line */
+@@ -1583,15 +1757,27 @@
+ match_bol = 0;
+ continue;
+ }
+- else /* found */
++ else { /* found */
++#ifdef UTF8
++ g_free(exp_backup);
++#endif /* UTF8 */
+ return (start + offset - q + found_start);
++ }
+ }
+- if (once_only)
++ if (once_only) {
++#ifdef UTF8
++ g_free(exp_backup);
++#endif /* UTF8 */
+ return -2;
++ }
+
+ if (buf[q - 1] != '\n') { /* incomplete line: try to recover */
+ buf = mbuf + MAX_REPL_LEN / 2;
++#ifndef UTF8
+ q = strlen ((const char *) buf);
++#else /* UTF8 */
++ q = wcslen (buf);
++#endif /* UTF8 */
+ memmove (mbuf, buf, q);
+ p = start + q;
+ move_win = 1;
+@@ -1601,36 +1787,59 @@
+ }
+ }
+ } else {
++#ifndef UTF8
+ *len = strlen ((const char *) exp);
++#else /* UTF8 */
++ *len = wcslen (exp);
++#endif /* UTF8 */
+ if (replace_case) {
+ for (p = start; p <= last_byte - l; p++) {
+- if ((*get_byte) (data, p) == (unsigned char)exp[0]) { /* check if first char matches */
++ if ((*get_byte) (data, p) == exp[0]) { /* check if first char matches */
+ for (f = 0, q = 0; q < l && f < 1; q++)
+- if ((*get_byte) (data, q + p) != (unsigned char)exp[q])
++ if ((*get_byte) (data, q + p) != exp[q])
+ f = 1;
+- if (f == 0)
++ if (f == 0) {
++#ifdef UTF8
++ g_free (exp_backup);
++#endif /* UTF8 */
+ return p;
++ }
+ }
+- if (once_only)
++ if (once_only) {
++#ifdef UTF8
++ g_free(exp_backup);
++#endif /* UTF8 */
+ return -2;
++ }
+ }
+ } else {
+ for (p = 0; exp[p] != 0; p++)
+ exp[p] = my_lower_case (exp[p]);
+
+ for (p = start; p <= last_byte - l; p++) {
+- if (my_lower_case ((*get_byte) (data, p)) == (unsigned char)exp[0]) {
++ if (my_lower_case ((*get_byte) (data, p)) == exp[0]) {
+ for (f = 0, q = 0; q < l && f < 1; q++)
+- if (my_lower_case ((*get_byte) (data, q + p)) != (unsigned char)exp[q])
++ if (my_lower_case ((*get_byte) (data, q + p)) != exp[q])
+ f = 1;
+- if (f == 0)
++ if (f == 0) {
++#ifdef UTF8
++ g_free (exp_backup);
++#endif /* UTF8 */
+ return p;
++ }
+ }
+- if (once_only)
++ if (once_only) {
++#ifdef UTF8
++ g_free (exp_backup);
++#endif /* UTF8 */
+ return -2;
++ }
+ }
+ }
+ }
++#ifdef UTF8
++ g_free (exp_backup);
++#endif /* UTF8 */
+ return -2;
+ }
+
+@@ -1644,9 +1853,14 @@
+
+ while ((p = edit_find_string (p, exp, len, last_byte, get_byte, data, once_only, d)) >= 0) {
+ if (replace_whole) {
++#ifndef UTF8
+ /*If the bordering chars are not in option_whole_chars_search then word is whole */
+ if (!strcasechr (option_whole_chars_search, (*get_byte) (data, p - 1))
+ && !strcasechr (option_whole_chars_search, (*get_byte) (data, p + *len)))
++#else /* UTF8 */
++ if (!iswalnum((*get_byte) (data, p - 1))
++ && !iswalnum((*get_byte) (data, p + *len)))
++#endif /* UTF8 */
+ return p;
+ if (once_only)
+ return -2;
+@@ -1678,6 +1892,7 @@
+
+ #define is_digit(x) ((x) >= '0' && (x) <= '9')
+
++#ifndef UTF8
+ #define snprint(v) { \
+ *p1++ = *p++; \
+ *p1 = '\0'; \
+@@ -1685,33 +1900,48 @@
+ if (n >= (size_t) (e - s)) goto nospc; \
+ s += n; \
+ }
++#else /* UTF8 */
++#define snprint(v) { \
++ *p1++ = *p++; \
++ *p1 = '\0'; \
++ n = swprintf(s, e-s, q1,v); \
++ if (n >= (size_t) (e - s)) goto nospc; \
++ s += n; \
++ }
++#endif /* UTF8 */
+
+ /* this function uses the sprintf command to do a vprintf */
+ /* it takes pointers to arguments instead of the arguments themselves */
+ /* The return value is the number of bytes written excluding '\0'
+ if successfull, -1 if the resulting string would be too long and
+ -2 if the format string is errorneous. */
+-static int snprintf_p (char *str, size_t size, const char *fmt,...)
+- __attribute__ ((format (printf, 3, 4)));
+-
+-static int snprintf_p (char *str, size_t size, const char *fmt,...)
++static int snprintf_p (mc_wchar_t *str, size_t size, const mc_wchar_t *fmt,...)
+ {
+ va_list ap;
+ size_t n;
+- const char *q, *p;
+- char *s = str, *e = str + size;
+- char q1[40];
+- char *p1;
++ const mc_wchar_t *q, *p;
++ mc_wchar_t *s = str, *e = str + size;
++ mc_wchar_t q1[40];
++
++ mc_wchar_t *p1;
+ int nargs = 0;
+
+ va_start (ap, fmt);
+ p = q = fmt;
+
++#ifndef UTF8
+ while ((p = strchr (p, '%'))) {
++#else /* UTF8 */
++ while ((p = wcschr (p, L'%'))) {
++#endif /* UTF8 */
+ n = p - q;
+ if (n >= (size_t) (e - s))
+ goto nospc;
++#ifndef UTF8
+ memcpy (s, q, n); /* copy stuff between format specifiers */
++#else /* UTF8 */
++ wmemcpy (s, q, n); /* copy stuff between format specifiers */
++#endif /* UTF8 */
+ s += n;
+ q = p;
+ p1 = q1;
+@@ -1739,45 +1969,78 @@
+ *p1++ = *p++;
+ if (*p == '*') {
+ p++;
++#ifndef UTF8
+ strcpy (p1, MY_itoa (*va_arg (ap, int *))); /* replace field width with a number */
+ p1 += strlen (p1);
++#else /* UTF8 */
++ wcscpy (p1, MY_itoa (*va_arg (ap, int *))); /* replace field width with a number */
++ p1 += wcslen (p1);
++#endif /* UTF8 */
+ } else {
+- while (is_digit (*p) && p1 < q1 + 20)
++#ifndef UTF8
++ while (is_digit (*p)
++#else /* UTF8 */
++ while (iswdigit (*p)
++#endif /* UTF8 */
++ && p1 < q1 + 20)
+ *p1++ = *p++;
+- if (is_digit (*p))
++#ifndef UTF8
++ if (is_digit (*p))
++#else /* UTF8 */
++ if (iswdigit (*p))
++#endif /* UTF8 */
+ goto err;
+ }
+ if (*p == '.')
+ *p1++ = *p++;
+ if (*p == '*') {
+ p++;
++#ifndef UTF8
+ strcpy (p1, MY_itoa (*va_arg (ap, int *))); /* replace precision with a number */
+ p1 += strlen (p1);
++#else /* UTF8 */
++ wcscpy (p1, MY_itoa (*va_arg (ap, int *))); /* replace precision with a number */
++ p1 += wcslen (p1);
++#endif /* UTF8 */
+ } else {
+- while (is_digit (*p) && p1 < q1 + 32)
++#ifndef UTF8
++ while (is_digit (*p)
++#else /* UTF8 */
++ while (iswdigit (*p)
++#endif /* UTF8 */
++ && p1 < q1 + 32)
+ *p1++ = *p++;
+- if (is_digit (*p))
++#ifndef UTF8
++ if (is_digit (*p))
++#else /* UTF8 */
++ if (iswdigit (*p))
++#endif /* UTF8 */
+ goto err;
+ }
+ /* flags done, now get argument */
+ if (*p == 's') {
++#ifndef UTF8
+ snprint (va_arg (ap, char *));
++#else /* UTF8 */
++ *p1++ = 'l';
++ snprint (va_arg (ap, mc_wchar_t *));
++#endif /* UTF8 */
+ } else if (*p == 'h') {
+- if (strchr ("diouxX", *p))
++ if (*p < 128 && strchr ("diouxX", *p))
+ snprint (*va_arg (ap, short *));
+ } else if (*p == 'l') {
+ *p1++ = *p++;
+- if (strchr ("diouxX", *p))
++ if (*p < 128 && strchr ("diouxX", *p))
+ snprint (*va_arg (ap, long *));
+- } else if (strchr ("cdiouxX", *p)) {
++ } else if (*p < 128 && strchr ("cdiouxX", *p)) {
+ snprint (*va_arg (ap, int *));
+ } else if (*p == 'L') {
+ *p1++ = *p++;
+- if (strchr ("EefgG", *p))
++ if (*p < 128 && strchr ("EefgG", *p))
+ snprint (*va_arg (ap, double *)); /* should be long double */
+- } else if (strchr ("EefgG", *p)) {
++ } else if (*p < 128 && strchr ("EefgG", *p)) {
+ snprint (*va_arg (ap, double *));
+- } else if (strchr ("DOU", *p)) {
++ } else if (*p < 128 && strchr ("DOU", *p)) {
+ snprint (*va_arg (ap, long *));
+ } else if (*p == 'p') {
+ snprint (*va_arg (ap, void **));
+@@ -1786,10 +2049,17 @@
+ q = p;
+ }
+ va_end (ap);
++#ifndef UTF8
+ n = strlen (q);
+ if (n >= (size_t) (e - s))
+ return -1;
+ memcpy (s, q, n + 1);
++#else /* UTF8 */
++ n = wcslen (q);
++ if (n >= (size_t) (e - s))
++ return -1;
++ wmemcpy (s, q, n + 1);
++#endif /* UTF8 */
+ return s + n - str;
+ nospc:
+ va_end (ap);
+@@ -1968,8 +2238,11 @@
+ }
+ }
+ if (replace_yes) { /* delete then insert new */
++#ifdef UTF8
++ mc_wchar_t *winput2 = mbstr_to_wchar(input2);
++#endif /* UTF8 */
+ if (replace_scanf) {
+- char repl_str[MAX_REPL_LEN + 2];
++ mc_wchar_t repl_str[MAX_REPL_LEN + 2];
+ int ret = 0;
+
+ /* we need to fill in sargs just like with scanf */
+@@ -1978,17 +2251,25 @@
+ for (k = 1;
+ k < NUM_REPL_ARGS && pmatch[k].rm_eo >= 0;
+ k++) {
++#ifndef UTF8
+ unsigned char *t;
++#else /* UTF8 */
++ mc_wchar_t *t;
++#endif
+
+ if (pmatch[k].rm_eo - pmatch[k].rm_so > 255) {
+ ret = -1;
+ break;
+ }
++#ifndef UTF8
+ t = (unsigned char *) &sargs[k - 1][0];
++#else /* UTF8 */
++ t = (mc_wchar_t *) &sargs[k - 1][0];
++#endif /* UTF8 */
+ for (j = 0;
+ j < pmatch[k].rm_eo - pmatch[k].rm_so
+ && j < 255; j++, t++)
+- *t = (unsigned char) edit_get_byte (edit,
++ *t = edit_get_byte (edit,
+ edit->
+ search_start
+ -
+@@ -2006,14 +2287,23 @@
+ }
+ if (!ret)
+ ret =
++#ifndef UTF8
+ snprintf_p (repl_str, MAX_REPL_LEN + 2, input2,
++#else /* UTF8 */
++ snprintf_p (repl_str, MAX_REPL_LEN + 2, winput2,
++#endif /* UTF8 */
+ PRINTF_ARGS);
+ if (ret >= 0) {
+ times_replaced++;
+ while (i--)
+ edit_delete (edit);
++#ifndef UTF8
+ while (repl_str[++i])
+ edit_insert (edit, repl_str[i]);
++#else /* UTF8 */
++ while (winput2[++i])
++ edit_insert (edit, winput2[i]);
++#endif /* UTF8 */
+ } else {
+ edit_error_dialog (_(" Replace "),
+ ret ==
+@@ -2027,10 +2317,18 @@
+ times_replaced++;
+ while (i--)
+ edit_delete (edit);
++#ifndef UTF8
+ while (input2[++i])
+ edit_insert (edit, input2[i]);
++#else /* UTF8 */
++ while (winput2[++i])
++ edit_insert (edit, winput2[i]);
++#endif /* UTF8 */
+ }
+ edit->found_len = i;
++#ifdef UTF8
++ g_free (winput2);
++#endif /* UTF8 */
+ }
+ /* so that we don't find the same string again */
+ if (replace_backwards) {
+@@ -2203,16 +2501,17 @@
+ #define TEMP_BUF_LEN 1024
+
+ /* Return a null terminated length of text. Result must be g_free'd */
+-static unsigned char *
++static mc_wchar_t *
+ edit_get_block (WEdit *edit, long start, long finish, int *l)
+ {
+- unsigned char *s, *r;
+- r = s = g_malloc (finish - start + 1);
++ mc_wchar_t *s, *r;
++ r = s = g_malloc ((finish - start + 1) * sizeof(mc_wchar_t));
+ if (column_highlighting) {
+ *l = 0;
+ /* copy from buffer, excluding chars that are out of the column 'margins' */
+ while (start < finish) {
+- int c, x;
++ mc_wchar_t c;
++ int x;
+ x = edit_move_forward3 (edit, edit_bol (edit, start), 0,
+ start);
+ c = edit_get_byte (edit, start);
+@@ -2245,11 +2544,15 @@
+ return 0;
+
+ if (column_highlighting) {
+- unsigned char *block, *p;
++ mc_wchar_t *block, *p;
+ int r;
+ p = block = edit_get_block (edit, start, finish, &len);
+ while (len) {
++#ifndef UTF8
+ r = mc_write (file, p, len);
++#else /* UTF8 */
++ r = wchar_write (file, p, len);
++#endif /* UTF8 */
+ if (r < 0)
+ break;
+ p += r;
+@@ -2257,15 +2560,19 @@
+ }
+ g_free (block);
+ } else {
+- unsigned char *buf;
++ mc_wchar_t *buf;
+ int i = start, end;
+ len = finish - start;
+- buf = g_malloc (TEMP_BUF_LEN);
++ buf = g_malloc (TEMP_BUF_LEN * sizeof(mc_wchar_t));
+ while (start != finish) {
+ end = min (finish, start + TEMP_BUF_LEN);
+ for (; i < end; i++)
+ buf[i - start] = edit_get_byte (edit, i);
++#ifndef UTF8
+ len -= mc_write (file, (char *) buf, end - start);
++#else /* UTF8 */
++ len -= wchar_write (file, buf, end - start);
++#endif /* UTF8 */
+ start = end;
+ }
+ g_free (buf);
+@@ -2603,17 +2910,20 @@
+
+ /* prints at the cursor */
+ /* returns the number of chars printed */
++#ifndef UTF8
+ int edit_print_string (WEdit * e, const char *s)
++#else /* UTF8 */
++int edit_print_wstring (WEdit * e, mc_wchar_t *s)
++#endif /* UTF8 */
+ {
+ int i = 0;
+ while (s[i])
+- edit_execute_cmd (e, -1, (unsigned char) s[i++]);
++ edit_execute_cmd (e, -1, s[i++]);
+ e->force |= REDRAW_COMPLETELY;
+ edit_update_screen (e);
+ return i;
+ }
+
+-
+ static void pipe_mail (WEdit *edit, char *to, char *subject, char *cc)
+ {
+ FILE *p = 0;
+@@ -2707,15 +3017,20 @@
+ /* find first character of current word */
+ static int edit_find_word_start (WEdit *edit, long *word_start, int *word_len)
+ {
+- int i, c, last;
++ int i;
++ mc_wint_t c, last;
+
+ /* return if at begin of file */
+ if (edit->curs1 <= 0)
+ return 0;
+
+- c = (unsigned char) edit_get_byte (edit, edit->curs1 - 1);
++ c = edit_get_byte (edit, edit->curs1 - 1);
+ /* return if not at end or in word */
++#ifndef UTF8
+ if (isspace (c) || !(isalnum (c) || c == '_'))
++#else /* UTF8 */
++ if (iswspace (c) || !(iswalnum (c) || c == '_'))
++#endif /* UTF8 */
+ return 0;
+
+ /* search start of word to be completed */
+@@ -2725,11 +3040,19 @@
+ return 0;
+
+ last = c;
+- c = (unsigned char) edit_get_byte (edit, edit->curs1 - i);
++ c = edit_get_byte (edit, edit->curs1 - i);
+
++#ifndef UTF8
+ if (!(isalnum (c) || c == '_')) {
++#else /* UTF8 */
++ if (!(iswalnum (c) || c == '_')) {
++#endif /* UTF8 */
+ /* return if word starts with digit */
++#ifndef UTF8
+ if (isdigit (last))
++#else /* UTF8 */
++ if (iswdigit (last))
++#endif /* UTF8 */
+ return 0;
+
+ *word_start = edit->curs1 - (i - 1); /* start found */
+@@ -2762,7 +3085,7 @@
+ int *num)
+ {
+ int len, max_len = 0, i, skip;
+- unsigned char *bufpos;
++ mc_wchar_t *bufpos;
+
+ /* collect max MAX_WORD_COMPLETIONS completions */
+ while (*num < MAX_WORD_COMPLETIONS) {
+@@ -2781,11 +3104,16 @@
+ buffers1[start >> S_EDIT_BUF_SIZE][start & M_EDIT_BUF_SIZE];
+ skip = 0;
+ for (i = 0; i < *num; i++) {
++#ifndef UTF8
+ if (strncmp
+ ((char *) &compl[i].text[word_len],
+- (char *) &bufpos[word_len], max (len,
+- compl[i].len) -
+- word_len) == 0) {
++ (char *) &bufpos[word_len],
++#else /* UTF8 */
++ if (wcsncmp
++ ((wchar_t *) &compl[i].text[word_len],
++ (wchar_t *) &bufpos[word_len],
++#endif /* UTF8 */
++ max (len, compl[i].len) - word_len) == 0) {
+ skip = 1;
+ break; /* skip it, already added */
+ }
+@@ -2793,7 +3121,7 @@
+ if (skip)
+ continue;
+
+- compl[*num].text = g_malloc (len + 1);
++ compl[*num].text = g_malloc ((len + 1) * sizeof(mc_wchar_t));
+ compl[*num].len = len;
+ for (i = 0; i < len; i++)
+ compl[*num].text[i] = *(bufpos + i);
+@@ -2807,6 +3135,18 @@
+ return max_len;
+ }
+
++#ifdef UTF8
++int edit_print_string (WEdit * e, const char *s)
++{
++ int i;
++ mc_wchar_t *ws = mbstr_to_wchar(s);
++ i = edit_print_wstring (e, ws);
++ g_free(ws);
++ return i;
++}
++
++#endif /* UTF8 */
++
+
+ /* let the user select its preferred completion */
+ static void
+@@ -2819,6 +3159,9 @@
+ WListbox *compl_list;
+ int compl_dlg_h; /* completion dialog height */
+ int compl_dlg_w; /* completion dialog width */
++#ifdef UTF8
++ char *mbtext;
++#endif /* UTF8 */
+
+ /* calculate the dialog metrics */
+ compl_dlg_h = num_compl + 2;
+@@ -2854,9 +3197,18 @@
+ add_widget (compl_dlg, compl_list);
+
+ /* fill the listbox with the completions */
++#ifndef UTF8
+ for (i = 0; i < num_compl; i++)
+ listbox_add_item (compl_list, LISTBOX_APPEND_AT_END, 0,
+ (char *) compl[i].text, NULL);
++#else /* UTF8 */
++ for (i = 0; i < num_compl; i++) {
++ mbtext = wchar_to_mbstr(compl[i].text);
++ listbox_add_item (compl_list, LISTBOX_APPEND_AT_END, 0,
++ mbtext, NULL);
++ g_free(mbtext);
++ }
++#endif /* UTF8 */
+
+ /* pop up the dialog */
+ run_dlg (compl_dlg);
+@@ -2864,9 +3216,17 @@
+ /* apply the choosen completion */
+ if (compl_dlg->ret_value == B_ENTER) {
+ listbox_get_current (compl_list, &curr, NULL);
+- if (curr)
++ if (curr){
++#ifndef UTF8
+ for (curr += word_len; *curr; curr++)
+ edit_insert (edit, *curr);
++#else /* UTF8 */
++ mc_wchar_t *wc, *wccurr = mbstr_to_wchar(curr);
++ for (wc = wccurr + word_len; *wc; wc++)
++ edit_insert (edit, *wc);
++ g_free(wccurr);
++#endif /* UTF8 */
++ }
+ }
+
+ /* destroy dialog before return */
+@@ -2883,8 +3243,9 @@
+ {
+ int word_len = 0, i, num_compl = 0, max_len;
+ long word_start = 0;
+- unsigned char *bufpos;
+- char *match_expr;
++ mc_wchar_t *bufpos;
++ mc_wchar_t *match_expr;
++ char *mbmatch_expr;
+ struct selection compl[MAX_WORD_COMPLETIONS]; /* completions */
+
+ /* don't want to disturb another search */
+@@ -2901,16 +3262,32 @@
+ /* prepare match expression */
+ bufpos = &edit->buffers1[word_start >> S_EDIT_BUF_SIZE]
+ [word_start & M_EDIT_BUF_SIZE];
++
++ match_expr = g_malloc((word_len + 14) * sizeof(mc_wchar_t));
++#ifndef UTF8
+ match_expr = g_strdup_printf ("%.*s[a-zA-Z_0-9]+", word_len, bufpos);
++#else /* UTF8 */
++ wcsncpy (match_expr, bufpos, word_len);
++ match_expr[word_len] = '\0';
++ wcscat (match_expr, L"[a-zA-Z_0-9]+");
++#endif /* UTF8 */
+
+ /* init search: backward, regexp, whole word, case sensitive */
+ edit_set_search_parameters (0, 1, 1, 1, 1);
+
+ /* collect the possible completions */
+ /* start search from curs1 down to begin of file */
++#ifndef UTF8
+ max_len =
+ edit_collect_completions (edit, word_start, word_len, match_expr,
+ (struct selection *) &compl, &num_compl);
++#else /* UTF8 */
++ mbmatch_expr = wchar_to_mbstr(match_expr);
++ max_len =
++ edit_collect_completions (edit, word_start, word_len, mbmatch_expr,
++ (struct selection *) &compl, &num_compl);
++ g_free(mbmatch_expr);
++#endif /* UTF8 */
+
+ if (num_compl > 0) {
+ /* insert completed word if there is only one match */
+--- mc-4.6.2-pre1/edit/editdraw.c
++++ mc-4.6.2-pre1/edit/editdraw.c
+@@ -70,11 +70,16 @@
+ * as decimal and as hex.
+ */
+ if (edit->curs1 < edit->last_byte) {
+- unsigned char cur_byte = edit_get_byte (edit, edit->curs1);
++ mc_wchar_t cur_byte = edit_get_byte (edit, edit->curs1);
++#ifndef UTF8
+ g_snprintf (byte_str, sizeof (byte_str), "%c %3d 0x%02X",
+ is_printable (cur_byte) ? cur_byte : '.',
+- (int) cur_byte,
+- (unsigned) cur_byte);
++#else /* UTF8 */
++ g_snprintf (byte_str, sizeof(byte_str), "%lc %3d 0x%02X",
++ iswprint(cur_byte) ? cur_byte : '.',
++#endif /* UTF8 */
++ (int) cur_byte,
++ (unsigned) cur_byte);
+ } else {
+ strcpy (byte_str, "<EOF>");
+ }
+@@ -206,11 +211,16 @@
+ #define lowlevel_set_color(x) attrset(MY_COLOR_PAIR(color))
+ #endif
+
++struct line_s {
++ mc_wchar_t ch;
++ unsigned int style;
++};
++
+ static void
+ print_to_widget (WEdit *edit, long row, int start_col, int start_col_real,
+- long end_col, unsigned int line[])
++ long end_col, struct line_s line[])
+ {
+- unsigned int *p;
++ struct line_s *p;
+
+ int x = start_col_real + EDIT_TEXT_HORIZONTAL_OFFSET;
+ int x1 = start_col + EDIT_TEXT_HORIZONTAL_OFFSET;
+@@ -224,9 +234,9 @@
+ edit_move (x1 + FONT_OFFSET_X, y + FONT_OFFSET_Y);
+ p = line;
+
+- while (*p) {
++ while (p->ch) {
+ int style;
+- int textchar;
++ mc_wchar_t textchar;
+ int color;
+
+ if (cols_to_skip) {
+@@ -235,9 +245,9 @@
+ continue;
+ }
+
+- style = *p & 0xFF00;
+- textchar = *p & 0xFF;
+- color = *p >> 16;
++ style = p->style & 0xFF00;
++ textchar = p->ch;
++ color = p->style >> 16;
+
+ if (style & MOD_ABNORMAL) {
+ /* Non-printable - use black background */
+@@ -266,8 +276,11 @@
+ lowlevel_set_color (color);
+ }
+ }
+-
++#ifdef UTF8
++ SLsmg_write_nwchars(&textchar, 1);
++#else
+ addch (textchar);
++#endif
+ p++;
+ }
+ }
+@@ -279,11 +292,11 @@
+ edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
+ long end_col)
+ {
+- static unsigned int line[MAX_LINE_LEN];
+- unsigned int *p = line;
++ struct line_s line[MAX_LINE_LEN];
++ struct line_s *p = line;
+ long m1 = 0, m2 = 0, q, c1, c2, tws;
+ int col, start_col_real;
+- unsigned int c;
++ mc_wint_t c;
+ int color;
+ int i;
+
+@@ -307,62 +320,89 @@
+ }
+
+ while (col <= end_col - edit->start_col) {
+- *p = 0;
++ p->ch = 0;
++ p->style = 0;
+ if (q == edit->curs1)
+- *p |= MOD_CURSOR;
++ p->style |= MOD_CURSOR;
+ if (q >= m1 && q < m2) {
+ if (column_highlighting) {
+ int x;
+ x = edit_move_forward3 (edit, b, 0, q);
+ if (x >= c1 && x < c2)
+- *p |= MOD_MARKED;
++ p->style |= MOD_MARKED;
+ } else
+- *p |= MOD_MARKED;
++ p->style |= MOD_MARKED;
+ }
+ if (q == edit->bracket)
+- *p |= MOD_BOLD;
++ p->style |= MOD_BOLD;
+ if (q >= edit->found_start
+ && q < edit->found_start + edit->found_len)
+- *p |= MOD_BOLD;
++ p->style |= MOD_BOLD;
+ c = edit_get_byte (edit, q);
+ /* we don't use bg for mc - fg contains both */
+ edit_get_syntax_color (edit, q, &color);
+- *p |= color << 16;
++ p->style |= color << 16;
+ switch (c) {
+ case '\n':
+ col = end_col - edit->start_col + 1; /* quit */
+- *(p++) |= ' ';
++ p->ch = ' ';
++ p++;
+ break;
+ case '\t':
+ i = TAB_SIZE - ((int) col % TAB_SIZE);
+ col += i;
+ if (use_colors && visible_tabs) {
+- c = (*p & ~MOD_CURSOR) | MOD_WHITESPACE;
++ c = (p->style & ~MOD_CURSOR) | MOD_WHITESPACE;
+ if (i > 2) {
+- *(p++) |= '<' | MOD_WHITESPACE;
+- while (--i > 1)
+- *(p++) = c | '-';
+- *(p++) = c | '>';
++ p->ch = '<';
++ p->style |= MOD_WHITESPACE;
++ p++;
++ while (--i > 1) {
++ p->style = c;
++ p->ch = '-';
++ p++;
++ }
++ p->style = c;
++ p->ch = '>';
++ p++;
+ } else if (i > 1) {
+- *(p++) |= '<' | MOD_WHITESPACE;
+- *(p++) = c | '>';
+- } else
+- *(p++) |= '>' | MOD_WHITESPACE;
++ p->style |= MOD_WHITESPACE;
++ p->ch = '<';
++ p++;
++ p->style = c;
++ p->ch = '>';
++ p++;
++ } else {
++ p->style |= MOD_WHITESPACE;
++ p->ch = '>';
++ p++;
++ }
+ } else if (use_colors && visible_tws && q >= tws) {
+- *p |= '.' | MOD_WHITESPACE;
+- c = *(p++) & ~MOD_CURSOR;
+- while (--i)
+- *(p++) = c;
++ p->style |= MOD_WHITESPACE;
++ p->ch = '.';
++ p++;
++ c = p->style & ~MOD_CURSOR;
++ while (--i) {
++ p->style = c;
++ p->ch = ' ';
++ p++;
++ }
+ } else {
+- *p |= ' ';
+- c = *(p++) & ~MOD_CURSOR;
+- while (--i)
+- *(p++) = c;
++ p->ch |= ' ';
++ c = p->style & ~MOD_CURSOR;
++ p++;
++ while (--i) {
++ p->style = c;
++ p->ch = ' ';
++ p++;
++ }
+ }
+ break;
+ case ' ':
+ if (use_colors && visible_tws && q >= tws) {
+- *(p++) |= '.' | MOD_WHITESPACE;
++ p->ch = '.';
++ p->style |= MOD_WHITESPACE;
++ p++;
+ col++;
+ break;
+ }
+@@ -372,22 +412,47 @@
+
+ /* Caret notation for control characters */
+ if (c < 32) {
+- *(p++) = '^' | MOD_ABNORMAL;
+- *(p++) = (c + 0x40) | MOD_ABNORMAL;
++ p->ch = '^';
++ p->style = MOD_ABNORMAL;
++ p++;
++ p->ch = c + 0x40;
++ p->style = MOD_ABNORMAL;
+ col += 2;
+ break;
+ }
+ if (c == 127) {
+- *(p++) = '^' | MOD_ABNORMAL;
+- *(p++) = '?' | MOD_ABNORMAL;
++ p->ch = '^';
++ p->style = MOD_ABNORMAL;
++ p++;
++ p->ch = '?';
++ p->style = MOD_ABNORMAL;
++ p++;
+ col += 2;
+ break;
+ }
+
+- if (is_printable (c)) {
+- *(p++) |= c;
++#ifndef UTF8
++ if (is_printable (c)
++#else /* UTF8 */
++ if (iswprint (c)
++#ifdef __STDC_ISO_10646__
++ && (c < BINARY_CHAR_OFFSET || c >= (BINARY_CHAR_OFFSET + 256))
++#endif
++#endif /* UTF8 */
++ ) {
++ p->ch = c;
++ p++;
++
++#ifdef UTF8
++ i = wcwidth(c);
++ if (i > 1) {
++ col += i - 1;
++ }
++#endif /* UTF8 */
+ } else {
+- *(p++) = '.' | MOD_ABNORMAL;
++ p->ch = '.';
++ p->style = MOD_ABNORMAL;
++ p++;
+ }
+ col++;
+ break;
+@@ -398,7 +463,7 @@
+ } else {
+ start_col_real = start_col = 0;
+ }
+- *p = 0;
++ p->ch = 0;
+
+ print_to_widget (edit, row, start_col, start_col_real, end_col, line);
+ }
+--- mc-4.6.2-pre1/edit/editkeys.c
++++ mc-4.6.2-pre1/edit/editkeys.c
+@@ -182,10 +182,10 @@
+ * 'command' is one of the editor commands from editcmddef.h.
+ */
+ int
+-edit_translate_key (WEdit *edit, long x_key, int *cmd, int *ch)
++edit_translate_key (WEdit *edit, long x_key, int *cmd, mc_wint_t *ch)
+ {
+ int command = CK_Insert_Char;
+- int char_for_insertion = -1;
++ mc_wint_t char_for_insertion = -1;
+ int i = 0;
+ int extmod = 0;
+ const edit_key_map_type *key_map = NULL;
+@@ -242,9 +242,30 @@
+ /* an ordinary insertable character */
+ if (x_key < 256 && !extmod) {
+ int c = convert_from_input_c (x_key);
+-
++#ifdef UTF8
++ mbstate_t mbs;
++ int res;
++ mc_wchar_t wc;
++
++ memset (&mbs, 0, sizeof (mbs));
++
++ if (edit->charpoint >= MB_CUR_MAX) edit->charpoint = 0;
++
++ edit->charbuf[edit->charpoint++] = c;
++
++ res = mbrtowc(&wc, (char *)edit->charbuf, edit->charpoint, &mbs);
++ if (res < 0) {
++ if (res != -2) edit->charpoint = 0; /* broken multibyte char, skip */
++ return 0;
++ }
++ edit->charpoint = 0;
++
++ if (iswprint (wc)) {
++ char_for_insertion = wc;
++#else
+ if (is_printable (c)) {
+ char_for_insertion = c;
++#endif /* UTF8 */
+ goto fin;
+ }
+ }
+@@ -283,7 +304,7 @@
+ *cmd = command;
+ *ch = char_for_insertion;
+
+- if (command == CK_Insert_Char && char_for_insertion == -1) {
++ if (command == CK_Insert_Char && char_for_insertion == (mc_wint_t)-1) {
+ /* unchanged, key has no function here */
+ return 0;
+ }
+--- mc-4.6.2-pre1/edit/editwidget.c
++++ mc-4.6.2-pre1/edit/editwidget.c
+@@ -331,7 +331,8 @@
+
+ case WIDGET_KEY:
+ {
+- int cmd, ch;
++ int cmd;
++ mc_wint_t ch;
+
+ /* The user may override the access-keys for the menu bar. */
+ if (edit_translate_key (e, parm, &cmd, &ch)) {
+--- mc-4.6.2-pre1/edit/wordproc.c
++++ mc-4.6.2-pre1/edit/wordproc.c
+@@ -40,7 +40,12 @@
+
+ #define tab_width option_tab_spacing
+
++#ifndef UTF8
+ #define NO_FORMAT_CHARS_START "-+*\\,.;:&>"
++#else /* UTF8 */
++#define NO_FORMAT_CHARS_START L"-+*\\,.;:&>"
++#endif /* UTF8 */
++
+ #define FONT_MEAN_WIDTH 1
+
+ static long
+@@ -57,14 +62,21 @@
+ p = edit_move_forward (edit, p, line - l, 0);
+
+ p = edit_bol (edit, p);
++
++#ifndef UTF8
+ while (strchr ("\t ", edit_get_byte (edit, p)))
++#else /* UTF8 */
++ while (wcschr (L"\t ", edit_get_byte (edit, p)))
++#endif /* UTF8 */
++
+ p++;
+ return p;
+ }
+
+ static int bad_line_start (WEdit * edit, long p)
+ {
+- int c;
++ mc_wint_t c;
++
+ c = edit_get_byte (edit, p);
+ if (c == '.') { /* `...' is acceptable */
+ if (edit_get_byte (edit, p + 1) == '.')
+@@ -78,7 +90,13 @@
+ return 0; /* `---' is acceptable */
+ return 1;
+ }
++
++#ifndef UTF8
+ if (strchr (NO_FORMAT_CHARS_START, c))
++#else /* UTF8 */
++ if (wcschr (NO_FORMAT_CHARS_START, c))
++#endif /* UTF8 */
++
+ return 1;
+ return 0;
+ }
+@@ -131,33 +149,37 @@
+ i - edit->curs_line, 0));
+ }
+
+-static unsigned char *
++static mc_wchar_t *
+ get_paragraph (WEdit *edit, long p, long q, int indent, int *size)
+ {
+- unsigned char *s, *t;
++ mc_wchar_t *s, *t;
+ #if 0
+- t = g_malloc ((q - p) + 2 * (q - p) / option_word_wrap_line_length +
+- 10);
++ t = g_malloc (((q - p) + 2 * (q - p) / option_word_wrap_line_length +
++ 10) * sizeof(mc_wchar_t));
+ #else
+- t = g_malloc (2 * (q - p) + 100);
++ t = g_malloc ((2 * (q - p) + 100) * sizeof(mc_wchar_t));
+ #endif
+ if (!t)
+ return 0;
+ for (s = t; p < q; p++, s++) {
+ if (indent)
+ if (edit_get_byte (edit, p - 1) == '\n')
++#ifndef UTF8
+ while (strchr ("\t ", edit_get_byte (edit, p)))
++#else /* UTF8 */
++ while (wcschr (L"\t ", edit_get_byte (edit, p)))
++#endif /* UTF8 */
+ p++;
+ *s = edit_get_byte (edit, p);
+ }
+- *size = (unsigned long) s - (unsigned long) t;
++ *size = s - t;
+ t[*size] = '\n';
+ return t;
+ }
+
+-static void strip_newlines (unsigned char *t, int size)
++static void strip_newlines (mc_wchar_t *t, int size)
+ {
+- unsigned char *p = t;
++ mc_wchar_t *p = t;
+ while (size--) {
+ *p = *p == '\n' ? ' ' : *p;
+ p++;
+@@ -174,7 +196,7 @@
+ {
+ return x += tab_width - x % tab_width;
+ }
+-static int line_pixel_length (unsigned char *t, long b, int l)
++static int line_pixel_length (mc_wchar_t *t, long b, int l)
+ {
+ int x = 0, c, xn = 0;
+ for (;;) {
+@@ -198,7 +220,7 @@
+ }
+
+ static int
+-next_word_start (unsigned char *t, int q, int size)
++next_word_start (mc_wchar_t *t, int q, int size)
+ {
+ int i;
+ int saw_ws = 0;
+@@ -222,7 +244,7 @@
+
+ /* find the start of a word */
+ static int
+-word_start (unsigned char *t, int q, int size)
++word_start (mc_wchar_t *t, int q, int size)
+ {
+ int i = q;
+ if (t[q] == ' ' || t[q] == '\t')
+@@ -241,7 +263,7 @@
+ }
+
+ /* replaces ' ' with '\n' to properly format a paragraph */
+-static void format_this (unsigned char *t, int size, int indent)
++static void format_this (mc_wchar_t *t, int size, int indent)
+ {
+ int q = 0, ww;
+ strip_newlines (t, size);
+@@ -269,7 +291,7 @@
+ }
+ }
+
+-static void replace_at (WEdit * edit, long q, int c)
++static void replace_at (WEdit * edit, long q, mc_wint_t c)
+ {
+ edit_cursor_move (edit, q - edit->curs1);
+ edit_delete (edit);
+@@ -278,18 +300,27 @@
+
+ /* replaces a block of text */
+ static void
+-put_paragraph (WEdit * edit, unsigned char *t, long p, int indent, int size)
++put_paragraph (WEdit * edit, mc_wchar_t *t, long p, int indent, int size)
+ {
+ long cursor;
+- int i, c = 0;
++ int i;
++ mc_wchar_t c = 0;
+ cursor = edit->curs1;
+ if (indent)
++#ifndef UTF8
+ while (strchr ("\t ", edit_get_byte (edit, p)))
++#else /* UTF8 */
++ while (wcschr (L"\t ", edit_get_byte (edit, p)))
++#endif /* UTF8 */
+ p++;
+ for (i = 0; i < size; i++, p++) {
+ if (i && indent) {
+ if (t[i - 1] == '\n' && c == '\n') {
++#ifndef UTF8
+ while (strchr ("\t ", edit_get_byte (edit, p)))
++#else /* UTF8 */
++ while (wcschr (L"\t ", edit_get_byte (edit, p)))
++#endif /* UTF8 */
+ p++;
+ } else if (t[i - 1] == '\n') {
+ long curs;
+@@ -301,7 +332,11 @@
+ p = edit->curs1;
+ } else if (c == '\n') {
+ edit_cursor_move (edit, p - edit->curs1);
++#ifndef UTF8
+ while (strchr ("\t ", edit_get_byte (edit, p))) {
++#else /* UTF8 */
++ while (wcschr (L"\t ", edit_get_byte (edit, p))) {
++#endif /* UTF8 */
+ edit_delete (edit);
+ if (cursor > edit->curs1)
+ cursor--;
+@@ -334,7 +369,7 @@
+ {
+ long p, q;
+ int size;
+- unsigned char *t;
++ mc_wchar_t *t;
+ int indent = 0;
+ if (option_word_wrap_line_length < 2)
+ return;
+@@ -344,17 +379,25 @@
+ q = end_paragraph (edit, force);
+ indent = test_indent (edit, p, q);
+ t = get_paragraph (edit, p, q, indent, &size);
+- if (!t)
++ if (!t)
+ return;
+ if (!force) {
+ int i;
++#ifndef UTF8
+ if (strchr (NO_FORMAT_CHARS_START, *t)) {
++#else /* UTF8 */
++ if (wcschr (NO_FORMAT_CHARS_START, *t)) {
++#endif /* UTF8 */
+ g_free (t);
+ return;
+ }
+ for (i = 0; i < size - 1; i++) {
+ if (t[i] == '\n') {
++#ifndef UTF8
+ if (strchr (NO_FORMAT_CHARS_START "\t ", t[i + 1])) {
++#else /* UTF8 */
++ if (wcschr (NO_FORMAT_CHARS_START "\t", t[i + 1])) {
++#endif /* UTF8 */
+ g_free (t);
+ return;
+ }
+--- mc-4.6.2-pre1/src/achown.c
++++ mc-4.6.2-pre1/src/achown.c
+@@ -584,6 +584,12 @@
+ b_att[2] = button_new (XTRACT (6));
+ b_user = button_new (XTRACT (5));
+ b_group = button_new (XTRACT (4));
++#ifdef UTF8
++ if (SLsmg_Is_Unicode) {
++ b_user->text = g_realloc (b_user->text, MB_CUR_MAX * 15 + 1);
++ b_group->text = g_realloc (b_group->text, MB_CUR_MAX * 15 + 1);
++ }
++#endif
+
+ add_widget (ch_dlg, b_group);
+ add_widget (ch_dlg, b_user);
+--- mc-4.6.2-pre1/src/boxes.c
++++ mc-4.6.2-pre1/src/boxes.c
+@@ -153,23 +153,23 @@
+ display_title = _(display_title);
+ for (i = 0; i < LIST_TYPES; i++) {
+ displays[i] = _(displays[i]);
+- if ((l = strlen (displays[i])) > maxlen)
++ if ((l = mbstrlen (displays[i])) > maxlen)
+ maxlen = l;
+ }
+
+- i = strlen (ok_button) + 5;
+- l = strlen (cancel_button) + 3;
++ i = mbstrlen (ok_button) + 5;
++ l = mbstrlen (cancel_button) + 3;
+ l = max (i, l);
+
+ i = maxlen + l + 16;
+ if (i > DISPLAY_X)
+ DISPLAY_X = i;
+
+- i = strlen (user_mini_status) + 13;
++ i = mbstrlen (user_mini_status) + 13;
+ if (i > DISPLAY_X)
+ DISPLAY_X = i;
+
+- i = strlen (display_title) + 10;
++ i = mbstrlen (display_title) + 10;
+ if (i > DISPLAY_X)
+ DISPLAY_X = i;
+
+@@ -288,20 +288,20 @@
+ int maxlen = 0;
+ for (i = SORT_TYPES - 1; i >= 0; i--) {
+ sort_orders_names[i] = _(sort_orders[i].sort_name);
+- r = strlen (sort_orders_names[i]);
++ r = mbstrlen (sort_orders_names[i]);
+ if (r > maxlen)
+ maxlen = r;
+ }
+
+ check_pos = maxlen + 9;
+
+- r = strlen (reverse_label) + 4;
+- i = strlen (case_label) + 4;
++ r = mbstrlen (reverse_label) + 4;
++ i = mbstrlen (case_label) + 4;
+ if (i > r)
+ r = i;
+
+- l = strlen (ok_button) + 6;
+- i = strlen (cancel_button) + 4;
++ l = mbstrlen (ok_button) + 6;
++ i = mbstrlen (cancel_button) + 4;
+ if (i > l)
+ l = i;
+
+@@ -310,7 +310,7 @@
+ if (i > SORT_X)
+ SORT_X = i;
+
+- i = strlen (sort_title) + 6;
++ i = mbstrlen (sort_title) + 6;
+ if (i > SORT_X)
+ SORT_X = i;
+
+@@ -408,7 +408,7 @@
+ while (i--)
+ {
+ conf_widgets [i].text = _(conf_widgets [i].text);
+- l1 = strlen (conf_widgets [i].text) + 3;
++ l1 = mbstrlen (conf_widgets [i].text) + 3;
+ if (l1 > maxlen)
+ maxlen = l1;
+ }
+@@ -423,8 +423,8 @@
+ * And this for the case when buttons with some space to the right
+ * do not fit within 2/6
+ */
+- l1 = strlen (conf_widgets [0].text) + 3;
+- i = strlen (conf_widgets [1].text) + 5;
++ l1 = mbstrlen (conf_widgets [0].text) + 3;
++ i = mbstrlen (conf_widgets [1].text) + 5;
+ if (i > l1)
+ l1 = i;
+
+@@ -497,11 +497,11 @@
+ {
+ display_widgets [i].text = _(display_widgets[i].text);
+ display_bits_str [i] = _(display_bits_str [i]);
+- l1 = strlen (display_bits_str [i]);
++ l1 = mbstrlen (display_bits_str [i]);
+ if (l1 > maxlen)
+ maxlen = l1;
+ }
+- l1 = strlen (display_widgets [2].text);
++ l1 = mbstrlen (display_widgets [2].text);
+ if (l1 > maxlen)
+ maxlen = l1;
+
+@@ -509,8 +509,8 @@
+ display_bits.xlen = (maxlen + 5) * 6 / 4;
+
+ /* See above confirm_box */
+- l1 = strlen (display_widgets [0].text) + 3;
+- i = strlen (display_widgets [1].text) + 5;
++ l1 = mbstrlen (display_widgets [0].text) + 3;
++ i = mbstrlen (display_widgets [1].text) + 5;
+ if (i > l1)
+ l1 = i;
+
+@@ -605,7 +605,7 @@
+
+ cpname = _("&Select");
+ add_widget (dbits_dlg,
+- button_new (4, DISPX - 8 - strlen (cpname), B_USER,
++ button_new (4, DISPX - 8 - mbstrlen (cpname), B_USER,
+ NORMAL_BUTTON, cpname, sel_charset_button));
+
+ return dbits_dlg;
+@@ -816,7 +816,7 @@
+ quick_widgets [1].y_divisions =
+ quick_widgets [0].y_divisions = Quick_input.ylen = 5;
+
+- len = strlen (quick_widgets [1].text);
++ len = mbstrlen (quick_widgets [1].text);
+
+ quick_widgets [0].relative_x =
+ quick_widgets [1].relative_x + len + 1;
+@@ -975,7 +975,7 @@
+ {
+ job_buttons [i].name = _(job_buttons [i].name);
+
+- len = strlen (job_buttons [i].name) + 4;
++ len = mbstrlen (job_buttons [i].name) + 4;
+ JOBS_X = max (JOBS_X, startx + len + 3);
+
+ job_buttons [i].xpos = startx;
+@@ -984,7 +984,7 @@
+
+ /* Last button - Ok a.k.a. Cancel :) */
+ job_buttons [n_buttons - 1].xpos =
+- JOBS_X - strlen (job_buttons [n_buttons - 1].name) - 7;
++ JOBS_X - mbstrlen (job_buttons [n_buttons - 1].name) - 7;
+
+ i18n_flag = 1;
+ }
+@@ -1042,7 +1042,7 @@
+
+ while (i--)
+ {
+- l1 = strlen (labs [i] = _(labs [i]));
++ l1 = mbstrlen (labs [i] = _(labs [i]));
+ if (l1 > maxlen)
+ maxlen = l1;
+ }
+@@ -1052,7 +1052,7 @@
+
+ for (i = sizeof(buts)/sizeof(buts[0]), l1 = 0; i--; )
+ {
+- l1 += strlen (buts [i] = _(buts [i]));
++ l1 += mbstrlen (buts [i] = _(buts [i]));
+ }
+ l1 += 15;
+ if (l1 > dialog_x)
+@@ -1061,7 +1061,7 @@
+ ilen = dialog_x - 7 - maxlen; /* for the case of very long buttons :) */
+ istart = dialog_x - 3 - ilen;
+
+- b2 = dialog_x - (strlen(buts[1]) + 6);
++ b2 = dialog_x - (mbstrlen(buts[1]) + 6);
+
+ i18n_flag = 1;
+ }
+--- mc-4.6.2-pre1/src/dialog.c
++++ mc-4.6.2-pre1/src/dialog.c
+@@ -166,7 +166,7 @@
+
+ if (h->title) {
+ attrset (DLG_HOT_NORMALC (h));
+- dlg_move (h, space, (h->cols - strlen (h->title)) / 2);
++ dlg_move (h, space, (h->cols - mbstrlen (h->title)) / 2);
+ addstr (h->title);
+ }
+ }
+--- mc-4.6.2-pre1/src/file.c
++++ mc-4.6.2-pre1/src/file.c
+@@ -161,15 +161,20 @@
+ do_transform_source (FileOpContext *ctx, const char *source)
+ {
+ size_t j, k, l, len;
+- const char *fnsource = x_basename (source);
++ char *fnsource = g_strdup (x_basename (source));
+ int next_reg;
+ enum CaseConvs case_conv = NO_CONV;
+ static char fntarget[MC_MAXPATHLEN];
+
++#ifdef UTF8
++ fix_utf8(fnsource);
++#endif
++
+ len = strlen (fnsource);
+ j = re_match (&ctx->rx, fnsource, len, 0, &ctx->regs);
+ if (j != len) {
+ transform_error = FILE_SKIP;
++ g_free (fnsource);
+ return NULL;
+ }
+ for (next_reg = 1, j = 0, k = 0; j < strlen (ctx->dest_mask); j++) {
+@@ -213,6 +218,7 @@
+ || ctx->regs.start[next_reg] < 0) {
+ message (1, MSG_ERROR, _(" Invalid target mask "));
+ transform_error = FILE_ABORT;
++ g_free(fnsource);
+ return NULL;
+ }
+ for (l = (size_t) ctx->regs.start[next_reg];
+@@ -227,6 +233,7 @@
+ }
+ }
+ fntarget[k] = 0;
++ g_free(fnsource);
+ return fntarget;
+ }
+
+@@ -1688,13 +1695,13 @@
+ *dp = '\0';
+
+ if (single_source) {
+- i = fmd_xlen - strlen (format_string) - 4;
++ i = fmd_xlen - mbstrlen (format_string) - 4;
+ g_snprintf (cmd_buf, sizeof (cmd_buf), format_string,
+ name_trunc (single_source, i));
+ } else {
+ g_snprintf (cmd_buf, sizeof (cmd_buf), format_string,
+ panel->marked);
+- i = strlen (cmd_buf) + 6 - fmd_xlen;
++ i = mbstrlen (cmd_buf) + 6 - fmd_xlen;
+ if (i > 0) {
+ fmd_xlen += i;
+ fmd_init_i18n (TRUE); /* to recalculate positions of child widgets */
+--- mc-4.6.2-pre1/src/filegui.c
++++ mc-4.6.2-pre1/src/filegui.c
+@@ -65,6 +65,7 @@
+ #include "filegui.h"
+ #include "key.h" /* get_event */
+ #include "util.h" /* strip_password() */
++#include "tty.h"
+
+ /* }}} */
+
+@@ -563,8 +564,8 @@
+ * longest of "Overwrite..." labels
+ * (assume "Target date..." are short enough)
+ */
+- l1 = max (strlen (rd_widgets[6].text),
+- strlen (rd_widgets[11].text));
++ l1 = max (mbstrlen (rd_widgets[6].text),
++ mbstrlen (rd_widgets[11].text));
+
+ /* longest of button rows */
+ i = sizeof (rd_widgets) / sizeof (rd_widgets[0]);
+@@ -575,7 +576,7 @@
+ l2 = max (l2, l);
+ l = 0;
+ }
+- l += strlen (rd_widgets[i].text) + 4;
++ l += mbstrlen (rd_widgets[i].text) + 4;
+ }
+ }
+ l2 = max (l2, l); /* last row */
+@@ -593,12 +594,12 @@
+ l = l1;
+ }
+ rd_widgets[i].xpos = l;
+- l += strlen (rd_widgets[i].text) + 4;
++ l += mbstrlen (rd_widgets[i].text) + 4;
+ }
+ }
+ /* Abort button is centered */
+ rd_widgets[1].xpos =
+- (rd_xlen - strlen (rd_widgets[1].text) - 3) / 2;
++ (rd_xlen - mbstrlen (rd_widgets[1].text) - 3) / 2;
+ }
+ #endif /* ENABLE_NLS */
+
+@@ -617,7 +618,7 @@
+
+ ADD_RD_LABEL (ui, 0,
+ name_trunc (ui->replace_filename,
+- rd_trunc - strlen (rd_widgets[0].text)), 0);
++ rd_trunc - mbstrlen (rd_widgets[0].text)), 0);
+ ADD_RD_BUTTON (1);
+
+ ADD_RD_BUTTON (2);
+@@ -804,36 +805,36 @@
+ if (fmd_widgets[i].text[0] != '\0')
+ fmd_widgets[i].text = _(fmd_widgets[i].text);
+
+- len = strlen (fmd_widgets[FMCB11].text)
+- + strlen (fmd_widgets[FMCB21].text) + 15;
++ len = mbstrlen (fmd_widgets[FMCB11].text)
++ + mbstrlen (fmd_widgets[FMCB21].text) + 15;
+ fmd_xlen = max (fmd_xlen, len);
+
+- len = strlen (fmd_widgets[FMCB12].text)
+- + strlen (fmd_widgets[FMCB22].text) + 15;
++ len = mbstrlen (fmd_widgets[FMCB12].text)
++ + mbstrlen (fmd_widgets[FMCB22].text) + 15;
+ fmd_xlen = max (fmd_xlen, len);
+
+- len = strlen (fmd_widgets[FMBRGT].text)
+- + strlen (fmd_widgets[FMBLFT].text) + 11;
++ len = mbstrlen (fmd_widgets[FMBRGT].text)
++ + mbstrlen (fmd_widgets[FMBLFT].text) + 11;
+
+ #ifdef FMBMID
+- len += strlen (fmd_widgets[FMBMID].text) + 6;
++ len += mbstrlen (fmd_widgets[FMBMID].text) + 6;
+ #endif
+
+ fmd_xlen = max (fmd_xlen, len + 4);
+
+ len = (fmd_xlen - (len + 6)) / 2;
+ i = fmd_widgets[FMBLFT].relative_x = len + 3;
+- i += strlen (fmd_widgets[FMBLFT].text) + 8;
++ i += mbstrlen (fmd_widgets[FMBLFT].text) + 8;
+
+ #ifdef FMBMID
+ fmd_widgets[FMBMID].relative_x = i;
+- i += strlen (fmd_widgets[FMBMID].text) + 6;
++ i += mbstrlen (fmd_widgets[FMBMID].text) + 6;
+ #endif
+
+ fmd_widgets[FMBRGT].relative_x = i;
+
+ #define chkbox_xpos(i) \
+- fmd_widgets [i].relative_x = fmd_xlen - strlen (fmd_widgets [i].text) - 6
++ fmd_widgets [i].relative_x = fmd_xlen - mbstrlen (fmd_widgets [i].text) - 6
+
+ chkbox_xpos (FMCB0);
+ chkbox_xpos (FMCB21);
+@@ -855,7 +856,7 @@
+
+ char *
+ file_mask_dialog (FileOpContext *ctx, FileOperation operation, const char *text,
+- const char *def_text, int only_one, int *do_background)
++ const char *def_text_orig, int only_one, int *do_background)
+ {
+ int source_easy_patterns = easy_patterns;
+ char *source_mask, *orig_mask, *dest_dir, *tmpdest;
+@@ -864,12 +865,20 @@
+ struct stat buf;
+ int val;
+ QuickDialog Quick_input;
+-
++ char *def_text;
+ g_return_val_if_fail (ctx != NULL, NULL);
++
++ def_text = g_strdup(def_text_orig);
++
+ #if 0
+ message (1, __FUNCTION__, "text = `%s' \n def_text = `%s'", text,
+ def_text);
+ #endif
++
++#ifdef UTF8
++ fix_utf8(def_text);
++#endif
++
+ fmd_init_i18n (FALSE);
+
+ /* Set up the result pointers */
+@@ -928,6 +937,7 @@
+ orig_mask = source_mask;
+ if (!dest_dir || !*dest_dir) {
+ g_free (source_mask);
++ g_free(def_text);
+ return dest_dir;
+ }
+ if (source_easy_patterns) {
+@@ -981,5 +991,6 @@
+ }
+ if (val == B_USER)
+ *do_background = 1;
++ g_free(def_text);
+ return dest_dir;
+ }
+--- mc-4.6.2-pre1/src/find.c
++++ mc-4.6.2-pre1/src/find.c
+@@ -217,7 +217,7 @@
+ int l1, maxlen = 0;
+
+ while (i--) {
+- l1 = strlen (labs[i] = _(labs[i]));
++ l1 = mbstrlen (labs[i] = _(labs[i]));
+ if (l1 > maxlen)
+ maxlen = l1;
+ }
+@@ -226,7 +226,7 @@
+ FIND_X = i;
+
+ for (i = sizeof (buts) / sizeof (buts[0]), l1 = 0; i--;) {
+- l1 += strlen (buts[i] = _(buts[i]));
++ l1 += mbstrlen (buts[i] = _(buts[i]));
+ }
+ l1 += 21;
+ if (l1 > FIND_X)
+@@ -235,8 +235,8 @@
+ ilen = FIND_X - 7 - maxlen; /* for the case of very long buttons :) */
+ istart = FIND_X - 3 - ilen;
+
+- b1 = b0 + strlen (buts[0]) + 7;
+- b2 = FIND_X - (strlen (buts[2]) + 6);
++ b1 = b0 + mbstrlen (buts[0]) + 7;
++ b2 = FIND_X - (mbstrlen (buts[2]) + 6);
+
+ i18n_flag = 1;
+ case_label = _(case_label);
+@@ -863,7 +863,7 @@
+ if (!i18n_flag) {
+ register int i = sizeof (fbuts) / sizeof (fbuts[0]);
+ while (i--)
+- fbuts[i].len = strlen (fbuts[i].text = _(fbuts[i].text)) + 3;
++ fbuts[i].len = mbstrlen (fbuts[i].text = _(fbuts[i].text)) + 3;
+ fbuts[2].len += 2; /* DEFPUSH_BUTTON */
+ i18n_flag = 1;
+ }
+@@ -1028,7 +1028,7 @@
+
+ if (!next_free) /* first turn i.e clean old list */
+ panel_clean_dir (current_panel);
+- list->list[next_free].fnamelen = strlen (name);
++ list->list[next_free].fnamelen = mbstrlen (name);
+ list->list[next_free].fname = name;
+ list->list[next_free].f.marked = 0;
+ list->list[next_free].f.link_to_dir = link_to_dir;
+--- mc-4.6.2-pre1/src/help.c
++++ mc-4.6.2-pre1/src/help.c
+@@ -447,10 +447,28 @@
+ #ifndef HAVE_SLANG
+ addch (acs_map [c]);
+ #else
++#if defined(UTF8) && SLANG_VERSION < 20000
++ SLsmg_draw_object (h->y + line + 2, h->x + col + 2, acs_map [c]);
++#else
+ SLsmg_draw_object (h->y + line + 2, h->x + col + 2, c);
++#endif /* UTF8 */
+ #endif
++ } else {
++#ifdef UTF8
++ if (SLsmg_Is_Unicode) {
++ int len;
++ mbstate_t mbs;
++ wchar_t wc;
++ memset (&mbs, 0, sizeof (mbs));
++ len = mbrtowc(&wc, p, MB_CUR_MAX, &mbs);
++ if (len <= 0) len = 1; /* skip broken multibyte chars */
++
++ SLsmg_write_nwchars(&wc, 1);
++ p += len - 1;
+ } else
++#endif
+ addch (c);
++ }
+ col++;
+ break;
+ }
+@@ -803,6 +821,12 @@
+ message (1, MSG_ERROR, _(" Cannot open file %s \n %s "), filename ? filename : hlpfile,
+ unix_error_string (errno));
+ }
++ else
++ {
++ char *conv = utf8_to_local(data);
++ g_free(data);
++ data = conv;
++ }
+
+ if (!filename)
+ g_free (hlpfile);
+--- mc-4.6.2-pre1/src/hotlist.c
++++ mc-4.6.2-pre1/src/hotlist.c
+@@ -563,7 +563,7 @@
+
+ row = hotlist_but [i].y;
+ ++count [row];
+- len [row] += strlen (hotlist_but [i].text) + 5;
++ len [row] += mbstrlen (hotlist_but [i].text) + 5;
+ if (hotlist_but [i].flags == DEFPUSH_BUTTON)
+ len [row] += 2;
+ }
+@@ -588,12 +588,12 @@
+ /* not first int the row */
+ if (!strcmp (hotlist_but [i].text, cancel_but))
+ hotlist_but [i].x =
+- cols - strlen (hotlist_but [i].text) - 13;
++ cols - mbstrlen (hotlist_but [i].text) - 13;
+ else
+ hotlist_but [i].x = cur_x [row];
+ }
+
+- cur_x [row] += strlen (hotlist_but [i].text) + 2
++ cur_x [row] += mbstrlen (hotlist_but [i].text) + 2
+ + (hotlist_but [i].flags == DEFPUSH_BUTTON ? 5 : 3);
+ }
+ }
+@@ -834,7 +834,7 @@
+ for (i = 0; i < 3; i++)
+ {
+ qw [i].text = _(qw [i].text);
+- l[i] = strlen (qw [i].text) + 3;
++ l[i] = mbstrlen (qw [i].text) + 3;
+ }
+ space = (len - 4 - l[0] - l[1] - l[2]) / 4;
+
+@@ -883,7 +883,7 @@
+
+ msglen(text1, &lines1, &cols1);
+ msglen(text2, &lines2, &cols2);
+- len = max ((int) strlen (header), cols1);
++ len = max ((int) mbstrlen (header), cols1);
+ len = max (len, cols2) + 4;
+ len = max (len, 64);
+
+@@ -979,7 +979,7 @@
+ #endif /* ENABLE_NLS */
+
+ msglen (label, &lines, &cols);
+- len = max ((int) strlen (header), cols) + 4;
++ len = max ((int) mbstrlen (header), cols) + 4;
+ len = max (len, 64);
+
+ #ifdef ENABLE_NLS
+@@ -1035,7 +1035,7 @@
+ {
+ char *prompt, *label;
+ const char *cp = _("Label for \"%s\":");
+- int l = strlen (cp);
++ int l = mbstrlen (cp);
+ char *label_string = g_strdup (current_panel->cwd);
+
+ strip_password (label_string, 1);
+--- mc-4.6.2-pre1/src/layout.c
++++ mc-4.6.2-pre1/src/layout.c
+@@ -366,36 +366,36 @@
+
+ while (i--) {
+ s_split_direction[i] = _(s_split_direction[i]);
+- l1 = strlen (s_split_direction[i]) + 7;
++ l1 = mbstrlen (s_split_direction[i]) + 7;
+ if (l1 > first_width)
+ first_width = l1;
+ }
+
+ for (i = 0; i <= 8; i++) {
+ check_options[i].text = _(check_options[i].text);
+- l1 = strlen (check_options[i].text) + 7;
++ l1 = mbstrlen (check_options[i].text) + 7;
+ if (l1 > first_width)
+ first_width = l1;
+ }
+
+- l1 = strlen (title1) + 1;
++ l1 = mbstrlen (title1) + 1;
+ if (l1 > first_width)
+ first_width = l1;
+
+- l1 = strlen (title2) + 1;
++ l1 = mbstrlen (title2) + 1;
+ if (l1 > first_width)
+ first_width = l1;
+
+
+- second_width = strlen (title3) + 1;
++ second_width = mbstrlen (title3) + 1;
+ for (i = 0; i < 6; i++) {
+ check_options[i].text = _(check_options[i].text);
+- l1 = strlen (check_options[i].text) + 7;
++ l1 = mbstrlen (check_options[i].text) + 7;
+ if (l1 > second_width)
+ second_width = l1;
+ }
+ if (console_flag) {
+- l1 = strlen (output_lines_label) + 13;
++ l1 = mbstrlen (output_lines_label) + 13;
+ if (l1 > second_width)
+ second_width = l1;
+ }
+@@ -409,14 +409,14 @@
+ *
+ * Now the last thing to do - properly space buttons...
+ */
+- l1 = 11 + strlen (ok_button) /* 14 - all brackets and inner space */
+- +strlen (save_button) /* notice: it is 3 char less because */
+- +strlen (cancel_button); /* of '&' char in button text */
++ l1 = 11 + mbstrlen (ok_button) /* 14 - all brackets and inner space */
++ +mbstrlen (save_button) /* notice: it is 3 char less because */
++ +mbstrlen (cancel_button); /* of '&' char in button text */
+
+ i = (first_width + second_width - l1) / 4;
+ b1 = 5 + i;
+- b2 = b1 + strlen (ok_button) + i + 6;
+- b3 = b2 + strlen (save_button) + i + 4;
++ b2 = b1 + mbstrlen (ok_button) + i + 6;
++ b3 = b2 + mbstrlen (save_button) + i + 4;
+
+ i18n_layt_flag = 1;
+ }
+@@ -684,7 +684,7 @@
+ panel_do_cols (0);
+ panel_do_cols (1);
+
+- promptl = strlen (prompt);
++ promptl = mbstrlen (prompt);
+
+ widget_set_size (&the_menubar->widget, 0, 0, 1, COLS);
+
+--- mc-4.6.2-pre1/src/learn.c
++++ mc-4.6.2-pre1/src/learn.c
+@@ -237,7 +237,7 @@
+ learn_but[0].x = 78 / 2 + 4;
+
+ learn_but[1].text = _(learn_but[1].text);
+- learn_but[1].x = 78 / 2 - (strlen (learn_but[1].text) + 9);
++ learn_but[1].x = 78 / 2 - (mbstrlen (learn_but[1].text) + 9);
+
+ learn_title = _(learn_title);
+ i18n_flag = 1;
+--- mc-4.6.2-pre1/src/main.c
++++ mc-4.6.2-pre1/src/main.c
+@@ -704,7 +704,7 @@
+ int prompt_len;
+
+ tmp_prompt = strip_ctrl_codes (subshell_prompt);
+- prompt_len = strlen (tmp_prompt);
++ prompt_len = mbstrlen (tmp_prompt);
+
+ /* Check for prompts too big */
+ if (COLS > 8 && prompt_len > COLS - 8) {
+@@ -1610,7 +1610,11 @@
+ if (xterm_flag && xterm_title) {
+ p = s = g_strdup (strip_home_and_password (current_panel->cwd));
+ do {
++#ifndef UTF8
+ if (!is_printable ((unsigned char) *s))
++#else /* UTF8 */
++ if (*(unsigned char *)s < ' ')
++#endif /* UTF8 */
+ *s = '?';
+ } while (*++s);
+ fprintf (stdout, "\33]0;mc - %s\7", p);
+--- mc-4.6.2-pre1/src/menu.c
++++ mc-4.6.2-pre1/src/menu.c
+@@ -22,6 +22,7 @@
+ #include <string.h>
+
+ #include <sys/types.h>
++#include <wchar.h>
+
+ #include "global.h"
+ #include "tty.h"
+@@ -53,35 +54,95 @@
+ {
+ Menu *menu;
+ const char *cp;
++ int wlen = 0;
++ mbstate_t s;
+
+ menu = (Menu *) g_malloc (sizeof (*menu));
+ menu->count = count;
+ menu->max_entry_len = 20;
+ menu->entries = entries;
++ menu->name = g_strdup (name);
++ menu_scan_hotkey (menu);
++#ifdef UTF8
++ menu->wentries = NULL;
++ menu->wname = NULL;
++ if (SLsmg_Is_Unicode) {
++ const char *str = menu->name;
++ memset (&s, 0, sizeof (s));
++ wlen = mbsrtowcs (NULL, &str, -1, &s);
++ if (wlen > 0)
++ ++wlen;
++ else {
++ wlen = 0;
++ memset (&s, 0, sizeof (s));
++ }
++ }
++#endif
+
+ if (entries != (menu_entry*) NULL) {
+ register menu_entry* mp;
+ for (mp = entries; count--; mp++) {
+ if (mp->text[0] != '\0') {
++ int len;
+ #ifdef ENABLE_NLS
+ mp->text = _(mp->text);
+ #endif /* ENABLE_NLS */
+ cp = strchr (mp->text,'&');
++#ifdef UTF8
++ if (SLsmg_Is_Unicode) {
++ len = mbstrlen(mp->text) + 1;
++ wlen += len;
++ menu->max_entry_len = max (len - 1, menu->max_entry_len);
++ } else
++#endif
++ len = strlen (mp->text);
+
+ if (cp != NULL && *(cp+1) != '\0') {
+ mp->hot_key = tolower ((unsigned char) *(cp+1));
+- menu->max_entry_len = max ((int) (strlen (mp->text) - 1),
+- menu->max_entry_len);
++ menu->max_entry_len = max (len - 1, menu->max_entry_len);
+ } else {
+- menu->max_entry_len = max ((int) strlen (mp->text),
+- menu->max_entry_len);
++ menu->max_entry_len = max (len, menu->max_entry_len);
+ }
+ }
+ }
+ }
+
+- menu->name = g_strdup (name);
+- menu_scan_hotkey(menu);
++#ifdef UTF8
++ if (wlen) {
++ wchar_t *wp;
++ const char *str;
++ int len;
++
++ menu->wentries = (wchar_t **)
++ g_malloc (sizeof (wchar_t *) * menu->count
++ + wlen * sizeof (wchar_t));
++ wp = (wchar_t *) (menu->wentries + menu->count);
++ str = menu->name;
++ len = mbsrtowcs (wp, &str, wlen, &s);
++ if (len > 0) {
++ menu->wname = wp;
++ wlen -= len + 1;
++ wp += len + 1;
++ } else
++ memset (&s, 0, sizeof (s));
++ if (menu->entries != NULL)
++ for (count = 0; count < menu->count; ++count)
++ if (menu->entries[count].text[0] != '\0') {
++ str = menu->entries[count].text;
++ menu->wentries[count] = wp;
++ len = mbsrtowcs (wp, &str, wlen, &s);
++ if (len > 0) {
++ wlen -= len + 1;
++ wp += len + 1;
++ } else {
++ memset (&s, 0, sizeof (s));
++ *wp++ = L'\0';
++ --wlen;
++ }
++ }
++ }
++#endif
++
+ menu->start_x = 0;
+ menu->help_node = g_strdup (help_node);
+ return menu;
+@@ -112,8 +173,26 @@
+ const char *text;
+
+ addch((unsigned char)menu->entries [idx].first_letter);
+- for (text = menu->entries [idx].text; *text; text++)
+- {
++#ifdef UTF8
++ if (menu->wentries) {
++ wchar_t *wtext, *wp;
++
++ for (wtext = wp = menu->wentries [idx]; *wtext; wtext++) {
++ if (*wtext == L'&') {
++ if (wtext > wp)
++ SLsmg_write_nwchars (wp, wtext - wp);
++ attrset (color == MENU_SELECTED_COLOR ?
++ MENU_HOTSEL_COLOR : MENU_HOT_COLOR);
++ SLsmg_write_nwchars (++wtext, 1);
++ attrset (color);
++ wp = wtext + 1;
++ }
++ }
++ if (wtext > wp)
++ SLsmg_write_nwchars (wp, wtext - wp);
++ } else
++#endif
++ for (text = menu->entries [idx].text; *text; text++) {
+ if (*text != '&')
+ addch(*text);
+ else {
+@@ -122,7 +201,7 @@
+ addch(*(++text));
+ attrset(color);
+ }
+- }
++ }
+ }
+ widget_move (&menubar->widget, y, x + 1);
+ }
+@@ -168,6 +247,12 @@
+ if (menubar->active)
+ attrset(i == menubar->selected?MENU_SELECTED_COLOR:SELECTED_COLOR);
+ widget_move (&menubar->widget, 0, menubar->menu [i]->start_x);
++#ifdef UTF8
++ if (menubar->menu [i]->wname)
++ SLsmg_write_nwchars (menubar->menu [i]->wname,
++ wcslen (menubar->menu [i]->wname));
++ else
++#endif
+ tty_printf ("%s", menubar->menu [i]->name);
+ }
+
+@@ -493,7 +578,13 @@
+
+ for (i = 0; i < items; i++)
+ {
+- int len = strlen(menubar->menu[i]->name);
++ int len;
++#ifdef UTF8
++ if (menubar->menu[i]->wname)
++ len = wcslen (menubar->menu[i]->wname);
++ else
++#endif
++ len = strlen(menubar->menu[i]->name);
+ menubar->menu[i]->start_x = start_x;
+ start_x += len + gap;
+ }
+@@ -506,7 +597,13 @@
+ for (i = 0; i < items; i++)
+ {
+ /* preserve length here, to be used below */
+- gap -= (menubar->menu[i]->start_x = strlen(menubar->menu[i]->name));
++#ifdef UTF8
++ if (menubar->menu[i]->wname)
++ menubar->menu[i]->start_x = wcslen (menubar->menu[i]->wname);
++ else
++#endif
++ menubar->menu[i]->start_x = strlen (menubar->menu[i]->name);
++ gap -= menubar->menu[i]->start_x;
+ }
+
+ gap /= (items - 1);
+@@ -530,6 +627,9 @@
+ void
+ destroy_menu (Menu *menu)
+ {
++#ifdef UTF8
++ g_free (menu->wentries);
++#endif
+ g_free (menu->name);
+ g_free (menu->help_node);
+ g_free (menu);
+--- mc-4.6.2-pre1/src/menu.h
++++ mc-4.6.2-pre1/src/menu.h
+@@ -21,6 +21,8 @@
+ menu_entry *entries;
+ int start_x; /* position relative to menubar start */
+ char *help_node;
++ wchar_t **wentries;
++ wchar_t *wname;
+ } Menu;
+
+ extern int menubar_visible;
+--- mc-4.6.2-pre1/src/myslang.h
++++ mc-4.6.2-pre1/src/myslang.h
+@@ -11,6 +11,16 @@
+ #endif /* HAVE_SLANG_SLANG_H */
+ #endif
+
++#if SLANG_VERSION >= 20000
++#define UTF8 1
++#define SLsmg_Is_Unicode SLsmg_is_utf8_mode()
++void SLsmg_write_nwchars(wchar_t *s, size_t n);
++#endif
++
++#ifdef UTF8
++# include <wchar.h>
++#endif
++
+ enum {
+ KEY_BACKSPACE = 400,
+ KEY_END, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT,
+--- mc-4.6.2-pre1/src/option.c
++++ mc-4.6.2-pre1/src/option.c
+@@ -123,12 +123,12 @@
+ title2 = _(" Pause after run... ");
+ title3 = _(" Other options ");
+
+- first_width = strlen (title1) + 1;
+- second_width = strlen (title3) + 1;
++ first_width = mbstrlen (title1) + 1;
++ second_width = mbstrlen (title3) + 1;
+
+ for (i = 0; check_options[i].text; i++) {
+ check_options[i].text = _(check_options[i].text);
+- l1 = strlen (check_options[i].text) + 7;
++ l1 = mbstrlen (check_options[i].text) + 7;
+ if (i >= OTHER_OPTIONS) {
+ if (l1 > first_width)
+ first_width = l1;
+@@ -141,23 +141,23 @@
+ i = PAUSE_OPTIONS;
+ while (i--) {
+ pause_options[i] = _(pause_options[i]);
+- l1 = strlen (pause_options[i]) + 7;
++ l1 = mbstrlen (pause_options[i]) + 7;
+ if (l1 > first_width)
+ first_width = l1;
+ }
+
+- l1 = strlen (title2) + 1;
++ l1 = mbstrlen (title2) + 1;
+ if (l1 > first_width)
+ first_width = l1;
+
+- l1 = 11 + strlen (ok_button)
+- + strlen (save_button)
+- + strlen (cancel_button);
++ l1 = 11 + mbstrlen (ok_button)
++ + mbstrlen (save_button)
++ + mbstrlen (cancel_button);
+
+ i = (first_width + second_width - l1) / 4;
+ b1 = 5 + i;
+- b2 = b1 + strlen (ok_button) + i + 6;
+- b3 = b2 + strlen (save_button) + i + 4;
++ b2 = b1 + mbstrlen (ok_button) + i + 6;
++ b3 = b2 + mbstrlen (save_button) + i + 4;
+
+ i18n_config_flag = 1;
+ }
+--- mc-4.6.2-pre1/src/panelize.c
++++ mc-4.6.2-pre1/src/panelize.c
+@@ -127,7 +127,7 @@
+ i = sizeof (panelize_but) / sizeof (panelize_but[0]);
+ while (i--) {
+ panelize_but[i].text = _(panelize_but[i].text);
+- maxlen += strlen (panelize_but[i].text) + 5;
++ maxlen += mbstrlen (panelize_but[i].text) + 5;
+ }
+ maxlen += 10;
+
+@@ -136,11 +136,11 @@
+ panelize_cols = max (panelize_cols, maxlen);
+
+ panelize_but[2].x =
+- panelize_but[3].x + strlen (panelize_but[3].text) + 7;
++ panelize_but[3].x + mbstrlen (panelize_but[3].text) + 7;
+ panelize_but[1].x =
+- panelize_but[2].x + strlen (panelize_but[2].text) + 5;
++ panelize_but[2].x + mbstrlen (panelize_but[2].text) + 5;
+ panelize_but[0].x =
+- panelize_cols - strlen (panelize_but[0].text) - 8 - BX;
++ panelize_cols - mbstrlen (panelize_but[0].text) - 8 - BX;
+
+ #endif /* ENABLE_NLS */
+
+--- mc-4.6.2-pre1/src/screen.c
++++ mc-4.6.2-pre1/src/screen.c
+@@ -171,21 +171,56 @@
+ static const char *
+ string_file_name (file_entry *fe, int len)
+ {
+- static char buffer [MC_MAXPATHLEN + 1];
+ size_t i;
+
+- for (i = 0; i < sizeof(buffer) - 1; i++) {
+- char c;
++#ifdef UTF8
++ static char buffer [BUF_SMALL * 4];
++ mbstate_t s;
++ int mbmax = MB_CUR_MAX;
++ const char *str = fe->fname;
+
+- c = fe->fname[i];
++ memset (&s, 0, sizeof (s));
++#else
++ static char buffer [BUF_SMALL];
++#endif
+
+- if (!c)
+- break;
++#ifdef UTF8
++ if (SLsmg_Is_Unicode)
++ for (i = 0; i < sizeof (buffer) - 1; i++) {
++ wchar_t wc;
++ int len;
+
+- if (!is_printable(c))
+- c = '?';
++ len = mbrtowc (&wc, str, mbmax, &s);
++ if (!len)
++ break;
++ if (len < 0) {
++ memset (&s, 0, sizeof (s));
++ buffer[i] = '?';
++ str++;
++ continue;
++ }
++ if (!is_printable (wc)) {
++ buffer[i] = '?';
++ str++;
++ continue;
++ }
++ if (i >= sizeof (buffer) - len)
++ break;
++ memcpy (buffer + i, str, len);
++ i += len - 1;
++ str += len;
++ } else
++#endif
++ for (i = 0; i < sizeof(buffer) - 1; i++) {
++ char c;
++
++ c = fe->fname[i];
+
+- buffer[i] = c;
++ if (!c) break;
++
++ if (!is_printable(c)) c = '?';
++
++ buffer[i] = c;
+ }
+
+ buffer[i] = 0;
+@@ -450,42 +485,6 @@
+ { "dot", 1, 0, J_RIGHT, " ", 0, string_dot, NULL },
+ };
+
+-static char *
+-to_buffer (char *dest, int just_mode, int len, const char *txt)
+-{
+- int txtlen = strlen (txt);
+- int still, over;
+-
+- /* Fill buffer with spaces */
+- memset (dest, ' ', len);
+-
+- still = (over=(txtlen > len)) ? (txtlen - len) : (len - txtlen);
+-
+- switch (HIDE_FIT(just_mode)){
+- case J_LEFT:
+- still = 0;
+- break;
+- case J_CENTER:
+- still /= 2;
+- break;
+- case J_RIGHT:
+- default:
+- break;
+- }
+-
+- if (over){
+- if (IS_FIT(just_mode))
+- strcpy (dest, name_trunc(txt, len));
+- else
+- strncpy (dest, txt+still, len);
+- } else
+- strncpy (dest+still, txt, txtlen);
+-
+- dest[len] = '\0';
+-
+- return (dest + len);
+-}
+-
+ static int
+ file_compute_color (int attr, file_entry *fe)
+ {
+@@ -539,14 +538,18 @@
+
+ /* Formats the file number file_index of panel in the buffer dest */
+ static void
+-format_file (char *dest, int limit, WPanel *panel, int file_index, int width, int attr, int isstatus)
++format_file (WPanel *panel, int file_index, int width, int attr, int isstatus)
+ {
+ int color, length, empty_line;
+ const char *txt;
+- char *old_pos;
+- char *cdest = dest;
+ format_e *format, *home;
+ file_entry *fe;
++#ifdef UTF8
++ char buffer[BUF_MEDIUM * sizeof (wchar_t)];
++#else
++ char buffer[BUF_MEDIUM];
++#endif
++ int txtwidth = 0;
+
+ length = 0;
+ empty_line = (file_index >= panel->count);
+@@ -564,34 +567,137 @@
+ break;
+
+ if (format->string_fn){
+- int len;
++ int len, still, over, perm, txtlen, wide;
+
+ if (empty_line)
+ txt = " ";
+ else
+ txt = (*format->string_fn)(fe, format->field_len);
+
+- old_pos = cdest;
+-
+ len = format->field_len;
+ if (len + length > width)
+ len = width - length;
+- if (len + (cdest - dest) > limit)
+- len = limit - (cdest - dest);
++ if (len >= BUF_MEDIUM)
++ len = BUF_MEDIUM - 1;
+ if (len <= 0)
+ break;
+- cdest = to_buffer (cdest, format->just_mode, len, txt);
+- length += len;
+
+- attrset (color);
++ perm = 0;
++ if (permission_mode) {
++ if (!strcmp(format->id, "perm"))
++ perm = 1;
++ else if (!strcmp(format->id, "mode"))
++ perm = 2;
++ }
+
+- if (permission_mode && !strcmp(format->id, "perm"))
+- add_permission_string (old_pos, format->field_len, fe, attr, color, 0);
+- else if (permission_mode && !strcmp(format->id, "mode"))
+- add_permission_string (old_pos, format->field_len, fe, attr, color, 1);
+- else
+- addstr (old_pos);
++ wide = 0;
++#ifdef UTF8
++ if (SLsmg_Is_Unicode && !empty_line && !perm) {
++ mbstate_t s;
++ const char *str = txt;
++
++ memset (&s, 0, sizeof (s));
++ txtlen = mbsrtowcs ((wchar_t *) buffer, &str,
++ sizeof (buffer) / sizeof (wchar_t), &s);
++ if (txtlen < 0) {
++ txt = " ";
++ txtlen = 1;
++ } else {
++ wide = 1;
++ txtwidth = wcswidth((wchar_t*)buffer, txtlen);
++ }
++ } else
++#endif
++ {
++ txtlen = mbstrlen (txt);
++ txtwidth = txtlen;
++ }
++
++ over = txtwidth > len;
++ still = over ? txtlen - len : len - txtlen;
++
++ switch (HIDE_FIT(format->just_mode)) {
++ case J_LEFT:
++ still = 0;
++ break;
++ case J_CENTER:
++ still /= 2;
++ break;
++ case J_RIGHT:
++ default:
++ break;
++ }
++
++ attrset (color);
++
++ if (wide) {
++#ifdef UTF8
++ if (over) {
++ if (IS_FIT (format->just_mode)) {
++ int n1 = 0;
++ int width1 = 0;
++ int n2 = 0;
++ int width2 = 0;
++ int len1 = len / 2;
++ int len2;
++
++ while (1) {
++ int w = wcwidth(((wchar_t *) buffer)[n1]);
++ if (width1 + w <= len1) {
++ width1 += w;
++ n1++;
++ }
++ else
++ break;
++ }
++ len2 = len - width1 - 1;
++
++ while (1) {
++ int w = wcwidth(((wchar_t *) buffer)[txtlen - n2 - 1]);
++ if (width2 + w <= len2) {
++ width2 += w;
++ n2++;
++ }
++ else
++ break;
++ }
++
++
++ SLsmg_write_nwchars ((wchar_t *) buffer, n1);
++ SLsmg_write_nwchars (L"~", 1);
++ printw ("%*s", len - width1 - width2 - 1, "");
++ SLsmg_write_nwchars (((wchar_t *) buffer)
++ + txtlen - n2, n2);
++ } else
++ SLsmg_write_nwchars ((wchar_t *) buffer, len);
++ } else {
++ printw ("%*s", still, "");
++ SLsmg_write_nwchars ((wchar_t *) buffer, txtlen);
++ printw ("%*s", len - txtwidth - still, "");
++ }
++#endif
++ } else {
++ if (over) {
++ if (IS_FIT (format->just_mode))
++ strcpy (buffer, name_trunc(txt, len));
++ else
++ memcpy (buffer, txt + still, len);
++ } else {
++ memset (buffer, ' ', still);
++ memcpy (buffer + still, txt, txtlen);
++ memset (buffer + still + txtlen, ' ',
++ len - txtlen - still);
++ }
++ buffer[len] = '\0';
+
++ if (perm)
++ add_permission_string (buffer, format->field_len, fe,
++ attr, color, perm - 1);
++ else
++ addstr (buffer);
++ }
++
++ length += len;
+ } else {
+ if (attr == SELECTED || attr == MARKED_SELECTED)
+ attrset (SELECTED_COLOR);
+@@ -614,7 +720,6 @@
+ {
+ int second_column = 0;
+ int width, offset;
+- char buffer [BUF_MEDIUM];
+
+ offset = 0;
+ if (!isstatus && panel->split){
+@@ -643,7 +748,7 @@
+ widget_move (&panel->widget, file_index - panel->top_file + 2, 1);
+ }
+
+- format_file (buffer, sizeof(buffer), panel, file_index, width, attr, isstatus);
++ format_file (panel, file_index, width, attr, isstatus);
+
+ if (!isstatus && panel->split){
+ if (second_column)
+@@ -692,7 +797,7 @@
+ ngettext("%s in %d file", "%s in %d files", panel->marked),
+ b_bytes, panel->marked);
+
+- if ((int) strlen (buffer) > cols-2){
++ if ((int) mbstrlen (buffer) > cols-2){
+ buffer [cols] = 0;
+ p += 2;
+ } else
+@@ -1104,6 +1209,12 @@
+ int side, width;
+
+ const char *txt;
++#ifdef UTF8
++ char buffer[30 * sizeof (wchar_t)];
++ mbstate_t s;
++
++ memset (&s, 0, sizeof (s));
++#endif
+ if (!panel->split)
+ adjust_top_file (panel);
+
+@@ -1128,16 +1239,38 @@
+ if (format->string_fn){
+ txt = format->title;
+
+- header_len = strlen (txt);
++ attrset (MARKED_COLOR);
++ width -= format->field_len;
++#ifdef UTF8
++ if (SLsmg_Is_Unicode) {
++ const char *str = txt;
++ header_len = mbsrtowcs ((wchar_t *) buffer, &str,
++ sizeof (buffer) / sizeof (wchar_t),
++ &s);
++ if (header_len < 0) {
++ memset (&s, 0, sizeof (s));
++ printw ("%*s", format->field_len, "");
++ continue;
++ }
++ if (header_len > format->field_len)
++ header_len = format->field_len;
++ spaces = (format->field_len - header_len) / 2;
++ extra = (format->field_len - header_len) % 2;
++ printw ("%*s", spaces, "");
++ SLsmg_write_nwchars ((wchar_t *) buffer, header_len);
++ printw ("%*s", spaces + extra, "");
++ continue;
++ }
++#endif
++
++ header_len = mbstrlen (txt);
+ if (header_len > format->field_len)
+ header_len = format->field_len;
+
+- attrset (MARKED_COLOR);
+ spaces = (format->field_len - header_len) / 2;
+ extra = (format->field_len - header_len) % 2;
+ tty_printf ("%*s%.*s%*s", spaces, "",
+ header_len, txt, spaces+extra, "");
+- width -= 2 * spaces + extra + header_len;
+ } else {
+ attrset (NORMAL_COLOR);
+ one_vline ();
+@@ -1894,11 +2027,24 @@
+ int i;
+ int wrapped = 0;
+ int found;
++ int prevpos, pos;
++ int j;
++ mbstate_t mbs;
+
+ l = strlen (panel->search_buffer);
+ if (c_code == KEY_BACKSPACE) {
+- if (l)
+- panel->search_buffer[--l] = '\0';
++ if (l) {
++ prevpos = pos = 0;
++ memset (&mbs, 0, sizeof (mbs));
++ while (pos < l) {
++ prevpos = pos;
++ j = mbrlen (panel->search_buffer + pos, l - pos, &mbs);
++ if (j <= 0) break;
++ pos += j;
++ }
++ --l;
++ panel->search_buffer[prevpos] = 0;
++ }
+ } else {
+ if (c_code && l < sizeof (panel->search_buffer)) {
+ panel->search_buffer[l] = c_code;
+@@ -1907,6 +2053,14 @@
+ }
+ }
+
++ prevpos = pos = 0;
++ memset (&mbs, 0, sizeof (mbs));
++ while (pos < l) {
++ prevpos = pos;
++ j = mbrlen (panel->search_buffer + pos, l - pos, &mbs);
++ if (j <= 0) break;
++ pos += j;
++ }
+ found = 0;
+ for (i = panel->selected; !wrapped || i != panel->selected; i++) {
+ if (i >= panel->count) {
+@@ -1917,9 +2071,9 @@
+ }
+ if (panel->
+ case_sensitive
+- ? (strncmp (panel->dir.list[i].fname, panel->search_buffer, l)
++ ? (strncmp (panel->dir.list[i].fname, panel->search_buffer, pos)
+ == 0) : (g_strncasecmp (panel->dir.list[i].fname,
+- panel->search_buffer, l) == 0)) {
++ panel->search_buffer, pos) == 0)) {
+ unselect_item (panel);
+ panel->selected = i;
+ select_item (panel);
+@@ -1928,7 +2082,7 @@
+ }
+ }
+ if (!found)
+- panel->search_buffer[--l] = 0;
++ panel->search_buffer[prevpos] = 0;
+
+ paint_panel (panel);
+ }
+--- mc-4.6.2-pre1/src/slint.c
++++ mc-4.6.2-pre1/src/slint.c
+@@ -141,7 +141,9 @@
+ slang_init (void)
+ {
+ SLtt_get_terminfo ();
+-
++#if SLANG_VERSION >= 20000
++ SLutf8_enable (-1);
++#endif
+ /*
+ * If the terminal in not in terminfo but begins with a well-known
+ * string such as "linux" or "xterm" S-Lang will go on, but the
+--- mc-4.6.2-pre1/src/tty.c
++++ mc-4.6.2-pre1/src/tty.c
+@@ -134,10 +134,12 @@
+ * defined or not. Congratulations! At least, they left the API call
+ * for SLsmg_write_nchars as it has always been.
+ */
+- char ch;
+-
+- ch = c;
+- SLsmg_write_nchars(&ch, 1);
++
++ /* The above comment is a nonsense, SLsmg_write_char(c) works pretty
++ * good for me. So please don't mess with Red Hat people.
++ * Jindrich Novy (jnovy at redhat.com)
++ */
++ SLsmg_write_char(c);
+ #else
+ addch(c);
+ #endif
+--- mc-4.6.2-pre1/src/tty.h
++++ mc-4.6.2-pre1/src/tty.h
+@@ -8,6 +8,8 @@
+ of ifdefs in the other files small.
+ */
+
++#include <glib.h> /* gboolean is used here */
++
+ #ifdef HAVE_SLANG
+ # include "myslang.h"
+ #endif
+--- mc-4.6.2-pre1/src/util.c
++++ mc-4.6.2-pre1/src/util.c
+@@ -33,7 +33,11 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#include <iconv.h>
++#include <langinfo.h>
++#include <errno.h>
+
++#include "tty.h"
+ #include "global.h"
+ #include "profile.h"
+ #include "main.h" /* mc_home */
+@@ -45,9 +49,39 @@
+ #include "charsets.h"
+ #endif
+
++#ifdef UTF8
++#include <wctype.h>
++#endif
++
+ static const char app_text [] = "Midnight-Commander";
+ int easy_patterns = 1;
+
++#if SLANG_VERSION >= 20000
++void SLsmg_write_nwchars(wchar_t *s, size_t n)
++{
++ if (SLsmg_is_utf8_mode()) { /* slang can handle it directly */
++ while(n-- && *s)
++ SLsmg_write_char(*s++);
++ }
++ else { /* convert wchars back to 8bit encoding */
++ mbstate_t mbs;
++ memset (&mbs, 0, sizeof (mbs));
++ while (n-- && *s) {
++ char buf[MB_LEN_MAX + 1]; /* should use 1 char, but to be sure */
++ if (*s < 0x80) {
++ SLsmg_write_char(*s++); /* ASCII */
++ }
++ else {
++ if (wcrtomb(buf, *s++, &mbs) == 1)
++ SLsmg_write_char((wchar_t)(buf[0]));
++ else
++ SLsmg_write_char('?'); /* should not happen */
++ }
++ }
++ }
++}
++#endif
++
+ extern void str_replace(char *s, char from, char to)
+ {
+ for (; *s != '\0'; s++) {
+@@ -78,9 +112,106 @@
+ return (c > 31 && c != 127 && c != 155);
+ }
+
++size_t
++mbstrlen (const char *str)
++{
++#ifdef UTF8
++ if (SLsmg_Is_Unicode) {
++ size_t width = 0;
++
++ for (; *str; str++) {
++ wchar_t c;
++ size_t len;
++
++ len = mbrtowc (&c, str, MB_CUR_MAX, NULL);
++
++ if (len == (size_t)(-1) || len == (size_t)(-2)) break;
++
++ if (len > 0) {
++ int wcsize = wcwidth(c);
++ width += wcsize > 0 ? wcsize : 0;
++ str += len-1;
++ }
++ }
++
++ return width;
++ } else
++#endif
++ return strlen (str);
++}
++
++#ifdef UTF8
++
++void
++fix_utf8(char *str)
++{
++ mbstate_t mbs;
++
++ char *p = str;
++
++ while (*p) {
++ int len;
++ memset (&mbs, 0, sizeof (mbs));
++ len = mbrlen(p, MB_CUR_MAX, &mbs);
++ if (len == -1) {
++ *p = '?';
++ p++;
++ } else if (len > 0) {
++ p += len;
++ } else {
++ p++;
++ }
++ }
++}
++#endif
++
++
++
++#ifdef UTF8
++wchar_t *
++mbstr_to_wchar (const char *str)
++{
++ int len = mbstrlen(str);
++ wchar_t *buf = g_malloc((len+1) * sizeof(wchar_t));
++ mbstate_t mbs;
++ memset (&mbs, 0, sizeof (mbs));
++ mbsrtowcs (buf, &str, len, &mbs);
++ buf[len] = 0;
++ return buf;
++}
++
++char *
++wchar_to_mbstr (const wchar_t *wstr)
++{
++ mbstate_t mbs;
++ const wchar_t *wstr2;
++ char * string;
++ int len;
++
++ memset (&mbs, 0, sizeof (mbs));
++ wstr2 = wstr;
++ len = wcsrtombs(NULL, &wstr2, 0, &mbs);
++ if (len <= 0)
++ return NULL;
++
++ string = g_malloc(len + 1);
++
++ wstr2 = wstr;
++ wcsrtombs(string, &wstr2, len, &mbs);
++ string[len] = 0;
++ return string;
++}
++#endif
++
++
++
+ int
+ is_printable (int c)
+ {
++#ifdef UTF8
++ if (SLsmg_Is_Unicode)
++ return iswprint (c);
++#endif
+ c &= 0xff;
+
+ #ifdef HAVE_CHARSET
+@@ -98,7 +229,7 @@
+ #endif /* !HAVE_CHARSET */
+ }
+
+-/* Calculates the message dimensions (lines and columns) */
++/* Calculates the message dimension in columns and lines. */
+ void
+ msglen (const char *text, int *lines, int *columns)
+ {
+@@ -111,8 +242,21 @@
+ nlines++;
+ colindex = 0;
+ } else {
++#ifndef UTF8
+ colindex++;
+ if (colindex > ncolumns)
++#else /* UTF8 */
++ size_t len;
++ wchar_t c;
++
++ len = mbrtowc (&c, text, MB_CUR_MAX, NULL);
++ if (len > 0 && len != (size_t)(-1) && len != (size_t)(-2)) {
++ int wcsize = wcwidth(c);
++ colindex += wcsize > 0 ? wcsize-1 : -1;
++ text += len-1;
++ }
++ if (++colindex > ncolumns)
++#endif /* UTF8 */
+ ncolumns = colindex;
+ }
+ }
+@@ -206,7 +350,24 @@
+ *d++ = '\\';
+ break;
+ }
++#ifndef UTF8
+ *d = *s;
++#else /* UTF8 */
++ {
++ mbstate_t mbs;
++ int len;
++ memset (&mbs, 0, sizeof (mbs));
++ len = mbrlen(s, MB_CUR_MAX, &mbs);
++ if (len > 0) {
++ while (len-- > 1)
++ *d++ = *s++;
++ *d = *s;
++ } else {
++ *d = '?';
++ }
++
++ }
++#endif /* UTF8 */
+ }
+ *d = '\0';
+ return ret;
+@@ -228,25 +389,90 @@
+ name_trunc (const char *txt, int trunc_len)
+ {
+ static char x[MC_MAXPATHLEN + MC_MAXPATHLEN];
+- int txt_len;
++ int txt_len, first, skip;
+ char *p;
++ const char *str;
+
+ if ((size_t) trunc_len > sizeof (x) - 1) {
+ trunc_len = sizeof (x) - 1;
+ }
+- txt_len = strlen (txt);
+- if (txt_len <= trunc_len) {
+- strcpy (x, txt);
+- } else {
+- int y = (trunc_len / 2) + (trunc_len % 2);
+- strncpy (x, txt, y);
+- strncpy (x + y, txt + txt_len - (trunc_len / 2), trunc_len / 2);
+- x[y] = '~';
+- }
+- x[trunc_len] = 0;
+- for (p = x; *p; p++)
+- if (!is_printable (*p))
+- *p = '?';
++ txt_len = mbstrlen (txt);
++ first = 0;
++ skip = 0;
++ if (txt_len > trunc_len) {
++ first = trunc_len / 2;
++ skip = txt_len - trunc_len + 1;
++ }
++
++#ifdef UTF8
++ if (SLsmg_Is_Unicode) {
++ mbstate_t s;
++ int mbmax;
++
++ str = txt;
++ memset (&s, 0, sizeof (s));
++ mbmax = MB_CUR_MAX;
++ p = x;
++ while (p < x + sizeof (x) - 1 && trunc_len) {
++ wchar_t wc;
++ int len;
++
++ len = mbrtowc (&wc, str, mbmax, &s);
++ if (!len)
++ break;
++ if (len < 0) {
++ memset (&s, 0, sizeof (s));
++ *p = '?';
++ len = 1;
++ str++;
++ } else if (!is_printable (wc)) {
++ *p = '?';
++ str += len;
++ len = 1;
++ } else if (p >= x + sizeof (x) - len)
++ break;
++ else {
++ memcpy (p, str, len);
++ str += len;
++ }
++ if (first) {
++ --trunc_len;
++ --first;
++ p += len;
++ if (!first && p < x + sizeof (x) - 1 && trunc_len) {
++ *p++ = '~';
++ --trunc_len;
++ }
++ } else if (skip)
++ --skip;
++ else {
++ --trunc_len;
++ p += len;
++ }
++ }
++ } else
++#endif
++ {
++ str = txt;
++ p = x;
++ while (p < x + sizeof (x) - 1) {
++ if (*str == '\0')
++ break;
++ else if (!is_printable (*str))
++ *p++ = '?';
++ else
++ *p++ = *str;
++ ++str;
++ if (first) {
++ --first;
++ if (!first) {
++ *p++ = '~';
++ str += skip;
++ }
++ }
++ }
++ }
++ *p = '\0';
+ return x;
+ }
+
+@@ -678,11 +904,61 @@
+ }
+
+ char *
++utf8_to_local(char *str)
++{
++ iconv_t cd;
++ size_t buflen = strlen(str);
++ char *output;
++ int retry = 1;
++
++ cd = iconv_open (nl_langinfo(CODESET), "UTF-8");
++ if (cd == (iconv_t) -1) {
++ return g_strdup(str);
++ }
++
++ output = g_malloc(buflen + 1);
++
++ while (retry)
++ {
++ char *wrptr = output;
++ char *inptr = str;
++ size_t insize = buflen;
++ size_t avail = buflen;
++ size_t nconv;
++
++ nconv = iconv (cd, &inptr, &insize, &wrptr, &avail);
++ if (nconv == (size_t) -1)
++ {
++ if (errno == E2BIG)
++ {
++ buflen *= 2;
++ g_free(output);
++ output = g_malloc(buflen + 1);
++ }
++ else
++ {
++ g_free(output);
++ return g_strdup(str);
++ }
++ }
++ else {
++ retry = 0;
++ *wrptr = 0;
++ }
++ }
++
++ iconv_close (cd);
++
++ return output;
++}
++
++char *
+ load_mc_home_file (const char *filename, char **allocated_filename)
+ {
+ char *hintfile_base, *hintfile;
+ char *lang;
+ char *data;
++ char *conv_data;
+
+ hintfile_base = concat_dir_and_file (mc_home, filename);
+ lang = guess_message_value ();
+@@ -715,7 +991,10 @@
+ else
+ g_free (hintfile);
+
+- return data;
++ conv_data = utf8_to_local(data);
++ g_free(data);
++
++ return conv_data;
+ }
+
+ /* Check strftime() results. Some systems (i.e. Solaris) have different
+@@ -724,12 +1003,14 @@
+ i18n_checktimelength (void)
+ {
+ size_t length, a, b;
+- char buf [MAX_I18NTIMELENGTH + 1];
++ char buf [4 * MAX_I18NTIMELENGTH + 1];
+ time_t testtime = time (NULL);
+
+- a = strftime (buf, sizeof(buf)-1, _("%b %e %H:%M"), localtime(&testtime));
+- b = strftime (buf, sizeof(buf)-1, _("%b %e %Y"), localtime(&testtime));
+-
++ strftime (buf, sizeof(buf)-1, _("%b %e %H:%M"), localtime(&testtime));
++ a = mbstrlen (buf);
++ strftime (buf, sizeof(buf)-1, _("%b %e %Y"), localtime(&testtime));
++ b = mbstrlen (buf);
++
+ length = max (a, b);
+
+ /* Don't handle big differences. Use standard value (email bug, please) */
+@@ -742,15 +1023,12 @@
+ const char *
+ file_date (time_t when)
+ {
+- static char timebuf [MAX_I18NTIMELENGTH + 1];
++ static char timebuf [4 * MAX_I18NTIMELENGTH + 1];
+ time_t current_time = time ((time_t) 0);
+- static size_t i18n_timelength = 0;
+ static const char *fmtyear, *fmttime;
+ const char *fmt;
+
+- if (i18n_timelength == 0){
+- i18n_timelength = i18n_checktimelength() + 1;
+-
++ if (fmtyear == NULL) {
+ /* strftime() format string for old dates */
+ fmtyear = _("%b %e %Y");
+ /* strftime() format string for recent dates */
+@@ -770,7 +1048,7 @@
+ else
+ fmt = fmttime;
+
+- strftime (timebuf, i18n_timelength, fmt, localtime(&when));
++ strftime (timebuf, sizeof (timebuf) - 1, fmt, localtime(&when));
+ return timebuf;
+ }
+
+@@ -900,10 +1178,27 @@
+ r++;
+ continue;
+ }
+-
++#ifndef UTF8
+ if (is_printable(*r))
+ *w++ = *r;
+ ++r;
++#else /* UTF8 */
++ {
++ mbstate_t mbs;
++ int len;
++ memset (&mbs, 0, sizeof (mbs));
++ len = mbrlen(r, MB_CUR_MAX, &mbs);
++
++ if (len > 0 && (unsigned char)*r >= ' ')
++ while (len--)
++ *w++ = *r++;
++ else {
++ if (len == -1)
++ *w++ = '?';
++ r++;
++ }
++ }
++#endif /* UTF8 */
+ }
+ *w = 0;
+ return s;
+--- mc-4.6.2-pre1/src/util.h
++++ mc-4.6.2-pre1/src/util.h
+@@ -103,6 +103,13 @@
+ char *get_group (int);
+ char *get_owner (int);
+
++void fix_utf8(char *str);
++size_t mbstrlen (const char *);
++wchar_t *mbstr_to_wchar (const char *);
++char *wchar_to_mbstr (const wchar_t *);
++char *utf8_to_local(char *str);
++
++
+ #define MAX_I18NTIMELENGTH 14
+ #define MIN_I18NTIMELENGTH 10
+ #define STD_I18NTIMELENGTH 12
+--- mc-4.6.2-pre1/src/view.c
++++ mc-4.6.2-pre1/src/view.c
+@@ -43,6 +43,10 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+
++#ifdef UTF8
++#include <wctype.h>
++#endif /* UTF8 */
++
+ #include "global.h"
+ #include "tty.h"
+ #include "cmd.h" /* For view_other_cmd */
+@@ -1642,7 +1646,7 @@
+ hline (' ', width);
+
+ file_label = _("File: %s");
+- file_label_width = strlen (file_label) - 2;
++ file_label_width = mbstrlen (file_label) - 2;
+ file_name = view->filename ? view->filename
+ : view->command ? view->command
+ : "";
+@@ -1910,6 +1914,12 @@
+ offset_type from;
+ int c;
+ struct hexedit_change_node *curr = view->change_list;
++#ifdef UTF8
++ mbstate_t mbs;
++ char mbbuf[MB_LEN_MAX];
++ int mblen;
++ wchar_t wc;
++#endif /* UTF8 */
+
+ view_display_clean (view);
+ view_display_ruler (view);
+@@ -1922,8 +1932,37 @@
+
+ tty_setcolor (NORMAL_COLOR);
+ for (row = 0, col = 0; row < height && (c = get_byte (view, from)) != -1; from++) {
+-
++#ifndef UTF8
+ if (view->text_nroff_mode && c == '\b') {
++#else /* UTF8 */
++ mblen = 1;
++ mbbuf[0] = convert_to_display_c (c);
++
++ while (mblen < MB_LEN_MAX) {
++ int res;
++ memset (&mbs, 0, sizeof (mbs));
++ res = mbrtowc (&wc, mbbuf, mblen, &mbs);
++ if (res <= 0 && res != -2) {
++ wc = '.';
++ mblen = 1;
++ break;
++ }
++ if (res == mblen)
++ break;
++
++ mbbuf[mblen] = convert_to_display_c (get_byte (view, from + mblen));
++ mblen++;
++ }
++
++ if (mblen == MB_LEN_MAX) {
++ wc = '.';
++ mblen = 1;
++ }
++
++ from += mblen - 1;
++
++ if (view->text_nroff_mode && wc == '\b') {
++#endif /* UTF8 */
+ int c_prev;
+ int c_next;
+
+@@ -1988,10 +2027,17 @@
+ if (col >= view->dpy_text_column
+ && col - view->dpy_text_column < width) {
+ widget_move (view, top + row, left + (col - view->dpy_text_column));
++#ifndef UTF8
+ c = convert_to_display_c (c);
+ if (!is_printable (c))
+ c = '.';
+ tty_print_char (c);
++#else
++ wc = convert_to_display_c (wc);
++ if (!iswprint (wc))
++ wc = '.';
++ tty_print_char (wc);
++#endif
+ }
+ col++;
+ tty_setcolor (NORMAL_COLOR);
+--- mc-4.6.2-pre1/src/widget.c
++++ mc-4.6.2-pre1/src/widget.c
+@@ -36,6 +36,9 @@
+
+ #include "global.h"
+ #include "tty.h"
++#ifdef UTF8
++#include <wctype.h>
++#endif /* UTF8 */
+ #include "color.h"
+ #include "mouse.h"
+ #include "dialog.h"
+@@ -182,6 +185,11 @@
+ if (b->hotpos >= 0) {
+ widget_selectcolor (w, b->selected, TRUE);
+ widget_move (w, 0, b->hotpos + off);
++#ifdef UTF8
++ if (SLsmg_Is_Unicode)
++ SLsmg_write_nwchars (&b->hotwc, 1);
++ else
++#endif
+ addch ((unsigned char) b->text[b->hotpos]);
+ }
+ return MSG_HANDLED;
+@@ -215,7 +223,7 @@
+ static int
+ button_len (const char *text, unsigned int flags)
+ {
+- int ret = strlen (text);
++ int ret = mbstrlen (text);
+ switch (flags){
+ case DEFPUSH_BUTTON:
+ ret += 6;
+@@ -238,14 +246,36 @@
+ * the button text is g_malloc()ed, we can safely change and shorten it.
+ */
+ static void
+-button_scan_hotkey (WButton *b)
++scan_hotkey (char *text, int *hotposp, int *hotkeyp, wchar_t *hotwcp)
+ {
+- char *cp = strchr (b->text, '&');
++ char *cp = strchr (text, '&');
+
+ if (cp != NULL && cp[1] != '\0') {
+- g_strlcpy (cp, cp + 1, strlen (cp));
+- b->hotkey = tolower ((unsigned char) *cp);
+- b->hotpos = cp - b->text;
++#ifdef UTF8
++ if (SLsmg_Is_Unicode) {
++ mbstate_t s;
++ int len;
++
++ *cp = '\0';
++ memset (&s, 0, sizeof (s));
++ len = mbrtowc (hotwcp, cp + 1, MB_CUR_MAX, &s);
++ if (len > 0) {
++ *hotposp = mbstrlen (text);
++ if (*hotposp < 0) {
++ *hotposp = -1;
++ } else {
++ /* FIXME */
++ *hotkeyp = tolower (*hotwcp);
++ }
++ }
++ } else
++#endif
++ {
++ *hotkeyp = tolower (cp[1]);
++ *hotposp = cp - text;
++ }
++
++ memmove (cp, cp + 1, strlen (cp + 1) + 1);
+ }
+ }
+
+@@ -266,8 +296,9 @@
+ widget_want_hotkey (b->widget, 1);
+ b->hotkey = 0;
+ b->hotpos = -1;
++ b->hotwc = L'\0';
+
+- button_scan_hotkey(b);
++ scan_hotkey(b->text, &b->hotpos, &b->hotkey, &b->hotwc);
+ return b;
+ }
+
+@@ -280,14 +311,13 @@
+ void
+ button_set_text (WButton *b, const char *text)
+ {
+- g_free (b->text);
++ g_free (b->text);
+ b->text = g_strdup (text);
+ b->widget.cols = button_len (text, b->flags);
+- button_scan_hotkey(b);
++ scan_hotkey(b->text, &b->hotpos, &b->hotkey, &b->hotwc);
+ dlg_redraw (b->widget.parent);
+ }
+
+-
+ /* Radio button widget */
+ static int radio_event (Gpm_Event *event, void *);
+
+@@ -362,14 +392,35 @@
+ widget_move (&r->widget, i, 0);
+
+ tty_printf ("(%c) ", (r->sel == i) ? '*' : ' ');
+- for (cp = r->texts[i]; *cp; cp++) {
+- if (*cp == '&') {
+- widget_selectcolor (w, focused, TRUE);
++ cp = strchr (r->texts[i], '&');
++ if (cp != NULL) {
++#ifdef UTF8
++ mbstate_t s;
++ wchar_t wc;
++ int len;
++#endif
++ tty_printf ("%.*s", (int) ((char *) cp - r->texts[i]),
++ r->texts[i]);
++ widget_selectcolor (w, focused, TRUE);
++#ifdef UTF8
++ if (SLsmg_Is_Unicode) {
++ memset (&s, 0, sizeof (s));
++ len = mbrtowc (&wc, cp + 1, MB_CUR_MAX, &s);
++ ++cp;
++ if (len > 0) {
++ tty_printf ("%.*s", len, cp);
++ cp += len;
++ }
++ } else
++#endif
++ {
+ addch (*++cp);
+- widget_selectcolor (w, focused, FALSE);
+- } else
+- addch (*cp);
+- }
++ ++cp;
++ }
++ widget_selectcolor (w, focused, FALSE);
++ } else
++ cp = r->texts[i];
++ addstr ((char *) cp);
+ }
+ return MSG_HANDLED;
+
+@@ -408,7 +459,7 @@
+ /* Compute the longest string */
+ max = 0;
+ for (i = 0; i < count; i++){
+- m = strlen (texts [i]);
++ m = mbstrlen (texts [i]);
+ if (m > max)
+ max = m;
+ }
+@@ -468,6 +519,11 @@
+ if (c->hotpos >= 0) {
+ widget_selectcolor (w, msg == WIDGET_FOCUS, TRUE);
+ widget_move (&c->widget, 0, +c->hotpos + 4);
++#ifdef UTF8
++ if (SLsmg_Is_Unicode)
++ SLsmg_write_nwchars (&c->hotwc, 1);
++ else
++#endif
+ addch ((unsigned char) c->text[c->hotpos]);
+ }
+ return MSG_HANDLED;
+@@ -505,35 +561,20 @@
+ check_new (int y, int x, int state, const char *text)
+ {
+ WCheck *c = g_new (WCheck, 1);
+- const char *s;
+- char *t;
+-
+- init_widget (&c->widget, y, x, 1, strlen (text),
++
++ init_widget (&c->widget, y, x, 1, mbstrlen (text),
+ check_callback, check_event);
+ c->state = state ? C_BOOL : 0;
+ c->text = g_strdup (text);
+ c->hotkey = 0;
+ c->hotpos = -1;
++ c->hotwc = L'\0';
+ widget_want_hotkey (c->widget, 1);
+
+- /* Scan for the hotkey */
+- for (s = text, t = c->text; *s; s++, t++){
+- if (*s != '&'){
+- *t = *s;
+- continue;
+- }
+- s++;
+- if (*s){
+- c->hotkey = tolower ((unsigned char) *s);
+- c->hotpos = t - c->text;
+- }
+- *t = *s;
+- }
+- *t = 0;
++ scan_hotkey (c->text, &c->hotpos, &c->hotkey, &c->hotwc);
+ return c;
+ }
+
+-
+ /* Label widget */
+
+ static cb_ret_t
+@@ -572,7 +613,7 @@
+ }
+ widget_move (&l->widget, y, 0);
+ tty_printf ("%s", p);
+- xlen = l->widget.cols - strlen (p);
++ xlen = l->widget.cols - mbstrlen (p);
+ if (xlen > 0)
+ tty_printf ("%*s", xlen, " ");
+ if (!q)
+@@ -606,7 +647,7 @@
+ if (text){
+ label->text = g_strdup (text);
+ if (label->auto_adjust_cols) {
+- newcols = strlen (text);
++ newcols = mbstrlen (text);
+ if (newcols > label->widget.cols)
+ label->widget.cols = newcols;
+ }
+@@ -630,7 +671,7 @@
+ if (!text || strchr(text, '\n'))
+ width = 1;
+ else
+- width = strlen (text);
++ width = mbstrlen (text);
+
+ l = g_new (WLabel, 1);
+ init_widget (&l->widget, y, x, 1, width, label_callback, NULL);
+@@ -778,13 +819,69 @@
+ /* Pointer to killed data */
+ static char *kill_buffer = 0;
+
++#ifdef UTF8
++static int
++charpos(WInput *in, int idx)
++{
++ int i, pos, l, len;
++ mbstate_t mbs;
++ memset (&mbs, 0, sizeof (mbs));
++ i = 0;
++ pos = 0;
++ len = strlen(in->buffer);
++
++ while (in->buffer[pos]) {
++ if (i == idx)
++ return pos;
++ l = mbrlen(in->buffer + pos, len - pos, &mbs);
++ if (l <= 0)
++ return pos;
++ pos+=l;
++ i++;
++ };
++ return pos;
++}
++
++static int
++charcolumn(WInput *in, int idx)
++{
++ int i, pos, l, width, len;
++ mbstate_t mbs;
++ memset (&mbs, 0, sizeof (mbs));
++ i = 0;
++ pos = 0; width = 0;
++ len = strlen(in->buffer);
++
++ while (in->buffer[pos]) {
++ wchar_t wc;
++ if (i == idx)
++ return width;
++ l = mbrtowc(&wc, in->buffer + pos, len - pos, &mbs);
++ if (l <= 0)
++ return width;
++ pos += l; width += wcwidth(wc);
++ i++;
++ };
++ return width;
++}
++#else
++#define charpos(in, idx) (idx)
++#define charcolumn(in, idx) (idx)
++#endif /* UTF8 */
++
+ void
+ update_input (WInput *in, int clear_first)
+ {
+ int has_history = 0;
+ int i, j;
+- unsigned char c;
+- int buf_len = strlen (in->buffer);
++ int buf_len = mbstrlen (in->buffer);
++#ifndef UTF8
++ unsigned char c;
++#else /* UTF8 */
++ wchar_t c;
++ mbstate_t mbs;
++ memset (&mbs, 0, sizeof (mbs));
++#endif /* UTF8 */
+
+ if (should_show_history_button (in))
+ has_history = HISTORY_BUTTON_WIDTH;
+@@ -794,7 +891,7 @@
+
+ /* Make the point visible */
+ if ((in->point < in->first_shown) ||
+- (in->point >= in->first_shown+in->field_len - has_history)){
++ (charcolumn(in, in->point) >= charcolumn(in, in->first_shown) + in->field_len - has_history)){
+ in->first_shown = in->point - (in->field_len / 3);
+ if (in->first_shown < 0)
+ in->first_shown = 0;
+@@ -814,14 +911,29 @@
+ addch (' ');
+ widget_move (&in->widget, 0, 0);
+
++#ifndef UTF8
+ for (i = 0, j = in->first_shown; i < in->field_len - has_history && in->buffer [j]; i++){
+ c = in->buffer [j++];
+ c = is_printable (c) ? c : '.';
+- if (in->is_password)
++#else /* UTF8 */
++ for (i = 0, j = in->first_shown; (i < in->field_len - has_history) && (j < buf_len); i++,j++){
++ char * chp = in->buffer + charpos(in,j);
++ size_t res = mbrtowc(&c, chp, strlen(chp), &mbs);
++ c = (res && iswprint (c)) ? 0 : '.';
++#endif /* UTF8 */
++ if (in->is_password)
+ c = '*';
++#ifndef UTF8
+ addch (c);
++#else /* UTF8 */
++ if (c) {
++ addch (c);
++ }
++ else
++ SLsmg_write_nchars (chp, res);
++#endif /* UTF8 */
+ }
+- widget_move (&in->widget, 0, in->point - in->first_shown);
++ widget_move (&in->widget, 0, charcolumn(in, in->point) - charcolumn(in, in->first_shown));
+
+ if (clear_first)
+ in->first = 0;
+@@ -974,7 +1086,7 @@
+ show_hist (GList *history, int widget_x, int widget_y)
+ {
+ GList *hi, *z;
+- size_t maxlen = strlen (i18n_htitle ()), i, count = 0;
++ size_t maxlen = mbstrlen (i18n_htitle ()), i, count = 0;
+ int x, y, w, h;
+ char *q, *r = 0;
+ Dlg_head *query_dlg;
+@@ -987,7 +1099,7 @@
+ z = g_list_first (history);
+ hi = z;
+ while (hi) {
+- if ((i = strlen ((char *) hi->data)) > maxlen)
++ if ((i = mbstrlen ((char *) hi->data)) > maxlen)
+ maxlen = i;
+ count++;
+ hi = g_list_next (hi);
+@@ -1157,35 +1269,83 @@
+ in->need_push = 1;
+ in->buffer [0] = 0;
+ in->point = 0;
++ in->charpoint = 0;
+ in->mark = 0;
+ free_completions (in);
+ update_input (in, 0);
+ }
+
++static void
++move_buffer_backward (WInput *in, int point)
++{
++ int i, pos, len;
++ int str_len = mbstrlen (in->buffer);
++ if (point >= str_len) return;
++
++ pos = charpos(in,point);
++ len = charpos(in,point + 1) - pos;
++
++ for (i = pos; in->buffer [i + len - 1]; i++)
++ in->buffer [i] = in->buffer [i + len];
++}
++
+ static cb_ret_t
+ insert_char (WInput *in, int c_code)
+ {
+ size_t i;
++#ifdef UTF8
++ mbstate_t mbs;
++ int res;
++
++ memset (&mbs, 0, sizeof (mbs));
++#else
++ in->charpoint = 0;
++#endif /* UTF8 */
+
+ if (c_code == -1)
+ return MSG_NOT_HANDLED;
+
++#ifdef UTF8
++ if (in->charpoint >= MB_CUR_MAX) return 1;
++
++ in->charbuf[in->charpoint++] = c_code;
++
++ res = mbrlen((char *)in->charbuf, in->charpoint, &mbs);
++ if (res < 0) {
++ if (res != -2) in->charpoint = 0; /* broken multibyte char, skip */
++ return 1;
++ }
++
++#endif /* UTF8 */
+ in->need_push = 1;
+- if (strlen (in->buffer)+1 == (size_t) in->current_max_len){
++ if (strlen (in->buffer) + 1 + in->charpoint >= (size_t) in->current_max_len){
+ /* Expand the buffer */
+- char *narea = g_realloc (in->buffer, in->current_max_len + in->field_len);
++ char *narea = g_realloc (in->buffer, in->current_max_len + in->field_len + in->charpoint);
+ if (narea){
+ in->buffer = narea;
+- in->current_max_len += in->field_len;
++ in->current_max_len += in->field_len + in->charpoint;
+ }
+ }
++#ifndef UTF8
+ if (strlen (in->buffer)+1 < (size_t) in->current_max_len){
+ size_t l = strlen (&in->buffer [in->point]);
+ for (i = l+1; i > 0; i--)
+ in->buffer [in->point+i] = in->buffer [in->point+i-1];
+ in->buffer [in->point] = c_code;
++#else /* UTF8 */
++ if (strlen (in->buffer) + in->charpoint < in->current_max_len){
++ size_t ins_point = charpos(in,in->point); /* bytes from begin */
++ /* move chars */
++ size_t rest_bytes = strlen (in->buffer + ins_point);
++
++ for (i = rest_bytes + 1; i > 0; i--)
++ in->buffer [ins_point + i + in->charpoint - 1] = in->buffer [ins_point + i - 1];
++
++ memcpy(in->buffer + ins_point, in->charbuf, in->charpoint);
++#endif /* UTF8 */
+ in->point++;
+ }
++ in->charpoint = 0;
+ return MSG_HANDLED;
+ }
+
+@@ -1193,12 +1353,14 @@
+ beginning_of_line (WInput *in)
+ {
+ in->point = 0;
++ in->charpoint = 0;
+ }
+
+ static void
+ end_of_line (WInput *in)
+ {
+- in->point = strlen (in->buffer);
++ in->point = mbstrlen (in->buffer);
++ in->charpoint = 0;
+ }
+
+ static void
+@@ -1206,18 +1368,21 @@
+ {
+ if (in->point)
+ in->point--;
++ in->charpoint = 0;
+ }
+
+ static void
+ forward_char (WInput *in)
+ {
+- if (in->buffer [in->point])
++ if (in->buffer [charpos(in,in->point)])
+ in->point++;
++ in->charpoint = 0;
+ }
+
+ static void
+ forward_word (WInput * in)
+ {
++#ifndef UTF8
+ char *p = in->buffer + in->point;
+
+ while (*p
+@@ -1227,11 +1392,39 @@
+ while (*p && isalnum ((unsigned char) *p))
+ p++;
+ in->point = p - in->buffer;
++#else /* UTF8 */
++ mbstate_t mbs;
++ int len = mbstrlen (in->buffer);
++ memset (&mbs, 0, sizeof (mbs));
++
++ while (in->point < len) {
++ wchar_t c;
++ char *p = in->buffer + charpos(in,in->point);
++ size_t res = mbrtowc(&c, p, strlen(p), &mbs);
++ if (res <= 0 || !(iswspace (c) || iswpunct (c)))
++ break;
++ in->point++;
++ }
++
++ memset (&mbs, 0, sizeof (mbs));
++
++ while (in->point < len) {
++ wchar_t c;
++ char *p = in->buffer + charpos(in,in->point);
++ size_t res = mbrtowc(&c, p, strlen(p), &mbs);
++ if (res <= 0 || !iswalnum (c))
++ break;
++ in->point++;
++ }
++
++ in->charpoint = 0;
++#endif /* UTF8 */
+ }
+
+ static void
+ backward_word (WInput *in)
+ {
++#ifndef UTF8
+ char *p = in->buffer + in->point;
+
+ while (p - 1 > in->buffer - 1 && (isspace ((unsigned char) *(p - 1))
+@@ -1241,6 +1434,32 @@
+ while (p - 1 > in->buffer - 1 && isalnum ((unsigned char) *(p - 1)))
+ p--;
+ in->point = p - in->buffer;
++#else /* UTF8 */
++ mbstate_t mbs;
++
++ memset (&mbs, 0, sizeof (mbs));
++ while (in->point > 0) {
++ wchar_t c;
++ char *p = in->buffer + charpos(in,in->point);
++ size_t res = mbrtowc(&c, p, strlen(p), &mbs);
++ if (*p && (res <= 0 || !(iswspace (c) || iswpunct (c))))
++ break;
++ in->point--;
++ }
++
++ memset (&mbs, 0, sizeof (mbs));
++
++ while (in->point > 0) {
++ wchar_t c;
++ char *p = in->buffer + charpos(in,in->point);
++ size_t res = mbrtowc(&c, p, strlen(p), &mbs);
++ if (*p && (res <= 0 || !iswalnum (c)))
++ break;
++ in->point--;
++ }
++
++ in->charpoint = 0;
++#endif /* UTF8 */
+ }
+
+ static void
+@@ -1273,8 +1492,9 @@
+
+ if (!in->point)
+ return;
+- for (i = in->point; in->buffer [i-1]; i++)
+- in->buffer [i-1] = in->buffer [i];
++
++ move_buffer_backward(in, in->point - 1);
++ in->charpoint = 0;
+ in->need_push = 1;
+ in->point--;
+ }
+@@ -1282,10 +1502,8 @@
+ static void
+ delete_char (WInput *in)
+ {
+- int i;
+-
+- for (i = in->point; in->buffer [i]; i++)
+- in->buffer [i] = in->buffer [i+1];
++ move_buffer_backward(in, in->point);
++ in->charpoint = 0;
+ in->need_push = 1;
+ }
+
+@@ -1300,6 +1518,9 @@
+
+ g_free (kill_buffer);
+
++ first=charpos(in,first);
++ last=charpos(in,last);
++
+ kill_buffer = g_strndup(in->buffer+first,last-first);
+ }
+
+@@ -1308,11 +1529,13 @@
+ {
+ int first = min (x_first, x_last);
+ int last = max (x_first, x_last);
+- size_t len = strlen (&in->buffer [last]) + 1;
++ size_t len;
+
+ in->point = first;
+ in->mark = first;
+- memmove (&in->buffer [first], &in->buffer [last], len);
++ len = strlen (&in->buffer [charpos(in,last)]) + 1;
++ memmove (&in->buffer [charpos(in,first)], &in->buffer [charpos(in,last)], len);
++ in->charpoint = 0;
+ in->need_push = 1;
+ }
+
+@@ -1329,6 +1552,8 @@
+ copy_region (in, old_point, new_point);
+ delete_region (in, old_point, new_point);
+ in->need_push = 1;
++ in->charpoint = 0;
++ in->charpoint = 0;
+ }
+
+ static void
+@@ -1372,16 +1597,20 @@
+
+ if (!kill_buffer)
+ return;
++ in->charpoint = 0;
+ for (p = kill_buffer; *p; p++)
+ insert_char (in, *p);
++ in->charpoint = 0;
+ }
+
+ static void
+ kill_line (WInput *in)
+ {
++ int chp = charpos(in,in->point);
+ g_free (kill_buffer);
+- kill_buffer = g_strdup (&in->buffer [in->point]);
+- in->buffer [in->point] = 0;
++ kill_buffer = g_strdup (&in->buffer [chp]);
++ in->buffer [chp] = 0;
++ in->charpoint = 0;
+ }
+
+ void
+@@ -1391,9 +1620,10 @@
+ g_free (in->buffer);
+ in->buffer = g_strdup (text); /* was in->buffer->text */
+ in->current_max_len = strlen (in->buffer) + 1;
+- in->point = strlen (in->buffer);
++ in->point = mbstrlen (in->buffer);
+ in->mark = 0;
+ in->need_push = 1;
++ in->charpoint = 0;
+ }
+
+ static void
+@@ -1520,6 +1750,7 @@
+ *in->buffer = 0;
+ in->point = 0;
+ in->first = 0;
++ in->charpoint = 0;
+ }
+
+ cb_ret_t
+@@ -1548,7 +1779,11 @@
+ }
+ }
+ if (!input_map [i].fn){
++#ifndef UTF8
+ if (c_code > 255 || !is_printable (c_code))
++#else /* UTF8 */
++ if (c_code > 255)
++#endif /* UTF8 */
+ return MSG_NOT_HANDLED;
+ if (in->first){
+ port_region_marked_for_delete (in);
+@@ -1581,6 +1816,9 @@
+ if (pos != in->point)
+ free_completions (in);
+ in->point = pos;
++#ifdef UTF8
++ in->charpoint = 0;
++#endif /* UTF8 */
+ update_input (in, 1);
+ }
+
+@@ -1621,7 +1859,7 @@
+ return MSG_HANDLED;
+
+ case WIDGET_CURSOR:
+- widget_move (&in->widget, 0, in->point - in->first_shown);
++ widget_move (&in->widget, 0, charcolumn(in, in->point) - charcolumn(in, in->first_shown));
+ return MSG_HANDLED;
+
+ case WIDGET_DESTROY:
+@@ -1645,7 +1883,7 @@
+ && should_show_history_button (in)) {
+ do_show_hist (in);
+ } else {
+- in->point = strlen (in->buffer);
++ in->point = mbstrlen (in->buffer);
+ if (event->x - in->first_shown - 1 < in->point)
+ in->point = event->x - in->first_shown - 1;
+ if (in->point < 0)
+@@ -1702,7 +1940,8 @@
+ in->is_password = 0;
+
+ strcpy (in->buffer, def_text);
+- in->point = strlen (in->buffer);
++ in->point = mbstrlen (in->buffer);
++ in->charpoint = 0;
+ return in;
+ }
+
+--- mc-4.6.2-pre1/src/widget.h
++++ mc-4.6.2-pre1/src/widget.h
+@@ -22,6 +22,7 @@
+ char *text; /* text of button */
+ int hotkey; /* hot KEY */
+ int hotpos; /* offset hot KEY char in text */
++ wchar_t hotwc;
+ bcback callback; /* Callback function */
+ } WButton;
+
+@@ -42,6 +43,7 @@
+ char *text; /* text of check button */
+ int hotkey; /* hot KEY */
+ int hotpos; /* offset hot KEY char in text */
++ wchar_t hotwc;
+ } WCheck;
+
+ typedef struct WGauge {
+@@ -57,16 +59,20 @@
+
+ typedef struct {
+ Widget widget;
+- int point; /* cursor position in the input line */
+- int mark; /* The mark position */
+- int first_shown; /* Index of the first shown character */
+- int current_max_len; /* Maximum length of input line */
+- int field_len; /* Length of the editing field */
++ int point; /* cursor position in the input line (mb chars) */
++ int mark; /* The mark position (mb chars) */
++ int first_shown; /* Index of the first shown character (mb chars) */
++ int current_max_len; /* Maximum length of input line (bytes) */
++ int field_len; /* Length of the editing field (mb chars) */
+ int color; /* color used */
+ int first; /* Is first keystroke? */
+ int disable_update; /* Do we want to skip updates? */
+ int is_password; /* Is this a password input line? */
+ char *buffer; /* pointer to editing buffer */
++#ifdef UTF8
++ char charbuf[MB_LEN_MAX];
++#endif /* UTF8 */
++ int charpoint;
+ GList *history; /* The history */
+ int need_push; /* need to push the current Input on hist? */
+ char **completions; /* Possible completions array */
+--- mc-4.6.2-pre1/src/wtools.c
++++ mc-4.6.2-pre1/src/wtools.c
+@@ -49,11 +49,11 @@
+ /* Adjust sizes */
+ lines = (lines > LINES - 6) ? LINES - 6 : lines;
+
+- if (title && (cols < (len = strlen (title) + 2)))
++ if (title && (cols < (len = mbstrlen (title) + 2)))
+ cols = len;
+
+ /* no &, but 4 spaces around button for brackets and such */
+- if (cols < (len = strlen (cancel_string) + 3))
++ if (cols < (len = mbstrlen (cancel_string) + 3))
+ cols = len;
+
+ cols = cols > COLS - 6 ? COLS - 6 : cols;
+@@ -124,7 +124,7 @@
+ va_start (ap, count);
+ for (i = 0; i < count; i++) {
+ char *cp = va_arg (ap, char *);
+- win_len += strlen (cp) + 6;
++ win_len += mbstrlen (cp) + 6;
+ if (strchr (cp, '&') != NULL)
+ win_len--;
+ }
+@@ -133,7 +133,7 @@
+
+ /* count coordinates */
+ msglen (text, &lines, &cols);
+- cols = 6 + max (win_len, max ((int) strlen (header), cols));
++ cols = 6 + max (win_len, max ((int) mbstrlen (header), cols));
+ lines += 4 + (count > 0 ? 2 : 0);
+ xpos = COLS / 2 - cols / 2;
+ ypos = LINES / 3 - (lines - 3) / 2;
+@@ -148,7 +148,7 @@
+ va_start (ap, count);
+ for (i = 0; i < count; i++) {
+ cur_name = va_arg (ap, char *);
+- xpos = strlen (cur_name) + 6;
++ xpos = mbstrlen (cur_name) + 6;
+ if (strchr (cur_name, '&') != NULL)
+ xpos--;
+
+@@ -463,7 +463,7 @@
+ quick_widgets[2].histname = histname;
+
+ msglen (text, &lines, &cols);
+- len = max ((int) strlen (header), cols) + 4;
++ len = max ((int) mbstrlen (header), cols) + 4;
+ len = max (len, 64);
+
+ /* The special value of def_text is used to identify password boxes
+@@ -485,7 +485,7 @@
+ quick_widgets[1].text = _(quick_widgets[1].text);
+ quick_widgets[0].relative_x = len / 2 + 4;
+ quick_widgets[1].relative_x =
+- len / 2 - (strlen (quick_widgets[1].text) + 9);
++ len / 2 - (mbstrlen (quick_widgets[1].text) + 9);
+ quick_widgets[0].x_divisions = quick_widgets[1].x_divisions = len;
+ #endif /* ENABLE_NLS */
+
Copied: trunk/debian/patches/49_64bit.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/49_64bit.patch)
===================================================================
--- trunk/debian/patches/49_64bit.patch (rev 0)
+++ trunk/debian/patches/49_64bit.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,54 @@
+--- mc-4.6.1a/src/mountlist.c.64bit 2005-02-08 23:33:52.000000000 +0100
++++ mc-4.6.1a/src/mountlist.c 2005-05-10 17:09:24.122853504 +0200
+@@ -131,11 +131,19 @@ struct mount_entry
+
+ struct fs_usage
+ {
++#ifndef HAVE_SYS_STATVFS_H
+ long fsu_blocks; /* Total blocks. */
+ long fsu_bfree; /* Free blocks available to superuser. */
+ long fsu_bavail; /* Free blocks available to non-superuser. */
+ long fsu_files; /* Total file nodes. */
+ long fsu_ffree; /* Free file nodes. */
++#else /* We have sys/statvfs.h, use proper data types when _FILE_OFFSET_BITS=64 */
++ fsblkcnt_t fsu_blocks;
++ fsblkcnt_t fsu_bfree;
++ fsblkcnt_t fsu_bavail;
++ fsblkcnt_t fsu_files;
++ fsblkcnt_t fsu_ffree;
++#endif /* HAVE_SYS_STATVFS_H */
+ };
+
+ static int get_fs_usage (char *path, struct fs_usage *fsp);
+@@ -665,6 +673,7 @@ my_statfs (struct my_statfs *myfs_stats,
+ BLOCKS FROMSIZE-byte blocks, rounding away from zero.
+ TOSIZE must be positive. Return -1 if FROMSIZE is not positive. */
+
++#if !defined(HAVE_SYS_STATFS_H) || !defined(STAT_STATVFS)
+ static long
+ fs_adjust_blocks (long blocks, int fromsize, int tosize)
+ {
+@@ -672,13 +681,21 @@ fs_adjust_blocks (long blocks, int froms
+ abort ();
+ if (fromsize <= 0)
+ return -1;
+-
++#else
++static fsblkcnt_t
++fs_adjust_blocks (fsblkcnt_t blocks, unsigned long fromsize, unsigned long tosize)
++{
++ if (!tosize)
++ abort ();
++ if (!fromsize)
++ return -1;
++#endif
+ if (fromsize == tosize) /* E.g., from 512 to 512. */
+ return blocks;
+ else if (fromsize > tosize) /* E.g., from 2048 to 512. */
+ return blocks * (fromsize / tosize);
+ else /* E.g., from 256 to 512. */
+- return (blocks + (blocks < 0 ? -1 : 1)) / (tosize / fromsize);
++ return (blocks + 1) / (tosize / fromsize);
+ }
+
+ #if defined(_AIX) && defined(_I386)
Copied: trunk/debian/patches/50_ignore_ftp_chmod_error.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/50_ignore_ftp_chmod_error.patch)
===================================================================
--- trunk/debian/patches/50_ignore_ftp_chmod_error.patch (rev 0)
+++ trunk/debian/patches/50_ignore_ftp_chmod_error.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,12 @@
+diff -Nurwd mc-4.6.2~pre1.orig/vfs/ftpfs.c mc-4.6.2~pre1/vfs/ftpfs.c
+--- mc-4.6.2~pre1.orig/vfs/ftpfs.c 2008-02-13 16:10:32.000000000 +0100
++++ mc-4.6.2~pre1/vfs/ftpfs.c 2008-02-13 16:54:31.000000000 +0100
+@@ -1525,7 +1525,7 @@
+ char buf[BUF_SMALL];
+
+ g_snprintf(buf, sizeof(buf), "SITE CHMOD %4.4o /%%s", mode & 07777);
+- return ftpfs_send_command(me, path, buf, OPT_FLUSH);
++ return ftpfs_send_command(me, path, buf, OPT_FLUSH | OPT_IGNORE_ERROR);
+ }
+
+ static int ftpfs_chown (struct vfs_class *me, const char *path, int owner, int group)
Copied: trunk/debian/patches/51_html-syntax.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/51_html-syntax.patch)
===================================================================
--- trunk/debian/patches/51_html-syntax.patch (rev 0)
+++ trunk/debian/patches/51_html-syntax.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,1278 @@
+diff -Nurwd mc-4.6.2~pre1.orig/syntax/html.syntax mc-4.6.2~pre1/syntax/html.syntax
+--- mc-4.6.2~pre1.orig/syntax/html.syntax 2008-02-16 13:49:01.000000000 +0100
++++ mc-4.6.2~pre1/syntax/html.syntax 2008-02-16 13:49:08.000000000 +0100
+@@ -1,20 +1,1264 @@
+-# Syntax rules for the HyperText Markup Language
++
++# html highlighting with tags in caps always. if you want everything in lowercase
++# use tr
++
++# i got upto IMG in the netscape comprehensive tags reference. thereafter will get
++# done later - paul
+
+ context default
+- keyword &\[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\]; brightgreen
+- keyword &#\{xX\}\[0123456789abcdefABCDEF\]; brightgreen
+- keyword &#\[0123456789\]; brightgreen
++ keyword whole &*; brightgreen/16
+ spellcheck
+
+-context <!-- --> brown
++ keyword </A> brightcyan/17
++ keyword </ADDRESS> brightcyan/17
++ keyword </APPLET> brightcyan/17
++ keyword </AREA> brightcyan/17
++ keyword </B> brightcyan/17
++ keyword </BASE> brightcyan/17
++ keyword </BASEFONT> brightcyan/17
++ keyword </BIG> brightcyan/17
++ keyword </BLOCKQUOTE> brightcyan/17
++ keyword </BODY> brightcyan/17
++ keyword </BR> brightcyan/17
++ keyword </BUTTON> brightcyan/17
++ keyword </CAPTION> brightcyan/17
++ keyword </CENTER> brightcyan/17
++ keyword </CITE> brightcyan/17
++ keyword </CODE> brightcyan/17
++ keyword </DD> brightcyan/17
++ keyword </DIR> brightcyan/17
++ keyword </DIV> brightcyan/17
++ keyword </DL> brightcyan/17
++ keyword </DT> brightcyan/17
++ keyword </EM> brightcyan/17
++ keyword </FONT> brightcyan/17
++ keyword </FORM> brightcyan/17
++ keyword </FRAME> brightcyan/17
++ keyword </FRAMESET> brightcyan/17
++ keyword </H1> brightcyan/17
++ keyword </H2> brightcyan/17
++ keyword </H3> brightcyan/17
++ keyword </H4> brightcyan/17
++ keyword </H5> brightcyan/17
++ keyword </H6> brightcyan/17
++ keyword </HEAD> brightcyan/17
++ keyword </HR> brightcyan/17
++ keyword </HTML> brightcyan/17
++ keyword </I> brightcyan/17
++ keyword </IMG> brightcyan/17
++ keyword </PRE> brightcyan/17
++ keyword </SMALL> brightcyan/17
++ keyword </SCRIPT> brightcyan/17
++ keyword </META> brightcyan/17
++ keyword </P> brightcyan/17
++ keyword </TABLE> brightcyan/17
++ keyword </TD> brightcyan/17
++ keyword </TITLE> brightcyan/17
++ keyword </TR> brightcyan/17
++ keyword </TT> brightcyan/17
++ keyword </U> brightcyan/17
++
++
++context <A > brightcyan/17
++ keyword = brightred/18
++
++ keyword "http:*" magenta/22
++ keyword "ftp:*" magenta/22
++ keyword "news:*" magenta/22
++ keyword "mailto:*" magenta/22
++ keyword "gopher:*" magenta/22
++ keyword "telnet:*" magenta/22
++ keyword "file:*" magenta/22
++ keyword "javascript:*" magenta/22
++
++ keyword "Alternate" magenta/22
++ keyword "Stylesheet" magenta/22
++ keyword "Start" magenta/22
++ keyword "Next" magenta/22
++ keyword "Prev" magenta/22
++ keyword "Contents" magenta/22
++ keyword "Index" magenta/22
++ keyword "Glossary" magenta/22
++ keyword "Copyright" magenta/22
++ keyword "Chapter" magenta/22
++ keyword "Section" magenta/22
++ keyword "Subsection" magenta/22
++ keyword "Appendix" magenta/22
++ keyword "Help" magenta/22
++ keyword "Bookmark" magenta/22
++
++ keyword "_blank" magenta/22
++ keyword "_self" magenta/22
++ keyword "_parent" magenta/22
++ keyword "_top" magenta/22
++
++ keyword "*" cyan/5
++
++# keyword whole charset yellow/24
++# keyword whole type yellow/24
++ keyword whole name yellow/24
++ keyword whole href yellow/24
++# keyword whole hreflang yellow/24
++# keyword whole rel yellow/24
++# keyword whole rev yellow/24
++ keyword whole shape yellow/24
++ keyword whole coords yellow/24
++# keyword whole tabindex yellow/24
++# keyword whole selected yellow/24
++ keyword whole target yellow/24
++ keyword whole onblur yellow/24
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onfocus yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++
++
++context <ADDRESS > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole dir yellow/24
++ keyword whole title yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onblur yellow/24
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onfocus yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++ keyword "*" cyan/5
++
++context <APPLET > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole align yellow/24
++ keyword whole alt yellow/24
++ keyword whole archive yellow/24
++ keyword whole code yellow/24
++ keyword whole codebase yellow/24
++ keyword whole height yellow/24
++ keyword whole hspace yellow/24
++ keyword whole mayscript yellow/24
++ keyword whole name yellow/24
++ keyword whole object yellow/24
++ keyword whole vspace yellow/24
++ keyword whole width yellow/24
++
++ keyword "http:*" magenta/22
++ keyword "ftp:*" magenta/22
++ keyword "news:*" magenta/22
++ keyword "mailto:*" magenta/22
++ keyword "gopher:*" magenta/22
++ keyword "telnet:*" magenta/22
++ keyword "file:*" magenta/22
++ keyword "javascript:*" magenta/22
++ keyword "*.class" magenta/22
++ keyword "*" cyan/5
++
++context <AREA > brightcyan/17
++ keyword = brightred/18
++
++# keyword whole accesskey yellow/24
++# keyword whole alt yellow/24
++ keyword whole coords yellow/24
++ keyword whole href yellow/24
++ keyword whole nohref yellow/24
++ keyword whole shape yellow/24
++# keyword whole onfocus yellow/24
++# keyword whole onblur yellow/24
++ keyword whole target magenta/22
++ keyword "_blank" magenta/22
++ keyword "_self" magenta/22
++ keyword "_parent" magenta/22
++ keyword "_top" magenta/22
++
++ keyword "DEFAULT" magenta/22
++ keyword "CIRCLE" magenta/22
++ keyword "POLY" magenta/22
++ keyword "POLYGON" magenta/22
++ keyword "RECT" magenta/22
++ keyword "RECTANGLE" magenta/22
++
++ keyword "http:*" magenta/22
++ keyword "ftp:*" magenta/22
++ keyword "news:*" magenta/22
++ keyword "gopher:*" magenta/22
++ keyword "telnet:*" magenta/22
++ keyword "*" cyan/5
++
++context <B > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++ keyword "*" cyan/5
++
++context <BASE > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole href yellow/24
++ keyword whole target yellow/24
++ keyword "_blank" magenta/22
++ keyword "_self" magenta/22
++ keyword "_parent" magenta/22
++ keyword "_top" magenta/22
++
++ keyword "http:*" magenta/22
++ keyword "ftp:*" magenta/22
++ keyword "*" cyan/5
++
++context <BASEFONT > brightcyan/17
++ keyword = brightred/18
++ keyword " magenta/22
++
++ keyword whole id yellow/24
++ keyword whole size yellow/24
++ keyword whole color yellow/24
++ keyword whole face yellow/24
++ keyword "*" cyan/5
++
++context <BIG > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++ keyword "*" cyan/5
++
++
++context <BLOCKQUOTE > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++
++ keyword whole cite yellow/24
++ keyword "*" cyan/5
++
++
++context <BODY > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++
++ keyword whole onload yellow/24
++ keyword whole onunload yellow/24
++
++ keyword whole alink yellow/24
++ keyword whole background yellow/24
++
++ keyword "*.gif" brightred/19
++ keyword "*.jpg" brightred/19
++ keyword "*.png" brightred/19
++ keyword "*" cyan/5
++
++ keyword whole bgcolor yellow/24
++ keyword whole link yellow/24
++ keyword whole text yellow/24
++ keyword whole vlink yellow/24
++
++context <BR > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++ keyword "*" cyan/5
++
++
++context <BUTTON > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++ keyword "*" cyan/5
++
++context <CAPTION > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++
++ keyword whole align yellow/24
++ keyword whole valign yellow/24
++ keyword whole onmouseup yellow/24
++ keyword "*" cyan/5
++
++context <CENTER > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++ keyword "*" cyan/5
++
++
++context <CITE > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++ keyword "*" cyan/5
++
++
++context <CODE > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++ keyword "*" cyan/5
++
++context <DD > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++ keyword "*" cyan/5
++
++context <DIR > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++ keyword "*" cyan/5
++
++
++context <DIV > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++
++ keyword whole align yellow/24
++ keyword whole "center" magenta/22
++ keyword whole "justify" magenta/22
++ keyword whole "left" magenta/22
++ keyword whole "right" magenta/22
++ keyword "*" cyan/5
++
++
++context <DL > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++ keyword "*" cyan/5
++
++context <DT > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++ keyword "*" cyan/5
++
++context <EM > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++ keyword "*" cyan/5
++
++
++context <DT > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++ keyword "*" cyan/5
++
++context <FONT > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++
++ keyword whole size yellow/24
++ keyword whole color yellow/24
++ keyword whole face yellow/24
++ keyword "*" cyan/5
++
++context <FORM > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++
++ keyword whole action yellow/24
++ keyword whole enctype yellow/24
++ keyword whole method yellow/24
++ keyword "GET" magenta/22
++ keyword "POST" magenta/22
++ keyword whole onreset yellow/24
++ keyword whole onsubmit yellow/24
++ keyword whole target yellow/24
++ keyword "_blank" magenta/22
++ keyword "_self" magenta/22
++ keyword "_parent" magenta/22
++ keyword "_top" magenta/22
++ keyword "*" cyan/5
++
++
++context <FRAME > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole frameborder yellow/24
++ keyword whole marginheight yellow/24
++ keyword whole marginwidth yellow/24
++ keyword whole name yellow/24
++ keyword whole noresize yellow/24
++ keyword whole scrolling yellow/24
++ keyword "YES" magenta/22
++ keyword "NO" magenta/22
++ keyword "AUTO" magenta/22
++ keyword whole src yellow/24
++ keyword "*" cyan/5
++
++
++context <FRAMESET > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole border yellow/24
++ keyword whole bordercolor yellow/24
++ keyword whole cols yellow/24
++ keyword whole onload yellow/24
++ keyword whole onunload yellow/24
++ keyword whole rows yellow/24
++
++
++context <H1 > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++
++ keyword whole align yellow/24
++ keyword "CENTRE" magenta/22
++ keyword "LEFT" magenta/22
++ keyword "RIGHT" magenta/22
++ keyword "*" cyan/5
++
++
++context <H2 > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++
++ keyword whole align yellow/24
++ keyword "CENTRE" magenta/22
++ keyword "LEFT" magenta/22
++ keyword "RIGHT" magenta/22
++ keyword "*" cyan/5
++
++
++context <H3 > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++
++ keyword whole align yellow/24
++ keyword "CENTRE" magenta/22
++ keyword "LEFT" magenta/22
++ keyword "RIGHT" magenta/22
++ keyword "*" cyan/5
++
++
++context <H4 > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++
++ keyword whole align yellow/24
++ keyword "CENTRE" magenta/22
++ keyword "LEFT" magenta/22
++ keyword "RIGHT" magenta/22
++ keyword "*" cyan/5
++
++
++context <H5 > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++
++ keyword whole align yellow/24
++ keyword "centre" magenta/22
++ keyword "left" magenta/22
++ keyword "right" magenta/22
++ keyword "*" cyan/5
++
++
++context <H6 > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++
++ keyword whole align yellow/24
++ keyword "centre" magenta/22
++ keyword "left" magenta/22
++ keyword "right" magenta/22
++ keyword "*" cyan/5
++
++
++context <HEAD > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++ keyword "*" cyan/5
++
++
++context <HR > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++ keyword whole color yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++
++ keyword whole align yellow/24
++ keyword "centre" magenta/22
++ keyword "left" magenta/22
++ keyword "right" magenta/22
++ keyword whole align yellow/24
++ keyword whole noshade yellow/24
++ keyword whole size yellow/24
++ keyword whole width yellow/24
++ keyword "*" cyan/5
++
++
++context <HTML > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++ keyword "*" cyan/5
++
++
++context <IMG > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++
++ keyword whole alt yellow/24
++ keyword whole border yellow/24
++ keyword whole height yellow/24
++ keyword whole hspace yellow/24
++ keyword whole ismap yellow/24
++ keyword whole src yellow/24
++ keyword "*.gif" brightred/19
++ keyword "*.jpg" brightred/19
++ keyword "*.png" brightred/19
++ keyword "*" cyan/5
++ keyword whole usemap yellow/24
++ keyword whole vspace yellow/24
++ keyword whole width yellow/24
++ keyword "*" cyan/5
++
++context <I > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++ keyword "*" cyan/5
++
++
++context <LINK > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++
++ keyword whole type yellow/24
++
++ keyword "text/css" magenta/22
++ keyword "text/javascript" magenta/22
++ keyword "*" cyan/5
++
++
++context <META > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole content yellow/24
++ keyword whole http-equiv yellow/24
++ keyword whole name yellow/24
++ keyword "*" cyan/5
++
++context <P > brightcyan/17
++
++
++context <TITLE > brightcyan/17
++ keyword = brightred/18
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++ keyword "*" cyan/5
++
++context <SCRIPT > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole language yellow/24
++ keyword whole src yellow/24
++
++ keyword "JavaScript" magenta/22
++ keyword "JavaScript1.2" magenta/22
++ keyword "JavaScript1.1" magenta/22
++ keyword "*" cyan/5
++
++context <TABLE > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++
++ keyword whole align yellow/24
++ keyword whole bgcolor yellow/24
++ keyword whole border yellow/24
++ keyword whole width yellow/24
++ keyword whole cellspacing yellow/24
++ keyword whole cellpadding yellow/24
++ keyword "right" magenta/22
++ keyword "left" magenta/22
++ keyword "*" cyan/5
++
++
++context <SMALL > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++ keyword "*" cyan/5
++
++context <TD > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++
++ keyword whole colspan yellow/24
++ keyword whole rowspan yellow/24
++ keyword whole align yellow/24
++ keyword "centre" magenta/22
++ keyword "char" magenta/22
++ keyword "justify" magenta/22
++ keyword "left" magenta/22
++ keyword "right" magenta/22
++ keyword whole bgcolor yellow/24
++ keyword whole valign yellow/24
++ keyword "baseline" magenta/22
++ keyword "bottom" magenta/22
++ keyword "middle" magenta/22
++ keyword "top" magenta/22
++ keyword whole colorspan yellow/24
++ keyword whole height yellow/24
++ keyword whole nowrap yellow/24
++ keyword whole rowspan yellow/24
++ keyword whole width yellow/24
++
++ keyword "*" cyan/5
++
++
++context <TR > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++ keyword whole onclick yellow/24
++ keyword whole ondblclick yellow/24
++ keyword whole onkeydown yellow/24
++ keyword whole onkeypress yellow/24
++ keyword whole onkeyup yellow/24
++ keyword whole onmousedown yellow/24
++ keyword whole onmousemove yellow/24
++ keyword whole onmouseout yellow/24
++ keyword whole onmouseover yellow/24
++ keyword whole onmouseup yellow/24
++
++ keyword whole align yellow/24
++ keyword "centre" magenta/22
++ keyword "char" magenta/22
++ keyword "justify" magenta/22
++ keyword "left" magenta/22
++ keyword "right" magenta/22
++
++ keyword whole bgcolor yellow/24
++ keyword whole valign yellow/24
++ keyword "baseline" magenta/22
++ keyword "bottom" magenta/22
++ keyword "middle" magenta/22
++ keyword "top" magenta/22
++
++ keyword "*" cyan/5
++
++context <TT > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++context <U > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++context <PRE > brightcyan/17
++ keyword = brightred/18
++
++ keyword whole class yellow/24
++ keyword whole id yellow/24
++ keyword whole style yellow/24
++ keyword whole title yellow/24
++
++ keyword whole dir yellow/24
++ keyword whole lang yellow/24
++
++context <!-- --> brown/22
+ spellcheck
+
+ context <! > brightred/orange
+ spellcheck
+
+-context </ > brightcyan
++context < > cyan/15
+
+-context < > brightcyan
+- keyword "*" green
+- keyword '*' green
+- keyword = yellow
Copied: trunk/debian/patches/52_debian_dsc.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/52_debian_dsc.patch)
===================================================================
--- trunk/debian/patches/52_debian_dsc.patch (rev 0)
+++ trunk/debian/patches/52_debian_dsc.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,31 @@
+diff -Nurwd mc-4.6.2~pre1.orig/syntax/debian-description.syntax mc-4.6.2~pre1/syntax/debian-description.syntax
+--- mc-4.6.2~pre1.orig/syntax/debian-description.syntax 1970-01-01 00:00:00.000000000 +0000
++++ mc-4.6.2~pre1/syntax/debian-description.syntax 2008-02-16 13:52:35.000000000 +0100
+@@ -0,0 +1,15 @@
++context default
++ keyword linestart Format green
++ keyword linestart Source brightmagenta
++ keyword linestart Version yellow
++ keyword linestart Binary brightgreen
++ keyword linestart Maintainer brightmagenta
++ keyword <*@*> brightred
++ keyword linestart Architecture cyan
++ keyword linestart Standards-Version brightmagenta
++ keyword linestart Build-Depends green
++ keyword linestart Files green
++
++context --- \n brightred
++ spellcheck
++
+diff -Nurwd mc-4.6.2~pre1.orig/syntax/Syntax mc-4.6.2~pre1/syntax/Syntax
+--- mc-4.6.2~pre1.orig/syntax/Syntax 2008-02-16 13:52:09.000000000 +0100
++++ mc-4.6.2~pre1/syntax/Syntax 2008-02-16 13:53:42.000000000 +0100
+@@ -148,5 +148,8 @@
+ file Don_t_match_me Mail\sfolder ^From\s
+ include mail.syntax
+
++file .\*\\.dsc$ Debian\sdescriptiom\sfile
++include debian-description.syntax
++
+ file .\* unknown
+ include unknown.syntax
Copied: trunk/debian/patches/53_strace_syntax.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/53_strace_syntax.patch)
===================================================================
--- trunk/debian/patches/53_strace_syntax.patch (rev 0)
+++ trunk/debian/patches/53_strace_syntax.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,59 @@
+diff -Nurwd mc-4.6.2~pre1.orig/syntax/strace.syntax mc-4.6.2~pre1/syntax/strace.syntax
+--- mc-4.6.2~pre1.orig/syntax/strace.syntax 1970-01-01 00:00:00.000000000 +0000
++++ mc-4.6.2~pre1/syntax/strace.syntax 2008-02-16 14:00:30.000000000 +0100
+@@ -0,0 +1,43 @@
++context default
++ keyword access(*) green
++ keyword execve(*) brightgreen
++ keyword uname(*) brightblue
++
++ keyword open(*) cyan
++ keyword close(*) cyan
++
++ keyword read(*) magenta
++ keyword select(*) magenta
++ keyword write(*) magenta
++
++ keyword readv(*) brightmagenta
++ keyword writev(*) brightmagenta
++
++ keyword fcntl64(*) white
++ keyword fstat64(*) white
++ keyword stat64(*) white
++
++ keyword old_mmap(*) red
++ keyword mmap2(*) red
++ keyword munmap(*) red
++
++ keyword exit_group(*) brightred
++ keyword kill(*) brightred
++ keyword wait4(*) brightred
++ keyword statfs(*) brightred
++ keyword ioctl(*) brightred
++ keyword rt_sigaction(*) brightred
++ keyword rt_sigprocmask(*) brightred
++ keyword alarm(*) brightred
++ keyword brk(*) brightred
++
++ keyword chown32(*) yellow
++ keyword chmod(*) yellow
++ keyword geteuid32(*) yellow
++ keyword getegid32(*) yellow
++ keyword getuid32(*) yellow
++ keyword getgid32(*) yellow
++ keyword setresuid32(*) yellow
++ keyword setresgid32(*) yellow
++ keyword gettimeofday(*) yellow
++
+diff -Nurwd mc-4.6.2~pre1.orig/syntax/Syntax mc-4.6.2~pre1/syntax/Syntax
+--- mc-4.6.2~pre1.orig/syntax/Syntax 2008-02-16 14:01:20.000000000 +0100
++++ mc-4.6.2~pre1/syntax/Syntax 2008-02-16 14:01:49.000000000 +0100
+@@ -151,5 +151,8 @@
+ file .\*\\.dsc$ Debian\sdescriptiom\sfile
+ include debian-description.syntax
+
++file .\*\\.strace$ Strace\sdebug\soutput
++include strace.syntax
++
+ file .\* unknown
+ include unknown.syntax
Copied: trunk/debian/patches/54_named_syntax.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/54_named_syntax.patch)
===================================================================
--- trunk/debian/patches/54_named_syntax.patch (rev 0)
+++ trunk/debian/patches/54_named_syntax.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,194 @@
+diff -Nurwd mc-4.6.2~pre1.orig/syntax/named.syntax mc-4.6.2~pre1/syntax/named.syntax
+--- mc-4.6.2~pre1.orig/syntax/named.syntax 1970-01-01 00:00:00.000000000 +0000
++++ mc-4.6.2~pre1/syntax/named.syntax 2008-02-16 16:50:52.000000000 +0100
+@@ -0,0 +1,178 @@
++wholechars abcdefghijklmnopqrstuvwxyz0123456789-
++
++context default
++ keyword whole acl yellow
++ keyword whole additional-from-auth yellow
++ keyword whole additional-from-cache yellow
++ keyword whole algorithm yellow
++ keyword whole allow-notify yellow
++ keyword whole allow-query yellow
++ keyword whole allow-recursion yellow
++ keyword whole allow-transfer yellow
++ keyword whole allow-update-forwarding yellow
++ keyword whole allow-v6-synthesis yellow
++ keyword whole allow yellow
++ keyword whole also-notify yellow
++ keyword whole auth-nxdomain yellow
++ keyword whole blackhole yellow
++ keyword whole bogus yellow
++ keyword whole cache-file yellow
++ keyword whole category yellow
++ keyword whole channel yellow
++ keyword whole check-names yellow
++ keyword whole class yellow
++ keyword whole cleaning-interval yellow
++ keyword whole controls yellow
++ keyword whole coresize yellow
++ keyword whole database yellow
++ keyword whole datasize yellow
++ keyword whole deallocate-on-exit yellow
++ keyword whole delegation-only yellow
++ keyword whole deny yellow
++ keyword whole dialup yellow
++ keyword whole directory yellow
++ keyword whole dump-file yellow
++ keyword whole edns yellow
++ keyword whole exclude yellow
++ keyword whole fake-iquery yellow
++ keyword whole fetch-glue yellow
++ keyword whole files yellow
++ keyword whole file yellow
++ keyword whole forwarders yellow
++ keyword whole forward yellow
++ keyword whole grant yellow
++ keyword whole has-old-clients yellow
++ keyword whole heartbeat-interval yellow
++ keyword whole host-statistics yellow
++ keyword whole inet yellow
++ keyword whole interface-interval yellow
++ keyword whole keys yellow
++ keyword whole key yellow
++ keyword whole lame-ttl yellow
++ keyword whole listen-on-v6 yellow
++ keyword whole listen-on yellow
++ keyword whole logging yellow
++ keyword whole lwres yellow
++ keyword whole maintain-ixfr-base yellow
++ keyword whole masters yellow
++ keyword whole match-clients yellow
++ keyword whole match-destinations yellow
++ keyword whole match-mapped-addresses yellow
++ keyword whole match-recursive-only yellow
++ keyword whole max-cache-size yellow
++ keyword whole max-cache-ttl yellow
++ keyword whole max-ixfr-log-size yellow
++ keyword whole max-ncache-ttl yellow
++ keyword whole max-refresh-time yellow
++ keyword whole max-retry-time yellow
++ keyword whole max-transfer-idle-in yellow
++ keyword whole max-transfer-idle-out yellow
++ keyword whole max-transfer-time-in yellow
++ keyword whole max-transfer-time-out yellow
++ keyword whole memstatistics-file yellow
++ keyword whole minimal-responses yellow
++ keyword whole min-refresh-time yellow
++ keyword whole min-retry-time yellow
++ keyword whole min-roots yellow
++ keyword whole multiple-cnames yellow
++ keyword whole named-xfer yellow
++ keyword whole name yellow
++ keyword whole ndots yellow
++ keyword whole notify-source-v6 yellow
++ keyword whole notify-source yellow
++ keyword whole notify yellow
++ keyword whole options yellow
++ keyword whole pid-file yellow
++ keyword whole port yellow
++ keyword whole print-category yellow
++ keyword whole print-severity yellow
++ keyword whole print-time yellow
++ keyword whole provide-ixfr yellow
++ keyword whole pubkey yellow
++ keyword whole query-source-v6 yellow
++ keyword whole query-source yellow
++ keyword whole random-device yellow
++ keyword whole recursion yellow
++ keyword whole recursive-clients yellow
++ keyword whole request-ixfr yellow
++ keyword whole rfc2308-type1 yellow
++ keyword whole root-delegation-only yellow
++ keyword whole rrset-order yellow
++ keyword whole search yellow
++ keyword whole secret yellow
++ keyword whole self yellow
++ keyword whole serial-queries yellow
++ keyword whole serial-query-rate yellow
++ keyword whole server yellow
++ keyword whole severity yellow
++ keyword whole sig-validity-interval yellow
++ keyword whole sortlist yellow
++ keyword whole stacksize yellow
++ keyword whole statistics-file yellow
++ keyword whole statistics-interval yellow
++ keyword whole subdomain yellow
++ keyword whole support-ixfr yellow
++ keyword whole suppress-initial-notify yellow
++ keyword whole syslog yellow
++ keyword whole tcp-clients yellow
++ keyword whole tkey-dhkey yellow
++ keyword whole tkey-domain yellow
++ keyword whole tkey-gssapi-credential yellow
++ keyword whole topology yellow
++ keyword whole transfer-format yellow
++ keyword whole transfers-in yellow
++ keyword whole transfer-source-v6 yellow
++ keyword whole transfer-source yellow
++ keyword whole transfers-out yellow
++ keyword whole transfers-per-ns yellow
++ keyword whole transfers yellow
++ keyword whole treat-cr-as-space yellow
++ keyword whole trusted-keys yellow
++ keyword whole type yellow
++ keyword whole update-policy yellow
++ keyword whole use-id-pool yellow
++ keyword whole use-ixfr yellow
++ keyword whole version yellow
++ keyword whole view yellow
++ keyword whole wildcard yellow
++ keyword whole zone-statistics yellow
++ keyword whole zone yellow
++
++ keyword whole any brightred
++ keyword whole fail brightred
++ keyword whole first brightred
++ keyword whole hint brightred
++ keyword whole ignore brightred
++ keyword whole many-answers brightred
++ keyword whole master brightred
++ keyword whole none brightred
++ keyword whole null brightred
++ keyword whole one-answer brightred
++ keyword whole only brightred
++ keyword whole response brightred
++ keyword whole slave brightred
++ keyword whole stderr brightred
++ keyword whole stub brightred
++ keyword whole warn brightred
++ keyword whole yes brightred
++ keyword whole no brightred
++
++ keyword /\* brown
++ keyword \*/ brown
++ keyword // brown
++ keyword # brown
++ keyword { brightcyan
++ keyword } brightcyan
++ keyword ; brightmagenta
++
++context exclusive /\* \*/ brown
++ spellcheck
++
++context exclusive // \n brown
++ spellcheck
++
++context exclusive # \n brown
++ spellcheck
++
++context " " green
++ spellcheck
+diff -Nurwd mc-4.6.2~pre1.orig/syntax/Syntax mc-4.6.2~pre1/syntax/Syntax
+--- mc-4.6.2~pre1.orig/syntax/Syntax 2008-02-16 16:52:06.000000000 +0100
++++ mc-4.6.2~pre1/syntax/Syntax 2008-02-16 16:51:39.000000000 +0100
+@@ -154,5 +154,8 @@
+ file .\*\\.strace$ Strace\sdebug\soutput
+ include strace.syntax
+
++file .\*named.conf$ Bind9\sconfiguration
++include named.syntax
++
+ file .\* unknown
+ include unknown.syntax
Copied: trunk/debian/patches/60_recode.patch (from rev 48, tags/4.6.2~pre1-3/debian/patches/60_recode.patch)
===================================================================
--- trunk/debian/patches/60_recode.patch (rev 0)
+++ trunk/debian/patches/60_recode.patch 2008-02-27 11:52:19 UTC (rev 80)
@@ -0,0 +1,1564 @@
+diff -Nurwd mc-4.6.2~pre1.orig/edit/editcmd.c mc-4.6.2~pre1/edit/editcmd.c
+--- mc-4.6.2~pre1.orig/edit/editcmd.c 2008-02-13 21:01:43.000000000 +0100
++++ mc-4.6.2~pre1/edit/editcmd.c 2008-02-13 21:02:16.000000000 +0100
+@@ -3321,7 +3321,7 @@
+ edit_select_codepage_cmd (WEdit *edit)
+ {
+ #ifdef HAVE_CHARSET
+- do_select_codepage ();
++ do_select_codepage (_(" Choose codepage "));
+ edit->force = REDRAW_COMPLETELY;
+ edit_refresh_cmd (edit);
+ #endif
+diff -Nurwd mc-4.6.2~pre1.orig/edit/Makefile.in mc-4.6.2~pre1/edit/Makefile.in
+--- mc-4.6.2~pre1.orig/edit/Makefile.in 2007-09-11 16:33:38.000000000 +0200
++++ mc-4.6.2~pre1/edit/Makefile.in 2008-02-13 21:01:06.000000000 +0100
+@@ -14,6 +14,8 @@
+
+ @SET_MAKE@
+
++SOURCES = $(libedit_a_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+diff -Nurwd mc-4.6.2~pre1.orig/po/ru.po mc-4.6.2~pre1/po/ru.po
+--- mc-4.6.2~pre1.orig/po/ru.po 2007-09-11 16:35:10.000000000 +0200
++++ mc-4.6.2~pre1/po/ru.po 2008-02-13 21:01:06.000000000 +0100
+@@ -17,7 +17,7 @@
+ "Project-Id-Version: ru\n"
+ "Report-Msgid-Bugs-To: mc-devel at gnome.org\n"
+ "POT-Creation-Date: 2007-09-11 17:35+0300\n"
+-"PO-Revision-Date: 2005-09-09 14:37+0300\n"
++"PO-Revision-Date: 2008-02-12 21:13+0100\n"
+ "Last-Translator: Anton S. Chumak <nightfast at yahoo.co.uk>\n"
+ "Language-Team: Russian ru at li.org\n"
+ "MIME-Version: 1.0\n"
+@@ -3625,23 +3625,31 @@
+ msgid "Changes to file lost"
+ msgstr "éÚÍÅÎÅÎÉÑ ÄÌÑ ÆÁÊÌÁ ÐÏÔÅÒÑÎÙ"
+
+-#~ msgid "&Type"
+-#~ msgstr "&ôÉÐ"
++#: messages for recode patch
++msgid "Panel &codepage"
++msgstr "ëÏÄÉÒÏ×ËÁ ÐÁÎÅÌÉ"
+
+-#~ msgid "&Links"
+-#~ msgstr "&óÓÙÌËÉ"
++msgid " Choose codepage "
++msgstr " ÷ÙÂÅÒÉÔÅ ËÏÄÉÒÏ×ËÕ"
+
+-#~ msgid "N&GID"
+-#~ msgstr "N&GID"
++msgid " Choose panel codepage "
++msgstr " ÷ÙÂÅÒÉÔÅ ËÏÄÉÒÏ×ËÕ ÐÁÎÅÌÉ "
+
+-#~ msgid "N&UID"
+-#~ msgstr "N&UID"
++msgid " Choose default FTP codepage "
++msgstr " ÷ÙÂÅÒÉÔÅ ËÏÄÉÒÏ×ËÕ FTP ÐÏ ÕÍÏÌÞÁÎÉÀ "
+
+-#~ msgid "&Owner"
+-#~ msgstr "&÷ÌÁÄÅÌÅÃ"
++msgid "FTP default codepage:"
++msgstr "ëÏÄÉÒÏ×ËÁ FTP ÐÏ ÕÍÏÌÞÁÎÉÀ:"
+
+-#~ msgid "&Group"
+-#~ msgstr "&çÒÕÐÐÁ"
++msgid "Recode file names:"
++msgstr "ðÅÒÅËÏÄÉÒÏ×ÁÔØ ÉÍÅÎÁ:"
++
++msgid "Recoding works only with COPY/MOVE operation"
++msgstr "ðÅÒÅËÏÄÉÒÏ×ËÁ ÒÁÂÏÔÁÅÔ ÔÏÌØËÏ ÄÌÑ ÏÐÅÒÁÃÉÊ ËÏÐÉÒÏ×ÁÎÉÑ/ÐÅÒÅÍÅÝÅÎÉÑ"
++
++msgid " Choose \"FROM\" codepage for COPY/MOVE operaion "
++msgstr" ÷ÙÂÅÒÉÔÅ ÎÁÞÁÌØÎÕÀ ËÏÄÉÒÏ×ËÕ ÄÌÑ ÏÐÅÒÁÃÉÉ ËÏÐÉÒÏ×ÁÎÉÑ/ÐÅÒÅÍÅÝÅÎÉÑ "
++
++msgid " Choose \"TO\" codepage for COPY/MOVE operaion "
++msgstr" ÷ÙÂÅÒÉÔÅ ËÏÎÅÞÎÕÀ ËÏÄÉÒÏ×ËÕ ÄÌÑ ÏÐÅÒÁÃÉÉ ËÏÐÉÒÏ×ÁÎÉÑ/ÐÅÒÅÍÅÝÅÎÉÑ "
+
+-#~ msgid "%s bytes in %d files"
+-#~ msgstr "%s ÂÁÊÔ × %d ÆÁÊÌÁÈ"
+diff -Nurwd mc-4.6.2~pre1.orig/src/boxes.c mc-4.6.2~pre1/src/boxes.c
+--- mc-4.6.2~pre1.orig/src/boxes.c 2008-02-13 21:01:43.000000000 +0100
++++ mc-4.6.2~pre1/src/boxes.c 2008-02-13 21:01:06.000000000 +0100
+@@ -52,6 +52,7 @@
+ #ifdef HAVE_CHARSET
+ #include "charsets.h"
+ #include "selcodepage.h"
++#include "recode.h"
+ #endif
+
+ #ifdef USE_NETCODE
+@@ -454,8 +455,8 @@
+ }
+ }
+
+-#define DISPY 11
+-#define DISPX 46
++#define DISPY 13
++#define DISPX 35
+
+
+ #ifndef HAVE_CHARSET
+@@ -551,23 +552,58 @@
+
+
+ static int new_display_codepage;
++static int new_ftp_codepage;
+
+-static WLabel *cplabel;
+ static WCheck *inpcheck;
+
++static WButton *cpbutton;
++static WButton *cpbutton_ftp;
++
+ static int
+ sel_charset_button (int action)
+ {
+ const char *cpname;
+ char buf[64];
+- new_display_codepage = select_charset (new_display_codepage, 1);
++ new_display_codepage = select_charset (new_display_codepage, 1, _(" Choose input codepage "));
+ cpname = (new_display_codepage < 0)
+ ? _("Other 8 bit")
+ : codepages[new_display_codepage].name;
+
+ /* avoid strange bug with label repainting */
+- g_snprintf (buf, sizeof (buf), "%-27s", cpname);
+- label_set_text (cplabel, buf);
++ sprintf( buf, "%s", cpname );
++ button_set_text (cpbutton, buf);
++
++ if(new_display_codepage<0) new_ftp_codepage=-1;
++ cpname = (new_ftp_codepage < 0)
++ ? _("Other 8 bit")
++ : codepages[ new_ftp_codepage ].name;
++ sprintf( buf, "%s", cpname );
++ button_set_text (cpbutton_ftp, buf);
++
++ return 0;
++}
++
++static int sel_charset_button_ftp(int action) {
++ char *cpname, buf[64];
++ if(new_display_codepage>0) {
++ new_ftp_codepage = select_charset(new_ftp_codepage, 0, _(" Choose default FTP codepage "));
++ cpname = (new_display_codepage < 0)
++ ? _("Other 8 bit")
++ : codepages[ new_display_codepage ].name;
++ sprintf( buf, "%s", cpname );
++ button_set_text( cpbutton, buf );
++ cpname = (new_ftp_codepage < 0)
++ ? _("Other 8 bit")
++ : codepages[ new_ftp_codepage ].name;
++ sprintf( buf, "%s", cpname );
++ button_set_text( cpbutton_ftp, buf );
++ }
++ else {
++ message( 1, _(" Warning "),
++ _("To use this feature select your codepage in\n"
++ "Setup / Display Bits dialog!\n"
++ "Do not forget to save options." ));
++ }
+ return 0;
+ }
+
+@@ -589,9 +625,6 @@
+ cpname = (new_display_codepage < 0)
+ ? _("Other 8 bit")
+ : codepages[new_display_codepage].name;
+- cplabel = label_new (4, 4, cpname);
+- add_widget (dbits_dlg, cplabel);
+-
+ add_widget (dbits_dlg,
+ button_new (DISPY - 3, DISPX / 2 + 3, B_CANCEL,
+ NORMAL_BUTTON, _("&Cancel"), 0));
+@@ -600,13 +633,30 @@
+ 0));
+
+ inpcheck =
+- check_new (6, 4, !use_8th_bit_as_meta, _("F&ull 8 bits input"));
++ check_new (8, 4, !use_8th_bit_as_meta, _("F&ull 8 bits input"));
+ add_widget (dbits_dlg, inpcheck);
+
+- cpname = _("&Select");
+- add_widget (dbits_dlg,
+- button_new (4, DISPX - 8 - mbstrlen (cpname), B_USER,
+- NORMAL_BUTTON, cpname, sel_charset_button));
++
++ add_widget( dbits_dlg, label_new( 5, 4, _("FTP default codepage:")));
++ if(n_codepages>0) {
++ cpname = (new_display_codepage < 0)
++ ? _("Other 8 bit")
++ : codepages[ new_display_codepage ].name;
++ }
++ else cpname= _("Other 8 bit");
++ cpbutton=button_new(4, 5, B_USER,
++ NORMAL_BUTTON, cpname, sel_charset_button);
++
++ if(n_codepages>0) {
++ cpname = (new_ftp_codepage < 0)
++ ? _("Other 8 bit")
++ : codepages[ new_ftp_codepage ].name;
++ }
++ else cpname= _("Other 8 bit");
++ cpbutton_ftp=button_new(6, 5, B_USER,
++ NORMAL_BUTTON, cpname, sel_charset_button_ftp);
++ add_widget( dbits_dlg, cpbutton_ftp);
++ add_widget (dbits_dlg, cpbutton);
+
+ return dbits_dlg;
+ }
+@@ -616,6 +666,7 @@
+ {
+ Dlg_head *dbits_dlg;
+ new_display_codepage = display_codepage;
++ new_ftp_codepage = ftp_codepage;
+
+ application_keypad_mode ();
+ dbits_dlg = init_disp_bits_box ();
+@@ -636,6 +687,17 @@
+ && display_codepage != 1) ? 128 : 160;
+ #endif
+ use_8th_bit_as_meta = !(inpcheck->state & C_BOOL);
++
++ ftp_codepage=new_ftp_codepage;
++ if(display_codepage<=0) {
++ panel_reset_codepage(left_panel);
++ paint_dir(left_panel);
++ display_mini_info(left_panel);
++ panel_reset_codepage(right_panel);
++ paint_dir(right_panel);
++ display_mini_info(right_panel);
++ }
++
+ }
+ destroy_dlg (dbits_dlg);
+ repaint_screen ();
+diff -Nurwd mc-4.6.2~pre1.orig/src/charsets.c mc-4.6.2~pre1/src/charsets.c
+--- mc-4.6.2~pre1.orig/src/charsets.c 2005-05-27 05:35:15.000000000 +0200
++++ mc-4.6.2~pre1/src/charsets.c 2008-02-13 21:01:06.000000000 +0100
+@@ -121,8 +121,6 @@
+ }
+ }
+
+-#define OTHER_8BIT "Other_8_bit"
+-
+ const char *
+ get_codepage_id (int n)
+ {
+@@ -141,7 +139,7 @@
+ return -1;
+ }
+
+-static char
++char
+ translate_character (iconv_t cd, char c)
+ {
+ char outbuf[4], *obuf;
+diff -Nurwd mc-4.6.2~pre1.orig/src/charsets.h mc-4.6.2~pre1/src/charsets.h
+--- mc-4.6.2~pre1.orig/src/charsets.h 2004-12-03 20:17:47.000000000 +0100
++++ mc-4.6.2~pre1/src/charsets.h 2008-02-13 21:01:06.000000000 +0100
+@@ -6,6 +6,7 @@
+ #define UNKNCHAR '\001'
+
+ #define CHARSETS_INDEX "mc.charsets"
++#define OTHER_8BIT "Other_8_bit"
+
+ extern int n_codepages;
+
+@@ -19,6 +20,10 @@
+
+ extern struct codepage_desc *codepages;
+
++#include <iconv.h>
++extern char translate_character(iconv_t cd, char c);
++extern char errbuf[255];
++
+ const char *get_codepage_id (int n);
+ int get_codepage_index (const char *id);
+ int load_codepages_list (void);
+diff -Nurwd mc-4.6.2~pre1.orig/src/cmd.c mc-4.6.2~pre1/src/cmd.c
+--- mc-4.6.2~pre1.orig/src/cmd.c 2007-05-02 14:01:13.000000000 +0200
++++ mc-4.6.2~pre1/src/cmd.c 2008-02-13 21:01:06.000000000 +0100
+@@ -70,6 +70,10 @@
+ # include "../edit/edit.h"
+ #endif
+
++#ifdef HAVE_CHARSET
++#include "recode.h"
++#endif
++
+ /* If set and you don't have subshell support,then C-o will give you a shell */
+ int output_starts_shell = 0;
+
+@@ -347,6 +351,9 @@
+ mkdir_cmd (void)
+ {
+ char *dir, *absdir;
++#ifdef HAVE_CHARSET
++ char *recoded_dir;
++#endif
+
+ dir =
+ input_expand_dialog (_("Create a new Directory"),
+@@ -356,8 +363,16 @@
+
+ if (dir[0] == '/' || dir[0] == '~')
+ absdir = g_strdup (dir);
+- else
++ else {
++#ifdef HAVE_CHARSET
++ recoded_dir=g_strdup(dir);
++ my_translate_string(dir,strlen(dir), recoded_dir,current_panel->tr_table_input);
++ absdir = concat_dir_and_file (current_panel->cwd, recoded_dir);
++ g_free(recoded_dir);
++#else
+ absdir = concat_dir_and_file (current_panel->cwd, dir);
++#endif
++ }
+
+ save_cwds_stat ();
+ if (my_mkdir (absdir, 0777) == 0) {
+diff -Nurwd mc-4.6.2~pre1.orig/src/file.c mc-4.6.2~pre1/src/file.c
+--- mc-4.6.2~pre1.orig/src/file.c 2008-02-13 21:01:43.000000000 +0100
++++ mc-4.6.2~pre1/src/file.c 2008-02-13 21:01:06.000000000 +0100
+@@ -73,6 +73,9 @@
+ #include "../vfs/vfs-impl.h"
+
+ /* }}} */
++#ifdef HAVE_CHARSET
++#include "recode.h"
++#endif
+
+ /* Hack: the vfs code should not rely on this */
+ #define WITH_FULL_PATHS 1
+@@ -917,7 +920,11 @@
+ }
+ /* Dive into subdir if exists */
+ if (toplevel && ctx->dive_into_subdirs) {
++#ifdef HAVE_CHARSET
++ dest_dir = concat_dir_and_recoded_fname(d, x_basename (s), ctx);
++#else
+ dest_dir = concat_dir_and_file (d, x_basename (s));
++#endif
+ } else {
+ dest_dir = g_strdup (d);
+ goto dont_mkdir;
+@@ -967,7 +974,11 @@
+
+ (*ctx->stat_func) (path, &buf);
+ if (S_ISDIR (buf.st_mode)) {
++#ifdef HAVE_CHARSET
++ mdpath = concat_dir_and_recoded_fname(dest_dir, next->d_name, ctx);
++#else
+ mdpath = concat_dir_and_file (dest_dir, next->d_name);
++#endif
+ /*
+ * From here, we just intend to recursively copy subdirs, not
+ * the double functionality of copying different when the target
+@@ -978,7 +989,11 @@
+ parent_dirs, progress_count, progress_bytes);
+ g_free (mdpath);
+ } else {
++#ifdef HAVE_CHARSET
++ dest_file=concat_dir_and_recoded_fname(dest_dir, x_basename(path),ctx);
++#else
+ dest_file = concat_dir_and_file (dest_dir, x_basename (path));
++#endif
+ return_status = copy_file_file (ctx, path, dest_file, 1,
+ progress_count, progress_bytes, 0);
+ g_free (dest_file);
+@@ -1168,7 +1183,12 @@
+ destdir = g_strdup (d);
+ move_over = 1;
+ } else
++#ifdef HAVE_CHARSET
++ destdir = concat_dir_and_recoded_fname(d, x_basename (s), ctx);
++#else
+ destdir = concat_dir_and_file (d, x_basename (s));
++#endif
++
+
+ if (sbuf.st_dev == dbuf.st_dev && sbuf.st_ino == dbuf.st_ino) {
+ int msize = COLS - 36;
+@@ -1873,7 +1893,12 @@
+ if (temp == NULL) {
+ value = transform_error;
+ } else {
++#ifdef HAVE_CHARSET
++ char *temp2 = concat_dir_and_recoded_fname (dest, temp, ctx);
++#else
+ char *temp2 = concat_dir_and_file (dest, temp);
++#endif
++
+ g_free (dest);
+ dest = temp2;
+ temp = NULL;
+@@ -1967,7 +1992,12 @@
+ if (temp == NULL)
+ value = transform_error;
+ else {
++#ifdef HAVE_CHARSET
++ char *temp2 = concat_dir_and_recoded_fname(dest, temp, ctx);
++#else
+ char *temp2 = concat_dir_and_file (dest, temp);
++#endif
++
+
+ switch (operation) {
+ case OP_COPY:
+diff -Nurwd mc-4.6.2~pre1.orig/src/filegui.c mc-4.6.2~pre1/src/filegui.c
+--- mc-4.6.2~pre1.orig/src/filegui.c 2008-02-13 21:01:43.000000000 +0100
++++ mc-4.6.2~pre1/src/filegui.c 2008-02-13 21:01:06.000000000 +0100
+@@ -67,6 +67,10 @@
+ #include "util.h" /* strip_password() */
+ #include "tty.h"
+
++#ifdef HAVE_CHARSET
++#include "recode.h"
++#endif
++
+ /* }}} */
+
+ /* Hack: the vfs code should not rely on this */
+@@ -721,57 +725,79 @@
+ }
+ }
+
++#ifdef HAVE_CHARSET
++#define FMDY 15
++#else
+ #define FMDY 13
++#endif
++
+ #define FMD_XLEN 64
+ extern int fmd_xlen;
+ static QuickWidget fmd_widgets[] = {
+
+-#define FMCB0 FMDC
+-#define FMCB12 0
+-#define FMCB11 1
+- /* follow symlinks and preserve Attributes must be the first */
+- {quick_checkbox, 3, 64, 8, FMDY, N_("preserve &Attributes"), 9, 0,
+- 0 /* &op_preserve */ , 0, NULL},
+- {quick_checkbox, 3, 64, 7, FMDY, N_("follow &Links"), 7, 0,
+- 0 /* &file_mask_op_follow_links */ , 0, NULL},
+- {quick_label, 3, 64, 5, FMDY, N_("to:"), 0, 0, 0, 0, NULL},
+- {quick_checkbox, 37, 64, 4, FMDY, N_("&Using shell patterns"), 0, 0,
+- 0 /* &source_easy_patterns */ , 0, NULL},
+- {quick_input, 3, 64, 3, FMDY, "", 58,
+- 0, 0, 0, "input-def"},
+-#define FMDI1 4
+-#define FMDI2 5
+-#define FMDC 3
+- {quick_input, 3, 64, 6, FMDY, "", 58, 0,
+- 0, 0, "input2"},
+-#define FMDI0 6
+- {quick_label, 3, 64, 2, FMDY, "", 0, 0, 0, 0, NULL},
+-#define FMBRGT 7
+- {quick_button, 42, 64, 9, FMDY, N_("&Cancel"), 0, B_CANCEL, 0, 0,
+- NULL},
+-#undef SKIP
++#ifdef HAVE_CHARSET
++ #define Y_OK 12
++#else
++ #define Y_OK 9
++#endif
++
+ #ifdef WITH_BACKGROUND
+-# define SKIP 5
+-# define FMCB21 11
+-# define FMCB22 10
+-# define FMBLFT 9
+-# define FMBMID 8
+- {quick_button, 25, 64, 9, FMDY, N_("&Background"), 0, B_USER, 0, 0,
+- NULL},
+-#else /* WITH_BACKGROUND */
+-# define SKIP 4
+-# define FMCB21 10
+-# define FMCB22 9
+-# define FMBLFT 8
+-# undef FMBMID
++ #define ADD 0
++#else
++ #define ADD -1
+ #endif
+- {quick_button, 14, 64, 9, FMDY, N_("&OK"), 0, B_ENTER, 0, 0, NULL},
+- {quick_checkbox, 42, 64, 8, FMDY, N_("&Stable Symlinks"), 0, 0,
+- 0 /* &file_mask_stable_symlinks */ , 0, NULL},
+- {quick_checkbox, 31, 64, 7, FMDY, N_("&Dive into subdir if exists"), 0,
+- 0,
+- 0 /* &dive_into_subdirs */ , 0, NULL},
+- NULL_QuickWidget
++
++ #define FM_STAB_SYM 0
++ #define FM_DIVE_INTO_SUBDIR 1
++ #define FM_PRES_ATTR 2
++ #define FM_FOLLOW_LINKS 3
++ #define FM_DST_INPUT 4
++ #define FM_DST_TITLE 5
++ #define FM_USING_SHELL_PATT 6
++ #define FM_SRC_INPUT 7
++ #define FM_SRC_TITLE 8
++ #define FM_CANCEL 9
++#ifdef WITH_BACKGROUND
++ #define FM_BKGND 10
++#endif
++ #define FM_OK 11+ADD
++#ifdef HAVE_CHARSET
++ #define FM_TO_CODEPAGE 12+ADD
++ #define FM_FROM_CODEPAGE 13+ADD
++ #define FM_RECODE_TITLE 14+ADD
++ #define FM_RECODE_ARROW 15+ADD
++#endif // HAVE_CHARSET
++
++
++#ifdef HAVE_CHARSET
++ #define SKIP 10
++ #define B_FROM B_USER+1
++ #define B_TO B_USER+2
++#else
++ #define SKIP 10
++#endif
++
++ {quick_checkbox, 42,64, 8, FMDY, N_("&Stable Symlinks"),0,0,0,0,"stab-sym"},
++ {quick_checkbox, 31,64, 7, FMDY, N_("&Dive into subdir if exists"),0,0,0,0,"dive"},
++ {quick_checkbox, 3, 64, 8, FMDY, N_("preserve &Attributes"),9,0,0,0,"preserve"},
++ {quick_checkbox, 3, 64, 7, FMDY, N_("follow &Links"),7,0,0,0,"follow"},
++ {quick_input, 3, 64, 6, FMDY, "", 58, 0, 0, 0, "input2"},
++ {quick_label, 3, 64, 5, FMDY, N_("to:"), 0, 0, 0, 0, "to"},
++ {quick_checkbox, 37,64, 4, FMDY, N_("&Using shell patterns"),0,0, 0,0,"us-sh"},
++ {quick_input, 3, 64, 3, FMDY, "", 58, 0, 0, 0, "input-def"},
++ {quick_label, 3, 64, 2, FMDY, "", 0, 0, 0, 0, "ql"},
++ {quick_button, 42,64, Y_OK, FMDY, N_("&Cancel"), 0, B_CANCEL, 0,0, "cancel"},
++#ifdef WITH_BACKGROUND
++ {quick_button, 25,64, Y_OK, FMDY, N_("&Background"), 0, B_USER, 0,0, "back"},
++#endif
++ {quick_button, 14,64, Y_OK, FMDY, N_("&OK"), 0, B_ENTER, 0, 0, "ok"},
++#ifdef HAVE_CHARSET
++ {quick_button, 46,64, 10, FMDY,"to codepage", 0, B_TO, 0, 0, "ql"},
++ {quick_button, 25,64, 10, FMDY, "from codepage", 0, B_FROM, 0, 0, "ql"},
++ {quick_label, 3, 64, 10, FMDY, N_("Recode file names:"), 0, 0, 0, 0, "ql"},
++ {quick_label, 42,64, 10, FMDY, "->", 0, 0, 0, 0, "ql"},
++#endif
++ {0}
+ };
+
+ static int
+@@ -805,48 +831,48 @@
+ if (fmd_widgets[i].text[0] != '\0')
+ fmd_widgets[i].text = _(fmd_widgets[i].text);
+
+- len = mbstrlen (fmd_widgets[FMCB11].text)
+- + mbstrlen (fmd_widgets[FMCB21].text) + 15;
++ len = mbstrlen (fmd_widgets[FM_FOLLOW_LINKS].text)
++ + mbstrlen (fmd_widgets[FM_DIVE_INTO_SUBDIR].text) + 15;
+ fmd_xlen = max (fmd_xlen, len);
+
+- len = mbstrlen (fmd_widgets[FMCB12].text)
+- + mbstrlen (fmd_widgets[FMCB22].text) + 15;
++ len = mbstrlen (fmd_widgets[FM_PRES_ATTR].text)
++ + mbstrlen (fmd_widgets[FM_STAB_SYM].text) + 15;
+ fmd_xlen = max (fmd_xlen, len);
+
+- len = mbstrlen (fmd_widgets[FMBRGT].text)
+- + mbstrlen (fmd_widgets[FMBLFT].text) + 11;
++ len = mbstrlen (fmd_widgets[FM_CANCEL].text)
++ + mbstrlen (fmd_widgets[FM_OK].text) + 11;
+
+-#ifdef FMBMID
+- len += mbstrlen (fmd_widgets[FMBMID].text) + 6;
++#ifdef FM_BKGND
++ len += mbstrlen (fmd_widgets[FM_BKGND].text) + 6;
+ #endif
+
+ fmd_xlen = max (fmd_xlen, len + 4);
+
+ len = (fmd_xlen - (len + 6)) / 2;
+- i = fmd_widgets[FMBLFT].relative_x = len + 3;
+- i += mbstrlen (fmd_widgets[FMBLFT].text) + 8;
++ i = fmd_widgets[FM_OK].relative_x = len + 3;
++ i += mbstrlen (fmd_widgets[FM_OK].text) + 8;
+
+-#ifdef FMBMID
+- fmd_widgets[FMBMID].relative_x = i;
+- i += mbstrlen (fmd_widgets[FMBMID].text) + 6;
++#ifdef FM_BKGND
++ fmd_widgets[FM_BKGND].relative_x = i;
++ i += mbstrlen (fmd_widgets[FM_BKGND].text) + 6;
+ #endif
+
+- fmd_widgets[FMBRGT].relative_x = i;
++ fmd_widgets[FM_CANCEL].relative_x = i;
+
+ #define chkbox_xpos(i) \
+ fmd_widgets [i].relative_x = fmd_xlen - mbstrlen (fmd_widgets [i].text) - 6
+
+- chkbox_xpos (FMCB0);
+- chkbox_xpos (FMCB21);
+- chkbox_xpos (FMCB22);
++ chkbox_xpos (FM_USING_SHELL_PATT);
++ chkbox_xpos (FM_DIVE_INTO_SUBDIR);
++ chkbox_xpos (FM_STAB_SYM);
+
+ if (fmd_xlen != FMD_XLEN) {
+ i = sizeof (fmd_widgets) / sizeof (fmd_widgets[0]) - 1;
+ while (i--)
+ fmd_widgets[i].x_divisions = fmd_xlen;
+
+- fmd_widgets[FMDI1].hotkey_pos =
+- fmd_widgets[FMDI2].hotkey_pos = fmd_xlen - 6;
++ fmd_widgets[FM_SRC_INPUT].hotkey_pos =
++ fmd_widgets[FM_DST_INPUT].hotkey_pos = fmd_xlen - 6;
+ }
+ #undef chkbox_xpos
+
+@@ -866,6 +892,9 @@
+ int val;
+ QuickDialog Quick_input;
+ char *def_text;
++#ifdef HAVE_CHARSET
++ char *errmsg;
++#endif
+ g_return_val_if_fail (ctx != NULL, NULL);
+
+ def_text = g_strdup(def_text_orig);
+@@ -883,10 +912,11 @@
+
+ /* Set up the result pointers */
+
+- fmd_widgets[FMCB12].result = &ctx->op_preserve;
+- fmd_widgets[FMCB11].result = &ctx->follow_links;
+- fmd_widgets[FMCB22].result = &ctx->stable_symlinks;
+- fmd_widgets[FMCB21].result = &ctx->dive_into_subdirs;
++ fmd_widgets[FM_PRES_ATTR].result = &ctx->op_preserve;
++ fmd_widgets[FM_FOLLOW_LINKS].result = &ctx->follow_links;
++ fmd_widgets[FM_STAB_SYM].result = &ctx->stable_symlinks;
++ fmd_widgets[FM_DIVE_INTO_SUBDIR].result = &ctx->dive_into_subdirs;
++
+
+ /* filter out a possible password from def_text */
+ def_text_secure = strip_password (g_strdup (def_text), 1);
+@@ -894,8 +924,9 @@
+ /* Create the dialog */
+
+ ctx->stable_symlinks = 0;
+- fmd_widgets[FMDC].result = &source_easy_patterns;
+- fmd_widgets[FMDI1].text = easy_patterns ? "*" : "^\\(.*\\)$";
++ fmd_widgets[FM_USING_SHELL_PATT].result = &source_easy_patterns;
++ fmd_widgets[FM_SRC_INPUT].text = easy_patterns ? "*" : "^\\(.*\\)$";
++
+ Quick_input.xlen = fmd_xlen;
+ Quick_input.xpos = -1;
+ Quick_input.title = op_names[operation];
+@@ -903,19 +934,37 @@
+ Quick_input.ylen = FMDY;
+ Quick_input.i18n = 1;
+ Quick_input.widgets = fmd_widgets;
+- fmd_widgets[FMDI0].text = text;
+- fmd_widgets[FMDI2].text = def_text_secure;
+- fmd_widgets[FMDI2].str_result = &dest_dir;
+- fmd_widgets[FMDI1].str_result = &source_mask;
++ fmd_widgets[FM_SRC_TITLE].text = text;
++ fmd_widgets[FM_DST_INPUT].text = def_text_secure;
++ fmd_widgets[FM_DST_INPUT].str_result = &dest_dir;
++ fmd_widgets[FM_SRC_INPUT].str_result = &source_mask;
+
+ *do_background = 0;
++
++#ifdef HAVE_CHARSET
++ ctx->from_codepage=current_panel->src_codepage;
++ ctx->to_codepage=left_panel->src_codepage;
++ if (left_panel) {
++ ctx->to_codepage=left_panel->src_codepage;
++ if( (current_panel==left_panel) && right_panel ) ctx->to_codepage=right_panel->src_codepage;
++ }
++#endif
++
+ ask_file_mask:
+
++#ifdef HAVE_CHARSET
++ if(operation!=OP_COPY && operation!=OP_MOVE) {
++ ctx->from_codepage=-1;
++ ctx->to_codepage=-1;
++ }
++ fmd_widgets[FM_FROM_CODEPAGE].text=get_codepage_id(ctx->from_codepage);
++ fmd_widgets[FM_TO_CODEPAGE].text=get_codepage_id(ctx->to_codepage);
++#endif
++
+ if ((val = quick_dialog_skip (&Quick_input, SKIP)) == B_CANCEL) {
+ g_free (def_text_secure);
+ return 0;
+ }
+- g_free (def_text_secure);
+
+ if (ctx->follow_links)
+ ctx->stat_func = mc_stat;
+@@ -937,6 +986,7 @@
+ orig_mask = source_mask;
+ if (!dest_dir || !*dest_dir) {
+ g_free (source_mask);
++ g_free (def_text_secure);
+ g_free(def_text);
+ return dest_dir;
+ }
+@@ -991,6 +1041,48 @@
+ }
+ if (val == B_USER)
+ *do_background = 1;
++#ifdef HAVE_CHARSET
++ if(val == B_FROM) {
++ if(operation==OP_COPY || operation==OP_MOVE) {
++ if(display_codepage<=0) {
++ message( 1, _(" Warning "),
++ _("To use this feature select your codepage in\n"
++ "Setup / Display Bits dialog!\n"
++ "Do not forget to save options." ));
++ goto ask_file_mask;
++ }
++ ctx->from_codepage=select_charset(ctx->from_codepage,0,
++ _(" Choose \"FROM\" codepage for COPY/MOVE operaion "));
++ }
++ else
++ message(1,"Warning",_("Recoding works only with COPY or MOVE operation"));
++ goto ask_file_mask;
++ }
++ if(val == B_TO) {
++ if(operation==OP_COPY || operation==OP_MOVE) {
++ if(display_codepage<=0) {
++ message( 1, _(" Warning "),
++ _("To use this feature select your codepage in\n"
++ "Setup / Display Bits dialog!\n"
++ "Do not forget to save options." ));
++ goto ask_file_mask;
++ }
++ ctx->to_codepage=select_charset(ctx->to_codepage,0,
++ _(" Choose \"TO\" codepage for COPY/MOVE operaion "));
++ }
++ else
++ message(1,"Warning",_("Recoding works only with COPY or MOVE operation"));
++ goto ask_file_mask;
++ }
++
++ errmsg=my_init_tt(ctx->to_codepage,ctx->from_codepage,ctx->tr_table);
++ if(errmsg) {
++ my_reset_tt(ctx->tr_table,256);
++ message( 1, MSG_ERROR, "%s", errmsg);
++ }
++#endif
++
++ g_free(def_text_secure);
+ g_free(def_text);
+ return dest_dir;
+ }
+diff -Nurwd mc-4.6.2~pre1.orig/src/fileopctx.c mc-4.6.2~pre1/src/fileopctx.c
+--- mc-4.6.2~pre1.orig/src/fileopctx.c 2005-05-27 05:35:15.000000000 +0200
++++ mc-4.6.2~pre1/src/fileopctx.c 2008-02-13 21:01:06.000000000 +0100
+@@ -25,8 +25,12 @@
+ #include <unistd.h>
+
+ #include "global.h"
+-#include "fileopctx.h"
+
++#ifdef HAVE_CHARSET
++#include "recode.h"
++#endif
++
++#include "fileopctx.h"
+
+ /**
+ * file_op_context_new:
+@@ -53,6 +57,12 @@
+ ctx->umask_kill = 0777777;
+ ctx->erase_at_end = TRUE;
+
++#ifdef HAVE_CHARSET
++ ctx->from_codepage=-1;
++ ctx->to_codepage=-1;
++ my_reset_tt(ctx->tr_table,256);
++#endif
++
+ return ctx;
+ }
+
+diff -Nurwd mc-4.6.2~pre1.orig/src/fileopctx.h mc-4.6.2~pre1/src/fileopctx.h
+--- mc-4.6.2~pre1.orig/src/fileopctx.h 2004-10-06 20:06:26.000000000 +0200
++++ mc-4.6.2~pre1/src/fileopctx.h 2008-02-13 21:01:06.000000000 +0100
+@@ -108,6 +108,14 @@
+ /* User interface data goes here */
+
+ void *ui;
++
++#ifdef HAVE_CHARSET
++ /* Recode data */
++ int from_codepage, to_codepage;
++ unsigned char tr_table[256];
++ unsigned char recode_buf[MC_MAXPATHLEN];
++#endif
++
+ } FileOpContext;
+
+
+diff -Nurwd mc-4.6.2~pre1.orig/src/main.c mc-4.6.2~pre1/src/main.c
+--- mc-4.6.2~pre1.orig/src/main.c 2008-02-13 21:01:43.000000000 +0100
++++ mc-4.6.2~pre1/src/main.c 2008-02-13 21:01:06.000000000 +0100
+@@ -81,6 +81,7 @@
+
+ #ifdef HAVE_CHARSET
+ #include "charsets.h"
++#include "recode.h"
+ #endif /* HAVE_CHARSET */
+
+ #ifdef USE_VFS
+@@ -97,6 +98,7 @@
+ /* The structures for the panels */
+ WPanel *left_panel = NULL;
+ WPanel *right_panel = NULL;
++WPanel* ret_panel=NULL;
+
+ /* The pointer to the tree */
+ WTree *the_tree = NULL;
+@@ -586,6 +588,7 @@
+ }
+ directory = *new_dir ? new_dir : home_dir;
+
++ ret_panel=panel;
+ if (mc_chdir (directory) == -1) {
+ strcpy (panel->cwd, olddir);
+ g_free (olddir);
+@@ -804,6 +807,10 @@
+ {' ', N_("&Quick view C-x q"), 'Q', quick_view_cmd},
+ {' ', N_("&Info C-x i"), 'I', info_cmd},
+ {' ', N_("&Tree"), 'T', tree_cmd},
++#ifdef HAVE_CHARSET
++ {' ', "", ' ', 0},
++ {' ', N_("Panel &codepage"), 'C', fnc_l_cmd},
++#endif
+ {' ', "", ' ', 0},
+ {' ', N_("&Sort order..."), 'S', sort_cmd},
+ {' ', "", ' ', 0},
+@@ -828,6 +835,10 @@
+ {' ', N_("&Quick view C-x q"), 'Q', quick_view_cmd},
+ {' ', N_("&Info C-x i"), 'I', info_cmd},
+ {' ', N_("&Tree"), 'T', tree_cmd},
++#ifdef HAVE_CHARSET
++ {' ', "", ' ', 0},
++ {' ', N_("Panel &codepage"), 'C', fnc_r_cmd},
++#endif
+ {' ', "", ' ', 0},
+ {' ', N_("&Sort order..."), 'S', sort_cmd},
+ {' ', "", ' ', 0},
+diff -Nurwd mc-4.6.2~pre1.orig/src/Makefile.am mc-4.6.2~pre1/src/Makefile.am
+--- mc-4.6.2~pre1.orig/src/Makefile.am 2006-02-04 12:13:30.000000000 +0100
++++ mc-4.6.2~pre1/src/Makefile.am 2008-02-13 21:01:06.000000000 +0100
+@@ -41,7 +41,8 @@
+ mc_LDADD = $(EDITLIB) $(SLANGLIB) $(VFSLIB) \
+ $(INTLLIBS) $(GLIB_LIBS) $(MCLIBS) $(LIBICONV)
+
+-CHARSET_SRC = charsets.c charsets.h selcodepage.c selcodepage.h
++CHARSET_SRC = charsets.c charsets.h selcodepage.c selcodepage.h \
++ recode.c recode.h
+
+ SRCS = achown.c achown.h background.c background.h boxes.c boxes.h \
+ chmod.c chmod.h chown.c chown.h cmd.c cmd.h color.c color.h \
+@@ -58,8 +59,8 @@
+ menu.c menu.h mountlist.c mountlist.h mouse.c mouse.h myslang.h \
+ option.c option.h panel.h panelize.c panelize.h poptalloca.h \
+ popt.c poptconfig.c popt.h popthelp.c poptint.h poptparse.c \
+- profile.c profile.h regex.c rxvt.c screen.c setup.c setup.h \
+- slint.c subshell.c subshell.h textconf.c textconf.h \
++ profile.c profile.h regex.c rxvt.c screen.c screen.h setup.c \
++ setup.h slint.c subshell.c subshell.h textconf.c textconf.h \
+ tree.c tree.h treestore.c treestore.h tty.c tty.h user.c user.h \
+ util.c util.h utilunix.c view.c view.h vfsdummy.h widget.c \
+ widget.h win.c win.h wtools.c wtools.h unixcompat.h \
+diff -Nurwd mc-4.6.2~pre1.orig/src/Makefile.in mc-4.6.2~pre1/src/Makefile.in
+--- mc-4.6.2~pre1.orig/src/Makefile.in 2007-09-11 16:33:39.000000000 +0200
++++ mc-4.6.2~pre1/src/Makefile.in 2008-02-13 21:01:06.000000000 +0100
+@@ -95,12 +95,12 @@
+ mountlist.c mountlist.h mouse.c mouse.h myslang.h option.c \
+ option.h panel.h panelize.c panelize.h poptalloca.h popt.c \
+ poptconfig.c popt.h popthelp.c poptint.h poptparse.c profile.c \
+- profile.h regex.c rxvt.c screen.c setup.c setup.h slint.c \
++ profile.h regex.c rxvt.c screen.c screen.h setup.c setup.h slint.c \
+ subshell.c subshell.h textconf.c textconf.h tree.c tree.h \
+ treestore.c treestore.h tty.c tty.h user.c user.h util.c \
+ util.h utilunix.c view.c view.h vfsdummy.h widget.c widget.h \
+ win.c win.h wtools.c wtools.h unixcompat.h x11conn.h x11conn.c \
+- ecs.h ecs.c charsets.c charsets.h selcodepage.c selcodepage.h
++ ecs.h ecs.c charsets.c charsets.h selcodepage.c selcodepage.h recode.c recode.h
+ am__objects_1 = achown.$(OBJEXT) background.$(OBJEXT) boxes.$(OBJEXT) \
+ chmod.$(OBJEXT) chown.$(OBJEXT) cmd.$(OBJEXT) color.$(OBJEXT) \
+ command.$(OBJEXT) complete.$(OBJEXT) cons.handler.$(OBJEXT) \
+@@ -120,7 +120,7 @@
+ tty.$(OBJEXT) user.$(OBJEXT) util.$(OBJEXT) utilunix.$(OBJEXT) \
+ view.$(OBJEXT) widget.$(OBJEXT) win.$(OBJEXT) wtools.$(OBJEXT) \
+ x11conn.$(OBJEXT) ecs.$(OBJEXT)
+-am__objects_2 = charsets.$(OBJEXT) selcodepage.$(OBJEXT)
++am__objects_2 = charsets.$(OBJEXT) selcodepage.$(OBJEXT) recode.$(OBJEXT)
+ @CHARSET_FALSE at am_mc_OBJECTS = $(am__objects_1)
+ @CHARSET_TRUE at am_mc_OBJECTS = $(am__objects_1) $(am__objects_2)
+ mc_OBJECTS = $(am_mc_OBJECTS)
+@@ -329,7 +329,8 @@
+ mc_LDADD = $(EDITLIB) $(SLANGLIB) $(VFSLIB) \
+ $(INTLLIBS) $(GLIB_LIBS) $(MCLIBS) $(LIBICONV)
+
+-CHARSET_SRC = charsets.c charsets.h selcodepage.c selcodepage.h
++CHARSET_SRC = charsets.c charsets.h selcodepage.c selcodepage.h \
++ recode.c recode.h
+ SRCS = achown.c achown.h background.c background.h boxes.c boxes.h \
+ chmod.c chmod.h chown.c chown.h cmd.c cmd.h color.c color.h \
+ command.c command.h complete.c complete.h cons.handler.c \
+@@ -345,7 +346,7 @@
+ menu.c menu.h mountlist.c mountlist.h mouse.c mouse.h myslang.h \
+ option.c option.h panel.h panelize.c panelize.h poptalloca.h \
+ popt.c poptconfig.c popt.h popthelp.c poptint.h poptparse.c \
+- profile.c profile.h regex.c rxvt.c screen.c setup.c setup.h \
++ profile.c profile.h regex.c rxvt.c screen.c screen.h setup.c setup.h \
+ slint.c subshell.c subshell.h textconf.c textconf.h \
+ tree.c tree.h treestore.c treestore.h tty.c tty.h user.c user.h \
+ util.c util.h utilunix.c view.c view.h vfsdummy.h widget.c \
+diff -Nurwd mc-4.6.2~pre1.orig/src/panel.h mc-4.6.2~pre1/src/panel.h
+--- mc-4.6.2~pre1.orig/src/panel.h 2004-12-03 20:17:47.000000000 +0100
++++ mc-4.6.2~pre1/src/panel.h 2008-02-13 21:01:06.000000000 +0100
+@@ -71,6 +71,19 @@
+
+ int searching;
+ char search_buffer [256];
++
++#ifdef HAVE_CHARSET
++ int src_codepage;
++ unsigned char tr_table[256], tr_table_input[256];
++#endif
++
++#ifdef USE_VFS
++ #ifdef HAVE_CHARSET
++ int ret_codepage;
++ #endif
++ int is_return;
++ char retdir[MC_MAXPATHLEN];
++#endif
+ } WPanel;
+
+ WPanel *panel_new (const char *panel_name);
+@@ -96,6 +109,7 @@
+ extern WPanel *left_panel;
+ extern WPanel *right_panel;
+ extern WPanel *current_panel;
++extern WPanel* ret_panel;
+
+ void try_to_select (WPanel *panel, const char *name);
+
+diff -Nurwd mc-4.6.2~pre1.orig/src/recode.c mc-4.6.2~pre1/src/recode.c
+--- mc-4.6.2~pre1.orig/src/recode.c 1970-01-01 00:00:00.000000000 +0000
++++ mc-4.6.2~pre1/src/recode.c 2008-02-13 21:01:06.000000000 +0100
+@@ -0,0 +1,153 @@
++#include "recode.h"
++#ifdef HAVE_CHARSET
++
++char *lang;
++char lang_codepage_name[256];
++int lang_codepage;
++
++int ftp_codepage=-1;
++
++// recode buffer for displaying file names
++unsigned char recode_buf[MC_MAXPATHLEN];
++
++WPanel* recode_panel;
++
++//--- get codepage from $LANG
++void get_locale_codepage() {
++ char* a;
++ char* b;
++ int len;
++
++ lang=getenv("LANG");
++ if(!lang) {
++ strncpy(lang_codepage_name,OTHER_8BIT, sizeof(OTHER_8BIT));
++ lang_codepage=-1;
++ return;
++ }
++
++ a=strchr(lang,'.');
++ if(!a) {
++ strncpy(lang_codepage_name,OTHER_8BIT, sizeof(OTHER_8BIT));
++ lang_codepage=-1;
++ return;
++ }
++ ++a;
++
++ b=strchr(lang,'@');
++ if(!b) b=lang+strlen(lang);
++
++ len=b-a;
++ if(len>=sizeof(lang_codepage_name)) len=sizeof(lang_codepage_name)-1;
++
++ memcpy(lang_codepage_name,a, len);
++ lang_codepage_name[len]='\0';
++ lang_codepage=get_codepage_index(lang_codepage_name);
++ if(lang_codepage<0) strncpy(lang_codepage_name,OTHER_8BIT, sizeof(OTHER_8BIT));
++}
++
++//--- reset translation table
++void my_reset_tt(unsigned char *table,int n) {
++ int i;
++ for(i=0;i<n;i++) table[i]=i;
++}
++
++//--- reset panel codepage
++void panel_reset_codepage(WPanel *p) {
++ p->src_codepage=-1;
++ my_reset_tt(p->tr_table,256);
++ my_reset_tt(p->tr_table_input,256);
++}
++
++//--- Initialize translation table
++// i need this function because init_translation_table from
++// charsets.c fills only fixed translation tables conv_displ and conv_input
++//---
++char* my_init_tt( int from, int to, unsigned char *table) {
++ int i;
++ iconv_t cd;
++ char *cpfrom, *cpto;
++
++ if(from < 0 || to < 0 || from == to) {
++ my_reset_tt(table,256);
++ return NULL;
++ }
++ my_reset_tt(table,128);
++ cpfrom=codepages[from ].id;
++ cpto=codepages[to].id;
++ cd=iconv_open(cpfrom, cpto);
++ if(cd==(iconv_t)-1) {
++ snprintf(errbuf, 255, _("Cannot translate from %s to %s"), cpfrom, cpto);
++ return errbuf;
++ }
++ for(i=128; i<=255; ++i) table[i] = translate_character(cd, i);
++ iconv_close(cd);
++ return NULL;
++}
++
++//--- Translate string from one codepage to another
++void my_translate_string(unsigned char *s1,int l1, unsigned char *s2, unsigned char *table) {
++ int i=0;
++ if(!s1) return;
++ while(i<l1) {
++ s2[i]=table[s1[i]];
++ i++;
++ }
++ s2[i]=0;
++}
++
++//--- Recode filename and concat in to dir
++char* concat_dir_and_recoded_fname(const char *dir, const char *fname, FileOpContext *ctx) {
++ int i = strlen (dir);
++
++ my_translate_string((unsigned char*)fname,strlen(fname),ctx->recode_buf,ctx->tr_table);
++ if (dir [i-1] == PATH_SEP)
++ return g_strconcat (dir, ctx->recode_buf, NULL);
++ else
++ return g_strconcat (dir, PATH_SEP_STR, ctx->recode_buf, NULL);
++ return 0;
++}
++
++
++//--- Internal handler for "Panel codepage"
++static void fnc_cmd(WPanel *p) {
++ char *errmsg;
++ if(display_codepage > 0) {
++ p->src_codepage=select_charset(p->src_codepage, 0, _(" Choose panel codepage "));
++ errmsg=my_init_tt(display_codepage,p->src_codepage,p->tr_table);
++ if(errmsg) {
++ panel_reset_codepage(p);
++ message( 1, MSG_ERROR, "%s", errmsg);
++ }
++ errmsg=my_init_tt(p->src_codepage,display_codepage,p->tr_table_input);
++ if (errmsg) {
++ panel_reset_codepage(p);
++ message( 1, MSG_ERROR, "%s", errmsg );
++ }
++ paint_dir(p);
++ show_dir(p);
++ display_mini_info(p);
++ }
++ else {
++ message( 1, _(" Warning "),
++ _("To use this feature select your codepage in\n"
++ "Setup / Display Bits dialog!\n"
++ "Do not forget to save options." ));
++ }
++}
++
++//--- Menu handlers for "Panel codepage" for left and right panel menu
++
++void fnc_l_cmd() {
++ fnc_cmd(left_panel);
++}
++
++void fnc_r_cmd() {
++ fnc_cmd(right_panel);
++}
++
++//--- screen handler for "Panel codepage"
++void fnc_c_cmd(WPanel *panel) {
++ fnc_cmd(current_panel);
++}
++
++#endif //HAVE_CHARSET
+diff -Nurwd mc-4.6.2~pre1.orig/src/recode.h mc-4.6.2~pre1/src/recode.h
+--- mc-4.6.2~pre1.orig/src/recode.h 1970-01-01 00:00:00.000000000 +0000
++++ mc-4.6.2~pre1/src/recode.h 2008-02-13 21:01:06.000000000 +0100
+@@ -0,0 +1,48 @@
++#ifndef __RECODE_H__
++#define __RECODE_H__
++#include <config.h>
++#ifdef HAVE_CHARSET
++
++#include <stdio.h>
++#include <locale.h>
++#include <iconv.h>
++
++#include "global.h"
++#include "wtools.h"
++#include "panel.h"
++#include "charsets.h"
++#include "selcodepage.h"
++#include "screen.h"
++#include "main.h"
++#include "fileopctx.h"
++
++extern char *lang;
++extern char lang_codepage_name[256];
++extern int lang_codepage;
++
++extern int ftp_codepage;
++
++// recode buffer for displaying file names
++extern unsigned char recode_buf[MC_MAXPATHLEN];
++extern WPanel* recode_panel;
++
++//--- get codepage from $LANG
++extern void get_locale_codepage();
++
++//--- reset translation table
++extern void my_reset_tt(unsigned char *table,int n);
++//--- reset panel codepage
++extern void panel_reset_codepage(WPanel *p);
++//--- Initialize translation table
++extern char* my_init_tt( int from, int to, unsigned char *table);
++//--- Translate string from one codepage to another
++extern void my_translate_string(unsigned char *s1,int l1, unsigned char *s2, unsigned char *table);
++//--- Recode filename and concat in to dir
++extern char* concat_dir_and_recoded_fname(const char *dir, const char *fname, FileOpContext *ctx);
++//--- handlers for "Panel codepage"
++extern void fnc_l_cmd();
++extern void fnc_r_cmd();
++extern void fnc_c_cmd(WPanel *panel);
++
++#endif // HAVE_CHARSET
++#endif //__RECODE_H__
+diff -Nurwd mc-4.6.2~pre1.orig/src/screen.c mc-4.6.2~pre1/src/screen.c
+--- mc-4.6.2~pre1.orig/src/screen.c 2008-02-13 21:01:43.000000000 +0100
++++ mc-4.6.2~pre1/src/screen.c 2008-02-13 21:01:06.000000000 +0100
+@@ -50,6 +50,10 @@
+ #include "main.h" /* the_menubar */
+ #include "unixcompat.h"
+
++#ifdef HAVE_CHARSET
++#include "recode.h"
++#endif
++
+ #define ELEMENTS(arr) ( sizeof(arr) / sizeof((arr)[0]) )
+
+ #define J_LEFT 1
+@@ -172,6 +176,7 @@
+ string_file_name (file_entry *fe, int len)
+ {
+ size_t i;
++ char* filename;
+
+ #ifdef UTF8
+ static char buffer [BUF_SMALL * 4];
+@@ -184,6 +189,13 @@
+ static char buffer [BUF_SMALL];
+ #endif
+
++#ifdef HAVE_CHARSET
++ my_translate_string(fe->fname,fe->fnamelen, recode_buf, recode_panel->tr_table);
++ filename= recode_buf;
++#else
++ filename=fe->fname;
++#endif
++
+ #ifdef UTF8
+ if (SLsmg_Is_Unicode)
+ for (i = 0; i < sizeof (buffer) - 1; i++) {
+@@ -214,7 +226,7 @@
+ for (i = 0; i < sizeof(buffer) - 1; i++) {
+ char c;
+
+- c = fe->fname[i];
++ c = filename[i];
+
+ if (!c) break;
+
+@@ -721,6 +733,10 @@
+ int second_column = 0;
+ int width, offset;
+
++#ifdef HAVE_CHARSET
++ recode_panel=panel;
++#endif
++
+ offset = 0;
+ if (!isstatus && panel->split){
+
+@@ -760,7 +776,7 @@
+ }
+ }
+
+-static void
++void
+ display_mini_info (WPanel *panel)
+ {
+ if (!show_mini_info)
+@@ -830,7 +846,7 @@
+ return;
+ }
+
+-static void
++void
+ paint_dir (WPanel *panel)
+ {
+ int i;
+@@ -868,7 +884,7 @@
+ #endif /* !HAVE_SLANG */
+ }
+
+-static void
++void
+ show_dir (WPanel *panel)
+ {
+ char *tmp;
+@@ -897,8 +913,15 @@
+ tmp = g_malloc (panel->widget.cols + 1);
+ tmp[panel->widget.cols] = '\0';
+
++#ifdef HAVE_CHARSET
++ my_translate_string(panel->cwd,strlen(panel->cwd),recode_buf, panel->tr_table);
++ trim (strip_home_and_password (recode_buf), tmp,
++ min (max (panel->widget.cols - 7, 0), panel->widget.cols) );
++ #else
+ trim (strip_home_and_password (panel->cwd), tmp,
+ max (panel->widget.cols - 9, 0));
++#endif
++
+ addstr (tmp);
+ g_free (tmp);
+
+@@ -1111,6 +1134,17 @@
+ mc_get_current_wd (panel->cwd, sizeof (panel->cwd) - 2);
+ strcpy (panel->lwd, ".");
+
++#ifdef HAVE_CHARSET
++ panel_reset_codepage(panel);
++#endif
++
++#ifdef USE_VFS
++ panel->is_return=0;
++ #ifdef HAVE_CHARSET
++ panel->ret_codepage=-1;
++ #endif
++#endif
++
+ panel->hist_name = g_strconcat ("Dir Hist ", panel_name, (char *) NULL);
+ panel->dir_history = history_get (panel->hist_name);
+ directory_history_add (panel, panel->cwd);
+@@ -2311,7 +2345,12 @@
+ { XCTRL('n'), move_down }, /* C-n like emacs */
+ { XCTRL('s'), start_search }, /* C-s like emacs */
+ { ALT('s'), start_search }, /* M-s not like emacs */
++#ifndef HAVE_CHARSET
+ { XCTRL('t'), mark_file },
++#endif
++#ifdef HAVE_CHARSET
++ { XCTRL('t'), mark_file }, /* was 'fnc_c_cmd' */
++#endif
+ { ALT('o'), chdir_other_panel },
+ { ALT('i'), sync_other_panel },
+ { ALT('l'), chdir_to_readlink },
+diff -Nurwd mc-4.6.2~pre1.orig/src/screen.h mc-4.6.2~pre1/src/screen.h
+--- mc-4.6.2~pre1.orig/src/screen.h 1970-01-01 00:00:00.000000000 +0000
++++ mc-4.6.2~pre1/src/screen.h 2008-02-13 21:01:06.000000000 +0100
+@@ -0,0 +1,11 @@
++#ifndef __SCREEN_H__
++#define __SCREEN_H__
++#include <config.h>
++
++#include "global.h"
++
++extern void paint_dir (WPanel *panel);
++extern void display_mini_info (WPanel *panel);
++extern void show_dir(WPanel *panel);
++#endif //__SCREEN_H__
++
+diff -Nurwd mc-4.6.2~pre1.orig/src/selcodepage.c mc-4.6.2~pre1/src/selcodepage.c
+--- mc-4.6.2~pre1.orig/src/selcodepage.c 2005-05-27 05:35:15.000000000 +0200
++++ mc-4.6.2~pre1/src/selcodepage.c 2008-02-13 21:01:06.000000000 +0100
+@@ -45,14 +45,16 @@
+ }
+
+ int
+-select_charset (int current_charset, int seldisplay)
++select_charset (int current_charset, int seldisplay, const char *title)
+ {
++ int new_charset;
++
+ int i, menu_lines = n_codepages + 1;
+ char buffer[255];
+
+ /* Create listbox */
+ Listbox *listbox = create_listbox_window (ENTRY_LEN + 2, menu_lines,
+- _(" Choose input codepage "),
++ title,
+ "[Codepages Translation]");
+
+ if (!seldisplay)
+@@ -82,20 +84,26 @@
+
+ i = run_listbox (listbox);
+
+- return (seldisplay) ? ((i >= n_codepages) ? -1 : i)
+- : (i - 1);
++ if(i==-1)
++ i = (seldisplay)
++ ? ((current_charset < 0) ? n_codepages : current_charset)
++ : (current_charset + 1);
++
++ new_charset =(seldisplay) ? ( (i >= n_codepages) ? -1 : i ) : ( i-1 );
++ new_charset = (new_charset==-2) ? current_charset:new_charset;
++ return new_charset;
+ }
+
+ /* Helper functions for codepages support */
+
+
+ int
+-do_select_codepage (void)
++do_select_codepage (const char *title)
+ {
+ const char *errmsg;
+
+ if (display_codepage > 0) {
+- source_codepage = select_charset (source_codepage, 0);
++ source_codepage = select_charset (source_codepage, 0, title);
+ errmsg =
+ init_translation_table (source_codepage, display_codepage);
+ if (errmsg) {
+diff -Nurwd mc-4.6.2~pre1.orig/src/selcodepage.h mc-4.6.2~pre1/src/selcodepage.h
+--- mc-4.6.2~pre1.orig/src/selcodepage.h 2005-06-14 15:14:49.000000000 +0200
++++ mc-4.6.2~pre1/src/selcodepage.h 2008-02-13 21:01:06.000000000 +0100
+@@ -2,8 +2,8 @@
+ #define MC_SELCODEPAGE_H
+
+ #ifdef HAVE_CHARSET
+-int select_charset (int current_charset, int seldisplay);
+-int do_select_codepage (void);
++int select_charset (int current_charset, int seldisplay, const char *title);
++int do_select_codepage (const char *title);
+ #endif /* HAVE_CHARSET */
+
+ #endif
+diff -Nurwd mc-4.6.2~pre1.orig/src/setup.c mc-4.6.2~pre1/src/setup.c
+--- mc-4.6.2~pre1.orig/src/setup.c 2006-02-23 16:32:18.000000000 +0100
++++ mc-4.6.2~pre1/src/setup.c 2008-02-13 21:01:06.000000000 +0100
+@@ -48,6 +48,8 @@
+
+ #ifdef HAVE_CHARSET
+ #include "charsets.h"
++#include"recode.h"
++#include "wtools.h"
+ #endif
+
+ #ifdef USE_NETCODE
+@@ -269,6 +271,11 @@
+ g_snprintf (buffer, sizeof (buffer), "%d", panel->user_mini_status);
+ save_string (section, "user_mini_status", buffer,
+ profile_name);
++
++#ifdef HAVE_CHARSET
++ // save panel codepage
++ save_string(section, "panel_display_codepage", get_codepage_id(panel->src_codepage), profile_name);
++#endif
+ }
+
+ void
+@@ -371,6 +378,7 @@
+ #ifdef HAVE_CHARSET
+ save_string( "Misc", "display_codepage",
+ get_codepage_id( display_codepage ), profile_name );
++ save_string( "Misc", "ftp_codepage", get_codepage_id(ftp_codepage), profile_name);
+ #endif /* HAVE_CHARSET */
+
+ g_free (profile);
+@@ -420,6 +428,31 @@
+ panel->user_mini_status =
+ load_int (section, "user_mini_status", 0);
+
++#ifdef HAVE_CHARSET
++//--- Loading panel codepage
++ panel_reset_codepage(panel);
++ if(load_codepages_list()>0) {
++ char cpname[128];
++ char *errmsg;
++
++
++ if(display_codepage>=0) {
++ load_string(section, "panel_display_codepage", "", cpname, sizeof(cpname));
++ if(cpname[0]!='\0') panel->src_codepage = get_codepage_index(cpname);
++ }
++
++ errmsg=my_init_tt(display_codepage,panel->src_codepage,panel->tr_table);
++ if(errmsg) {
++ panel_reset_codepage(panel);
++ message( 1, MSG_ERROR, "%s", errmsg );
++ }
++ errmsg=my_init_tt(panel->src_codepage,display_codepage,panel->tr_table_input);
++ if(errmsg) {
++ panel_reset_codepage(panel);
++ message( 1, MSG_ERROR, "%s", errmsg );
++ }
++ }
++#endif
+ }
+
+ static void
+@@ -569,10 +602,16 @@
+ #ifdef HAVE_CHARSET
+ if ( load_codepages_list() > 0 ) {
+ char cpname[128];
+- load_string( "Misc", "display_codepage", "",
+- cpname, sizeof(cpname) );
+- if ( cpname[0] != '\0' )
+- display_codepage = get_codepage_index( cpname );
++ get_locale_codepage();
++ load_string("Misc", "display_codepage", "", cpname, sizeof(cpname));
++ if(cpname[0] != '\0') display_codepage=get_codepage_index(cpname);
++ else display_codepage=lang_codepage;
++
++ ftp_codepage=-1;
++ if(display_codepage >= 0) {
++ load_string( "Misc", "ftp_codepage", "", cpname, sizeof(cpname));
++ if(cpname[0] != '\0') ftp_codepage=get_codepage_index(cpname);
++ }
+ }
+
+ init_translation_table( source_codepage, display_codepage );
+diff -Nurwd mc-4.6.2~pre1.orig/src/view.c mc-4.6.2~pre1/src/view.c
+--- mc-4.6.2~pre1.orig/src/view.c 2008-02-13 21:01:43.000000000 +0100
++++ mc-4.6.2~pre1/src/view.c 2008-02-13 21:01:06.000000000 +0100
+@@ -3232,7 +3232,7 @@
+
+ #ifdef HAVE_CHARSET
+ case XCTRL ('t'):
+- do_select_codepage ();
++ do_select_codepage (_(" Choose codepage "));
+ view->dirty++;
+ view_update (view);
+ return MSG_HANDLED;
+diff -Nurwd mc-4.6.2~pre1.orig/vfs/vfs.c mc-4.6.2~pre1/vfs/vfs.c
+--- mc-4.6.2~pre1.orig/vfs/vfs.c 2008-02-13 21:01:43.000000000 +0100
++++ mc-4.6.2~pre1/vfs/vfs.c 2008-02-13 21:01:06.000000000 +0100
+@@ -53,6 +53,11 @@
+ #include "smbfs.h"
+ #include "local.h"
+
++#include "../src/panel.h"
++#ifdef HAVE_CHARSET
++#include "../src/recode.h"
++#endif
++
+ /* They keep track of the current directory */
+ static struct vfs_class *current_vfs;
+ static char *current_dir;
+@@ -685,8 +690,66 @@
+ vfsid old_vfsid;
+ int result;
+
++#ifdef HAVE_CHARSET
++ char* errmsg;
++#endif
++ WPanel* p=ret_panel;
++
+ new_dir = vfs_canon (path);
+ new_vfs = vfs_get_class (new_dir);
++ old_vfsid = vfs_getid (current_vfs, current_dir);
++ old_vfs = current_vfs;
++
++ if(p) {
++
++ // Change from localfs to ftpfs
++ ret_panel=NULL;
++ if( (strcmp(old_vfs->name,"localfs")==0) &&
++ (strcmp(new_vfs->name,"ftpfs")==0)){
++ p->is_return=1;
++ strncpy(p->retdir,current_dir, MC_MAXPATHLEN);
++#ifdef HAVE_CHARSET
++ p->ret_codepage=p->src_codepage;
++ p->src_codepage=ftp_codepage;
++ errmsg=my_init_tt(display_codepage,p->src_codepage,p->tr_table);
++ if(errmsg) {
++ panel_reset_codepage(p);
++ message( 1, MSG_ERROR, "%s", errmsg );
++ }
++ errmsg=my_init_tt(p->src_codepage,display_codepage,p->tr_table_input);
++ if(errmsg) {
++ panel_reset_codepage(p);
++ message( 1, MSG_ERROR, "%s", errmsg );
++ }
++#endif
++ }
++
++ // Change from ftpfs to localfs
++ if( (strcmp(old_vfs->name,"ftpfs")==0) &&
++ (strcmp(new_vfs->name,"localfs")==0) &&
++ p->is_return){
++ p->is_return=0;
++ g_free(new_dir);
++ new_dir = vfs_canon (p->retdir);
++ new_vfs = vfs_get_class (new_dir);
++#ifdef HAVE_CHARSET
++ p->src_codepage=p->ret_codepage;
++ errmsg=my_init_tt(display_codepage,p->src_codepage,p->tr_table);
++ if(errmsg) {
++ panel_reset_codepage(p);
++ message( 1, MSG_ERROR, "%s", errmsg );
++ }
++ errmsg=my_init_tt(p->src_codepage,display_codepage,p->tr_table_input);
++ if(errmsg) {
++ panel_reset_codepage(p);
++ message( 1, MSG_ERROR, "%s", errmsg );
++ }
++#endif
++ }
++ }
++
++
++
+ if (!new_vfs->chdir) {
+ g_free (new_dir);
+ return -1;
+@@ -700,9 +763,6 @@
+ return -1;
+ }
+
+- old_vfsid = vfs_getid (current_vfs, current_dir);
+- old_vfs = current_vfs;
+-
+ /* Actually change directory */
+ g_free (current_dir);
+ current_dir = new_dir;
More information about the Pkg-mc-commits
mailing list