[Midnightbsd-cvs] src [10958] vendor/dialog/dist: Update to 1.2
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Jun 15 12:21:15 EDT 2018
Revision: 10958
http://svnweb.midnightbsd.org/src/?rev=10958
Author: laffer1
Date: 2018-06-15 12:21:14 -0400 (Fri, 15 Jun 2018)
Log Message:
-----------
Update to 1.2
Modified Paths:
--------------
vendor/dialog/dist/CHANGES
vendor/dialog/dist/VERSION
vendor/dialog/dist/aclocal.m4
vendor/dialog/dist/argv.c
vendor/dialog/dist/arrows.c
vendor/dialog/dist/buttons.c
vendor/dialog/dist/calendar.c
vendor/dialog/dist/checklist.c
vendor/dialog/dist/columns.c
vendor/dialog/dist/config.guess
vendor/dialog/dist/config.sub
vendor/dialog/dist/configure
vendor/dialog/dist/configure.in
vendor/dialog/dist/dialog-config.in
vendor/dialog/dist/dialog.1
vendor/dialog/dist/dialog.3
vendor/dialog/dist/dialog.c
vendor/dialog/dist/dialog.h
vendor/dialog/dist/dialog.pl
vendor/dialog/dist/dlg_colors.h
vendor/dialog/dist/dlg_keys.c
vendor/dialog/dist/dlg_keys.h
vendor/dialog/dist/editbox.c
vendor/dialog/dist/formbox.c
vendor/dialog/dist/fselect.c
vendor/dialog/dist/guage.c
vendor/dialog/dist/headers-sh.in
vendor/dialog/dist/help.c
vendor/dialog/dist/inputbox.c
vendor/dialog/dist/inputstr.c
vendor/dialog/dist/makefile.in
vendor/dialog/dist/menubox.c
vendor/dialog/dist/mixedform.c
vendor/dialog/dist/mixedgauge.c
vendor/dialog/dist/mouse.c
vendor/dialog/dist/mousewget.c
vendor/dialog/dist/msgbox.c
vendor/dialog/dist/package/debian/changelog
vendor/dialog/dist/package/debian/copyright
vendor/dialog/dist/package/dialog.spec
vendor/dialog/dist/pause.c
vendor/dialog/dist/po/cs.po
vendor/dialog/dist/po/el.po
vendor/dialog/dist/po/gl.po
vendor/dialog/dist/po/hr.po
vendor/dialog/dist/po/lt.po
vendor/dialog/dist/po/sr.po
vendor/dialog/dist/po/zh_TW.po
vendor/dialog/dist/prgbox.c
vendor/dialog/dist/progressbox.c
vendor/dialog/dist/rc.c
vendor/dialog/dist/rename.sh
vendor/dialog/dist/samples/README
vendor/dialog/dist/samples/calendar
vendor/dialog/dist/samples/calendar-stdout
vendor/dialog/dist/samples/calendar2
vendor/dialog/dist/samples/calendar2-stdout
vendor/dialog/dist/samples/calendar3
vendor/dialog/dist/samples/calendar3-stdout
vendor/dialog/dist/samples/checklist
vendor/dialog/dist/samples/checklist-8bit
vendor/dialog/dist/samples/checklist-utf8
vendor/dialog/dist/samples/checklist1
vendor/dialog/dist/samples/checklist10
vendor/dialog/dist/samples/checklist11
vendor/dialog/dist/samples/checklist2
vendor/dialog/dist/samples/checklist3
vendor/dialog/dist/samples/checklist4
vendor/dialog/dist/samples/checklist5
vendor/dialog/dist/samples/checklist6
vendor/dialog/dist/samples/checklist7
vendor/dialog/dist/samples/checklist8
vendor/dialog/dist/samples/checklist9
vendor/dialog/dist/samples/debian.rc
vendor/dialog/dist/samples/dialog.py
vendor/dialog/dist/samples/editbox
vendor/dialog/dist/samples/editbox-utf8
vendor/dialog/dist/samples/editbox2
vendor/dialog/dist/samples/editbox3
vendor/dialog/dist/samples/editbox4
vendor/dialog/dist/samples/form1
vendor/dialog/dist/samples/form1-both
vendor/dialog/dist/samples/form1-extra
vendor/dialog/dist/samples/form1-help
vendor/dialog/dist/samples/form1-utf8
vendor/dialog/dist/samples/form2
vendor/dialog/dist/samples/form3
vendor/dialog/dist/samples/form4
vendor/dialog/dist/samples/form5
vendor/dialog/dist/samples/form6
vendor/dialog/dist/samples/fselect
vendor/dialog/dist/samples/fselect-stdout
vendor/dialog/dist/samples/fselect0
vendor/dialog/dist/samples/fselect1
vendor/dialog/dist/samples/fselect1-stdout
vendor/dialog/dist/samples/fselect2
vendor/dialog/dist/samples/fselect2-stdout
vendor/dialog/dist/samples/gauge
vendor/dialog/dist/samples/gauge0
vendor/dialog/dist/samples/gauge0-input-fd
vendor/dialog/dist/samples/gauge2
vendor/dialog/dist/samples/infobox
vendor/dialog/dist/samples/infobox1
vendor/dialog/dist/samples/infobox2
vendor/dialog/dist/samples/infobox3
vendor/dialog/dist/samples/infobox4
vendor/dialog/dist/samples/infobox5
vendor/dialog/dist/samples/infobox6
vendor/dialog/dist/samples/inputbox
vendor/dialog/dist/samples/inputbox-both
vendor/dialog/dist/samples/inputbox-extra
vendor/dialog/dist/samples/inputbox-help
vendor/dialog/dist/samples/inputbox1
vendor/dialog/dist/samples/inputbox2
vendor/dialog/dist/samples/inputbox3
vendor/dialog/dist/samples/inputbox4
vendor/dialog/dist/samples/inputbox5
vendor/dialog/dist/samples/inputbox6-8bit
vendor/dialog/dist/samples/inputbox6-utf8
vendor/dialog/dist/samples/inputbox7
vendor/dialog/dist/samples/inputmenu
vendor/dialog/dist/samples/inputmenu-stdout
vendor/dialog/dist/samples/inputmenu1
vendor/dialog/dist/samples/inputmenu2
vendor/dialog/dist/samples/inputmenu3
vendor/dialog/dist/samples/inputmenu4
vendor/dialog/dist/samples/killall
vendor/dialog/dist/samples/listing
vendor/dialog/dist/samples/menubox
vendor/dialog/dist/samples/menubox-8bit
vendor/dialog/dist/samples/menubox-utf8
vendor/dialog/dist/samples/menubox1
vendor/dialog/dist/samples/menubox10
vendor/dialog/dist/samples/menubox2
vendor/dialog/dist/samples/menubox3
vendor/dialog/dist/samples/menubox4
vendor/dialog/dist/samples/menubox5
vendor/dialog/dist/samples/menubox6
vendor/dialog/dist/samples/menubox7
vendor/dialog/dist/samples/menubox8
vendor/dialog/dist/samples/menubox9
vendor/dialog/dist/samples/mixedform
vendor/dialog/dist/samples/mixedform2
vendor/dialog/dist/samples/mixedgauge
vendor/dialog/dist/samples/msgbox
vendor/dialog/dist/samples/msgbox-help
vendor/dialog/dist/samples/msgbox-utf8
vendor/dialog/dist/samples/msgbox1
vendor/dialog/dist/samples/msgbox2
vendor/dialog/dist/samples/msgbox3
vendor/dialog/dist/samples/msgbox4-8bit
vendor/dialog/dist/samples/msgbox4-eucjp
vendor/dialog/dist/samples/msgbox4-utf8
vendor/dialog/dist/samples/msgbox5
vendor/dialog/dist/samples/msgbox6
vendor/dialog/dist/samples/msgbox6a
vendor/dialog/dist/samples/password
vendor/dialog/dist/samples/password1
vendor/dialog/dist/samples/password2
vendor/dialog/dist/samples/passwordform1
vendor/dialog/dist/samples/passwordform1-utf8
vendor/dialog/dist/samples/pause
vendor/dialog/dist/samples/pause-both
vendor/dialog/dist/samples/pause-extra
vendor/dialog/dist/samples/pause-help
vendor/dialog/dist/samples/prgbox
vendor/dialog/dist/samples/prgbox2
vendor/dialog/dist/samples/programbox
vendor/dialog/dist/samples/programbox2
vendor/dialog/dist/samples/progress
vendor/dialog/dist/samples/progress2
vendor/dialog/dist/samples/radiolist
vendor/dialog/dist/samples/radiolist1
vendor/dialog/dist/samples/radiolist10
vendor/dialog/dist/samples/radiolist2
vendor/dialog/dist/samples/radiolist3
vendor/dialog/dist/samples/radiolist4
vendor/dialog/dist/samples/report-button
vendor/dialog/dist/samples/report-edit
vendor/dialog/dist/samples/report-string
vendor/dialog/dist/samples/report-tempfile
vendor/dialog/dist/samples/report-yesno
vendor/dialog/dist/samples/rotated-data
vendor/dialog/dist/samples/setup-edit
vendor/dialog/dist/samples/setup-tempfile
vendor/dialog/dist/samples/setup-utf8
vendor/dialog/dist/samples/setup-vars
vendor/dialog/dist/samples/shortlist
vendor/dialog/dist/samples/slackware.rc
vendor/dialog/dist/samples/sourcemage.rc
vendor/dialog/dist/samples/suse.rc
vendor/dialog/dist/samples/tailbox
vendor/dialog/dist/samples/tailboxbg
vendor/dialog/dist/samples/tailboxbg1
vendor/dialog/dist/samples/tailboxbg2
vendor/dialog/dist/samples/testdata-8bit
vendor/dialog/dist/samples/textbox
vendor/dialog/dist/samples/textbox-both
vendor/dialog/dist/samples/textbox-help
vendor/dialog/dist/samples/textbox2
vendor/dialog/dist/samples/textbox3
vendor/dialog/dist/samples/timebox
vendor/dialog/dist/samples/timebox-stdout
vendor/dialog/dist/samples/timebox2
vendor/dialog/dist/samples/timebox2-stdout
vendor/dialog/dist/samples/wheel
vendor/dialog/dist/samples/whiptail.rc
vendor/dialog/dist/samples/yesno
vendor/dialog/dist/samples/yesno-both
vendor/dialog/dist/samples/yesno-extra
vendor/dialog/dist/samples/yesno-help
vendor/dialog/dist/samples/yesno-utf8
vendor/dialog/dist/samples/yesno2
vendor/dialog/dist/samples/yesno3
vendor/dialog/dist/samples/yesno4
vendor/dialog/dist/tailbox.c
vendor/dialog/dist/textbox.c
vendor/dialog/dist/timebox.c
vendor/dialog/dist/trace.c
vendor/dialog/dist/ui_getc.c
vendor/dialog/dist/util.c
vendor/dialog/dist/version.c
vendor/dialog/dist/yesno.c
Added Paths:
-----------
vendor/dialog/dist/buildlist.c
vendor/dialog/dist/package/freebsd/
vendor/dialog/dist/package/freebsd/Makefile
vendor/dialog/dist/package/freebsd/distinfo
vendor/dialog/dist/package/freebsd/pkg-descr
vendor/dialog/dist/package/freebsd/pkg-plist
vendor/dialog/dist/po/an.po
vendor/dialog/dist/po/fa.po
vendor/dialog/dist/po/ia.po
vendor/dialog/dist/rangebox.c
vendor/dialog/dist/samples/buildlist
vendor/dialog/dist/samples/buildlist2
vendor/dialog/dist/samples/checklist12
vendor/dialog/dist/samples/dft-cancel
vendor/dialog/dist/samples/dft-extra
vendor/dialog/dist/samples/dft-help
vendor/dialog/dist/samples/dft-no
vendor/dialog/dist/samples/menubox12
vendor/dialog/dist/samples/rangebox
vendor/dialog/dist/samples/rangebox2
vendor/dialog/dist/samples/rangebox3
vendor/dialog/dist/samples/rangebox4
vendor/dialog/dist/samples/treeview
vendor/dialog/dist/samples/treeview2
vendor/dialog/dist/samples/with-dquotes
vendor/dialog/dist/samples/with-squotes
vendor/dialog/dist/treeview.c
Removed Paths:
-------------
vendor/dialog/dist/samples/install/FDISK.TEST
Property Changed:
----------------
vendor/dialog/dist/config.guess
vendor/dialog/dist/config.sub
vendor/dialog/dist/configure
vendor/dialog/dist/headers-sh.in
vendor/dialog/dist/install-sh
vendor/dialog/dist/package/debian/rules
vendor/dialog/dist/rename.sh
vendor/dialog/dist/samples/calendar
vendor/dialog/dist/samples/calendar-stdout
vendor/dialog/dist/samples/calendar2
vendor/dialog/dist/samples/calendar2-stdout
vendor/dialog/dist/samples/calendar3
vendor/dialog/dist/samples/calendar3-stdout
vendor/dialog/dist/samples/checklist
vendor/dialog/dist/samples/checklist-8bit
vendor/dialog/dist/samples/checklist-utf8
vendor/dialog/dist/samples/checklist1
vendor/dialog/dist/samples/checklist10
vendor/dialog/dist/samples/checklist11
vendor/dialog/dist/samples/checklist2
vendor/dialog/dist/samples/checklist3
vendor/dialog/dist/samples/checklist4
vendor/dialog/dist/samples/checklist5
vendor/dialog/dist/samples/checklist6
vendor/dialog/dist/samples/checklist7
vendor/dialog/dist/samples/checklist8
vendor/dialog/dist/samples/checklist9
vendor/dialog/dist/samples/editbox
vendor/dialog/dist/samples/editbox-utf8
vendor/dialog/dist/samples/editbox2
vendor/dialog/dist/samples/editbox3
vendor/dialog/dist/samples/editbox4
vendor/dialog/dist/samples/form1
vendor/dialog/dist/samples/form1-both
vendor/dialog/dist/samples/form1-extra
vendor/dialog/dist/samples/form1-help
vendor/dialog/dist/samples/form1-utf8
vendor/dialog/dist/samples/form2
vendor/dialog/dist/samples/form3
vendor/dialog/dist/samples/form4
vendor/dialog/dist/samples/form5
vendor/dialog/dist/samples/form6
vendor/dialog/dist/samples/fselect
vendor/dialog/dist/samples/fselect-stdout
vendor/dialog/dist/samples/fselect0
vendor/dialog/dist/samples/fselect1
vendor/dialog/dist/samples/fselect1-stdout
vendor/dialog/dist/samples/fselect2
vendor/dialog/dist/samples/fselect2-stdout
vendor/dialog/dist/samples/gauge
vendor/dialog/dist/samples/gauge0
vendor/dialog/dist/samples/gauge0-input-fd
vendor/dialog/dist/samples/gauge2
vendor/dialog/dist/samples/infobox
vendor/dialog/dist/samples/infobox1
vendor/dialog/dist/samples/infobox2
vendor/dialog/dist/samples/infobox3
vendor/dialog/dist/samples/infobox4
vendor/dialog/dist/samples/infobox5
vendor/dialog/dist/samples/infobox6
vendor/dialog/dist/samples/inputbox
vendor/dialog/dist/samples/inputbox-both
vendor/dialog/dist/samples/inputbox-extra
vendor/dialog/dist/samples/inputbox-help
vendor/dialog/dist/samples/inputbox1
vendor/dialog/dist/samples/inputbox2
vendor/dialog/dist/samples/inputbox3
vendor/dialog/dist/samples/inputbox4
vendor/dialog/dist/samples/inputbox5
vendor/dialog/dist/samples/inputbox6-8bit
vendor/dialog/dist/samples/inputbox6-utf8
vendor/dialog/dist/samples/inputbox7
vendor/dialog/dist/samples/inputmenu
vendor/dialog/dist/samples/inputmenu-stdout
vendor/dialog/dist/samples/inputmenu1
vendor/dialog/dist/samples/inputmenu2
vendor/dialog/dist/samples/inputmenu3
vendor/dialog/dist/samples/inputmenu4
vendor/dialog/dist/samples/killall
vendor/dialog/dist/samples/listing
vendor/dialog/dist/samples/menubox
vendor/dialog/dist/samples/menubox-8bit
vendor/dialog/dist/samples/menubox-utf8
vendor/dialog/dist/samples/menubox1
vendor/dialog/dist/samples/menubox10
vendor/dialog/dist/samples/menubox2
vendor/dialog/dist/samples/menubox3
vendor/dialog/dist/samples/menubox4
vendor/dialog/dist/samples/menubox5
vendor/dialog/dist/samples/menubox6
vendor/dialog/dist/samples/menubox7
vendor/dialog/dist/samples/menubox8
vendor/dialog/dist/samples/menubox9
vendor/dialog/dist/samples/mixedform
vendor/dialog/dist/samples/mixedform2
vendor/dialog/dist/samples/mixedgauge
vendor/dialog/dist/samples/msgbox
vendor/dialog/dist/samples/msgbox-help
vendor/dialog/dist/samples/msgbox-utf8
vendor/dialog/dist/samples/msgbox1
vendor/dialog/dist/samples/msgbox2
vendor/dialog/dist/samples/msgbox3
vendor/dialog/dist/samples/msgbox4-8bit
vendor/dialog/dist/samples/msgbox4-eucjp
vendor/dialog/dist/samples/msgbox4-utf8
vendor/dialog/dist/samples/msgbox5
vendor/dialog/dist/samples/msgbox6
vendor/dialog/dist/samples/msgbox6a
vendor/dialog/dist/samples/password
vendor/dialog/dist/samples/password1
vendor/dialog/dist/samples/password2
vendor/dialog/dist/samples/passwordform1
vendor/dialog/dist/samples/passwordform1-utf8
vendor/dialog/dist/samples/pause
vendor/dialog/dist/samples/pause-both
vendor/dialog/dist/samples/pause-extra
vendor/dialog/dist/samples/pause-help
vendor/dialog/dist/samples/prgbox
vendor/dialog/dist/samples/prgbox2
vendor/dialog/dist/samples/programbox
vendor/dialog/dist/samples/programbox2
vendor/dialog/dist/samples/progress
vendor/dialog/dist/samples/progress2
vendor/dialog/dist/samples/radiolist
vendor/dialog/dist/samples/radiolist1
vendor/dialog/dist/samples/radiolist10
vendor/dialog/dist/samples/radiolist2
vendor/dialog/dist/samples/radiolist3
vendor/dialog/dist/samples/radiolist4
vendor/dialog/dist/samples/rotated-data
vendor/dialog/dist/samples/shortlist
vendor/dialog/dist/samples/tailbox
vendor/dialog/dist/samples/tailboxbg
vendor/dialog/dist/samples/tailboxbg1
vendor/dialog/dist/samples/tailboxbg2
vendor/dialog/dist/samples/textbox
vendor/dialog/dist/samples/textbox-both
vendor/dialog/dist/samples/textbox-help
vendor/dialog/dist/samples/textbox2
vendor/dialog/dist/samples/textbox3
vendor/dialog/dist/samples/timebox
vendor/dialog/dist/samples/timebox-stdout
vendor/dialog/dist/samples/timebox2
vendor/dialog/dist/samples/timebox2-stdout
vendor/dialog/dist/samples/wheel
vendor/dialog/dist/samples/yesno
vendor/dialog/dist/samples/yesno-both
vendor/dialog/dist/samples/yesno-extra
vendor/dialog/dist/samples/yesno-help
vendor/dialog/dist/samples/yesno-utf8
vendor/dialog/dist/samples/yesno2
vendor/dialog/dist/samples/yesno3
vendor/dialog/dist/samples/yesno4
Modified: vendor/dialog/dist/CHANGES
===================================================================
--- vendor/dialog/dist/CHANGES 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/CHANGES 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,155 @@
--- $Id: CHANGES,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+-- $Id: CHANGES,v 1.476 2013/09/24 00:06:47 tom Exp $
-- Thomas E. Dickey <dickey at invisible-island.net>
This version of dialog was originally from a Debian snapshot. I've done this
to it:
+2013/09/23
+ + fix samples/inputbox6-utf8, which had depended unnecessarily on bash.
+ + improve memory caching for wide-character manipulation in gauge
+ widget (report by Devin Teske).
+ + add dlg_reallocate_gauge (discussion with Devin Teske).
+ + updated configure macros to use msys changes from ncurses.
+ + update config.guess, config.sub
+
+2013/09/02
+ + modify makefile rule to make the ".png" filenames created by groff
+ predictable.
+ + add option --help-tags to allow scripts to get the item's tag field
+ consistently from help- and help-item button results rather than
+ getting the item's text for the latter (discussion with Florent
+ Rougon).
+ + correct manpage discussion of DIALOG_ITEM_HELP versus --item-help,
+ as well as --help-button return status (report by Florent Rougon).
+ + correct limit used for --hline option (report by Devin Teske,
+ cf: 2011/06/30).
+ + do not print empty "[]" if a --hline option was given with an empty
+ value (report by Devin Teske).
+ + miscellaneous configure script fixes/updates. In particular, add
+ option --with-shared which builds shared libraries without a libtool
+ dependency.
+ + add FreeBSD port-files for test-builds.
+ + update lt.po, add fa.po from
+ http://translationproject.org/latest/dialog/
+ + update config.guess, config.sub
+
+2013/05/23
+ + modify ifdef in arrows.c to work around packages which use the
+ wide-character ncursesw headers with the ncurses library (report
+ by Aleksey Cheusov).
+ + correct workaround for xterm alternate-screen to work with/without
+ the fix made in ncurses that makes putp() always write to the
+ standard output (Debian #708829).
+ + improve limit-checks for checklist, in case the dialog is resized
+ (report by Ilya A Arkhipov).
+ + add --last-key option (adapted from patch by Jordi Pujol, Debian
+ #697607).
+
+2013/03/15
+ + update zh_TW.po, add an.po from
+ http://translationproject.org/latest/dialog/
+
+2012/12/30 - release 1.2
+ + improve some older changelog entries to help with HTML'izing content.
+ + various fixes/improvments for scrollbar appearance.
+ + add mappings for some equivalent options provided by whiptail;
+ add configure option --disable-whiptail to allow suppressing these.
+ + add configure option --disable-Xdialog2 to allow suppressing the
+ newer features, i.e., for cdialog 1.2
+ + add --no-items option, for consistency.
+ + add --no-tags option, like Xdialog.
+ + add buildlist, rangebox and treeview dialogs, like Xdialog.
+ + remove obsolete workaround for ncurses 4.2 scrolling in checklist
+ and menubox.
+ + improve dialog_helpfile() by preventing it from showing extra buttons
+ (suggested by xDog Walker).
+ + correct logic in formbox's scroll_next() function (report by xDog
+ Walker).
+ + fix a case with inputbox widget where preset input text is not shown
+ until moving the cursor within the text (report by xDog Walker).
+ + handle SIGCHLD in dialog_prgbox() to eliminate defunct processes
+ (report by xDog Walker).
+ + improve the way "hotkeys" are assigned to widget buttons by checking
+ if a given key has already been used in the row of buttons (Debian
+ #684933).
+ + amend fix for --trace parsing from 2012/07/03, which sometimes
+ skipped a parameter (report by xDog Walker).
+ + drop copismall and install files from samples, which were essentially
+ nonfunctional.
+ + correct secondary border colors in samples/slackware.rc and
+ samples/whiptail.rc
+ + update gl.po, add ia.po from
+ http://translationproject.org/latest/dialog/
+ + fix various issues reported by coverity scan.
+ + miscellaneous configure script fixes/updates:
+ + require autoconf 2.52+patches
+ + support --datarootdir option
+ + check for clang compiler
+ + check for tinfo library when looking for ncurses
+ + add 3rd parameter to AC_DEFINE for autoheader
+ + remove unused macros from aclocal.m4
+ + update config.guess, config.sub
+
+2012/07/06
+ + modify samples/setup-tempfile to work with Tru64's shell.
+ + modify inputmenu sample scripts to make them more portable:
+ + use "id" rather than "$GROUPS", use sed to work with Solaris.
+ + use sed to split-up the rename results to work with HPUX.
+ + fix regression in msgbox (ArchLinux #30574)
+
+2012/07/03
+ + modify prgbox widget to work with --extra-button, etc.
+ + add case values to several widgets to allow for mouse-clicks with
+ "--extra-button" and "--help-button" additions.
+ + correct timebox widget's exit code for "--extra-button" when handing
+ the "enter" key.
+ + modify msgbox widget to honor "--extra-button".
+ + corrected processing of "--trace" option, which did not update the
+ index into command-line to point past its value.
+ + add a check in dialog program for valid characters used in option,
+ e.g., to generate an error if a script attempts to add option value
+ using "=" rather than with whitespace.
+ + add new command-line option --default-button and library function
+ dlg_default_button() to retrieve the value set by the option
+ to provide a way to set the default button directly rather than
+ by combining --nook, etc. (patch by Zoltan Kelemen).
+ + amend include of unctrl.h to apply only to the case where curses.h
+ is included, to avoid conflict of ncurses' unctrl.h with a system
+ implementation (report by Martin Roedlach)
+ + add limit-check to dlg_toupper() in non-wide curses mode to work
+ when non-character values such as arrow-key codes are passed to
+ it (patch by Zoltan Kelemen).
+ + override timeout value, e.g., as set via --timeout command-line
+ option in pause widget because that interferes with pause's behavior
+ (report by Jan Spitalnik).
+ + modify samples/inputmenu* to allow ":" in renamed text (report by
+ Andreas Stoewing).
+ + modify double-quoting to make it more consistent, i.e., checklist
+ output is quoted only when needed. This fixes the case where
+ single-quotes were used whether or not needed, but also modifies
+ older checklist behavior for double-quoting which always added those
+ (Debian #663664).
+ + correct exit-code used in inputmenu for "rename" button (Debian
+ #673041, forwarded from Ubuntu #333909, patch by Lebedev Vadim).
+ + update el.po and hr.po from
+ http://translationproject.org/latest/dialog/
+ + use checkbashisms to clean up sample scripts.
+
+2012/02/15
+ + modify menubox.c to use the same improvement as in checklist.c
+ + improve auto width computation for checklist widget by using
+ dlg_calc_list_width as in the non-auto case (Edho Arief).
+ + eliminate some bashisms in the sample scripts (Pedro Giffuni).
+ + makefile fixes from FreeBSD ports (Li-Wen Hsu):
+ + make --with-package option of configure script work.
+ + get LIBTOOL_VERSION from configure script, needed by
+ ${LIBTOOL_VERSION} in LIBTOOL_CREATE (LIB_CREATE in configure and
+ aclocal.m4)
+ + update cs.po and sr.po from
+ http://translationproject.org/latest/dialog/
+ + updated configure script macros, improving CF_XOPEN_SOURCE among
+ other fixes.
+
2011/10/20
+ fix --analyze warnings for clang versions 2.8, 2.9.
+ add configure check for lint program.
@@ -181,7 +327,7 @@
separate ncurses' header files.
+ CF_DISABLE_RPATH_HACK, fix garbled message
+ CF_LD_RPATH_OPT, add mirbsd
- + CF_MAKEFLAGS, filter out GNU make's entering/leaving messages.
+ + CF_MAKEFLAGS, filter out GNU make's entering/leaving messages.
This only appeared when using the macro in a dpkg script, though it
should have in other cases.
+ CF_RPATH_HACK, add a check for libraries not found, e.g., from
@@ -498,7 +644,8 @@
+ use $(INSTALL_SCRIPT) for installing dialog-config (report by
Santiago Vila).
-2007/02/27
+2007/02/27 - release 1.1
+ + mark as "dialog 1.1"
+ add dialog-config script, which provides applications with compile-
and link-information for using the dialog library.
+ move calls to dlg_trim_string() out of loop in dialog.c, so each
@@ -731,8 +878,7 @@
+ modify tailboxbg by resetting tty modes at the point where it forks a
process to update the screen, rather than waiting until that process
exits. This improves user feedback by making it apparent that dialog
- is no longer processing input after that point (Redhat Bugzilla
- #142538).
+ is no longer processing input after that point (Redhat #142538).
+ minor updates to some .po files using Babel Fish, comparing with lynx.
+ update es.po (Santiago Vila).
+ work around bug in NetBSD 1.6 curses which seems to be confused by
@@ -918,8 +1064,7 @@
before dialog is invoked (Debian #244746).
+ correct dlg_match_char() function, which was broken during rewrite
to support wide-characters (Debian #244777).
- + improved ru.po, uses UTF-8 charset (Leonid Kanter, Redhat Bugzilla
- #119200).
+ + improved ru.po, uses UTF-8 charset (Leonid Kanter, Redhat #119200).
+ correct position of shadow drawn for dialogs, which appeared to work
for most versions of curses (other than NetBSD) but would have been
visible for certain color schemes (discussion with Julian Coleman).
@@ -1250,7 +1395,7 @@
the --stdout option does not work on HPUX but otherwise dialog works.
+ updated el.po (patch by kromJx <kromJx at crosswinds.net>).
-2002/05/19
+2002/05/19 - release 0.9b
+ add --no-collapse option to allow one to retain tabs and repeated
blanks in a message box (request by Roberto Simoni).
+ use DLG_EXIT_ESC constant rather than -1's in several places. This
@@ -1718,15 +1863,15 @@
Santiago Vila <sanvila at ctv.es>:
1999/10/07
- + add a password dialog box.
+ + add a password dialog box (Debian #45964, patch by Joey Hess).
+ implement "--defaultno" option to specify if the default for
- the yes/no box is "No".
+ the yes/no box is "No" (Debian #46076, patch by Joey Hess).
1999/03/10
+ modify input.c to clear the input field to the right of the
- given string (unclear: this seems redundant, since the
- dialog is drawn in a new window).
+ given string, to help with screen-refresh
1998/12/08
- + check for list_height less than one in checklist.c
+ + check for list_height less than one in checklist.c (Debian
+ #22239).
1998/10/21
+ use function wscrl() in preference to scroll() in checklist.c
and menubox.c (unclear: in ncurses, scroll() is a macro that
@@ -1736,12 +1881,14 @@
that directory.
1998/09/12
+ simplify menubox.c using new functions print_arrows() and
- print_items().
- + add logic to handle KEY_NPAGE and KEY_PPAGE.
- + change sample scripts to use Debian tempfile utility rather
- than putting files into /tmp.
- + change sample scripts to use 'dialog' from user's path rather
- than in the parent directory as in the build directory.
+ print_items(). add logic to handle KEY_NPAGE and KEY_PPAGE
+ (Debian #26326).
+ + modifications to provide sample scripts (Debian #26211):
+ + change sample scripts to use Debian tempfile utility rather
+ than putting files into /tmp.
+ + change sample scripts to use 'dialog' from user's path
+ rather than in the parent directory as in the build
+ directory.
+ use the system copy of GPL rather than that in the build
directory as an example for the textbox script.
@@ -1767,16 +1914,16 @@
1998/05/24
+ Replaced guage.c by the one in dialog 0.6z, which is known to work.
- Fixes Bug #18284: unstable dialog.
+ Fixes Debian #18284: unstable dialog.
1997/12/16
+ dialog.c: dialog_input_result printed with "%s" format. This was
- Bug #9913, fixed by Bill Mitchell, but the change was lost.
+ Debian #9913, fixed by Bill Mitchell, but the change was lost.
+ Pristine source, .depend is not removed in clean target. Instead, it
- is made zero lenght (otherwise it would not work *without* fakeroot).
- + Added '^U' support in input box (Bug #9915, patch by joey at debian.org).
- + Wrote patch to fix core-dumping problem (Bug #13170). Sven Rudolph
+ is made zero length (otherwise it would not work *without* fakeroot).
+ + Added '^U' support in input box (Debian #9915, patch by Joey Hess).
+ + Wrote patch to fix core-dumping problem (Debian #13170). Sven Rudolph
<sr1 at inf.tu-dresden.de>:
-- vile:fk=8bit
Modified: vendor/dialog/dist/VERSION
===================================================================
--- vendor/dialog/dist/VERSION 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/VERSION 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1 +1 @@
-10:1:0 1.1 20111020
+11:1:0 1.2 20130923
Modified: vendor/dialog/dist/aclocal.m4
===================================================================
--- vendor/dialog/dist/aclocal.m4 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/aclocal.m4 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,7 +1,7 @@
dnl macros used for DIALOG configure script
-dnl $Id: aclocal.m4,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+dnl $Id: aclocal.m4,v 1.94 2013/09/22 14:26:24 tom Exp $
dnl ---------------------------------------------------------------------------
-dnl Copyright 1999-2010,2011 -- Thomas E. Dickey
+dnl Copyright 1999-2012,2013 -- Thomas E. Dickey
dnl
dnl Permission is hereby granted, free of charge, to any person obtaining a
dnl copy of this software and associated documentation files (the
@@ -31,17 +31,14 @@
dnl http://invisible-island.net/autoconf/
dnl ---------------------------------------------------------------------------
dnl ---------------------------------------------------------------------------
-dnl AM_GNU_GETTEXT version: 12 updated: 2010/06/19 07:02:11
+dnl AM_GNU_GETTEXT version: 13 updated: 2012/11/09 05:47:26
dnl --------------
dnl Usage: Just like AM_WITH_NLS, which see.
AC_DEFUN([AM_GNU_GETTEXT],
[AC_REQUIRE([AC_PROG_MAKE_SET])dnl
- AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_PROG_RANLIB])dnl
- AC_REQUIRE([AC_ISC_POSIX])dnl
AC_REQUIRE([AC_HEADER_STDC])dnl
- AC_REQUIRE([AC_C_CONST])dnl
AC_REQUIRE([AC_C_INLINE])dnl
AC_REQUIRE([AC_TYPE_OFF_T])dnl
AC_REQUIRE([AC_TYPE_SIZE_T])dnl
@@ -48,6 +45,7 @@
AC_REQUIRE([AC_FUNC_ALLOCA])dnl
AC_REQUIRE([AC_FUNC_MMAP])dnl
AC_REQUIRE([jm_GLIBC21])dnl
+ AC_REQUIRE([CF_PROG_CC])dnl
AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
stdlib.h string.h unistd.h sys/param.h])
@@ -282,7 +280,7 @@
AC_SUBST($1)dnl
])dnl
dnl ---------------------------------------------------------------------------
-dnl AM_WITH_NLS version: 24 updated: 2010/06/20 09:24:28
+dnl AM_WITH_NLS version: 25 updated: 2012/10/06 08:57:51
dnl -----------
dnl Inserted as requested by gettext 0.10.40
dnl File from /usr/share/aclocal
@@ -385,7 +383,7 @@
LIBS="$cf_save_LIBS_1"
if test "$cf_cv_func_gettext" = yes ; then
- AC_DEFINE(HAVE_LIBINTL_H)
+ AC_DEFINE(HAVE_LIBINTL_H,1,[Define to 1 if we have libintl.h])
dnl If an already present or preinstalled GNU gettext() is found,
dnl use it. But if this macro is used in GNU gettext, and GNU
@@ -592,16 +590,32 @@
AC_SUBST(GENCAT)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_AC_PREREQ version: 2 updated: 1997/09/06 13:24:56
-dnl ------------
-dnl Conditionally generate script according to whether we're using the release
-dnl version of autoconf, or a patched version (using the ternary component as
-dnl the patch-version).
-define(CF_AC_PREREQ,
-[CF_PREREQ_COMPARE(
-AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)),
-AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), [$1], [$2], [$3])])dnl
+dnl CF_ACVERSION_CHECK version: 4 updated: 2013/03/04 19:52:56
+dnl ------------------
+dnl Conditionally generate script according to whether we're using a given autoconf.
+dnl
+dnl $1 = version to compare against
+dnl $2 = code to use if AC_ACVERSION is at least as high as $1.
+dnl $3 = code to use if AC_ACVERSION is older than $1.
+define([CF_ACVERSION_CHECK],
+[
+ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])dnl
+ifdef([m4_version_compare],
+[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])],
+[CF_ACVERSION_COMPARE(
+AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])),
+AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_ACVERSION_COMPARE version: 3 updated: 2012/10/03 18:39:53
+dnl --------------------
+dnl CF_ACVERSION_COMPARE(MAJOR1, MINOR1, TERNARY1,
+dnl MAJOR2, MINOR2, TERNARY2,
+dnl PRINTABLE2, not FOUND, FOUND)
+define([CF_ACVERSION_COMPARE],
+[ifelse(builtin([eval], [$2 < $5]), 1,
+[ifelse([$8], , ,[$8])],
+[ifelse([$9], , ,[$9])])])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42
dnl -------------
dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
@@ -876,12 +890,6 @@
AC_DEFUN([CF_ARG_DISABLE],
[CF_ARG_OPTION($1,[$2],[$3],[$4],yes)])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ARG_ENABLE version: 3 updated: 1999/03/30 17:24:31
-dnl -------------
-dnl Allow user to enable a normally-off option.
-AC_DEFUN([CF_ARG_ENABLE],
-[CF_ARG_OPTION($1,[$2],[$3],[$4],no)])dnl
-dnl ---------------------------------------------------------------------------
dnl CF_ARG_MSG_ENABLE version: 2 updated: 2000/07/29 19:32:03
dnl -----------------
dnl Verbose form of AC_ARG_ENABLE:
@@ -927,7 +935,7 @@
])dnl
])])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_BUNDLED_INTL version: 16 updated: 2010/10/23 15:55:05
+dnl CF_BUNDLED_INTL version: 17 updated: 2012/10/06 08:57:51
dnl ---------------
dnl Top-level macro for configuring an application with a bundled copy of
dnl the intl and po directories for gettext.
@@ -984,7 +992,7 @@
[ --with-textdomain=PKG NLS text-domain (default is package name)],
[NLS_TEXTDOMAIN=$withval],
[NLS_TEXTDOMAIN=$PACKAGE])
- AC_DEFINE_UNQUOTED(NLS_TEXTDOMAIN,"$NLS_TEXTDOMAIN")
+ AC_DEFINE_UNQUOTED(NLS_TEXTDOMAIN,"$NLS_TEXTDOMAIN",[Define to the nls textdomain value])
AC_SUBST(NLS_TEXTDOMAIN)
fi
@@ -1004,7 +1012,7 @@
INTLDIR_MAKE="#"
fi
if test -z "$INTLDIR_MAKE"; then
- AC_DEFINE(HAVE_LIBGETTEXT_H)
+ AC_DEFINE(HAVE_LIBGETTEXT_H,1,[Define to 1 if we have libgettext.h])
for cf_makefile in \
$srcdir/intl/Makefile.in \
$srcdir/intl/makefile.in
@@ -1047,17 +1055,43 @@
if test "$USE_INCLUDED_LIBINTL" = yes ; then
if test "$nls_cv_force_use_gnu_gettext" = yes ; then
- AC_DEFINE(HAVE_GETTEXT)
+ AC_DEFINE(HAVE_GETTEXT,1,[Define to 1 if we have gettext function])
elif test "$nls_cv_use_gnu_gettext" = yes ; then
- AC_DEFINE(HAVE_GETTEXT)
+ AC_DEFINE(HAVE_GETTEXT,1,[Define to 1 if we have gettext function])
fi
if test -n "$nls_cv_header_intl" ; then
- AC_DEFINE(HAVE_LIBINTL_H)
+ AC_DEFINE(HAVE_LIBINTL_H,1,[Define to 1 if we have header-file for libintl])
fi
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_CACHE version: 11 updated: 2008/03/23 14:45:59
+dnl CF_CC_ENV_FLAGS version: 1 updated: 2012/10/03 05:25:49
+dnl ---------------
+dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
+dnl into CC. This will not help with broken scripts that wrap the compiler with
+dnl options, but eliminates a more common category of user confusion.
+AC_DEFUN([CF_CC_ENV_FLAGS],
+[
+# This should have been defined by AC_PROG_CC
+: ${CC:=cc}
+
+AC_MSG_CHECKING(\$CC variable)
+case "$CC" in #(vi
+*[[\ \ ]]-[[IUD]]*)
+ AC_MSG_RESULT(broken)
+ AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
+ # humor him...
+ cf_flags=`echo "$CC" | sed -e 's/^[[^ ]]*[[ ]]//'`
+ CC=`echo "$CC" | sed -e 's/[[ ]].*//'`
+ CF_ADD_CFLAGS($cf_flags)
+ ;;
+*)
+ AC_MSG_RESULT(ok)
+ ;;
+esac
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CHECK_CACHE version: 12 updated: 2012/10/02 20:55:03
dnl --------------
dnl Check if we're accidentally using a cache from a different machine.
dnl Derive the system name, as a check for reusing the autoconf cache.
@@ -1080,7 +1114,7 @@
system_name="`(hostname) 2>/dev/null`"
fi
fi
-test -n "$system_name" && AC_DEFINE_UNQUOTED(SYSTEM_NAME,"$system_name")
+test -n "$system_name" && AC_DEFINE_UNQUOTED(SYSTEM_NAME,"$system_name",[Define to the system name.])
AC_CACHE_VAL(cf_cv_system_name,[cf_cv_system_name="$system_name"])
test -z "$system_name" && system_name="$cf_cv_system_name"
@@ -1092,7 +1126,61 @@
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_CHTYPE version: 7 updated: 2010/10/23 15:54:49
+dnl CF_CHECK_LIBTOOL_VERSION version: 1 updated: 2013/04/06 18:03:09
+dnl ------------------------
+dnl Show the version of libtool
+dnl
+dnl Save the version in a cache variable - this is not entirely a good thing,
+dnl but the version string from libtool is very ugly, and for bug reports it
+dnl might be useful to have the original string.
+AC_DEFUN([CF_CHECK_LIBTOOL_VERSION],[
+if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+then
+ AC_MSG_CHECKING(version of $LIBTOOL)
+ CF_LIBTOOL_VERSION
+ AC_MSG_RESULT($cf_cv_libtool_version)
+ if test -z "$cf_cv_libtool_version" ; then
+ AC_MSG_ERROR(This is not GNU libtool)
+ fi
+else
+ AC_MSG_ERROR(GNU libtool has not been found)
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CLANG_COMPILER version: 1 updated: 2012/06/16 14:55:39
+dnl -----------------
+dnl Check if the given compiler is really clang. clang's C driver defines
+dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does
+dnl not ignore some gcc options.
+dnl
+dnl This macro should be run "soon" after AC_PROG_CC or AC_PROG_CPLUSPLUS, to
+dnl ensure that it is not mistaken for gcc/g++. It is normally invoked from
+dnl the wrappers for gcc and g++ warnings.
+dnl
+dnl $1 = GCC (default) or GXX
+dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS
+dnl $3 = CFLAGS (default) or CXXFLAGS
+AC_DEFUN([CF_CLANG_COMPILER],[
+ifelse([$2],,CLANG_COMPILER,[$2])=no
+
+if test "$ifelse([$1],,[$1],GCC)" = yes ; then
+ AC_MSG_CHECKING(if this is really Clang ifelse([$1],GXX,C++,C) compiler)
+ cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"
+ ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -Qunused-arguments"
+ AC_TRY_COMPILE([],[
+#ifdef __clang__
+#else
+make an error
+#endif
+],[ifelse([$2],,CLANG_COMPILER,[$2])=yes
+cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
+],[])
+ ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS"
+ AC_MSG_RESULT($ifelse([$2],,CLANG_COMPILER,[$2]))
+fi
+])
+dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_CHTYPE version: 8 updated: 2012/10/06 08:57:51
dnl ----------------
dnl Test if curses defines 'chtype' (usually a 'long' type for SysV curses).
AC_DEFUN([CF_CURSES_CHTYPE],
@@ -1104,7 +1192,7 @@
[cf_cv_chtype_decl=yes],
[cf_cv_chtype_decl=no])])
if test $cf_cv_chtype_decl = yes ; then
- AC_DEFINE(HAVE_TYPE_CHTYPE)
+ AC_DEFINE(HAVE_TYPE_CHTYPE,1,[Define to 1 if chtype is declared])
AC_CACHE_CHECK(if chtype is scalar or struct,cf_cv_chtype_type,[
AC_TRY_COMPILE([#include <${cf_cv_ncurses_header:-curses.h}>],
[chtype foo; long x = foo],
@@ -1111,7 +1199,7 @@
[cf_cv_chtype_type=scalar],
[cf_cv_chtype_type=struct])])
if test $cf_cv_chtype_type = scalar ; then
- AC_DEFINE(TYPE_CHTYPE_IS_SCALAR)
+ AC_DEFINE(TYPE_CHTYPE_IS_SCALAR,1,[Define to 1 if chtype is a scaler/integer])
fi
fi
])dnl
@@ -1198,30 +1286,6 @@
done
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_WGETPARENT version: 2 updated: 2011/10/17 20:12:04
-dnl --------------------
-dnl Check for curses support for directly determining the parent of a given
-dnl window. Some implementations make this difficult, so we provide for
-dnl defining an application-specific function that gives this functionality.
-dnl
-dnl $1 = name of function to use if the feature is missing
-AC_DEFUN([CF_CURSES_WGETPARENT],[
-CF_CURSES_FUNCS(wgetparent)
-if test "x$cf_cv_func_wgetparent" != xyes
-then
- AC_MSG_CHECKING(if WINDOW has _parent member)
- AC_TRY_COMPILE([#include <${cf_cv_ncurses_header:-curses.h}>],
- [WINDOW *p = stdscr->_parent],
- [cf_window__parent=yes],
- [cf_window__parent=no])
- AC_MSG_RESULT($cf_window__parent)
- if test "$cf_window__parent" = yes
- then
- AC_DEFINE(HAVE_WINDOW__PARENT)
- fi
-fi
-])dnl
-dnl ---------------------------------------------------------------------------
dnl CF_CURSES_HEADER version: 3 updated: 2011/05/01 19:47:45
dnl ----------------
dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
@@ -1251,7 +1315,7 @@
AC_CHECK_HEADERS($cf_cv_ncurses_header)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_LIBS version: 35 updated: 2011/08/09 21:06:37
+dnl CF_CURSES_LIBS version: 37 updated: 2013/02/09 17:33:50
dnl --------------
dnl Look for the curses libraries. Older curses implementations may require
dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first.
@@ -1288,7 +1352,7 @@
ac_cv_func_initscr=yes
])])
fi
- ;;
+ ;;
linux*)
case `arch 2>/dev/null` in
x86_64)
@@ -1303,7 +1367,7 @@
CF_ADD_LIBDIR(/lib)
;;
esac
- ;;
+ ;;
sunos3*|sunos4*)
if test "x$cf_cv_screen" = "xcurses_5lib"
then
@@ -1317,65 +1381,69 @@
esac
if test ".$ac_cv_func_initscr" != .yes ; then
- cf_save_LIBS="$LIBS"
- cf_term_lib=""
- cf_curs_lib=""
+ cf_save_LIBS="$LIBS"
- if test ".${cf_cv_ncurses_version:-no}" != .no
- then
- cf_check_list="ncurses curses cursesX"
- else
- cf_check_list="cursesX curses ncurses"
- fi
+ if test ".${cf_cv_ncurses_version:-no}" != .no
+ then
+ cf_check_list="ncurses curses cursesX"
+ else
+ cf_check_list="cursesX curses ncurses"
+ fi
- # Check for library containing tgoto. Do this before curses library
- # because it may be needed to link the test-case for initscr.
- AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[
- for cf_term_lib in $cf_check_list otermcap termcap termlib unknown
- do
- AC_CHECK_LIB($cf_term_lib,tgoto,[break])
- done
- ])
+ # Check for library containing tgoto. Do this before curses library
+ # because it may be needed to link the test-case for initscr.
+ if test "x$cf_term_lib" = x
+ then
+ AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[
+ for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
+ do
+ AC_CHECK_LIB($cf_term_lib,tgoto,[break])
+ done
+ ])
+ fi
- # Check for library containing initscr
- test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS"
- for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
- do
- AC_CHECK_LIB($cf_curs_lib,initscr,[break])
- done
- test $cf_curs_lib = unknown && AC_MSG_ERROR(no curses library found)
+ # Check for library containing initscr
+ test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS"
+ if test "x$cf_curs_lib" = x
+ then
+ for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
+ do
+ AC_CHECK_LIB($cf_curs_lib,initscr,[break])
+ done
+ fi
+ test $cf_curs_lib = unknown && AC_MSG_ERROR(no curses library found)
- LIBS="-l$cf_curs_lib $cf_save_LIBS"
- if test "$cf_term_lib" = unknown ; then
- AC_MSG_CHECKING(if we can link with $cf_curs_lib library)
- AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
- [initscr()],
- [cf_result=yes],
- [cf_result=no])
- AC_MSG_RESULT($cf_result)
- test $cf_result = no && AC_MSG_ERROR(Cannot link curses library)
- elif test "$cf_curs_lib" = "$cf_term_lib" ; then
- :
- elif test "$cf_term_lib" != predefined ; then
- AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries)
- AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
- [initscr(); tgoto((char *)0, 0, 0);],
- [cf_result=no],
- [
- LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
- AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
- [initscr()],
- [cf_result=yes],
- [cf_result=error])
- ])
- AC_MSG_RESULT($cf_result)
- fi
+ LIBS="-l$cf_curs_lib $cf_save_LIBS"
+ if test "$cf_term_lib" = unknown ; then
+ AC_MSG_CHECKING(if we can link with $cf_curs_lib library)
+ AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
+ [initscr()],
+ [cf_result=yes],
+ [cf_result=no])
+ AC_MSG_RESULT($cf_result)
+ test $cf_result = no && AC_MSG_ERROR(Cannot link curses library)
+ elif test "$cf_curs_lib" = "$cf_term_lib" ; then
+ :
+ elif test "$cf_term_lib" != predefined ; then
+ AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries)
+ AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
+ [initscr(); tgoto((char *)0, 0, 0);],
+ [cf_result=no],
+ [
+ LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
+ AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
+ [initscr()],
+ [cf_result=yes],
+ [cf_result=error])
+ ])
+ AC_MSG_RESULT($cf_result)
+ fi
fi
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_TERM_H version: 9 updated: 2011/04/09 18:19:55
+dnl CF_CURSES_TERM_H version: 10 updated: 2012/10/06 08:57:51
dnl ----------------
dnl SVr4 curses should have term.h as well (where it puts the definitions of
dnl the low-level interface). This may not be true in old/broken implementations,
@@ -1434,18 +1502,18 @@
case $cf_cv_term_header in #(vi
term.h) #(vi
- AC_DEFINE(HAVE_TERM_H)
+ AC_DEFINE(HAVE_TERM_H,1,[Define to 1 if we have term.h])
;;
ncurses/term.h) #(vi
- AC_DEFINE(HAVE_NCURSES_TERM_H)
+ AC_DEFINE(HAVE_NCURSES_TERM_H,1,[Define to 1 if we have ncurses/term.h])
;;
ncursesw/term.h)
- AC_DEFINE(HAVE_NCURSESW_TERM_H)
+ AC_DEFINE(HAVE_NCURSESW_TERM_H,1,[Define to 1 if we have ncursesw/term.h])
;;
esac
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_UNCTRL_H version: 1 updated: 2011/04/09 18:19:55
+dnl CF_CURSES_UNCTRL_H version: 2 updated: 2012/10/06 08:57:51
dnl ------------------
dnl Any X/Open curses implementation must have unctrl.h, but ncurses packages
dnl may put it in a subdirectory (along with ncurses' other headers, of
@@ -1489,18 +1557,18 @@
case $cf_cv_unctrl_header in #(vi
unctrl.h) #(vi
- AC_DEFINE(HAVE_UNCTRL_H)
+ AC_DEFINE(HAVE_UNCTRL_H,1,[Define to 1 if we have unctrl.h])
;;
ncurses/unctrl.h) #(vi
- AC_DEFINE(HAVE_NCURSES_UNCTRL_H)
+ AC_DEFINE(HAVE_NCURSES_UNCTRL_H,1,[Define to 1 if we have ncurses/unctrl.h])
;;
ncursesw/unctrl.h)
- AC_DEFINE(HAVE_NCURSESW_UNCTRL_H)
+ AC_DEFINE(HAVE_NCURSESW_UNCTRL_H,1,[Define to 1 if we have ncursesw/unctrl.h])
;;
esac
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_WACS_MAP version: 5 updated: 2011/01/15 11:28:59
+dnl CF_CURSES_WACS_MAP version: 6 updated: 2012/10/06 08:57:51
dnl ------------------
dnl Check for likely values of wacs_map[].
AC_DEFUN([CF_CURSES_WACS_MAP],
@@ -1519,10 +1587,10 @@
break])
done])
-test "$cf_cv_curses_wacs_map" != unknown && AC_DEFINE_UNQUOTED(CURSES_WACS_ARRAY,$cf_cv_curses_wacs_map)
+test "$cf_cv_curses_wacs_map" != unknown && AC_DEFINE_UNQUOTED(CURSES_WACS_ARRAY,$cf_cv_curses_wacs_map,[Define to name of (n)curses wide-character array])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_WACS_SYMBOLS version: 1 updated: 2011/01/15 11:28:59
+dnl CF_CURSES_WACS_SYMBOLS version: 2 updated: 2012/10/06 08:57:51
dnl ----------------------
dnl Do a check to see if the WACS_xxx constants are defined compatibly with
dnl X/Open Curses. In particular, NetBSD's implementation of the WACS_xxx
@@ -1554,15 +1622,39 @@
fi
])
-test "$cf_cv_curses_wacs_symbols" != no && AC_DEFINE(CURSES_WACS_SYMBOLS)
+test "$cf_cv_curses_wacs_symbols" != no && AC_DEFINE(CURSES_WACS_SYMBOLS,1,[Define to 1 if (n)curses supports wide-character WACS_ symbols])
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_WGETPARENT version: 3 updated: 2012/10/06 08:57:51
+dnl --------------------
+dnl Check for curses support for directly determining the parent of a given
+dnl window. Some implementations make this difficult, so we provide for
+dnl defining an application-specific function that gives this functionality.
+dnl
+dnl $1 = name of function to use if the feature is missing
+AC_DEFUN([CF_CURSES_WGETPARENT],[
+CF_CURSES_FUNCS(wgetparent)
+if test "x$cf_cv_func_wgetparent" != xyes
+then
+ AC_MSG_CHECKING(if WINDOW has _parent member)
+ AC_TRY_COMPILE([#include <${cf_cv_ncurses_header:-curses.h}>],
+ [WINDOW *p = stdscr->_parent],
+ [cf_window__parent=yes],
+ [cf_window__parent=no])
+ AC_MSG_RESULT($cf_window__parent)
+ if test "$cf_window__parent" = yes
+ then
+ AC_DEFINE(HAVE_WINDOW__PARENT,1,[Define to 1 if WINDOW struct has _parent member])
+ fi
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52
dnl ----------
dnl "dirname" is not portable, so we fake it with a shell script.
AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_DISABLE_ECHO version: 11 updated: 2009/12/13 13:16:57
+dnl CF_DISABLE_ECHO version: 12 updated: 2012/10/06 16:30:28
dnl ---------------
dnl You can always use "make -n" to see the actual options, but it's hard to
dnl pick out/analyze warning messages when the compile-line is long.
@@ -1577,7 +1669,7 @@
AC_DEFUN([CF_DISABLE_ECHO],[
AC_MSG_CHECKING(if you want to see long compiling messages)
CF_ARG_DISABLE(echo,
- [ --disable-echo display "compiling" commands],
+ [ --disable-echo do not display "compiling" commands],
[
ECHO_LT='--silent'
ECHO_LD='@echo linking [$]@;'
@@ -1642,36 +1734,18 @@
fi
])
dnl ---------------------------------------------------------------------------
-dnl CF_FIND_HEADER version: 2 updated: 2007/07/29 11:32:00
-dnl --------------
-dnl Find a header file, searching for it if it is not already in the include
-dnl path.
-dnl
-dnl $1 = the header filename
-dnl $2 = the package name
-dnl $3 = action to perform if successful
-dnl $4 = action to perform if not successful
-AC_DEFUN([CF_FIND_HEADER],[
-AC_CHECK_HEADER([$1],
- cf_find_header=yes,[
- cf_find_header=no
-CF_HEADER_PATH(cf_search,$2)
-for cf_incdir in $cf_search
-do
- if test -f $cf_incdir/$1 ; then
- CF_ADD_INCDIR($cf_incdir)
- CF_VERBOSE(... found in $cf_incdir)
- cf_find_header=yes
- break
- fi
- CF_VERBOSE(... tested $cf_incdir)
-done
-])
-if test "$cf_find_header" = yes ; then
-ifelse([$3],,:,[$3])
-ifelse([$4],,,[else
-$4])
-fi
+dnl CF_ENABLE_RPATH version: 2 updated: 2010/03/27 18:39:42
+dnl ---------------
+dnl Check if the rpath option should be used, setting cache variable
+dnl cf_cv_enable_rpath if so.
+AC_DEFUN([CF_ENABLE_RPATH],
+[
+AC_MSG_CHECKING(if rpath option should be used)
+AC_ARG_ENABLE(rpath,
+[ --enable-rpath use rpath option when generating shared libraries],
+[cf_cv_enable_rpath=$enableval],
+[cf_cv_enable_rpath=no])
+AC_MSG_RESULT($cf_cv_enable_rpath)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_FIND_LIBRARY version: 9 updated: 2008/03/23 14:48:54
@@ -1854,7 +1928,16 @@
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_WAIT version: 2 updated: 1997/10/21 19:45:33
+dnl CF_FORGET_TOOL version: 1 updated: 2013/04/06 18:03:09
+dnl --------------
+dnl Forget that we saw the given tool.
+AC_DEFUN([CF_FORGET_TOOL],[
+unset ac_cv_prog_ac_ct_$1
+unset ac_ct_$1
+unset $1
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_FUNC_WAIT version: 3 updated: 2012/10/06 08:57:51
dnl ------------
dnl Test for the presence of <sys/wait.h>, 'union wait', arg-type of 'wait()'
dnl and/or 'waitpid()'.
@@ -1879,7 +1962,7 @@
[cf_cv_arg_union_wait=no])
])
AC_MSG_RESULT($cf_cv_arg_union_wait)
- test $cf_cv_arg_union_wait = yes && AC_DEFINE(WAIT_USES_UNION)
+ test $cf_cv_arg_union_wait = yes && AC_DEFINE(WAIT_USES_UNION,1,[Define to 1 if wait() uses a union parameter])
AC_MSG_CHECKING(if union wait can be used as waitpid-arg)
AC_CACHE_VAL(cf_cv_arg_union_waitpid,[
@@ -1889,12 +1972,12 @@
[cf_cv_arg_union_waitpid=no])
])
AC_MSG_RESULT($cf_cv_arg_union_waitpid)
- test $cf_cv_arg_union_waitpid = yes && AC_DEFINE(WAITPID_USES_UNION)
+ test $cf_cv_arg_union_waitpid = yes && AC_DEFINE(WAITPID_USES_UNION,1,[Define to 1 if waitpid() uses a union parameter])
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_GCC_ATTRIBUTES version: 14 updated: 2010/10/23 15:52:32
+dnl CF_GCC_ATTRIBUTES version: 16 updated: 2012/10/02 20:55:03
dnl -----------------
dnl Test for availability of useful gcc __attribute__ directives to quiet
dnl compiler warnings. Though useful, not all are supported -- and contrary
@@ -1972,28 +2055,28 @@
test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
cat conftest.h >>confdefs.h
case $cf_attribute in #(vi
+ noreturn) #(vi
+ AC_DEFINE_UNQUOTED(GCC_NORETURN,$cf_directive,[Define to noreturn-attribute for gcc])
+ ;;
printf) #(vi
- if test "$cf_printf_attribute" = no ; then
- cat >>confdefs.h <<EOF
-#define GCC_PRINTFLIKE(fmt,var) /* nothing */
-EOF
- else
- cat >>confdefs.h <<EOF
-#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
-EOF
+ cf_value='/* nothing */'
+ if test "$cf_printf_attribute" != no ; then
+ cf_value='__attribute__((format(printf,fmt,var)))'
+ AC_DEFINE(GCC_PRINTF,1,[Define to 1 if the compiler supports gcc-like printf attribute.])
fi
+ AC_DEFINE_UNQUOTED(GCC_PRINTFLIKE(fmt,var),$cf_value,[Define to printf-attribute for gcc])
;;
scanf) #(vi
- if test "$cf_scanf_attribute" = no ; then
- cat >>confdefs.h <<EOF
-#define GCC_SCANFLIKE(fmt,var) /* nothing */
-EOF
- else
- cat >>confdefs.h <<EOF
-#define GCC_SCANFLIKE(fmt,var) __attribute__((format(scanf,fmt,var)))
-EOF
+ cf_value='/* nothing */'
+ if test "$cf_scanf_attribute" != no ; then
+ cf_value='__attribute__((format(scanf,fmt,var)))'
+ AC_DEFINE(GCC_SCANF,1,[Define to 1 if the compiler supports gcc-like scanf attribute.])
fi
+ AC_DEFINE_UNQUOTED(GCC_SCANFLIKE(fmt,var),$cf_value,[Define to sscanf-attribute for gcc])
;;
+ unused) #(vi
+ AC_DEFINE_UNQUOTED(GCC_UNUSED,$cf_directive,[Define to unused-attribute for gcc])
+ ;;
esac
fi
done
@@ -2004,7 +2087,7 @@
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_GCC_VERSION version: 5 updated: 2010/04/24 11:02:31
+dnl CF_GCC_VERSION version: 7 updated: 2012/10/18 06:46:33
dnl --------------
dnl Find version of gcc
AC_DEFUN([CF_GCC_VERSION],[
@@ -2012,13 +2095,13 @@
GCC_VERSION=none
if test "$GCC" = yes ; then
AC_MSG_CHECKING(version of $CC)
- GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
+ GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[[^)]]*) //' -e 's/^.*(Debian[[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
test -z "$GCC_VERSION" && GCC_VERSION=unknown
AC_MSG_RESULT($GCC_VERSION)
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 27 updated: 2010/10/23 15:52:32
+dnl CF_GCC_WARNINGS version: 29 updated: 2012/06/16 14:55:39
dnl ---------------
dnl Check if the compiler supports useful warning options. There's a few that
dnl we don't use, simply because they're too noisy:
@@ -2041,6 +2124,7 @@
[
AC_REQUIRE([CF_GCC_VERSION])
CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
+CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
cat > conftest.$ac_ext <<EOF
#line __oline__ "${as_me:-configure}"
@@ -2116,6 +2200,13 @@
continue;;
esac
;;
+ Wpointer-arith) #(vi
+ case $GCC_VERSION in
+ [[12]].*)
+ CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
+ continue;;
+ esac
+ ;;
esac
EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
fi
@@ -2214,78 +2305,7 @@
$1="[$]$1 $cf_header_path_list"
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23
-dnl ---------------
-dnl Insert text into the help-message, for readability, from AC_ARG_WITH.
-AC_DEFUN([CF_HELP_MESSAGE],
-[AC_DIVERT_HELP([$1])dnl
-])dnl
-dnl ---------------------------------------------------------------------------
-dnl CF_INCLUDE_DIRS version: 6 updated: 2009/01/06 19:37:40
-dnl ---------------
-dnl Construct the list of include-options according to whether we're building
-dnl in the source directory or using '--srcdir=DIR' option. If we're building
-dnl with gcc, don't append the includedir if it happens to be /usr/include,
-dnl since that usually breaks gcc's shadow-includes.
-AC_DEFUN([CF_INCLUDE_DIRS],
-[
-CPPFLAGS="$CPPFLAGS -I. -I../include"
-if test "$srcdir" != "."; then
- CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
-fi
-if test "$GCC" != yes; then
- CPPFLAGS="$CPPFLAGS -I\${includedir}"
-elif test "$includedir" != "/usr/include"; then
- if test "$includedir" = '${prefix}/include' ; then
- if test $prefix != /usr ; then
- CPPFLAGS="$CPPFLAGS -I\${includedir}"
- fi
- else
- CPPFLAGS="$CPPFLAGS -I\${includedir}"
- fi
-fi
-AC_SUBST(CPPFLAGS)
-])dnl
-dnl ---------------------------------------------------------------------------
-dnl CF_INCLUDE_PATH version: 5 updated: 2010/01/17 20:36:17
-dnl ---------------
-dnl Adds to the include-path
-dnl
-dnl Autoconf 1.11 should have provided a way to add include path options to
-dnl the cpp-tests.
-dnl
-AC_DEFUN([CF_INCLUDE_PATH],
-[
-$1=
-for cf_path in $1
-do
- cf_result="no"
- AC_MSG_CHECKING(for directory $cf_path)
- if test -d $cf_path
- then
- INCLUDES="$INCLUDES -I$cf_path"
- ac_cpp="${ac_cpp} -I$cf_path"
- CFLAGS="$CFLAGS -I$cf_path"
- cf_result="yes"
- case $cf_path in
- /usr/include|/usr/include/*)
- ;;
- *)
- CF_DIRNAME(cf_temp,$cf_path)
- case $cf_temp in
- */include)
- INCLUDES="$INCLUDES -I$cf_temp"
- ac_cpp="${ac_cpp} -I$cf_temp"
- CFLAGS="$CFLAGS -I$cf_temp"
- ;;
- esac
- esac
- fi
- AC_MSG_RESULT($cf_result)
-done
-])dnl
-dnl ---------------------------------------------------------------------------
-dnl CF_INTEL_COMPILER version: 4 updated: 2010/05/26 05:38:42
+dnl CF_INTEL_COMPILER version: 5 updated: 2013/02/10 10:41:05
dnl -----------------
dnl Check if the given compiler is really the Intel compiler for Linux. It
dnl tries to imitate gcc, but does not return an error when it finds a mismatch
@@ -2299,6 +2319,7 @@
dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS
dnl $3 = CFLAGS (default) or CXXFLAGS
AC_DEFUN([CF_INTEL_COMPILER],[
+AC_REQUIRE([AC_CANONICAL_HOST])
ifelse([$2],,INTEL_COMPILER,[$2])=no
if test "$ifelse([$1],,[$1],GCC)" = yes ; then
@@ -2322,7 +2343,7 @@
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_LARGEFILE version: 7 updated: 2007/06/02 11:58:50
+dnl CF_LARGEFILE version: 8 updated: 2012/10/06 08:57:51
dnl ------------
dnl Add checks for large file support.
AC_DEFUN([CF_LARGEFILE],[
@@ -2356,7 +2377,7 @@
[cf_cv_struct_dirent64=yes],
[cf_cv_struct_dirent64=no])
])
- test "$cf_cv_struct_dirent64" = yes && AC_DEFINE(HAVE_STRUCT_DIRENT64)
+ test "$cf_cv_struct_dirent64" = yes && AC_DEFINE(HAVE_STRUCT_DIRENT64,1,[Define to 1 if we have struct dirent64])
fi
])
])
@@ -2444,11 +2465,23 @@
$1="$cf_library_path_list [$]$1"
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_LIB_PREFIX version: 8 updated: 2008/09/13 11:34:16
+dnl CF_LIBTOOL_VERSION version: 1 updated: 2013/04/06 18:03:09
+dnl ------------------
+AC_DEFUN([CF_LIBTOOL_VERSION],[
+if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+then
+ cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
+else
+ cf_cv_libtool_version=
+fi
+test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_LIB_PREFIX version: 9 updated: 2012/01/21 19:28:10
dnl -------------
dnl Compute the library-prefix for the given host system
dnl $1 = variable to set
-AC_DEFUN([CF_LIB_PREFIX],
+define([CF_LIB_PREFIX],
[
case $cf_cv_system_name in #(vi
OS/2*|os2*) #(vi
@@ -2461,6 +2494,69 @@
AC_SUBST(LIB_PREFIX)
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_LIB_SUFFIX version: 22 updated: 2013/09/07 13:54:05
+dnl -------------
+dnl Compute the library file-suffix from the given model name
+dnl $1 = model name
+dnl $2 = variable to set (the nominal library suffix)
+dnl $3 = dependency variable to set (actual filename)
+dnl The variable $LIB_SUFFIX, if set, prepends the variable to set.
+AC_DEFUN([CF_LIB_SUFFIX],
+[
+ case X$1 in #(vi
+ Xlibtool) #(vi
+ $2='.la'
+ $3=[$]$2
+ ;;
+ Xdebug) #(vi
+ $2='_g.a'
+ $3=[$]$2
+ ;;
+ Xprofile) #(vi
+ $2='_p.a'
+ $3=[$]$2
+ ;;
+ Xshared) #(vi
+ case $cf_cv_system_name in
+ aix[[5-7]]*) #(vi
+ $2='.a'
+ $3=[$]$2
+ ;;
+ cygwin*|msys*|mingw*) #(vi
+ $2='.dll'
+ $3='.dll.a'
+ ;;
+ darwin*) #(vi
+ $2='.dylib'
+ $3=[$]$2
+ ;;
+ hpux*) #(vi
+ case $target in
+ ia64*) #(vi
+ $2='.so'
+ $3=[$]$2
+ ;;
+ *) #(vi
+ $2='.sl'
+ $3=[$]$2
+ ;;
+ esac
+ ;;
+ *) #(vi
+ $2='.so'
+ $3=[$]$2
+ ;;
+ esac
+ ;;
+ *)
+ $2='.a'
+ $3=[$]$2
+ ;;
+ esac
+ test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
+ test -n "$LIB_SUFFIX" && $3="${LIB_SUFFIX}[$]{$3}"
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_MAKEFLAGS version: 14 updated: 2011/03/31 19:29:46
dnl ------------
dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
@@ -2562,7 +2658,7 @@
fi
])
dnl ---------------------------------------------------------------------------
-dnl CF_MBSTATE_T version: 3 updated: 2007/03/25 15:55:36
+dnl CF_MBSTATE_T version: 4 updated: 2012/10/06 08:57:51
dnl ------------
dnl Check if mbstate_t is declared, and if so, which header file.
dnl This (including wchar.h) is needed on Tru64 5.0 to declare mbstate_t,
@@ -2590,15 +2686,15 @@
[cf_cv_mbstate_t=unknown])])])
if test "$cf_cv_mbstate_t" = yes ; then
- AC_DEFINE(NEED_WCHAR_H)
+ AC_DEFINE(NEED_WCHAR_H,1,[Define to 1 if we must include wchar.h])
fi
if test "$cf_cv_mbstate_t" != unknown ; then
- AC_DEFINE(HAVE_MBSTATE_T)
+ AC_DEFINE(HAVE_MBSTATE_T,1,[Define to 1 if mbstate_t is declared])
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MIXEDCASE_FILENAMES version: 3 updated: 2003/09/20 17:07:55
+dnl CF_MIXEDCASE_FILENAMES version: 5 updated: 2013/09/07 13:54:05
dnl ----------------------
dnl Check if the file-system supports mixed-case filenames. If we're able to
dnl create a lowercase name and see it as uppercase, it doesn't support that.
@@ -2607,7 +2703,7 @@
AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
if test "$cross_compiling" = yes ; then
case $target_alias in #(vi
- *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi
+ *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw32*|*-uwin*) #(vi
cf_cv_mixedcase=no
;;
*)
@@ -2625,7 +2721,7 @@
rm -f conftest CONFTEST
fi
])
-test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES)
+test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.])
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_MSG_LOG version: 5 updated: 2010/10/23 15:52:32
@@ -2669,7 +2765,7 @@
,[$1=no])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_CONFIG version: 8 updated: 2010/07/08 05:17:30
+dnl CF_NCURSES_CONFIG version: 10 updated: 2012/10/06 08:57:51
dnl -----------------
dnl Tie together the configure-script macros for ncurses.
dnl Prefer the "-config" script from ncurses 6.x, to simplify analysis.
@@ -2681,8 +2777,11 @@
cf_ncuconfig_root=ifelse($1,,ncurses,$1)
echo "Looking for ${cf_ncuconfig_root}-config"
-AC_PATH_PROGS(NCURSES_CONFIG,${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config,none)
+CF_ACVERSION_CHECK(2.52,
+ [AC_CHECK_TOOLS(NCURSES_CONFIG, ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)],
+ [AC_PATH_PROGS(NCURSES_CONFIG, ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)])
+
if test "$NCURSES_CONFIG" != none ; then
CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
@@ -2692,7 +2791,7 @@
CF_CURSES_HEADER(ifelse($1,,ncurses,$1))
dnl like CF_NCURSES_CPPFLAGS
-AC_DEFINE(NCURSES)
+AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries])
dnl like CF_NCURSES_LIBS
CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_ncuconfig_root)
@@ -2709,7 +2808,7 @@
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_CPPFLAGS version: 20 updated: 2010/11/20 17:02:38
+dnl CF_NCURSES_CPPFLAGS version: 21 updated: 2012/10/06 08:57:51
dnl -------------------
dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting
dnl the CPPFLAGS variable so we can include its header.
@@ -2755,12 +2854,12 @@
CF_TERM_HEADER
# some applications need this, but should check for NCURSES_VERSION
-AC_DEFINE(NCURSES)
+AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries])
CF_NCURSES_VERSION
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_HEADER version: 2 updated: 2008/03/23 14:48:54
+dnl CF_NCURSES_HEADER version: 3 updated: 2012/10/06 08:57:51
dnl -----------------
dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
dnl variations of ncurses' installs.
@@ -2811,16 +2910,16 @@
case $cf_cv_ncurses_header in # (vi
*ncurses.h)
- AC_DEFINE(HAVE_NCURSES_H)
+ AC_DEFINE(HAVE_NCURSES_H,1,[Define to 1 if we have ncurses.h])
;;
esac
case $cf_cv_ncurses_header in # (vi
ncurses/curses.h|ncurses/ncurses.h)
- AC_DEFINE(HAVE_NCURSES_NCURSES_H)
+ AC_DEFINE(HAVE_NCURSES_NCURSES_H,1,[Define to 1 if we have ncurses/ncurses.h])
;;
ncursesw/curses.h|ncursesw/ncurses.h)
- AC_DEFINE(HAVE_NCURSESW_NCURSES_H)
+ AC_DEFINE(HAVE_NCURSESW_NCURSES_H,1,[Define to 1 if we have ncursesw/ncurses.h])
;;
esac
@@ -2894,7 +2993,7 @@
AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_VERSION version: 13 updated: 2010/10/23 15:54:49
+dnl CF_NCURSES_VERSION version: 14 updated: 2012/10/06 08:57:51
dnl ------------------
dnl Check for the version of ncurses, to aid in reporting bugs, etc.
dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS. We don't use
@@ -2953,10 +3052,10 @@
])
rm -f $cf_tempfile
])
-test "$cf_cv_ncurses_version" = no || AC_DEFINE(NCURSES)
+test "$cf_cv_ncurses_version" = no || AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_NO_LEAKS_OPTION version: 4 updated: 2006/12/16 14:24:05
+dnl CF_NO_LEAKS_OPTION version: 5 updated: 2012/10/02 20:55:03
dnl ------------------
dnl see CF_WITH_NO_LEAKS
AC_DEFUN([CF_NO_LEAKS_OPTION],[
@@ -2963,7 +3062,7 @@
AC_MSG_CHECKING(if you want to use $1 for testing)
AC_ARG_WITH($1,
[$2],
- [AC_DEFINE($3)ifelse([$4],,[
+ [AC_DEFINE_UNQUOTED($3,1,"Define to 1 if you want to use $1 for testing.")ifelse([$4],,[
$4
])
: ${with_cflags:=-g}
@@ -2985,6 +3084,25 @@
esac
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_NUMBER_SYNTAX version: 1 updated: 2003/09/20 18:12:49
+dnl ----------------
+dnl Check if the given variable is a number. If not, report an error.
+dnl $1 is the variable
+dnl $2 is the message
+AC_DEFUN([CF_NUMBER_SYNTAX],[
+if test -n "$1" ; then
+ case $1 in #(vi
+ [[0-9]]*) #(vi
+ ;;
+ *)
+ AC_MSG_ERROR($2 is not a number: $1)
+ ;;
+ esac
+else
+ AC_MSG_ERROR($2 value is empty)
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_OUR_MESSAGES version: 7 updated: 2004/09/12 19:45:55
dnl ---------------
dnl Check if we use the messages included with this program
@@ -3022,20 +3140,23 @@
AC_SUBST(SUB_MAKEFILE)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_PATHSEP version: 5 updated: 2010/05/26 05:38:42
+dnl CF_PATHSEP version: 6 updated: 2012/09/29 18:38:12
dnl ----------
-dnl Provide a value for the $PATH and similar separator
+dnl Provide a value for the $PATH and similar separator (or amend the value
+dnl as provided in autoconf 2.5x).
AC_DEFUN([CF_PATHSEP],
[
+ AC_MSG_CHECKING(for PATH separator)
case $cf_cv_system_name in
os2*) PATH_SEPARATOR=';' ;;
- *) PATH_SEPARATOR=':' ;;
+ *) ${PATH_SEPARATOR:=':'} ;;
esac
ifelse([$1],,,[$1=$PATH_SEPARATOR])
AC_SUBST(PATH_SEPARATOR)
+ AC_MSG_RESULT($PATH_SEPARATOR)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_PATH_SYNTAX version: 13 updated: 2010/05/26 05:38:42
+dnl CF_PATH_SYNTAX version: 14 updated: 2012/06/19 20:58:54
dnl --------------
dnl Check the argument to see that it looks like a pathname. Rewrite it if it
dnl begins with one of the prefix/exec_prefix variables, and then again if the
@@ -3055,7 +3176,7 @@
;;
.[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX
;;
-.\[$]{*prefix}*) #(vi
+.\[$]{*prefix}*|.\[$]{*dir}*) #(vi
eval $1="[$]$1"
case ".[$]$1" in #(vi
.NONE/*)
@@ -3072,6 +3193,40 @@
esac
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_PKG_CONFIG version: 7 updated: 2011/04/29 04:53:22
+dnl -------------
+dnl Check for the package-config program, unless disabled by command-line.
+AC_DEFUN([CF_PKG_CONFIG],
+[
+AC_MSG_CHECKING(if you want to use pkg-config)
+AC_ARG_WITH(pkg-config,
+ [ --with-pkg-config{=path} enable/disable use of pkg-config],
+ [cf_pkg_config=$withval],
+ [cf_pkg_config=yes])
+AC_MSG_RESULT($cf_pkg_config)
+
+case $cf_pkg_config in #(vi
+no) #(vi
+ PKG_CONFIG=none
+ ;;
+yes) #(vi
+ CF_ACVERSION_CHECK(2.52,
+ [AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)],
+ [AC_PATH_PROG(PKG_CONFIG, pkg-config, none)])
+ ;;
+*)
+ PKG_CONFIG=$withval
+ ;;
+esac
+
+test -z "$PKG_CONFIG" && PKG_CONFIG=none
+if test "$PKG_CONFIG" != none ; then
+ CF_PATH_SYNTAX(PKG_CONFIG)
+fi
+
+AC_SUBST(PKG_CONFIG)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_POSIX_C_SOURCE version: 8 updated: 2010/05/26 05:38:42
dnl -----------------
dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed.
@@ -3145,32 +3300,20 @@
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_PROG_CC_U_D version: 1 updated: 2005/07/14 16:59:30
-dnl --------------
-dnl Check if C (preprocessor) -U and -D options are processed in the order
-dnl given rather than by type of option. Some compilers insist on apply all
-dnl of the -U options after all of the -D options. Others allow mixing them,
-dnl and may predefine symbols that conflict with those we define.
-AC_DEFUN([CF_PROG_CC_U_D],
-[
-AC_CACHE_CHECK(if $CC -U and -D options work together,cf_cv_cc_u_d_options,[
- cf_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
- AC_TRY_COMPILE([],[
-#ifndef U_D_OPTIONS
-make an undefined-error
-#endif
-#ifdef D_U_OPTIONS
-make a defined-error
-#endif
- ],[
- cf_cv_cc_u_d_options=yes],[
- cf_cv_cc_u_d_options=no])
- CPPFLAGS="$cf_save_CPPFLAGS"
-])
+dnl CF_PROG_CC version: 3 updated: 2012/10/06 15:31:55
+dnl ----------
+dnl standard check for CC, plus followup sanity checks
+dnl $1 = optional parameter to pass to AC_PROG_CC to specify compiler name
+AC_DEFUN([CF_PROG_CC],[
+ifelse($1,,[AC_PROG_CC],[AC_PROG_CC($1)])
+CF_GCC_VERSION
+CF_ACVERSION_CHECK(2.52,
+ [AC_PROG_CC_STDC],
+ [CF_ANSI_CC_REQD])
+CF_CC_ENV_FLAGS
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_PROG_EXT version: 10 updated: 2004/01/03 19:28:18
+dnl CF_PROG_EXT version: 11 updated: 2012/10/06 08:57:51
dnl -----------
dnl Compute $PROG_EXT, used for non-Unix ports, such as OS/2 EMX.
AC_DEFUN([CF_PROG_EXT],
@@ -3192,8 +3335,9 @@
PROG_EXT="$EXEEXT"
AC_SUBST(PROG_EXT)
-test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT")
+test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT",[Define to the program extension (normally blank)])
])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_PROG_LINT version: 2 updated: 2009/08/12 04:43:14
dnl ------------
AC_DEFUN([CF_PROG_LINT],
@@ -3202,6 +3346,28 @@
AC_SUBST(LINT_OPTS)
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_PROG_LN_S version: 2 updated: 2010/08/14 18:25:37
+dnl ------------
+dnl Combine checks for "ln -s" and "ln -sf", updating $LN_S to include "-f"
+dnl option if it is supported.
+AC_DEFUN([CF_PROG_LN_S],[
+AC_PROG_LN_S
+AC_MSG_CHECKING(if $LN_S -f options work)
+
+rm -f conf$$.src conf$$dst
+echo >conf$$.dst
+echo first >conf$$.src
+if $LN_S -f conf$$.src conf$$.dst 2>/dev/null; then
+ cf_prog_ln_sf=yes
+else
+ cf_prog_ln_sf=no
+fi
+rm -f conf$$.dst conf$$src
+AC_MSG_RESULT($cf_prog_ln_sf)
+
+test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_REMOVE_DEFINE version: 3 updated: 2010/01/09 11:05:50
dnl ----------------
dnl Remove all -U and -D options that refer to the given symbol from a list
@@ -3219,7 +3385,7 @@
-e 's/-[[UD]]'"$3"'\(=[[^ ]]*\)\?[$]//g'`
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_RPATH_HACK version: 9 updated: 2011/02/13 13:31:33
+dnl CF_RPATH_HACK version: 11 updated: 2013/09/01 13:02:00
dnl -------------
AC_DEFUN([CF_RPATH_HACK],
[
@@ -3236,8 +3402,8 @@
AC_TRY_LINK([#include <stdio.h>],
[printf("Hello");],
- [cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u`
- cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[[ ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort -u`])
+ [cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
+ cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[[ ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort | uniq`])
# If we passed the link-test, but get a "not found" on a given library,
# this could be due to inept reconfiguration of gcc to make it only
@@ -3270,6 +3436,8 @@
CF_RPATH_HACK_2(LIBS)
CF_VERBOSE(...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS)
+else
+ AC_MSG_RESULT(no)
fi
AC_SUBST(EXTRA_LDFLAGS)
])dnl
@@ -3334,6 +3502,440 @@
AC_SUBST(EXTRA_LDFLAGS)
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_SHARED_OPTS version: 83 updated: 2013/09/21 17:34:53
+dnl --------------
+dnl --------------
+dnl Attempt to determine the appropriate CC/LD options for creating a shared
+dnl library.
+dnl
+dnl Notes:
+dnl a) ${LOCAL_LDFLAGS} is used to link executables that will run within
+dnl the build-tree, i.e., by making use of the libraries that are compiled in
+dnl $rel_builddir/lib We avoid compiling-in a $rel_builddir/lib path for the
+dnl shared library since that can lead to unexpected results at runtime.
+dnl b) ${LOCAL_LDFLAGS2} has the same intention but assumes that the shared
+dnl libraries are compiled in ../../lib
+dnl
+dnl The variable 'cf_cv_do_symlinks' is used to control whether we configure
+dnl to install symbolic links to the rel/abi versions of shared libraries.
+dnl
+dnl The variable 'cf_cv_shlib_version' controls whether we use the rel or abi
+dnl version when making symbolic links.
+dnl
+dnl The variable 'cf_cv_shlib_version_infix' controls whether shared library
+dnl version numbers are infix (ex: libncurses.<ver>.dylib) or postfix
+dnl (ex: libncurses.so.<ver>).
+dnl
+dnl Some loaders leave 'so_locations' lying around. It's nice to clean up.
+AC_DEFUN([CF_SHARED_OPTS],
+[
+ AC_REQUIRE([CF_LD_RPATH_OPT])
+ RM_SHARED_OPTS=
+ LOCAL_LDFLAGS=
+ LOCAL_LDFLAGS2=
+ LD_SHARED_OPTS=
+ INSTALL_LIB="-m 644"
+ : ${rel_builddir:=.}
+
+ cf_cv_do_symlinks=no
+ cf_ld_rpath_opt=
+ test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+
+ AC_MSG_CHECKING(if release/abi version should be used for shared libs)
+ AC_ARG_WITH(shlib-version,
+ [ --with-shlib-version=X Specify rel or abi version for shared libs],
+ [test -z "$withval" && withval=auto
+ case $withval in #(vi
+ yes) #(vi
+ cf_cv_shlib_version=auto
+ ;;
+ rel|abi|auto|no) #(vi
+ cf_cv_shlib_version=$withval
+ ;;
+ *)
+ AC_MSG_ERROR([option value must be one of: rel, abi, auto or no])
+ ;;
+ esac
+ ],[cf_cv_shlib_version=auto])
+ AC_MSG_RESULT($cf_cv_shlib_version)
+
+ cf_cv_rm_so_locs=no
+ cf_try_cflags=
+
+ # Some less-capable ports of gcc support only -fpic
+ CC_SHARED_OPTS=
+ if test "$GCC" = yes
+ then
+ AC_MSG_CHECKING(which $CC option to use)
+ cf_save_CFLAGS="$CFLAGS"
+ for CC_SHARED_OPTS in -fPIC -fpic ''
+ do
+ CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
+ AC_TRY_COMPILE([#include <stdio.h>],[int x = 1],[break],[])
+ done
+ AC_MSG_RESULT($CC_SHARED_OPTS)
+ CFLAGS="$cf_save_CFLAGS"
+ fi
+
+ cf_cv_shlib_version_infix=no
+
+ case $cf_cv_system_name in #(vi
+ aix4.[3-9]*|aix[[5-7]]*) #(vi
+ if test "$GCC" = yes; then
+ CC_SHARED_OPTS=
+ MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
+ else
+ # CC_SHARED_OPTS='-qpic=large -G'
+ # perhaps "-bM:SRE -bnoentry -bexpall"
+ MK_SHARED_LIB='${CC} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
+ fi
+ ;;
+ beos*) #(vi
+ MK_SHARED_LIB='${CC} ${CFLAGS} -o $[@] -Xlinker -soname=`basename $[@]` -nostart -e 0'
+ ;;
+ cygwin*) #(vi
+ CC_SHARED_OPTS=
+ MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
+ RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
+ cf_cv_shlib_version=cygdll
+ cf_cv_shlib_version_infix=cygdll
+ cat >mk_shared_lib.sh <<-CF_EOF
+ #!/bin/sh
+ SHARED_LIB=\[$]1
+ IMPORT_LIB=\`echo "\[$]1" | sed -e 's/cyg/lib/' -e 's/[[0-9]]*\.dll[$]/.dll.a/'\`
+ shift
+ cat <<-EOF
+ Linking shared library
+ ** SHARED_LIB \[$]SHARED_LIB
+ ** IMPORT_LIB \[$]IMPORT_LIB
+EOF
+ exec \[$]* -shared -Wl,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
+CF_EOF
+ chmod +x mk_shared_lib.sh
+ ;;
+ msys*) #(vi
+ CC_SHARED_OPTS=
+ MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
+ RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
+ cf_cv_shlib_version=msysdll
+ cf_cv_shlib_version_infix=msysdll
+ cat >mk_shared_lib.sh <<-CF_EOF
+ #!/bin/sh
+ SHARED_LIB=\[$]1
+ IMPORT_LIB=\`echo "\[$]1" | sed -e 's/msys-/lib/' -e 's/[[0-9]]*\.dll[$]/.dll.a/'\`
+ shift
+ cat <<-EOF
+ Linking shared library
+ ** SHARED_LIB \[$]SHARED_LIB
+ ** IMPORT_LIB \[$]IMPORT_LIB
+EOF
+ exec \[$]* -shared -Wl,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
+CF_EOF
+ chmod +x mk_shared_lib.sh
+ ;;
+ darwin*) #(vi
+ cf_try_cflags="no-cpp-precomp"
+ CC_SHARED_OPTS="-dynamic"
+ MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $[@]` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $[@]'
+ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
+ cf_cv_shlib_version_infix=yes
+ AC_CACHE_CHECK([if ld -search_paths_first works], cf_cv_ldflags_search_paths_first, [
+ cf_save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ AC_TRY_LINK(, [int i;], cf_cv_ldflags_search_paths_first=yes, cf_cv_ldflags_search_paths_first=no)
+ LDFLAGS=$cf_save_LDFLAGS])
+ if test $cf_cv_ldflags_search_paths_first = yes; then
+ LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ fi
+ ;;
+ hpux[[7-8]]*) #(vi
+ # HP-UX 8.07 ld lacks "+b" option used for libdir search-list
+ if test "$GCC" != yes; then
+ CC_SHARED_OPTS='+Z'
+ fi
+ MK_SHARED_LIB='${LD} -b -o $[@]'
+ INSTALL_LIB="-m 555"
+ ;;
+ hpux*) #(vi
+ # (tested with gcc 2.7.2 -- I don't have c89)
+ if test "$GCC" = yes; then
+ LD_SHARED_OPTS='-Xlinker +b -Xlinker ${libdir}'
+ else
+ CC_SHARED_OPTS='+Z'
+ LD_SHARED_OPTS='-Wl,+b,${libdir}'
+ fi
+ MK_SHARED_LIB='${LD} +b ${libdir} -b -o $[@]'
+ # HP-UX shared libraries must be executable, and should be
+ # readonly to exploit a quirk in the memory manager.
+ INSTALL_LIB="-m 555"
+ ;;
+ interix*)
+ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
+ if test "$cf_cv_shlib_version" = rel; then
+ cf_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
+ else
+ cf_shared_soname='`basename $@`'
+ fi
+ CC_SHARED_OPTS=
+ MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o $@'
+ ;;
+ irix*) #(vi
+ if test "$cf_cv_enable_rpath" = yes ; then
+ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
+ fi
+ # tested with IRIX 5.2 and 'cc'.
+ if test "$GCC" != yes; then
+ CC_SHARED_OPTS='-KPIC'
+ MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $[@]` -o $[@]'
+ else
+ MK_SHARED_LIB='${CC} -shared -Wl,-soname,`basename $[@]` -o $[@]'
+ fi
+ cf_cv_rm_so_locs=yes
+ ;;
+ linux*|gnu*|k*bsd*-gnu) #(vi
+ if test "$DFT_LWR_MODEL" = "shared" ; then
+ LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ fi
+ if test "$cf_cv_enable_rpath" = yes ; then
+ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
+ fi
+ CF_SHARED_SONAME
+ MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
+ ;;
+ mingw*) #(vi
+ cf_cv_shlib_version=mingw
+ cf_cv_shlib_version_infix=mingw
+ if test "$DFT_LWR_MODEL" = "shared" ; then
+ LOCAL_LDFLAGS="-Wl,--enable-auto-import"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ EXTRA_LDFLAGS="-Wl,--enable-auto-import $EXTRA_LDFLAGS"
+ fi
+ CC_SHARED_OPTS=
+ MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
+ RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
+ cat >mk_shared_lib.sh <<-CF_EOF
+ #!/bin/sh
+ SHARED_LIB=\[$]1
+ IMPORT_LIB=\`echo "\[$]1" | sed -e 's/[[0-9]]*\.dll[$]/.dll.a/'\`
+ shift
+ cat <<-EOF
+ Linking shared library
+ ** SHARED_LIB \[$]SHARED_LIB
+ ** IMPORT_LIB \[$]IMPORT_LIB
+EOF
+ exec \[$]* -shared -Wl,--enable-auto-import,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
+CF_EOF
+ chmod +x mk_shared_lib.sh
+ ;;
+ openbsd[[2-9]].*|mirbsd*) #(vi
+ if test "$DFT_LWR_MODEL" = "shared" ; then
+ LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ fi
+ if test "$cf_cv_enable_rpath" = yes ; then
+ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
+ fi
+ CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
+ CF_SHARED_SONAME
+ MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
+ ;;
+ nto-qnx*|openbsd*|freebsd[[12]].*) #(vi
+ CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
+ MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
+ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
+ ;;
+ dragonfly*|freebsd*) #(vi
+ CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
+ if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
+ LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
+ LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${RPATH_LIST} $LOCAL_LDFLAGS"
+ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
+ fi
+ CF_SHARED_SONAME
+ MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $[@]` -o $[@]'
+ ;;
+ netbsd*) #(vi
+ CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
+ if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
+ LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
+ if test "$cf_cv_shlib_version" = auto; then
+ if test -f /usr/libexec/ld.elf_so; then
+ cf_cv_shlib_version=abi
+ else
+ cf_cv_shlib_version=rel
+ fi
+ fi
+ CF_SHARED_SONAME
+ MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]'
+ else
+ MK_SHARED_LIB='${CC} -Wl,-shared -Wl,-Bshareable -o $[@]'
+ fi
+ ;;
+ osf*|mls+*) #(vi
+ # tested with OSF/1 V3.2 and 'cc'
+ # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't
+ # link with shared libs).
+ MK_SHARED_LIB='${LD} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $[@]`'
+ case $host_os in #(vi
+ osf4*)
+ MK_SHARED_LIB="${MK_SHARED_LIB} -msym"
+ ;;
+ esac
+ MK_SHARED_LIB="${MK_SHARED_LIB}"' -o $[@]'
+ if test "$DFT_LWR_MODEL" = "shared" ; then
+ LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ fi
+ cf_cv_rm_so_locs=yes
+ ;;
+ sco3.2v5*) # (also uw2* and UW7: hops 13-Apr-98
+ # tested with osr5.0.5
+ if test "$GCC" != yes; then
+ CC_SHARED_OPTS='-belf -KPIC'
+ fi
+ MK_SHARED_LIB='${LD} -dy -G -h `basename $[@] .${REL_VERSION}`.${ABI_VERSION} -o [$]@'
+ if test "$cf_cv_enable_rpath" = yes ; then
+ # only way is to set LD_RUN_PATH but no switch for it
+ RUN_PATH=$libdir
+ fi
+ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
+ LINK_PROGS='LD_RUN_PATH=${libdir}'
+ LINK_TESTS='Pwd=`pwd`;LD_RUN_PATH=`dirname $${Pwd}`/lib'
+ ;;
+ sunos4*) #(vi
+ # tested with SunOS 4.1.1 and gcc 2.7.0
+ if test "$GCC" != yes; then
+ CC_SHARED_OPTS='-KPIC'
+ fi
+ MK_SHARED_LIB='${LD} -assert pure-text -o $[@]'
+ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
+ ;;
+ solaris2*) #(vi
+ # tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2
+ # tested with SunOS 5.10 (solaris 10) and gcc 3.4.3
+ if test "$DFT_LWR_MODEL" = "shared" ; then
+ LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ fi
+ if test "$cf_cv_enable_rpath" = yes ; then
+ EXTRA_LDFLAGS="-R \${libdir} $EXTRA_LDFLAGS"
+ fi
+ CF_SHARED_SONAME
+ if test "$GCC" != yes; then
+ cf_save_CFLAGS="$CFLAGS"
+ for cf_shared_opts in -xcode=pic32 -xcode=pic13 -KPIC -Kpic -O
+ do
+ CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ AC_TRY_COMPILE([#include <stdio.h>],[printf("Hello\n");],[break])
+ done
+ CFLAGS="$cf_save_CFLAGS"
+ CC_SHARED_OPTS=$cf_shared_opts
+ MK_SHARED_LIB='${CC} -dy -G -h '$cf_cv_shared_soname' -o $[@]'
+ else
+ MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]'
+ fi
+ ;;
+ sysv5uw7*|unix_sv*) #(vi
+ # tested with UnixWare 7.1.0 (gcc 2.95.2 and cc)
+ if test "$GCC" != yes; then
+ CC_SHARED_OPTS='-KPIC'
+ fi
+ MK_SHARED_LIB='${LD} -d y -G -o [$]@'
+ ;;
+ *)
+ CC_SHARED_OPTS='unknown'
+ MK_SHARED_LIB='echo unknown'
+ ;;
+ esac
+
+ # This works if the last tokens in $MK_SHARED_LIB are the -o target.
+ case "$cf_cv_shlib_version" in #(vi
+ rel|abi)
+ case "$MK_SHARED_LIB" in #(vi
+ *'-o $[@]') #(vi
+ test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ ;;
+ *)
+ AC_MSG_WARN(ignored --with-shlib-version)
+ ;;
+ esac
+ ;;
+ esac
+
+ if test -n "$cf_try_cflags"
+ then
+cat > conftest.$ac_ext <<EOF
+#line __oline__ "${as_me:-configure}"
+#include <stdio.h>
+int main(int argc, char *argv[[]])
+{
+ printf("hello\n");
+ return (argv[[argc-1]] == 0) ;
+}
+EOF
+ cf_save_CFLAGS="$CFLAGS"
+ for cf_opt in $cf_try_cflags
+ do
+ CFLAGS="$cf_save_CFLAGS -$cf_opt"
+ AC_MSG_CHECKING(if CFLAGS option -$cf_opt works)
+ if AC_TRY_EVAL(ac_compile); then
+ AC_MSG_RESULT(yes)
+ cf_save_CFLAGS="$CFLAGS"
+ else
+ AC_MSG_RESULT(no)
+ fi
+ done
+ CFLAGS="$cf_save_CFLAGS"
+ fi
+
+
+ # RPATH_LIST is a colon-separated list of directories
+ test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}"
+ test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}"
+
+ test $cf_cv_rm_so_locs = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations"
+
+ CF_VERBOSE(CC_SHARED_OPTS: $CC_SHARED_OPTS)
+ CF_VERBOSE(MK_SHARED_LIB: $MK_SHARED_LIB)
+
+ AC_SUBST(CC_SHARED_OPTS)
+ AC_SUBST(LD_RPATH_OPT)
+ AC_SUBST(LD_SHARED_OPTS)
+ AC_SUBST(MK_SHARED_LIB)
+ AC_SUBST(RM_SHARED_OPTS)
+
+ AC_SUBST(LINK_PROGS)
+ AC_SUBST(LINK_TESTS)
+
+ AC_SUBST(EXTRA_LDFLAGS)
+ AC_SUBST(LOCAL_LDFLAGS)
+ AC_SUBST(LOCAL_LDFLAGS2)
+
+ AC_SUBST(INSTALL_LIB)
+ AC_SUBST(RPATH_LIST)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_SHARED_SONAME version: 3 updated: 2008/09/08 18:34:43
+dnl ----------------
+dnl utility macro for CF_SHARED_OPTS, constructs "$cf_cv_shared_soname" for
+dnl substitution into MK_SHARED_LIB string for the "-soname" (or similar)
+dnl option.
+dnl
+dnl $1 is the default that should be used for "$cf_cv_shlib_version".
+dnl If missing, use "rel".
+define([CF_SHARED_SONAME],
+[
+ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=ifelse($1,,rel,$1)
+ if test "$cf_cv_shlib_version" = rel; then
+ cf_cv_shared_soname='`basename $[@] .${REL_VERSION}`.${ABI_VERSION}'
+ else
+ cf_cv_shared_soname='`basename $[@]`'
+ fi
+])
+dnl ---------------------------------------------------------------------------
dnl CF_SUBDIR_PATH version: 6 updated: 2010/04/21 06:20:50
dnl --------------
dnl Construct a search-list for a nonstandard header/lib-file
@@ -3351,58 +3953,7 @@
CF_ADD_SUBDIR_PATH($1,$2,$3,[$]HOME,$prefix)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_SUBST version: 4 updated: 2006/06/17 12:33:03
-dnl --------
-dnl Shorthand macro for substituting things that the user may override
-dnl with an environment variable.
-dnl
-dnl $1 = long/descriptive name
-dnl $2 = environment variable
-dnl $3 = default value
-AC_DEFUN([CF_SUBST],
-[AC_CACHE_VAL(cf_cv_subst_$2,[
-AC_MSG_CHECKING(for $1 (symbol $2))
-CF_SUBST_IF([-z "[$]$2"], [$2], [$3])
-cf_cv_subst_$2=[$]$2
-AC_MSG_RESULT([$]$2)
-])
-])dnl
-dnl ---------------------------------------------------------------------------
-dnl CF_SYSTYPE version: 3 updated: 2001/02/03 00:14:59
-dnl ----------
-dnl Derive the system-type (our main clue to the method of building shared
-dnl libraries).
-AC_DEFUN([CF_SYSTYPE],
-[
-AC_MSG_CHECKING(for system type)
-AC_CACHE_VAL(cf_cv_systype,[
-AC_ARG_WITH(system-type,
-[ --with-system-type=XXX test: override derived host system-type],
-[cf_cv_systype=$withval],
-[
-cf_cv_systype="`(uname -s || hostname || echo unknown) 2>/dev/null |sed -e s'/[[:\/.-]]/_/'g | sed 1q`"
-if test -z "$cf_cv_systype"; then cf_cv_systype=unknown;fi
-])])
-AC_MSG_RESULT($cf_cv_systype)
-])dnl
-dnl ---------------------------------------------------------------------------
-dnl CF_SYS_NAME version: 3 updated: 2008/03/23 14:48:54
-dnl -----------
-dnl Derive the system name, as a check for reusing the autoconf cache
-AC_DEFUN([CF_SYS_NAME],
-[
-SYS_NAME=`(uname -s -r || uname -a || hostname) 2>/dev/null | sed 1q`
-test -z "$SYS_NAME" && SYS_NAME=unknown
-AC_DEFINE_UNQUOTED(SYS_NAME,"$SYS_NAME")
-
-AC_CACHE_VAL(cf_cv_system_name,[cf_cv_system_name="$SYS_NAME"])
-
-if test ".$SYS_NAME" != ".$cf_cv_system_name" ; then
- AC_MSG_RESULT("Cached system name does not agree with actual")
- AC_MSG_ERROR("Please remove config.cache and try again.")
-fi])
-dnl ---------------------------------------------------------------------------
-dnl CF_TERM_HEADER version: 2 updated: 2010/10/23 15:54:49
+dnl CF_TERM_HEADER version: 3 updated: 2012/10/06 08:57:51
dnl --------------
dnl Look for term.h, which is part of X/Open curses. It defines the interface
dnl to terminfo database. Usually it is in the same include-path as curses.h,
@@ -3435,21 +3986,60 @@
case $cf_cv_term_header in # (vi
*term.h)
- AC_DEFINE(HAVE_TERM_H)
+ AC_DEFINE(HAVE_TERM_H,1,[Define to 1 if we have term.h])
;;
esac
case $cf_cv_term_header in # (vi
ncurses/term.h) #(vi
- AC_DEFINE(HAVE_NCURSES_TERM_H)
+ AC_DEFINE(HAVE_NCURSES_TERM_H,1,[Define to 1 if we have ncurses/term.h])
;;
ncursesw/term.h)
- AC_DEFINE(HAVE_NCURSESW_TERM_H)
+ AC_DEFINE(HAVE_NCURSESW_TERM_H,1,[Define to 1 if we have ncursesw/term.h])
;;
esac
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_UNION_WAIT version: 5 updated: 1997/11/23 14:49:44
+dnl CF_TRY_XOPEN_SOURCE version: 1 updated: 2011/10/30 17:09:50
+dnl -------------------
+dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we
+dnl can define it successfully.
+AC_DEFUN([CF_TRY_XOPEN_SOURCE],[
+AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[
+ AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+],[
+#ifndef _XOPEN_SOURCE
+make an error
+#endif],
+ [cf_cv_xopen_source=no],
+ [cf_save="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+],[
+#ifdef _XOPEN_SOURCE
+make an error
+#endif],
+ [cf_cv_xopen_source=no],
+ [cf_cv_xopen_source=$cf_XOPEN_SOURCE])
+ CPPFLAGS="$cf_save"
+ ])
+])
+
+if test "$cf_cv_xopen_source" != no ; then
+ CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE)
+ CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE)
+ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
+ CF_ADD_CFLAGS($cf_temp_xopen_source)
+fi
+])
+dnl ---------------------------------------------------------------------------
+dnl CF_UNION_WAIT version: 6 updated: 2012/10/06 08:57:51
dnl -------------
dnl Check to see if the BSD-style union wait is declared. Some platforms may
dnl use this, though it is deprecated in favor of the 'int' type in Posix.
@@ -3492,7 +4082,7 @@
],
[cf_cv_type_unionwait=no])])])
AC_MSG_RESULT($cf_cv_type_unionwait)
-test $cf_cv_type_unionwait = yes && AC_DEFINE(HAVE_TYPE_UNIONWAIT)
+test $cf_cv_type_unionwait = yes && AC_DEFINE(HAVE_TYPE_UNIONWAIT,1,[Define to 1 if type unionwait is declared])
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_UPPER version: 5 updated: 2001/01/29 23:40:59
@@ -3504,7 +4094,7 @@
$1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_UTF8_LIB version: 7 updated: 2010/06/20 09:24:28
+dnl CF_UTF8_LIB version: 8 updated: 2012/10/06 08:57:51
dnl -----------
dnl Check for multibyte support, and if not found, utf8 compatibility library
AC_DEFUN([CF_UTF8_LIB],
@@ -3523,7 +4113,7 @@
# HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
# ncurses/ncursesw:
if test "$cf_cv_utf8_lib" = "add-on" ; then
- AC_DEFINE(HAVE_LIBUTF8_H)
+ AC_DEFINE(HAVE_LIBUTF8_H,1,[Define to 1 if we should include libutf8.h])
CF_ADD_INCDIR($cf_cv_header_path_utf8)
CF_ADD_LIBDIR($cf_cv_library_path_utf8)
CF_ADD_LIBS($cf_cv_library_file_utf8)
@@ -3538,7 +4128,7 @@
CF_MSG_LOG([$1])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_VERSION_INFO version: 4 updated: 2011/01/02 19:09:47
+dnl CF_VERSION_INFO version: 6 updated: 2013/06/16 10:25:53
dnl ---------------
dnl Define several useful symbols derived from the VERSION file. A separate
dnl file is preferred to embedding the version numbers in various scripts.
@@ -3603,7 +4193,7 @@
fi
# show the actual data that we have for versions:
-CF_VERBOSE(VERSION $VERSION)
+CF_VERBOSE(ABI VERSION $VERSION)
CF_VERBOSE(VERSION_MAJOR $VERSION_MAJOR)
CF_VERBOSE(VERSION_MINOR $VERSION_MINOR)
CF_VERBOSE(VERSION_PATCH $VERSION_PATCH)
@@ -3618,7 +4208,7 @@
ifelse($1,,,[
cf_PACKAGE=$1
PACKAGE=ifelse($2,,$1,$2)
- AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
+ AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE",[Define to the package-name])
AC_SUBST(PACKAGE)
CF_UPPER(cf_PACKAGE,$cf_PACKAGE)
AC_DEFINE_UNQUOTED(${cf_PACKAGE}_VERSION,"${VERSION_MAJOR}.${VERSION_MINOR}")
@@ -3657,6 +4247,26 @@
fi
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_WITH_ABI_VERSION version: 1 updated: 2003/09/20 18:12:49
+dnl -------------------
+dnl Allow library's ABI to be overridden. Generally this happens when a
+dnl packager has incremented the ABI past that used in the original package,
+dnl and wishes to keep doing this.
+dnl
+dnl $1 is the package name, if any, to derive a corresponding {package}_ABI
+dnl symbol.
+AC_DEFUN([CF_WITH_ABI_VERSION],[
+test -z "$cf_cv_abi_version" && cf_cv_abi_version=0
+AC_ARG_WITH(abi-version,
+[ --with-abi-version=XXX override derived ABI version],
+[AC_MSG_WARN(overriding ABI version $cf_cv_abi_version to $withval)
+ cf_cv_abi_version=$withval])
+ CF_NUMBER_SYNTAX($cf_cv_abi_version,ABI version)
+ifelse($1,,,[
+$1_ABI=$cf_cv_abi_version
+])
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_WITH_CURSES_DIR version: 3 updated: 2010/11/20 17:02:38
dnl ------------------
dnl Wrapper for AC_ARG_WITH to specify directory under which to look for curses
@@ -3711,7 +4321,7 @@
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_WITH_LIBTOOL version: 28 updated: 2011/07/02 15:40:32
+dnl CF_WITH_LIBTOOL version: 30 updated: 2013/09/07 13:54:05
dnl ---------------
dnl Provide a configure option to incorporate libtool. Define several useful
dnl symbols for the makefile rules.
@@ -3781,7 +4391,14 @@
CF_PATH_SYNTAX(with_libtool)
LIBTOOL=$with_libtool
else
- AC_PATH_PROG(LIBTOOL,libtool)
+ AC_CHECK_TOOLS(LIBTOOL,[libtool glibtool],none)
+ CF_LIBTOOL_VERSION
+ if test -z "$cf_cv_libtool_version" && test "$LIBTOOL" = libtool
+ then
+ CF_FORGET_TOOL(LIBTOOL)
+ AC_CHECK_TOOLS(LIBTOOL,[glibtool],none)
+ CF_LIBTOOL_VERSION
+ fi
fi
if test -z "$LIBTOOL" ; then
AC_MSG_ERROR(Cannot find libtool)
@@ -3797,22 +4414,12 @@
LIB_UNINSTALL='${LIBTOOL} --mode=uninstall'
LIB_PREP=:
- # Show the version of libtool
- AC_MSG_CHECKING(version of libtool)
+ CF_CHECK_LIBTOOL_VERSION
- # Save the version in a cache variable - this is not entirely a good
- # thing, but the version string from libtool is very ugly, and for
- # bug reports it might be useful to have the original string. "("
- cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
- AC_MSG_RESULT($cf_cv_libtool_version)
- if test -z "$cf_cv_libtool_version" ; then
- AC_MSG_ERROR(This is not GNU libtool)
- fi
-
# special hack to add -no-undefined (which libtool should do for itself)
LT_UNDEF=
case "$cf_cv_system_name" in #(vi
- cygwin*|mingw32*|uwin*|aix[[4-7]]) #(vi
+ cygwin*|msys*|mingw32*|uwin*|aix[[4-7]]) #(vi
LT_UNDEF=-no-undefined
;;
esac
@@ -3878,7 +4485,7 @@
AC_SUBST(LIBTOOL_OPTS)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_WITH_NO_LEAKS version: 1 updated: 2006/12/14 18:00:21
+dnl CF_WITH_NO_LEAKS version: 2 updated: 2012/10/06 08:57:51
dnl ----------------
AC_DEFUN([CF_WITH_NO_LEAKS],[
@@ -3890,11 +4497,11 @@
AC_MSG_CHECKING(if you want to perform memory-leak testing)
AC_ARG_WITH(no-leaks,
[ --with-no-leaks test: free permanent memory, analyze leaks],
- [AC_DEFINE(NO_LEAKS)
+ [AC_DEFINE(NO_LEAKS,1,[Define to 1 to enable leak-checking])
cf_doalloc=".${with_dmalloc}${with_dbmalloc}${with_purify}${with_valgrind}"
case ${cf_doalloc} in #(vi
*yes*) ;;
- *) AC_DEFINE(DOALLOC,10000) ;;
+ *) AC_DEFINE(DOALLOC,10000,[Define to size of malloc-array]) ;;
esac
with_no_leaks=yes],
[with_no_leaks=])
@@ -3911,6 +4518,108 @@
AC_SUBST(LINK_PREFIX)
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_WITH_REL_VERSION version: 1 updated: 2003/09/20 18:12:49
+dnl -------------------
+dnl Allow library's release-version to be overridden. Generally this happens when a
+dnl packager has incremented the release-version past that used in the original package,
+dnl and wishes to keep doing this.
+dnl
+dnl $1 is the package name, if any, to derive corresponding {package}_MAJOR
+dnl and {package}_MINOR symbols
+dnl symbol.
+AC_DEFUN([CF_WITH_REL_VERSION],[
+test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
+AC_ARG_WITH(rel-version,
+[ --with-rel-version=XXX override derived release version],
+[AC_MSG_WARN(overriding release version $cf_cv_rel_version to $withval)
+ cf_cv_rel_version=$withval])
+ifelse($1,,[
+ CF_NUMBER_SYNTAX($cf_cv_rel_version,Release version)
+],[
+ $1_MAJOR=`echo "$cf_cv_rel_version" | sed -e 's/\..*//'`
+ $1_MINOR=`echo "$cf_cv_rel_version" | sed -e 's/^[[^.]]*//' -e 's/^\.//' -e 's/\..*//'`
+ CF_NUMBER_SYNTAX([$]$1_MAJOR,Release major-version)
+ CF_NUMBER_SYNTAX([$]$1_MINOR,Release minor-version)
+])
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_WITH_SHARED_OR_LIBTOOL version: 5 updated: 2013/09/02 09:17:44
+dnl -------------------------
+dnl Provide shared libraries using either autoconf macros (--with-shared) or
+dnl using the external libtool script (--with-libtool).
+dnl
+dnl $1 = program name (all caps preferred)
+dnl $1 = release version
+dnl $2 = ABI version
+define([CF_WITH_SHARED_OR_LIBTOOL],[
+
+REL_VERSION=$2
+ABI_VERSION=$3
+cf_cv_rel_version=$REL_VERSION
+AC_SUBST(ABI_VERSION)
+AC_SUBST(REL_VERSION)
+
+CF_WITH_REL_VERSION($1)
+CF_WITH_ABI_VERSION
+
+LIB_MODEL=static
+DFT_LWR_MODEL=$LIB_MODEL
+LIBTOOL_MAKE="#"
+
+# use to comment-out makefile lines
+MAKE_NORMAL=
+MAKE_STATIC=
+MAKE_SHARED="#"
+
+CF_WITH_LIBTOOL
+
+LIB_CREATE="$LIB_CREATE \[$]@"
+
+if test "$with_libtool" = "yes" ; then
+ OBJEXT="lo"
+ LIB_MODEL=libtool
+ DFT_LWR_MODEL=$LIB_MODEL
+ LIBTOOL_MAKE=
+ CF_WITH_LIBTOOL_OPTS
+ MAKE_NORMAL="#"
+ MAKE_STATIC="#"
+ MAKE_SHARED=
+else
+ AC_MSG_CHECKING(if you want to build shared libraries)
+ AC_ARG_WITH(shared,
+ [ --with-shared generate shared-libraries],
+ [with_shared=$withval],
+ [with_shared=no])
+ AC_MSG_RESULT($with_shared)
+ if test "$with_shared" = "yes" ; then
+ LIB_MODEL=shared
+ DFT_LWR_MODEL=$LIB_MODEL
+ CF_SHARED_OPTS
+ LIB_PREP=:
+ LIB_CREATE="[$]MK_SHARED_LIB"
+ CFLAGS="$CFLAGS $CC_SHARED_OPTS"
+ MAKE_NORMAL="#"
+ MAKE_STATIC="#"
+ MAKE_SHARED=
+ fi
+fi
+
+LIB_SUFFIX=
+CF_LIB_SUFFIX($LIB_MODEL, DFT_LIB_SUFFIX, DFT_DEP_SUFFIX)
+LIB_SUFFIX=$DFT_LIB_SUFFIX
+
+AC_SUBST(DFT_LWR_MODEL)
+AC_SUBST(DFT_LIB_SUFFIX)
+AC_SUBST(DFT_DEP_SUFFIX)
+AC_SUBST(LIB_MODEL)
+
+AC_SUBST(LIBTOOL_MAKE)
+
+AC_SUBST(MAKE_NORMAL)
+AC_SUBST(MAKE_SHARED)
+AC_SUBST(MAKE_STATIC)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_WITH_VALGRIND version: 1 updated: 2006/12/14 18:00:21
dnl ----------------
AC_DEFUN([CF_WITH_VALGRIND],[
@@ -3981,7 +4690,7 @@
test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 37 updated: 2011/08/06 20:32:05
+dnl CF_XOPEN_SOURCE version: 45 updated: 2013/09/07 14:06:25
dnl ---------------
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -3991,6 +4700,7 @@
dnl $1 is the nominal value for _XOPEN_SOURCE
dnl $2 is the nominal value for _POSIX_C_SOURCE
AC_DEFUN([CF_XOPEN_SOURCE],[
+AC_REQUIRE([AC_CANONICAL_HOST])
cf_XOPEN_SOURCE=ifelse([$1],,500,[$1])
cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2])
@@ -4000,7 +4710,7 @@
aix[[4-7]]*) #(vi
cf_xopen_source="-D_ALL_SOURCE"
;;
-cygwin) #(vi
+cygwin|msys) #(vi
cf_XOPEN_SOURCE=600
;;
darwin[[0-8]].*) #(vi
@@ -4008,6 +4718,7 @@
;;
darwin*) #(vi
cf_xopen_source="-D_DARWIN_C_SOURCE"
+ cf_XOPEN_SOURCE=
;;
freebsd*|dragonfly*) #(vi
# 5.x headers associate
@@ -4025,16 +4736,24 @@
;;
irix[[56]].*) #(vi
cf_xopen_source="-D_SGI_SOURCE"
+ cf_XOPEN_SOURCE=
;;
linux*|gnu*|mint*|k*bsd*-gnu) #(vi
CF_GNU_SOURCE
;;
mirbsd*) #(vi
- # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
+ # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types
+ cf_XOPEN_SOURCE=
+ CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
;;
netbsd*) #(vi
cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
;;
+openbsd[[4-9]]*) #(vi
+ # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
+ cf_xopen_source="-D_BSD_SOURCE"
+ cf_XOPEN_SOURCE=600
+ ;;
openbsd*) #(vi
# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
;;
@@ -4047,43 +4766,188 @@
sco*) #(vi
# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
;;
-solaris2.1[[0-9]]) #(vi
- cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- ;;
-solaris2.[[1-9]]) #(vi
+solaris2.*) #(vi
cf_xopen_source="-D__EXTENSIONS__"
;;
*)
- AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[
- AC_TRY_COMPILE([#include <sys/types.h>],[
+ CF_TRY_XOPEN_SOURCE
+ CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
+ ;;
+esac
+
+if test -n "$cf_xopen_source" ; then
+ CF_ADD_CFLAGS($cf_xopen_source)
+fi
+
+dnl In anything but the default case, we may have system-specific setting
+dnl which is still not guaranteed to provide all of the entrypoints that
+dnl _XOPEN_SOURCE would yield.
+if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+ AC_MSG_CHECKING(if _XOPEN_SOURCE really is set)
+ AC_TRY_COMPILE([#include <stdlib.h>],[
#ifndef _XOPEN_SOURCE
make an error
#endif],
- [cf_cv_xopen_source=no],
- [cf_save="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- AC_TRY_COMPILE([#include <sys/types.h>],[
-#ifdef _XOPEN_SOURCE
+ [cf_XOPEN_SOURCE_set=yes],
+ [cf_XOPEN_SOURCE_set=no])
+ AC_MSG_RESULT($cf_XOPEN_SOURCE_set)
+ if test $cf_XOPEN_SOURCE_set = yes
+ then
+ AC_TRY_COMPILE([#include <stdlib.h>],[
+#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
make an error
#endif],
- [cf_cv_xopen_source=no],
- [cf_cv_xopen_source=$cf_XOPEN_SOURCE])
- CPPFLAGS="$cf_save"
- ])
+ [cf_XOPEN_SOURCE_set_ok=yes],
+ [cf_XOPEN_SOURCE_set_ok=no])
+ if test $cf_XOPEN_SOURCE_set_ok = no
+ then
+ AC_MSG_WARN(_XOPEN_SOURCE is lower than requested)
+ fi
+ else
+ CF_TRY_XOPEN_SOURCE
+ fi
+fi
])
- if test "$cf_cv_xopen_source" != no ; then
- CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE)
- CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE)
- cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
- CF_ADD_CFLAGS($cf_temp_xopen_source)
- fi
- CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
+dnl ---------------------------------------------------------------------------
+dnl CF__ADD_SHLIB_RULES version: 4 updated: 2013/07/22 18:49:24
+dnl -------------------
+dnl Append rules for creating, installing, uninstalling and cleaning library.
+dnl In particular, this is needed for shared libraries since there are symbolic
+dnl links which depend on configuration choices.
+dnl
+dnl The logic is controlled by these cache variables:
+dnl $cf_cv_do_symlinks
+dnl $cf_cv_shlib_version
+dnl
+dnl The macro uses variables set by CF__DEFINE_SHLIB_VARS
+dnl
+dnl $1 = makefile to append to
+dnl $2 = model (static, shared, libtool)
+dnl $3 = objects (dependencies)
+dnl $4 = additional libraries needed to link the shared library
+define([CF__ADD_SHLIB_RULES],[
+
+CF__DEFINE_LIB_TARGET
+
+case x$2 in
+xlibtool|xshared) #(vi
+ cf_libdeps="ifelse($4,,,[$4])"
;;
+x*)
+ cf_libdeps=
+ ;;
esac
-if test -n "$cf_xopen_source" ; then
- CF_ADD_CFLAGS($cf_xopen_source)
+cat >>$1 <<CF_EOF
+
+# generated by CF__ADD_SHLIB_RULES
+# libmodel: $2
+# symlinks: $cf_cv_do_symlinks
+# shlibver: $cf_cv_shlib_version
+
+CF_EOF
+
+cat >>$1 <<CF_EOF
+$cf_libname :: \\
+CF_EOF
+
+cat >>$1 <<CF_EOF
+ $3
+ @echo linking \[$]@
+ \$(LIBTOOL_CREATE) $3 $cf_libdeps
+CF_EOF
+
+if test "x$cf_cv_do_symlinks" = xyes
+then
+cat >>$1 <<CF_EOF
+ \$(LN_S) $cf_libname $cf_liblink
+ \$(LN_S) $cf_liblink $cf_libroot
+CF_EOF
fi
+
+cat >>$1 <<CF_EOF
+
+install \\
+install.libs :: \$(DESTDIR)\$(libdir)/$cf_libname
+
+\$(DESTDIR)\$(libdir)/$cf_libname :: \\
+ \$(DESTDIR)\$(libdir) \\
+ $3
+ @echo linking \[$]@
+ \$(LIBTOOL_CREATE) $3 $cf_libdeps
+CF_EOF
+
+if test "x$cf_cv_do_symlinks" = xyes
+then
+cat >>$1 <<CF_EOF
+ cd \$(DESTDIR)\$(libdir) && (\$(LN_S) $cf_libname $cf_liblink; \$(LN_S) $cf_liblink $cf_libroot; )
+CF_EOF
+fi
+
+if test x$2 = xshared
+then
+cat >>$1 <<CF_EOF
+ - test -z "\$(DESTDIR)" && /sbin/ldconfig
+CF_EOF
+fi
+
+cat >>$1 <<CF_EOF
+
+uninstall \\
+uninstall.libs ::
+ @echo uninstalling \$(DESTDIR)\$(libdir)/$cf_libname
+CF_EOF
+
+if test "x$cf_cv_do_symlinks" = xyes
+then
+cat >>$1 <<CF_EOF
+ -rm -f \$(DESTDIR)\$(libdir)/$cf_libroot
+ -rm -f \$(DESTDIR)\$(libdir)/$cf_liblink
+CF_EOF
+fi
+
+cat >>$1 <<CF_EOF
+ -rm -f \$(DESTDIR)\$(libdir)/$cf_libname
+
+clean \\
+clean.libs ::
+CF_EOF
+
+if test "x$cf_cv_do_symlinks" = xyes
+then
+cat >>$1 <<CF_EOF
+ -rm -f $cf_libroot
+ -rm -f $cf_liblink
+CF_EOF
+fi
+
+cat >>$1 <<CF_EOF
+ -rm -f $cf_libname
+
+mostlyclean::
+ -rm -f $3
+# end generated by CF__ADD_SHLIB_RULES
+CF_EOF
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF__CURSES_HEAD version: 2 updated: 2010/10/23 15:54:49
+dnl ---------------
+dnl Define a reusable chunk which includes <curses.h> and <term.h> when they
+dnl are both available.
+define([CF__CURSES_HEAD],[
+#ifdef HAVE_XCURSES
+#include <xcurses.h>
+char * XCursesProgramName = "test";
+#else
+#include <${cf_cv_ncurses_header:-curses.h}>
+#if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H)
+#include <ncursesw/term.h>
+#elif defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H)
+#include <ncurses/term.h>
+#elif defined(HAVE_TERM_H)
+#include <term.h>
+#endif
+#endif
])
dnl ---------------------------------------------------------------------------
dnl CF__CURSES_HEAD version: 2 updated: 2010/10/23 15:54:49
@@ -4106,6 +4970,52 @@
#endif
])
dnl ---------------------------------------------------------------------------
+dnl CF__DEFINE_LIB_TARGET version: 1 updated: 2013/07/22 18:27:50
+dnl ---------------------
+define([CF__DEFINE_LIB_TARGET],[
+cf_libname=\${LIB_BASENAME}
+cf_liblink=$cf_libname
+cf_libroot=$cf_libname
+
+if test "x$cf_cv_do_symlinks" = xyes
+then
+ case "x$cf_cv_shlib_version" in #(vi
+ xrel) #(vi
+ cf_liblink="\${LIB_ABI_NAME}"
+ cf_libname="\${LIB_REL_NAME}"
+ ;;
+ xabi)
+ cf_liblink="\${LIB_REL_NAME}"
+ cf_libname="\${LIB_ABI_NAME}"
+ ;;
+ esac
+fi
+LIB_TARGET=$cf_libname
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF__DEFINE_SHLIB_VARS version: 2 updated: 2013/07/27 17:38:32
+dnl ---------------------
+dnl Substitute makefile variables useful for CF__ADD_SHLIB_RULES.
+dnl
+dnl The substitution requires these variables:
+dnl LIB_PREFI - "lib"
+dnl LIB_ROOTNAME - "foo"
+dnl LIB_SUFFIX - ".so"
+dnl REL_VERSION - "5.0"
+dnl ABI_VERSION - "4.2.4"
+define([CF__DEFINE_SHLIB_VARS],[
+CF__DEFINE_LIB_TARGET
+SET_SHLIB_VARS="# begin CF__DEFINE_SHLIB_VARS\\
+LIB_BASENAME = ${LIB_PREFIX}\${LIB_ROOTNAME}\${LIB_SUFFIX}\\
+LIB_REL_NAME = \${LIB_BASENAME}.\${REL_VERSION}\\
+LIB_ABI_NAME = \${LIB_BASENAME}.\${ABI_VERSION}\\
+LIB_TARGET = $LIB_TARGET\\
+RM_SHARED_OPTS = $RM_SHARED_OPTS\\
+# end CF__DEFINE_SHLIB_VARS"
+AC_SUBST(SET_SHLIB_VARS)
+AC_SUBST(LIB_TARGET)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF__ICONV_BODY version: 2 updated: 2007/07/26 17:35:47
dnl --------------
dnl Test-code needed for iconv compile-checks
@@ -4123,6 +5033,22 @@
#include <iconv.h>]
)dnl
dnl ---------------------------------------------------------------------------
+dnl CF__INIT_SHLIB_RULES version: 2 updated: 2013/07/27 17:38:32
+dnl --------------------
+dnl The third parameter to AC_OUTPUT, used to pass variables needed for
+dnl CF__ADD_SHLIB_RULES.
+define([CF__INIT_SHLIB_RULES],[
+ABI_VERSION="$ABI_VERSION"
+REL_VERSION="$REL_VERSION"
+LIB_MODEL="$LIB_MODEL"
+LIB_PREFIX="$LIB_PREFIX"
+LIB_ROOTNAME="$LIB_ROOTNAME"
+DFT_DEP_SUFFIX="$DFT_DEP_SUFFIX"
+RM_SHARED_OPTS="$RM_SHARED_OPTS"
+cf_cv_do_symlinks="$cf_cv_do_symlinks"
+cf_cv_shlib_version="$cf_cv_shlib_version"
+])
+dnl ---------------------------------------------------------------------------
dnl CF__INTL_BODY version: 1 updated: 2007/07/26 17:35:47
dnl -------------
dnl Test-code needed for libintl compile-checks
Modified: vendor/dialog/dist/argv.c
===================================================================
--- vendor/dialog/dist/argv.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/argv.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: argv.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: argv.c,v 1.2 2012/11/30 20:28:23 tom Exp $
*
* argv - Reusable functions for argv-parsing.
*
- * Copyright 2011 Thomas E. Dickey
+ * Copyright 2011,2012 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -56,12 +56,6 @@
}
} else if (blob[n] == '\\') {
if (quoted && !isspace(UCH(blob[n + 1]))) {
- if (!inparm) {
- if (pass)
- result[count] = param;
- ++count;
- inparm = TRUE;
- }
if (pass) {
*param++ = blob[n];
*param++ = blob[n + 1];
Modified: vendor/dialog/dist/arrows.c
===================================================================
--- vendor/dialog/dist/arrows.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/arrows.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: arrows.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: arrows.c,v 1.51 2013/09/02 15:10:09 tom Exp $
*
* arrows.c -- draw arrows to indicate end-of-range for lists
*
- * Copyright 2000-2010,2011 Thomas E. Dickey
+ * Copyright 2000-2012,2013 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -74,9 +74,10 @@
int bottom;
if (dialog_vars.help_line != 0
+ && dialog_vars.help_line[0] != 0
&& (bottom = getmaxy(win) - 1) > 0) {
chtype attr = A_NORMAL;
- const int *cols = dlg_index_columns(dialog_vars.help_line);
+ int cols = dlg_count_columns(dialog_vars.help_line);
int other = decorations ? (ON_LEFT + ON_RIGHT) : 0;
int avail = (getmaxx(win) - other - 2);
int limit = dlg_count_real_columns(dialog_vars.help_line) + 2;
@@ -86,7 +87,7 @@
other = decorations ? ON_LEFT : 0;
(void) wmove(win, bottom, other + (avail - limit) / 2);
waddch(win, '[');
- dlg_print_text(win, dialog_vars.help_line, cols[limit], &attr);
+ dlg_print_text(win, dialog_vars.help_line, cols, &attr);
waddch(win, ']');
wmove(win, cur_y, cur_x);
}
@@ -136,7 +137,7 @@
(void) wmove(win, bottom, x);
if (bottom_arrow) {
- (void) wattrset(win, merge_colors(darrow_attr, attr));
+ (void) wattrset(win, merge_colors(darrow_attr, borderattr));
(void) add_acs(win, ACS_DARROW);
(void) waddstr(win, "(+)");
} else {
@@ -196,34 +197,48 @@
whline(win, dlg_boxchar(ACS_HLINE), 4 - len);
}
}
-#define BARSIZE(num) (int) (((all_high * (num)) + all_high - 1) / total_data)
+#define BARSIZE(num) (int) (0.5 + (double) ((all_high * (int) (num)) / (double) total_data))
+#define ORDSIZE(num) (int) ((double) ((all_high * (int) (num)) / (double) all_diff))
if (dialog_state.use_scrollbar) {
int all_high = (bottom - top - 1);
+ this_data = MAX(0, this_data);
+
if (total_data > 0 && all_high > 0) {
+ int all_diff = (int) (total_data + 1);
+ int bar_diff = (int) (next_data + 1 - this_data);
int bar_high;
int bar_y;
- bar_high = BARSIZE(next_data - this_data);
+ bar_high = ORDSIZE(bar_diff);
if (bar_high <= 0)
bar_high = 1;
if (bar_high < all_high) {
+ int bar_last = BARSIZE(next_data);
+
wmove(win, top + 1, right);
(void) wattrset(win, save);
wvline(win, ACS_VLINE | A_REVERSE, all_high);
- bar_y = BARSIZE(this_data);
- if (bar_y > all_high - bar_high)
- bar_y = all_high - bar_high;
+ bar_y = ORDSIZE(this_data);
+ if (bar_y >= bar_last && bar_y > 0)
+ bar_y = bar_last - 1;
+ if (bar_last - bar_y > bar_high && bar_high > 1)
+ ++bar_y;
+ bar_last = MIN(bar_last, all_high);
wmove(win, top + 1 + bar_y, right);
(void) wattrset(win, position_indicator_attr);
wattron(win, A_REVERSE);
- wvline(win, ACS_BLOCK, bar_high);
+#if defined(WACS_BLOCK) && defined(NCURSES_VERSION) && defined(USE_WIDE_CURSES)
+ wvline_set(win, WACS_BLOCK, bar_last - bar_y);
+#else
+ wvline(win, ACS_BLOCK, bar_last - bar_y);
+#endif
}
}
}
Added: vendor/dialog/dist/buildlist.c
===================================================================
--- vendor/dialog/dist/buildlist.c (rev 0)
+++ vendor/dialog/dist/buildlist.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,1097 @@
+/*
+ * $Id: buildlist.c,v 1.59 2013/09/02 17:01:02 tom Exp $
+ *
+ * buildlist.c -- implements the buildlist dialog
+ *
+ * Copyright 2012,2013 Thomas E. Dickey
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License, version 2.1
+ * as published by the Free Software Foundation.
+ *
+ * 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to
+ * Free Software Foundation, Inc.
+ * 51 Franklin St., Fifth Floor
+ * Boston, MA 02110, USA.
+ */
+
+#include <dialog.h>
+#include <dlg_keys.h>
+
+/*
+ * Visually like menubox, but two columns.
+ */
+
+#define sLEFT (-2)
+#define sRIGHT (-1)
+
+#define KEY_TOGGLE ' '
+#define KEY_LEFTCOL '^'
+#define KEY_RIGHTCOL '$'
+
+#define MIN_HIGH (1 + (5 * MARGIN))
+
+typedef struct {
+ WINDOW *win;
+ int box_y;
+ int box_x;
+ int top_index;
+ int cur_index;
+} MY_DATA;
+
+typedef struct {
+ DIALOG_LISTITEM *items;
+ int base_y; /* base for mouse coordinates */
+ int base_x;
+ int use_height; /* actual size of column box */
+ int use_width;
+ int item_no;
+ int check_x;
+ int item_x;
+ MY_DATA list[2];
+} ALL_DATA;
+
+/*
+ * Print list item. The 'selected' parameter is true if 'choice' is the
+ * current item. That one is colored differently from the other items.
+ */
+static void
+print_item(ALL_DATA * data,
+ WINDOW *win,
+ DIALOG_LISTITEM * item,
+ int choice,
+ int selected)
+{
+ chtype save = dlg_get_attrs(win);
+ int i;
+ bool both = (!dialog_vars.no_tags && !dialog_vars.no_items);
+ bool first = TRUE;
+ int climit = (data->item_x - data->check_x - 1);
+ const char *show = (dialog_vars.no_items
+ ? item->name
+ : item->text);
+
+ /* Clear 'residue' of last item */
+ (void) wattrset(win, menubox_attr);
+ (void) wmove(win, choice, 0);
+ for (i = 0; i < getmaxx(win); i++)
+ (void) waddch(win, ' ');
+
+ (void) wmove(win, choice, data->check_x);
+ (void) wattrset(win, menubox_attr);
+
+ if (both) {
+ dlg_print_listitem(win, item->name, climit, first, selected);
+ (void) waddch(win, ' ');
+ first = FALSE;
+ }
+
+ (void) wmove(win, choice, data->item_x);
+ climit = (getmaxx(win) - data->item_x + 1);
+ dlg_print_listitem(win, show, climit, first, selected);
+
+ if (selected) {
+ dlg_item_help(item->help);
+ }
+ (void) wattrset(win, save);
+}
+
+/*
+ * Prints either the left (unselected) or right (selected) list.
+ */
+static void
+print_1_list(ALL_DATA * data,
+ int choice,
+ int selected)
+{
+ MY_DATA *moi = data->list + selected;
+ WINDOW *win = moi->win;
+ int i, j;
+ int last = 0;
+ int max_rows = getmaxy(win);
+
+ for (i = j = 0; j < max_rows; i++) {
+ int ii = i + moi->top_index;
+ if (ii >= data->item_no) {
+ break;
+ } else if (!(selected ^ (data->items[ii].state != 0))) {
+ print_item(data,
+ win,
+ &data->items[ii],
+ j, ii == choice);
+ last = ++j;
+ }
+ }
+ if (wmove(win, last, 0) != ERR)
+ wclrtobot(win);
+ (void) wnoutrefresh(win);
+}
+
+/*
+ * Return the previous item from the list, staying in the same column. If no
+ * further movement is possible, return the same choice as given.
+ */
+static int
+prev_item(ALL_DATA * data, int choice, int selected)
+{
+ int result = choice;
+ int n;
+
+ for (n = choice - 1; n >= 0; --n) {
+ if ((data->items[n].state != 0) == selected) {
+ result = n;
+ break;
+ }
+ }
+ return result;
+}
+
+/*
+ * Return true if the given choice is on the first page in the current column.
+ */
+static bool
+stop_prev(ALL_DATA * data, int choice, int selected)
+{
+ return (prev_item(data, choice, selected) == choice);
+}
+
+static bool
+check_hotkey(DIALOG_LISTITEM * items, int choice, int selected)
+{
+ bool result = FALSE;
+
+ if ((items[choice].state != 0) == selected) {
+ if (dlg_match_char(dlg_last_getc(),
+ (dialog_vars.no_tags
+ ? items[choice].text
+ : items[choice].name))) {
+ result = TRUE;
+ }
+ }
+ return result;
+}
+
+/*
+ * Return the next item from the list, staying in the same column. If no
+ * further movement is possible, return the same choice as given.
+ */
+static int
+next_item(ALL_DATA * data, int choice, int selected)
+{
+ int result = choice;
+ int n;
+
+ for (n = choice + 1; n < data->item_no; ++n) {
+ if ((data->items[n].state != 0) == selected) {
+ result = n;
+ break;
+ }
+ }
+ dlg_trace_msg("next_item(%d) ->%d\n", choice, result);
+ return result;
+}
+
+/*
+ * Translate a choice from items[] to a row-number in an unbounded column,
+ * starting at zero.
+ */
+static int
+index2row(ALL_DATA * data, int choice, int selected)
+{
+ int result = -1;
+ int n;
+ for (n = 0; n < data->item_no; ++n) {
+ if ((data->items[n].state != 0) == selected) {
+ ++result;
+ }
+ if (n == choice)
+ break;
+ }
+ return result;
+}
+
+/*
+ * Return the first choice from items[] for the given column.
+ */
+static int
+first_item(ALL_DATA * data, int selected)
+{
+ int result = -1;
+ int n;
+
+ for (n = 0; n < data->item_no; ++n) {
+ if ((data->items[n].state != 0) == selected) {
+ result = n;
+ break;
+ }
+ }
+ return result;
+}
+
+/*
+ * Return the last choice from items[] for the given column.
+ */
+static int
+last_item(ALL_DATA * data, int selected)
+{
+ int result = -1;
+ int n;
+
+ for (n = data->item_no - 1; n >= 0; --n) {
+ if ((data->items[n].state != 0) == selected) {
+ result = n;
+ break;
+ }
+ }
+ return result;
+}
+
+/*
+ * Convert a row-number back to an item number, i.e., index into items[].
+ */
+static int
+row2index(ALL_DATA * data, int row, int selected)
+{
+ int result = -1;
+ int n;
+ for (n = 0; n < data->item_no; ++n) {
+ if ((data->items[n].state != 0) == selected) {
+ if (row-- <= 0) {
+ result = n;
+ break;
+ }
+ }
+ }
+ return result;
+}
+
+static int
+skip_rows(ALL_DATA * data, int row, int skip, int selected)
+{
+ int choice = row2index(data, row, selected);
+ int result = row;
+ int n;
+ if (skip > 0) {
+ for (n = choice + 1; n < data->item_no; ++n) {
+ if ((data->items[n].state != 0) == selected) {
+ ++result;
+ if (--skip <= 0)
+ break;
+ }
+ }
+ } else if (skip < 0) {
+ for (n = choice - 1; n >= 0; --n) {
+ if ((data->items[n].state != 0) == selected) {
+ --result;
+ if (++skip >= 0)
+ break;
+ }
+ }
+ }
+ return result;
+}
+
+/*
+ * Find the closest item in the given column starting with the given choice.
+ */
+static int
+closest_item(ALL_DATA * data, int choice, int selected)
+{
+ int prev = choice;
+ int next = choice;
+ int result = choice;
+ int n;
+
+ for (n = choice; n >= 0; --n) {
+ if ((data->items[n].state != 0) == selected) {
+ prev = n;
+ break;
+ }
+ }
+ for (n = choice; n < data->item_no; ++n) {
+ if ((data->items[n].state != 0) == selected) {
+ next = n;
+ break;
+ }
+ }
+ if (prev != choice) {
+ result = prev;
+ if (next != choice) {
+ if ((choice - prev) > (next - choice)) {
+ result = next;
+ }
+ }
+ } else if (next != choice) {
+ result = next;
+ }
+ return result;
+}
+
+static void
+print_both(ALL_DATA * data,
+ int choice)
+{
+ int selected;
+ int cur_y, cur_x;
+ WINDOW *dialog = wgetparent(data->list[0].win);
+
+ getyx(dialog, cur_y, cur_x);
+ for (selected = 0; selected < 2; ++selected) {
+ MY_DATA *moi = data->list + selected;
+ WINDOW *win = moi->win;
+ int thumb_top = index2row(data, moi->top_index, selected);
+ int thumb_max = index2row(data, -1, selected);
+ int thumb_end = thumb_top + getmaxy(win);
+
+ print_1_list(data, choice, selected);
+
+ dlg_mouse_setcode(selected * KEY_MAX);
+ dlg_draw_scrollbar(dialog,
+ (long) (moi->top_index),
+ (long) (thumb_top),
+ (long) MIN(thumb_end, thumb_max),
+ (long) thumb_max,
+ moi->box_x + data->check_x,
+ moi->box_x + getmaxx(win),
+ moi->box_y,
+ moi->box_y + getmaxy(win) + 1,
+ menubox_border2_attr,
+ menubox_border_attr);
+ }
+ (void) wmove(dialog, cur_y, cur_x);
+ dlg_mouse_setcode(0);
+}
+
+static void
+set_top_item(ALL_DATA * data, int value, int selected)
+{
+ if (value != data->list[selected].top_index) {
+ dlg_trace_msg("set top of %s column to %d\n",
+ selected ? "right" : "left",
+ value);
+ data->list[selected].top_index = value;
+ }
+}
+
+/*
+ * Adjust the top-index as needed to ensure that it and the given item are
+ * visible.
+ */
+static void
+fix_top_item(ALL_DATA * data, int cur_item, int selected)
+{
+ int top_item = data->list[selected].top_index;
+ int cur_row = index2row(data, cur_item, selected);
+ int top_row = index2row(data, top_item, selected);
+
+ if (cur_row < top_row) {
+ top_item = cur_item;
+ } else if ((cur_row - top_row) > data->use_height) {
+ top_item = row2index(data, cur_row + 1 - data->use_height, selected);
+ }
+ if (cur_row < data->use_height) {
+ top_item = row2index(data, 0, selected);
+ }
+ dlg_trace_msg("fix_top_item(cur_item %d, selected %d) ->top_item %d\n",
+ cur_item, selected, top_item);
+ set_top_item(data, top_item, selected);
+}
+
+/*
+ * This is an alternate interface to 'buildlist' which allows the application
+ * to read the list item states back directly without putting them in the
+ * output buffer.
+ */
+int
+dlg_buildlist(const char *title,
+ const char *cprompt,
+ int height,
+ int width,
+ int list_height,
+ int item_no,
+ DIALOG_LISTITEM * items,
+ const char *states,
+ int order_mode,
+ int *current_item)
+{
+ /* *INDENT-OFF* */
+ static DLG_KEYS_BINDING binding[] = {
+ HELPKEY_BINDINGS,
+ ENTERKEY_BINDINGS,
+ DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_RIGHT ),
+ DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ),
+ DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ),
+ DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_LEFT ),
+ DLG_KEYS_DATA( DLGK_ITEM_FIRST, KEY_HOME ),
+ DLG_KEYS_DATA( DLGK_ITEM_LAST, KEY_END ),
+ DLG_KEYS_DATA( DLGK_ITEM_LAST, KEY_LL ),
+ DLG_KEYS_DATA( DLGK_ITEM_NEXT, '+' ),
+ DLG_KEYS_DATA( DLGK_ITEM_NEXT, KEY_DOWN ),
+ DLG_KEYS_DATA( DLGK_ITEM_NEXT, CHR_NEXT ),
+ DLG_KEYS_DATA( DLGK_ITEM_PREV, '-' ),
+ DLG_KEYS_DATA( DLGK_ITEM_PREV, KEY_UP ),
+ DLG_KEYS_DATA( DLGK_ITEM_PREV, CHR_PREVIOUS ),
+ DLG_KEYS_DATA( DLGK_PAGE_NEXT, KEY_NPAGE ),
+ DLG_KEYS_DATA( DLGK_PAGE_NEXT, DLGK_MOUSE(KEY_NPAGE) ),
+ DLG_KEYS_DATA( DLGK_PAGE_NEXT, DLGK_MOUSE(KEY_NPAGE+KEY_MAX) ),
+ DLG_KEYS_DATA( DLGK_PAGE_PREV, KEY_PPAGE ),
+ DLG_KEYS_DATA( DLGK_PAGE_PREV, DLGK_MOUSE(KEY_PPAGE) ),
+ DLG_KEYS_DATA( DLGK_PAGE_PREV, DLGK_MOUSE(KEY_PPAGE+KEY_MAX) ),
+ DLG_KEYS_DATA( DLGK_GRID_LEFT, KEY_LEFTCOL ),
+ DLG_KEYS_DATA( DLGK_GRID_RIGHT, KEY_RIGHTCOL ),
+ END_KEYS_BINDING
+ };
+ /* *INDENT-ON* */
+
+#ifdef KEY_RESIZE
+ int old_height = height;
+ int old_width = width;
+#endif
+ ALL_DATA all;
+ MY_DATA *data = all.list;
+ int i, j, k, key2, found, x, y, cur_x, cur_y;
+ int key = 0, fkey;
+ bool save_visit = dialog_state.visit_items;
+ int button;
+ int cur_item;
+ int was_mouse;
+ int name_width, text_width, full_width, list_width;
+ int result = DLG_EXIT_UNKNOWN;
+ int num_states;
+ bool first = TRUE;
+ WINDOW *dialog;
+ char *prompt = dlg_strclone(cprompt);
+ const char **buttons = dlg_ok_labels();
+ const char *widget_name = "buildlist";
+
+ (void) order_mode;
+
+ /*
+ * Unlike other uses of --visit-items, we have two windows to visit.
+ */
+ if (dialog_state.visit_cols)
+ dialog_state.visit_cols = 2;
+
+ memset(&all, 0, sizeof(all));
+ all.items = items;
+ all.item_no = item_no;
+
+ if (dialog_vars.default_item != 0) {
+ cur_item = dlg_default_listitem(items);
+ } else {
+ if ((cur_item = first_item(&all, 0)) < 0)
+ cur_item = first_item(&all, 1);
+ }
+ button = (dialog_state.visit_items
+ ? (items[cur_item].state ? sRIGHT : sLEFT)
+ : dlg_default_button());
+
+ dlg_does_output();
+ dlg_tab_correct_str(prompt);
+
+#ifdef KEY_RESIZE
+ retry:
+#endif
+
+ all.use_height = list_height;
+ all.use_width = (2 * (dlg_calc_list_width(item_no, items)
+ + 4
+ + 2 * MARGIN)
+ + 1);
+ all.use_width = MAX(26, all.use_width);
+ if (all.use_height == 0) {
+ /* calculate height without items (4) */
+ dlg_auto_size(title, prompt, &height, &width, MIN_HIGH, all.use_width);
+ dlg_calc_listh(&height, &all.use_height, item_no);
+ } else {
+ dlg_auto_size(title, prompt,
+ &height, &width,
+ MIN_HIGH + all.use_height, all.use_width);
+ }
+ dlg_button_layout(buttons, &width);
+ dlg_print_size(height, width);
+ dlg_ctl_size(height, width);
+
+ /* we need at least two states */
+ if (states == 0 || strlen(states) < 2)
+ states = " *";
+ num_states = (int) strlen(states);
+
+ x = dlg_box_x_ordinate(width);
+ y = dlg_box_y_ordinate(height);
+
+ dialog = dlg_new_window(height, width, y, x);
+ dlg_register_window(dialog, widget_name, binding);
+ dlg_register_buttons(dialog, widget_name, buttons);
+
+ dlg_mouse_setbase(all.base_x = x, all.base_y = y);
+
+ dlg_draw_box2(dialog, 0, 0, height, width, dialog_attr, border_attr, border2_attr);
+ dlg_draw_bottom_box2(dialog, border_attr, border2_attr, dialog_attr);
+ dlg_draw_title(dialog, title);
+
+ (void) wattrset(dialog, dialog_attr);
+ dlg_print_autowrap(dialog, prompt, height, width);
+
+ list_width = (width - 6 * MARGIN - 2) / 2;
+ getyx(dialog, cur_y, cur_x);
+ data[0].box_y = cur_y + 1;
+ data[0].box_x = MARGIN + 1;
+ data[1].box_y = cur_y + 1;
+ data[1].box_x = data[0].box_x + 1 + 2 * MARGIN + list_width;
+
+ /*
+ * After displaying the prompt, we know how much space we really have.
+ * Limit the list to avoid overwriting the ok-button.
+ */
+ if (all.use_height + MIN_HIGH > height - cur_y)
+ all.use_height = height - MIN_HIGH - cur_y;
+ if (all.use_height <= 0)
+ all.use_height = 1;
+
+ for (k = 0; k < 2; ++k) {
+ /* create new window for the list */
+ data[k].win = dlg_sub_window(dialog, all.use_height, list_width,
+ y + data[k].box_y + 1,
+ x + data[k].box_x + 1);
+
+ /* draw a box around the list items */
+ dlg_draw_box(dialog, data[k].box_y, data[k].box_x,
+ all.use_height + 2 * MARGIN,
+ list_width + 2 * MARGIN,
+ menubox_border_attr, menubox_border2_attr);
+ }
+
+ text_width = 0;
+ name_width = 0;
+ /* Find length of longest item to center buildlist */
+ for (i = 0; i < item_no; i++) {
+ text_width = MAX(text_width, dlg_count_columns(items[i].text));
+ name_width = MAX(name_width, dlg_count_columns(items[i].name));
+ }
+
+ /* If the name+text is wider than the list is allowed, then truncate
+ * one or both of them. If the name is no wider than 1/4 of the list,
+ * leave it intact.
+ */
+ all.use_width = (list_width - 6 * MARGIN);
+ if (dialog_vars.no_tags && !dialog_vars.no_items) {
+ full_width = MIN(all.use_width, text_width);
+ } else if (dialog_vars.no_items) {
+ full_width = MIN(all.use_width, name_width);
+ } else {
+ if (text_width >= 0
+ && name_width >= 0
+ && all.use_width > 0
+ && text_width + name_width > all.use_width) {
+ int need = (int) (0.25 * all.use_width);
+ if (name_width > need) {
+ int want = (int) (all.use_width * ((double) name_width) /
+ (text_width + name_width));
+ name_width = (want > need) ? want : need;
+ }
+ text_width = all.use_width - name_width;
+ }
+ full_width = text_width + name_width;
+ }
+
+ all.check_x = (all.use_width - full_width) / 2;
+ all.item_x = ((dialog_vars.no_tags
+ ? 0
+ : (dialog_vars.no_items
+ ? 0
+ : (name_width + 2)))
+ + all.check_x);
+
+ /* ensure we are scrolled to show the current choice */
+ j = MIN(all.use_height, item_no);
+ for (i = 0; i < 2; ++i) {
+ int top_item = 0;
+ if ((items[cur_item].state != 0) == i) {
+ top_item = cur_item - j + 1;
+ if (top_item < 0)
+ top_item = 0;
+ set_top_item(&all, top_item, i);
+ } else {
+ set_top_item(&all, 0, i);
+ }
+ }
+
+ /* register the new window, along with its borders */
+ for (i = 0; i < 2; ++i) {
+ dlg_mouse_mkbigregion(data[i].box_y + 1,
+ data[i].box_x,
+ all.use_height,
+ list_width + 2,
+ 2 * KEY_MAX + (i * (1 + all.use_height)),
+ 1, 1, 1 /* by lines */ );
+ }
+
+ dlg_draw_buttons(dialog, height - 2, 0, buttons, button, FALSE, width);
+
+ while (result == DLG_EXIT_UNKNOWN) {
+ int which = (items[cur_item].state != 0);
+ MY_DATA *moi = data + which;
+ int at_top = index2row(&all, moi->top_index, which);
+ int at_end = index2row(&all, -1, which);
+ int at_bot = skip_rows(&all, at_top, all.use_height, which);
+
+ dlg_trace_msg("\t** state %d:%d top %d (%d:%d:%d) %d\n",
+ cur_item, item_no - 1,
+ moi->top_index,
+ at_top, at_bot, at_end,
+ which);
+
+ if (first) {
+ print_both(&all, cur_item);
+ dlg_trace_win(dialog);
+ first = FALSE;
+ }
+
+ if (button < 0) { /* --visit-items */
+ int cur_row = index2row(&all, cur_item, which);
+ cur_y = (data[which].box_y
+ + cur_row
+ + 1);
+ if (at_top > 0)
+ cur_y -= at_top;
+ cur_x = (data[which].box_x
+ + all.check_x + 1);
+ dlg_trace_msg("\t...visit row %d (%d,%d)\n", cur_row, cur_y, cur_x);
+ wmove(dialog, cur_y, cur_x);
+ }
+
+ key = dlg_mouse_wgetch(dialog, &fkey);
+ if (dlg_result_key(key, fkey, &result))
+ break;
+
+ was_mouse = (fkey && is_DLGK_MOUSE(key));
+ if (was_mouse)
+ key -= M_EVENT;
+
+ if (!was_mouse) {
+ ;
+ } else if (key >= 2 * KEY_MAX) {
+ i = (key - 2 * KEY_MAX) % (1 + all.use_height);
+ j = (key - 2 * KEY_MAX) / (1 + all.use_height);
+ k = row2index(&all, i + at_top, j);
+ dlg_trace_msg("MOUSE column %d, row %d ->item %d\n", j, i, k);
+ if (k >= 0 && j < 2) {
+ if (j != which) {
+ /*
+ * Mouse click was in the other column.
+ */
+ moi = data + j;
+ fix_top_item(&all, k, j);
+ }
+ which = j;
+ at_top = index2row(&all, moi->top_index, which);
+ at_bot = skip_rows(&all, at_top, all.use_height, which);
+ cur_item = k;
+ print_both(&all, cur_item);
+ key = KEY_TOGGLE; /* force the selected item to toggle */
+ } else {
+ beep();
+ continue;
+ }
+ fkey = FALSE;
+ } else if (key >= KEY_MIN) {
+ if (key > KEY_MAX) {
+ if (which == 0) {
+ key = KEY_RIGHTCOL; /* switch to right-column */
+ fkey = FALSE;
+ } else {
+ key -= KEY_MAX;
+ }
+ } else {
+ if (which == 1) {
+ key = KEY_LEFTCOL; /* switch to left-column */
+ fkey = FALSE;
+ }
+ }
+ key = dlg_lookup_key(dialog, key, &fkey);
+ }
+
+ /*
+ * A space toggles the item status. Normally we put the cursor on
+ * the next available item in the same column. But if there are no
+ * more items in the column, move the cursor to the other column.
+ */
+ if (key == KEY_TOGGLE) {
+ int new_choice;
+ int new_state = items[cur_item].state + 1;
+
+ if ((new_choice = next_item(&all, cur_item, which)) == cur_item) {
+ new_choice = prev_item(&all, cur_item, which);
+ }
+ dlg_trace_msg("cur_item %d, new_choice:%d\n", cur_item, new_choice);
+ if (new_state >= num_states)
+ new_state = 0;
+
+ items[cur_item].state = new_state;
+ if (cur_item == moi->top_index) {
+ set_top_item(&all, new_choice, which);
+ }
+
+ if (new_choice >= 0) {
+ fix_top_item(&all, cur_item, !which);
+ cur_item = new_choice;
+ }
+ print_both(&all, cur_item);
+ dlg_trace_win(dialog);
+ continue; /* wait for another key press */
+ }
+
+ /*
+ * Check if key pressed matches first character of any item tag in
+ * list. If there is more than one match, we will cycle through
+ * each one as the same key is pressed repeatedly.
+ */
+ found = FALSE;
+ if (!fkey) {
+ if (button < 0 || !dialog_state.visit_items) {
+ for (j = cur_item + 1; j < item_no; j++) {
+ if (check_hotkey(items, j, which)) {
+ found = TRUE;
+ i = j;
+ break;
+ }
+ }
+ if (!found) {
+ for (j = 0; j <= cur_item; j++) {
+ if (check_hotkey(items, j, which)) {
+ found = TRUE;
+ i = j;
+ break;
+ }
+ }
+ }
+ if (found)
+ dlg_flush_getc();
+ } else if ((j = dlg_char_to_button(key, buttons)) >= 0) {
+ button = j;
+ ungetch('\n');
+ continue;
+ }
+ }
+
+ /*
+ * A single digit (1-9) positions the selection to that line in the
+ * current screen.
+ */
+ if (!found
+ && (key <= '9')
+ && (key > '0')
+ && (key - '1' < at_bot)) {
+ found = TRUE;
+ i = key - '1';
+ }
+
+ if (!found && fkey) {
+ switch (key) {
+ case DLGK_FIELD_PREV:
+ if ((button == sRIGHT) && dialog_state.visit_items) {
+ key = DLGK_GRID_LEFT;
+ button = sLEFT;
+ } else {
+ button = dlg_prev_button(buttons, button);
+ dlg_draw_buttons(dialog, height - 2, 0, buttons, button,
+ FALSE, width);
+ if (button == sRIGHT) {
+ key = DLGK_GRID_RIGHT;
+ } else {
+ continue;
+ }
+ }
+ break;
+ case DLGK_FIELD_NEXT:
+ if ((button == sLEFT) && dialog_state.visit_items) {
+ key = DLGK_GRID_RIGHT;
+ button = sRIGHT;
+ } else {
+ button = dlg_next_button(buttons, button);
+ dlg_draw_buttons(dialog, height - 2, 0, buttons, button,
+ FALSE, width);
+ if (button == sLEFT) {
+ key = DLGK_GRID_LEFT;
+ } else {
+ continue;
+ }
+ }
+ break;
+ }
+ }
+
+ if (!found && fkey) {
+ i = cur_item;
+ found = TRUE;
+ switch (key) {
+ case DLGK_GRID_LEFT:
+ i = closest_item(&all, cur_item, 0);
+ fix_top_item(&all, i, 0);
+ break;
+ case DLGK_GRID_RIGHT:
+ i = closest_item(&all, cur_item, 1);
+ fix_top_item(&all, i, 1);
+ break;
+ case DLGK_PAGE_PREV:
+ if (cur_item > moi->top_index) {
+ i = moi->top_index;
+ } else if (moi->top_index != 0) {
+ int temp = at_top;
+ if ((temp -= all.use_height) < 0)
+ temp = 0;
+ i = row2index(&all, temp, which);
+ }
+ break;
+ case DLGK_PAGE_NEXT:
+ if ((at_end - at_bot) < all.use_height) {
+ i = next_item(&all,
+ row2index(&all, at_end, which),
+ which);
+ } else {
+ i = next_item(&all,
+ row2index(&all, at_bot, which),
+ which);
+ at_top = at_bot;
+ set_top_item(&all,
+ next_item(&all,
+ row2index(&all, at_top, which),
+ which),
+ which);
+ at_bot = skip_rows(&all, at_top, all.use_height, which);
+ at_bot = MIN(at_bot, at_end);
+ }
+ break;
+ case DLGK_ITEM_FIRST:
+ i = first_item(&all, which);
+ break;
+ case DLGK_ITEM_LAST:
+ i = last_item(&all, which);
+ break;
+ case DLGK_ITEM_PREV:
+ i = prev_item(&all, cur_item, which);
+ if (stop_prev(&all, cur_item, which))
+ continue;
+ break;
+ case DLGK_ITEM_NEXT:
+ i = next_item(&all, cur_item, which);
+ break;
+ default:
+ found = FALSE;
+ break;
+ }
+ }
+
+ if (found) {
+ if (i != cur_item) {
+ int now_at = index2row(&all, i, which);
+ int oops = item_no;
+ int old_item;
+
+ dlg_trace_msg("<--CHOICE %d\n", i);
+ dlg_trace_msg("<--topITM %d\n", moi->top_index);
+ dlg_trace_msg("<--now_at %d\n", now_at);
+ dlg_trace_msg("<--at_top %d\n", at_top);
+ dlg_trace_msg("<--at_bot %d\n", at_bot);
+
+ if (now_at >= at_bot) {
+ while (now_at >= at_bot) {
+ if ((at_bot - at_top) >= all.use_height) {
+ set_top_item(&all,
+ next_item(&all, moi->top_index, which),
+ which);
+ }
+ at_top = index2row(&all, moi->top_index, which);
+ at_bot = skip_rows(&all, at_top, all.use_height, which);
+
+ dlg_trace_msg("...at_bot %d (now %d vs %d)\n",
+ at_bot, now_at, at_end);
+ dlg_trace_msg("...topITM %d\n", moi->top_index);
+ dlg_trace_msg("...at_top %d (diff %d)\n", at_top,
+ at_bot - at_top);
+
+ if (at_bot >= at_end) {
+ /*
+ * If we bumped into the end, move the top-item
+ * down by one line so that we can display the
+ * last item in the list.
+ */
+ if ((at_bot - at_top) > all.use_height) {
+ set_top_item(&all,
+ next_item(&all, moi->top_index, which),
+ which);
+ } else if (at_top > 0 &&
+ (at_bot - at_top) >= all.use_height) {
+ set_top_item(&all,
+ next_item(&all, moi->top_index, which),
+ which);
+ }
+ break;
+ }
+ if (--oops < 0) {
+ dlg_trace_msg("OOPS-forward\n");
+ break;
+ }
+ }
+ } else if (now_at < at_top) {
+ while (now_at < at_top) {
+ old_item = moi->top_index;
+ set_top_item(&all,
+ prev_item(&all, moi->top_index, which),
+ which);
+ at_top = index2row(&all, moi->top_index, which);
+
+ dlg_trace_msg("...at_top %d (now %d)\n", at_top, now_at);
+ dlg_trace_msg("...topITM %d\n", moi->top_index);
+
+ if (moi->top_index >= old_item)
+ break;
+ if (at_top <= now_at)
+ break;
+ if (--oops < 0) {
+ dlg_trace_msg("OOPS-backward\n");
+ break;
+ }
+ }
+ }
+ dlg_trace_msg("-->now_at %d\n", now_at);
+ cur_item = i;
+ print_both(&all, cur_item);
+ }
+ dlg_trace_win(dialog);
+ continue; /* wait for another key press */
+ }
+
+ if (fkey) {
+ switch (key) {
+ case DLGK_ENTER:
+ result = dlg_enter_buttoncode(button);
+ break;
+#ifdef KEY_RESIZE
+ case KEY_RESIZE:
+ /* reset data */
+ height = old_height;
+ width = old_width;
+ /* repaint */
+ dlg_clear();
+ dlg_del_window(dialog);
+ refresh();
+ dlg_mouse_free_regions();
+ goto retry;
+#endif
+ default:
+ if (was_mouse) {
+ if ((key2 = dlg_ok_buttoncode(key)) >= 0) {
+ result = key2;
+ break;
+ }
+ beep();
+ }
+ }
+ } else {
+ beep();
+ }
+ }
+
+ dialog_state.visit_cols = save_visit;
+ dlg_del_window(dialog);
+ dlg_mouse_free_regions();
+ free(prompt);
+ *current_item = cur_item;
+ return result;
+}
+
+/*
+ * Display a dialog box with a list of options that can be turned on or off
+ */
+int
+dialog_buildlist(const char *title,
+ const char *cprompt,
+ int height,
+ int width,
+ int list_height,
+ int item_no,
+ char **items,
+ int order_mode)
+{
+ int result;
+ int i, j;
+ DIALOG_LISTITEM *listitems;
+ bool separate_output = dialog_vars.separate_output;
+ bool show_status = FALSE;
+ int current = 0;
+ char *help_result;
+
+ listitems = dlg_calloc(DIALOG_LISTITEM, (size_t) item_no + 1);
+ assert_ptr(listitems, "dialog_buildlist");
+
+ for (i = j = 0; i < item_no; ++i) {
+ listitems[i].name = items[j++];
+ listitems[i].text = (dialog_vars.no_items
+ ? dlg_strempty()
+ : items[j++]);
+ listitems[i].state = !dlg_strcmp(items[j++], "on");
+ listitems[i].help = ((dialog_vars.item_help)
+ ? items[j++]
+ : dlg_strempty());
+ }
+ dlg_align_columns(&listitems[0].text, (int) sizeof(DIALOG_LISTITEM), item_no);
+
+ result = dlg_buildlist(title,
+ cprompt,
+ height,
+ width,
+ list_height,
+ item_no,
+ listitems,
+ NULL,
+ order_mode,
+ ¤t);
+
+ switch (result) {
+ case DLG_EXIT_OK: /* FALLTHRU */
+ case DLG_EXIT_EXTRA:
+ show_status = TRUE;
+ break;
+ case DLG_EXIT_HELP:
+ dlg_add_help_listitem(&result, &help_result, &listitems[current]);
+ if ((show_status = dialog_vars.help_status)) {
+ if (separate_output) {
+ dlg_add_string(help_result);
+ dlg_add_separator();
+ } else {
+ dlg_add_quoted(help_result);
+ }
+ } else {
+ dlg_add_string(help_result);
+ }
+ break;
+ }
+
+ if (show_status) {
+ for (i = 0; i < item_no; i++) {
+ if (listitems[i].state) {
+ if (separate_output) {
+ dlg_add_string(listitems[i].name);
+ dlg_add_separator();
+ } else {
+ if (dlg_need_separator())
+ dlg_add_separator();
+ dlg_add_quoted(listitems[i].name);
+ }
+ }
+ }
+ dlg_add_last_key(-1);
+ }
+
+ dlg_free_columns(&listitems[0].text, (int) sizeof(DIALOG_LISTITEM), item_no);
+ free(listitems);
+ return result;
+}
Modified: vendor/dialog/dist/buttons.c
===================================================================
--- vendor/dialog/dist/buttons.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/buttons.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: buttons.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: buttons.c,v 1.94 2012/12/30 20:51:01 tom Exp $
*
* buttons.c -- draw buttons, e.g., OK/Cancel
*
- * Copyright 2000-2010,2011 Thomas E. Dickey
+ * Copyright 2000-2011,2012 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -28,7 +28,7 @@
#include <wchar.h>
#endif
-#define MIN_BUTTON (dialog_state.visit_items ? -1 : 0)
+#define MIN_BUTTON (-dialog_state.visit_cols)
static void
center_label(char *buffer, int longest, const char *label)
@@ -86,11 +86,85 @@
return result;
}
+static size_t
+count_labels(const char **labels)
+{
+ size_t result = 0;
+ if (labels != 0) {
+ while (*labels++ != 0) {
+ ++result;
+ }
+ }
+ return result;
+}
+
/*
+ * Check if the latest key should be added to the hotkey list.
+ */
+static int
+was_hotkey(int this_key, int *used_keys, size_t next)
+{
+ int result = FALSE;
+
+ if (next != 0) {
+ size_t n;
+ for (n = 0; n < next; ++n) {
+ if (used_keys[n] == this_key) {
+ result = TRUE;
+ break;
+ }
+ }
+ }
+ return result;
+}
+
+/*
+ * Determine the hot-keys for a set of button-labels. Normally these are
+ * the first uppercase character in each label. However, if more than one
+ * button has the same first-uppercase, then we will (attempt to) look for
+ * an alternate.
+ *
+ * This allocates data which must be freed by the caller.
+ */
+static int *
+get_hotkeys(const char **labels)
+{
+ int *result = 0;
+ size_t count = count_labels(labels);
+ size_t n;
+
+ if ((result = dlg_calloc(int, count + 1)) != 0) {
+ for (n = 0; n < count; ++n) {
+ const char *label = labels[n];
+ const int *indx = dlg_index_wchars(label);
+ int limit = dlg_count_wchars(label);
+ int i;
+
+ for (i = 0; i < limit; ++i) {
+ int first = indx[i];
+ int check = UCH(label[first]);
+#ifdef USE_WIDE_CURSES
+ int last = indx[i + 1];
+ if ((last - first) != 1) {
+ const char *temp = (label + first);
+ check = string_to_char(&temp);
+ }
+#endif
+ if (dlg_isupper(check) && !was_hotkey(check, result, n)) {
+ result[n] = check;
+ break;
+ }
+ }
+ }
+ }
+ return result;
+}
+
+/*
* Print a button
*/
static void
-print_button(WINDOW *win, char *label, int y, int x, int selected)
+print_button(WINDOW *win, char *label, int hotkey, int y, int x, int selected)
{
int i;
int state = 0;
@@ -110,23 +184,20 @@
(void) waddstr(win, "<");
(void) wattrset(win, label_attr);
for (i = 0; i < limit; ++i) {
+ int check;
int first = indx[i];
int last = indx[i + 1];
switch (state) {
case 0:
+ check = UCH(label[first]);
#ifdef USE_WIDE_CURSES
if ((last - first) != 1) {
const char *temp = (label + first);
- int cmp = string_to_char(&temp);
- if (dlg_isupper(cmp)) {
- (void) wattrset(win, key_attr);
- state = 1;
- }
- break;
+ check = string_to_char(&temp);
}
#endif
- if (dlg_isupper(UCH(label[first]))) {
+ if (check == hotkey) {
(void) wattrset(win, key_attr);
state = 1;
}
@@ -203,22 +274,27 @@
int length;
int unused;
int used;
+ int result;
- if (count == 0)
- return 0;
- dlg_button_sizes(labels, FALSE, &longest, &length);
- used = (length + (count * 2));
- unused = limit - used;
+ *margin = 0;
+ if (count != 0) {
+ dlg_button_sizes(labels, FALSE, &longest, &length);
+ used = (length + (count * 2));
+ unused = limit - used;
- if ((*gap = unused / (count + 3)) <= 0) {
- if ((*gap = unused / (count + 1)) <= 0)
- *gap = 1;
- *margin = *gap;
+ if ((*gap = unused / (count + 3)) <= 0) {
+ if ((*gap = unused / (count + 1)) <= 0)
+ *gap = 1;
+ *margin = *gap;
+ } else {
+ *margin = *gap * 2;
+ }
+ *step = *gap + (used + count - 1) / count;
+ result = (*gap > 0) && (unused >= 0);
} else {
- *margin = *gap * 2;
+ result = 0;
}
- *step = *gap + (used + count - 1) / count;
- return (*gap > 0) && (unused >= 0);
+ return result;
}
/*
@@ -282,35 +358,41 @@
* Allocate a buffer big enough for any label.
*/
need = (size_t) longest;
- for (n = 0; labels[n] != 0; ++n) {
- need += strlen(labels[n]) + 1;
- }
- buffer = dlg_malloc(char, need);
- assert_ptr(buffer, "dlg_draw_buttons");
+ if (need != 0) {
+ int *hotkeys = get_hotkeys(labels);
+ assert_ptr(hotkeys, "dlg_draw_buttons");
- /*
- * Draw the labels.
- */
- for (n = 0; labels[n] != 0; n++) {
- center_label(buffer, longest, labels[n]);
- mouse_mkbutton(y, x, dlg_count_columns(buffer), n);
- print_button(win, buffer, y, x,
- (selected == n) || (n == 0 && selected < 0));
- if (selected == n)
- getyx(win, final_y, final_x);
+ for (n = 0; labels[n] != 0; ++n) {
+ need += strlen(labels[n]) + 1;
+ }
+ buffer = dlg_malloc(char, need);
+ assert_ptr(buffer, "dlg_draw_buttons");
- if (vertical) {
- if ((y += step) > limit)
- break;
- } else {
- if ((x += step) > limit)
- break;
+ /*
+ * Draw the labels.
+ */
+ for (n = 0; labels[n] != 0; n++) {
+ center_label(buffer, longest, labels[n]);
+ mouse_mkbutton(y, x, dlg_count_columns(buffer), n);
+ print_button(win, buffer, hotkeys[n], y, x,
+ (selected == n) || (n == 0 && selected < 0));
+ if (selected == n)
+ getyx(win, final_y, final_x);
+
+ if (vertical) {
+ if ((y += step) > limit)
+ break;
+ } else {
+ if ((x += step) > limit)
+ break;
+ }
}
+ (void) wmove(win, final_y, final_x);
+ wrefresh(win);
+ (void) wattrset(win, save);
+ free(buffer);
+ free(hotkeys);
}
- (void) wmove(win, final_y, final_x);
- wrefresh(win);
- free(buffer);
- (void) wattrset(win, save);
}
/*
@@ -364,19 +446,27 @@
int
dlg_char_to_button(int ch, const char **labels)
{
+ int result = DLG_EXIT_UNKNOWN;
+
if (labels != 0) {
+ int *hotkeys = get_hotkeys(labels);
int j;
ch = (int) dlg_toupper(dlg_last_getc());
- for (j = 0; labels[j] != 0; ++j) {
- int cmp = dlg_button_to_char(labels[j]);
- if (ch == cmp) {
- dlg_flush_getc();
- return j;
+
+ if (hotkeys != 0) {
+ for (j = 0; labels[j] != 0; ++j) {
+ if (ch == hotkeys[j]) {
+ dlg_flush_getc();
+ result = j;
+ break;
+ }
}
+ free(hotkeys);
}
}
- return DLG_EXIT_UNKNOWN;
+
+ return result;
}
static const char *
@@ -488,10 +578,12 @@
const char **
dlg_ok_label(void)
{
- static const char *labels[3];
+ static const char *labels[4];
int n = 0;
labels[n++] = my_ok_label();
+ if (dialog_vars.extra_button)
+ labels[n++] = my_extra_label();
if (dialog_vars.help_button)
labels[n++] = my_help_label();
labels[n] = 0;
@@ -537,6 +629,7 @@
} else if (dialog_vars.help_button && (button == n)) {
result = DLG_EXIT_HELP;
}
+ dlg_trace_msg("# dlg_ok_buttoncode(%d) = %d\n", button, result);
return result;
}
@@ -575,7 +668,7 @@
/*
* Find the button-index for the "OK" or "Cancel" button, according to
* whether --defaultno is given. If --nocancel was given, we always return
- * the index for "OK".
+ * the index for the first button (usually "OK" unless --nook was used).
*/
int
dlg_defaultno_button(void)
@@ -586,10 +679,34 @@
while (dlg_ok_buttoncode(result) != DLG_EXIT_CANCEL)
++result;
}
+ dlg_trace_msg("# dlg_defaultno_button() = %d\n", result);
return result;
}
/*
+ * Find the button-index for a button named with --default-button. If the
+ * option was not specified, or if the selected button does not exist, return
+ * the index of the first button (usually "OK" unless --nook was used).
+ */
+int
+dlg_default_button(void)
+{
+ int i, n;
+ int result = 0;
+
+ if (dialog_vars.default_button >= 0) {
+ for (i = 0; (n = dlg_ok_buttoncode(i)) >= 0; i++) {
+ if (n == dialog_vars.default_button) {
+ result = i;
+ break;
+ }
+ }
+ }
+ dlg_trace_msg("# dlg_default_button() = %d\n", result);
+ return result;
+}
+
+/*
* Return a list of buttons for Yes/No labels.
*/
const char **
@@ -642,10 +759,14 @@
int
dlg_next_button(const char **labels, int button)
{
- if (labels[button + 1] != 0)
+ if (button < -1)
+ button = -1;
+
+ if (labels[button + 1] != 0) {
++button;
- else
+ } else {
button = MIN_BUTTON;
+ }
return button;
}
@@ -655,9 +776,12 @@
int
dlg_prev_button(const char **labels, int button)
{
- if (button > MIN_BUTTON)
+ if (button > MIN_BUTTON) {
--button;
- else {
+ } else {
+ if (button < -1)
+ button = -1;
+
while (labels[button + 1] != 0)
++button;
}
Modified: vendor/dialog/dist/calendar.c
===================================================================
--- vendor/dialog/dist/calendar.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/calendar.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: calendar.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: calendar.c,v 1.67 2013/03/17 15:03:41 tom Exp $
*
* calendar.c -- implements the calendar box
*
- * Copyright 2001-2010,2011 Thomas E. Dickey
+ * Copyright 2001-2012,2013 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -436,7 +436,7 @@
WINDOW *dialog;
time_t now_time = time((time_t *) 0);
struct tm current;
- int state = dlg_defaultno_button();
+ int state = dlg_default_button();
const char **buttons = dlg_ok_labels();
char *prompt = dlg_strclone(subtitle);
int mincols = MIN_WIDE;
@@ -681,6 +681,7 @@
dlg_add_result(buffer);
dlg_add_separator();
+ dlg_add_last_key(-1);
return CleanupResult(result, dialog, prompt, &save_vars);
}
Modified: vendor/dialog/dist/checklist.c
===================================================================
--- vendor/dialog/dist/checklist.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/checklist.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: checklist.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: checklist.c,v 1.153 2013/09/02 17:01:02 tom Exp $
*
* checklist.c -- implements the checklist box
*
- * Copyright 2000-2010,2011 Thomas E. Dickey
+ * Copyright 2000-2012,2013 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -29,45 +29,32 @@
#include <dialog.h>
#include <dlg_keys.h>
-static int list_width, check_x, item_x, checkflag;
-
#define MIN_HIGH (1 + (5 * MARGIN))
-#define LLEN(n) ((n) * CHECKBOX_TAGS)
-#define ItemData(i) &items[LLEN(i)]
-#define ItemName(i) items[LLEN(i)]
-#define ItemText(i) items[LLEN(i) + 1]
-#define ItemStatus(i) items[LLEN(i) + 2]
-#define ItemHelp(i) items[LLEN(i) + 3]
+typedef struct {
+ /* the outer-window */
+ WINDOW *dialog;
+ int box_y;
+ int box_x;
+ int check_x;
+ int item_x;
+ int checkflag;
+ int use_height;
+ int use_width;
+ /* the inner-window */
+ WINDOW *list;
+ DIALOG_LISTITEM *items;
+ int item_no;
+ const char *states;
+} ALL_DATA;
-static void
-print_arrows(WINDOW *win,
- int box_x,
- int box_y,
- int scrollamt,
- int choice,
- int item_no,
- int list_height)
-{
- dlg_draw_scrollbar(win,
- (long) (scrollamt),
- (long) (scrollamt),
- (long) (scrollamt + choice),
- (long) (item_no),
- box_x + check_x,
- box_x + list_width,
- box_y,
- box_y + list_height + 1,
- menubox_border2_attr,
- menubox_border_attr);
-}
-
/*
* Print list item. The 'selected' parameter is true if 'choice' is the
* current item. That one is colored differently from the other items.
*/
static void
-print_item(WINDOW *win,
+print_item(ALL_DATA * data,
+ WINDOW *win,
DIALOG_LISTITEM * item,
const char *states,
int choice,
@@ -75,58 +62,84 @@
{
chtype save = dlg_get_attrs(win);
int i;
- chtype attr = A_NORMAL;
- const int *cols;
- const int *indx;
- int limit;
+ bool both = (!dialog_vars.no_tags && !dialog_vars.no_items);
+ bool first = TRUE;
+ int climit = (getmaxx(win) - data->check_x + 1);
+ const char *show = (dialog_vars.no_items
+ ? item->name
+ : item->text);
/* Clear 'residue' of last item */
(void) wattrset(win, menubox_attr);
(void) wmove(win, choice, 0);
- for (i = 0; i < list_width; i++)
+ for (i = 0; i < data->use_width; i++)
(void) waddch(win, ' ');
- (void) wmove(win, choice, check_x);
+ (void) wmove(win, choice, data->check_x);
(void) wattrset(win, selected ? check_selected_attr : check_attr);
(void) wprintw(win,
- (checkflag == FLAG_CHECK) ? "[%c]" : "(%c)",
+ (data->checkflag == FLAG_CHECK) ? "[%c]" : "(%c)",
states[item->state]);
(void) wattrset(win, menubox_attr);
(void) waddch(win, ' ');
- if (strlen(item->name) != 0) {
+ if (both) {
+ dlg_print_listitem(win, item->name, climit, first, selected);
+ first = FALSE;
+ }
- indx = dlg_index_wchars(item->name);
+ (void) wmove(win, choice, data->item_x);
+ dlg_print_listitem(win, show, climit, first, selected);
- (void) wattrset(win, selected ? tag_key_selected_attr : tag_key_attr);
- (void) waddnstr(win, item->name, indx[1]);
-
- if ((int) strlen(item->name) > indx[1]) {
- limit = dlg_limit_columns(item->name, (item_x - check_x - 6), 1);
- if (limit > 1) {
- (void) wattrset(win, selected ? tag_selected_attr : tag_attr);
- (void) waddnstr(win,
- item->name + indx[1],
- indx[limit] - indx[1]);
- }
- }
+ if (selected) {
+ dlg_item_help(item->help);
}
+ (void) wattrset(win, save);
+}
- if (strlen(item->text) != 0) {
- cols = dlg_index_columns(item->text);
- limit = dlg_limit_columns(item->text, (getmaxx(win) - item_x + 1), 0);
+static void
+print_list(ALL_DATA * data, int choice, int scrollamt, int max_choice)
+{
+ int i;
+ int cur_y, cur_x;
- if (limit > 0) {
- (void) wmove(win, choice, item_x);
- (void) wattrset(win, selected ? item_selected_attr : item_attr);
- dlg_print_text(win, item->text, cols[limit], &attr);
- }
+ getyx(data->dialog, cur_y, cur_x);
+ for (i = 0; i < max_choice; i++) {
+ print_item(data,
+ data->list,
+ &data->items[i + scrollamt],
+ data->states,
+ i, i == choice);
}
+ (void) wnoutrefresh(data->list);
- if (selected) {
- dlg_item_help(item->help);
+ dlg_draw_scrollbar(data->dialog,
+ (long) (scrollamt),
+ (long) (scrollamt),
+ (long) (scrollamt + max_choice),
+ (long) (data->item_no),
+ data->box_x + data->check_x,
+ data->box_x + data->use_width,
+ data->box_y,
+ data->box_y + data->use_height + 1,
+ menubox_border2_attr,
+ menubox_border_attr);
+
+ (void) wmove(data->dialog, cur_y, cur_x);
+}
+
+static bool
+check_hotkey(DIALOG_LISTITEM * items, int choice)
+{
+ bool result = FALSE;
+
+ if (dlg_match_char(dlg_last_getc(),
+ (dialog_vars.no_tags
+ ? items[choice].text
+ : items[choice].name))) {
+ result = TRUE;
}
- (void) wattrset(win, save);
+ return result;
}
/*
@@ -176,22 +189,26 @@
int old_height = height;
int old_width = width;
#endif
- int i, j, key2, found, x, y, cur_x, cur_y, box_x, box_y;
+ ALL_DATA all;
+ int i, j, key2, found, x, y, cur_x, cur_y;
int key = 0, fkey;
- int button = dialog_state.visit_items ? -1 : dlg_defaultno_button();
+ int button = dialog_state.visit_items ? -1 : dlg_default_button();
int choice = dlg_default_listitem(items);
int scrollamt = 0;
int max_choice;
int was_mouse;
- int use_height;
- int use_width, name_width, text_width;
+ int use_width, list_width, name_width, text_width;
int result = DLG_EXIT_UNKNOWN;
int num_states;
- WINDOW *dialog, *list;
+ WINDOW *dialog;
char *prompt = dlg_strclone(cprompt);
const char **buttons = dlg_ok_labels();
const char *widget_name;
+ memset(&all, 0, sizeof(all));
+ all.items = items;
+ all.item_no = item_no;
+
dlg_does_output();
dlg_tab_correct_str(prompt);
@@ -220,14 +237,17 @@
retry:
#endif
- use_height = list_height;
- if (use_height == 0) {
- use_width = dlg_calc_list_width(item_no, items) + 10;
+ all.use_height = list_height;
+ use_width = dlg_calc_list_width(item_no, items) + 10;
+ use_width = MAX(26, use_width);
+ if (all.use_height == 0) {
/* calculate height without items (4) */
- dlg_auto_size(title, prompt, &height, &width, MIN_HIGH, MAX(26, use_width));
- dlg_calc_listh(&height, &use_height, item_no);
+ dlg_auto_size(title, prompt, &height, &width, MIN_HIGH, use_width);
+ dlg_calc_listh(&height, &all.use_height, item_no);
} else {
- dlg_auto_size(title, prompt, &height, &width, MIN_HIGH + use_height, 26);
+ dlg_auto_size(title, prompt,
+ &height, &width,
+ MIN_HIGH + all.use_height, use_width);
}
dlg_button_layout(buttons, &width);
dlg_print_size(height, width);
@@ -237,13 +257,15 @@
if (states == 0 || strlen(states) < 2)
states = " *";
num_states = (int) strlen(states);
+ all.states = states;
- checkflag = flag;
+ all.checkflag = flag;
x = dlg_box_x_ordinate(width);
y = dlg_box_y_ordinate(height);
dialog = dlg_new_window(height, width, y, x);
+ all.dialog = dialog;
dlg_register_window(dialog, widget_name, binding);
dlg_register_buttons(dialog, widget_name, buttons);
@@ -256,30 +278,31 @@
(void) wattrset(dialog, dialog_attr);
dlg_print_autowrap(dialog, prompt, height, width);
- list_width = width - 6;
+ all.use_width = width - 6;
getyx(dialog, cur_y, cur_x);
- box_y = cur_y + 1;
- box_x = (width - list_width) / 2 - 1;
+ all.box_y = cur_y + 1;
+ all.box_x = (width - all.use_width) / 2 - 1;
/*
* After displaying the prompt, we know how much space we really have.
* Limit the list to avoid overwriting the ok-button.
*/
- if (use_height + MIN_HIGH > height - cur_y)
- use_height = height - MIN_HIGH - cur_y;
- if (use_height <= 0)
- use_height = 1;
+ if (all.use_height + MIN_HIGH > height - cur_y)
+ all.use_height = height - MIN_HIGH - cur_y;
+ if (all.use_height <= 0)
+ all.use_height = 1;
- max_choice = MIN(use_height, item_no);
+ max_choice = MIN(all.use_height, item_no);
+ max_choice = MAX(max_choice, 1);
/* create new window for the list */
- list = dlg_sub_window(dialog, use_height, list_width,
- y + box_y + 1, x + box_x + 1);
+ all.list = dlg_sub_window(dialog, all.use_height, all.use_width,
+ y + all.box_y + 1, x + all.box_x + 1);
/* draw a box around the list items */
- dlg_draw_box(dialog, box_y, box_x,
- use_height + 2 * MARGIN,
- list_width + 2 * MARGIN,
+ dlg_draw_box(dialog, all.box_y, all.box_x,
+ all.use_height + 2 * MARGIN,
+ all.use_width + 2 * MARGIN,
menubox_border_attr, menubox_border2_attr);
text_width = 0;
@@ -294,48 +317,54 @@
* one or both of them. If the name is no wider than 1/4 of the list,
* leave it intact.
*/
- use_width = (list_width - 6);
- if (text_width + name_width > use_width) {
- int need = (int) (0.25 * use_width);
- if (name_width > need) {
- int want = (int) (use_width * ((double) name_width) /
- (text_width + name_width));
- name_width = (want > need) ? want : need;
+ use_width = (all.use_width - 6);
+ if (dialog_vars.no_tags) {
+ list_width = MIN(all.use_width, text_width);
+ } else if (dialog_vars.no_items) {
+ list_width = MIN(all.use_width, name_width);
+ } else {
+ if (text_width >= 0
+ && name_width >= 0
+ && use_width > 0
+ && text_width + name_width > use_width) {
+ int need = (int) (0.25 * use_width);
+ if (name_width > need) {
+ int want = (int) (use_width * ((double) name_width) /
+ (text_width + name_width));
+ name_width = (want > need) ? want : need;
+ }
+ text_width = use_width - name_width;
}
- text_width = use_width - name_width;
+ list_width = (text_width + name_width);
}
- check_x = (use_width - (text_width + name_width)) / 2;
- item_x = name_width + check_x + 6;
+ all.check_x = (use_width - list_width) / 2;
+ all.item_x = ((dialog_vars.no_tags
+ ? 0
+ : (dialog_vars.no_items
+ ? 0
+ : (2 + name_width)))
+ + all.check_x + 4);
/* ensure we are scrolled to show the current choice */
- if (choice >= (max_choice + scrollamt)) {
- scrollamt = choice - max_choice + 1;
+ scrollamt = MIN(scrollamt, max_choice + item_no - 1);
+ if (choice >= (max_choice + scrollamt - 1)) {
+ scrollamt = MAX(0, choice - max_choice + 1);
choice = max_choice - 1;
}
- /* Print the list */
- for (i = 0; i < max_choice; i++) {
- print_item(list,
- &items[i + scrollamt],
- states,
- i, i == choice);
- }
- (void) wnoutrefresh(list);
+ print_list(&all, choice, scrollamt, max_choice);
/* register the new window, along with its borders */
- dlg_mouse_mkbigregion(box_y + 1, box_x, use_height, list_width + 2,
+ dlg_mouse_mkbigregion(all.box_y + 1, all.box_x,
+ all.use_height, all.use_width + 2,
KEY_MAX, 1, 1, 1 /* by lines */ );
- print_arrows(dialog,
- box_x, box_y,
- scrollamt, max_choice, item_no, use_height);
-
dlg_draw_buttons(dialog, height - 2, 0, buttons, button, FALSE, width);
dlg_trace_win(dialog);
while (result == DLG_EXIT_UNKNOWN) {
if (button < 0) /* --visit-items */
- wmove(dialog, box_y + choice + 1, box_x + check_x + 2);
+ wmove(dialog, all.box_y + choice + 1, all.box_x + all.check_x + 2);
key = dlg_mouse_wgetch(dialog, &fkey);
if (dlg_result_key(key, fkey, &result))
@@ -349,19 +378,8 @@
getyx(dialog, cur_y, cur_x);
i = (key - KEY_MAX);
if (i < max_choice) {
- /* De-highlight current item */
- print_item(list,
- &items[scrollamt + choice],
- states,
- choice, FALSE);
- /* Highlight new item */
choice = (key - KEY_MAX);
- print_item(list,
- &items[scrollamt + choice],
- states,
- choice, TRUE);
- (void) wnoutrefresh(list);
- (void) wmove(dialog, cur_y, cur_x);
+ print_list(&all, choice, scrollamt, max_choice);
key = ' '; /* force the selected item to toggle */
} else {
@@ -385,13 +403,15 @@
if (next >= num_states)
next = 0;
- getyx(dialog, cur_y, cur_x);
if (flag == FLAG_CHECK) { /* checklist? */
+ getyx(dialog, cur_y, cur_x);
items[current].state = next;
- print_item(list,
+ print_item(&all, all.list,
&items[scrollamt + choice],
states,
choice, TRUE);
+ (void) wnoutrefresh(all.list);
+ (void) wmove(dialog, cur_y, cur_x);
} else { /* radiolist */
for (i = 0; i < item_no; i++) {
if (i != current) {
@@ -399,23 +419,19 @@
}
}
if (items[current].state) {
+ getyx(dialog, cur_y, cur_x);
items[current].state = next ? next : 1;
- print_item(list,
+ print_item(&all, all.list,
&items[current],
states,
choice, TRUE);
+ (void) wnoutrefresh(all.list);
+ (void) wmove(dialog, cur_y, cur_x);
} else {
items[current].state = 1;
- for (i = 0; i < max_choice; i++)
- print_item(list,
- &items[scrollamt + i],
- states,
- i, i == choice);
+ print_list(&all, choice, scrollamt, max_choice);
}
}
- (void) wnoutrefresh(list);
- (void) wmove(dialog, cur_y, cur_x);
- wrefresh(dialog);
continue; /* wait for another key press */
}
@@ -428,7 +444,7 @@
if (!fkey) {
if (button < 0 || !dialog_state.visit_items) {
for (j = scrollamt + choice + 1; j < item_no; j++) {
- if (dlg_match_char(dlg_last_getc(), items[j].name)) {
+ if (check_hotkey(items, j)) {
found = TRUE;
i = j - scrollamt;
break;
@@ -436,7 +452,7 @@
}
if (!found) {
for (j = 0; j <= scrollamt + choice; j++) {
- if (dlg_match_char(dlg_last_getc(), items[j].name)) {
+ if (check_hotkey(items, j)) {
found = TRUE;
i = j - scrollamt;
break;
@@ -506,82 +522,17 @@
if (i != choice) {
getyx(dialog, cur_y, cur_x);
if (i < 0 || i >= max_choice) {
-#if defined(NCURSES_VERSION_MAJOR) && NCURSES_VERSION_MAJOR < 5
- /*
- * Using wscrl to assist ncurses scrolling is not needed
- * in version 5.x
- */
- if (i == -1) {
- if (use_height > 1) {
- /* De-highlight current first item */
- print_item(list,
- &items[scrollamt],
- states,
- 0, FALSE);
- scrollok(list, TRUE);
- wscrl(list, -1);
- scrollok(list, FALSE);
- }
- scrollamt--;
- print_item(list,
- &items[scrollamt],
- states,
- 0, TRUE);
- } else if (i == max_choice) {
- if (use_height > 1) {
- /* De-highlight current last item before scrolling up */
- print_item(list,
- &items[scrollamt + max_choice - 1],
- states,
- max_choice - 1, FALSE);
- scrollok(list, TRUE);
- wscrl(list, 1);
- scrollok(list, FALSE);
- }
- scrollamt++;
- print_item(list,
- &items[scrollamt + max_choice - 1],
- states,
- max_choice - 1, TRUE);
- } else
-#endif
- {
- if (i < 0) {
- scrollamt += i;
- choice = 0;
- } else {
- choice = max_choice - 1;
- scrollamt += (i - max_choice + 1);
- }
- for (i = 0; i < max_choice; i++) {
- print_item(list,
- &items[scrollamt + i],
- states,
- i, i == choice);
- }
+ if (i < 0) {
+ scrollamt += i;
+ choice = 0;
+ } else {
+ choice = max_choice - 1;
+ scrollamt += (i - max_choice + 1);
}
- (void) wnoutrefresh(list);
- print_arrows(dialog,
- box_x, box_y,
- scrollamt, max_choice, item_no, use_height);
+ print_list(&all, choice, scrollamt, max_choice);
} else {
- /* De-highlight current item */
- print_item(list,
- &items[scrollamt + choice],
- states,
- choice, FALSE);
- /* Highlight new item */
choice = i;
- print_item(list,
- &items[scrollamt + choice],
- states,
- choice, TRUE);
- (void) wnoutrefresh(list);
- print_arrows(dialog,
- box_x, box_y,
- scrollamt, max_choice, item_no, use_height);
- (void) wmove(dialog, cur_y, cur_x);
- wrefresh(dialog);
+ print_list(&all, choice, scrollamt, max_choice);
}
}
continue; /* wait for another key press */
@@ -650,23 +601,26 @@
int flag)
{
int result;
- int i;
+ int i, j;
DIALOG_LISTITEM *listitems;
bool separate_output = ((flag == FLAG_CHECK)
&& (dialog_vars.separate_output));
bool show_status = FALSE;
int current = 0;
+ char *help_result;
listitems = dlg_calloc(DIALOG_LISTITEM, (size_t) item_no + 1);
assert_ptr(listitems, "dialog_checklist");
- for (i = 0; i < item_no; ++i) {
- listitems[i].name = ItemName(i);
- listitems[i].text = ItemText(i);
+ for (i = j = 0; i < item_no; ++i) {
+ listitems[i].name = items[j++];
+ listitems[i].text = (dialog_vars.no_items
+ ? dlg_strempty()
+ : items[j++]);
+ listitems[i].state = !dlg_strcmp(items[j++], "on");
listitems[i].help = ((dialog_vars.item_help)
- ? ItemHelp(i)
+ ? items[j++]
: dlg_strempty());
- listitems[i].state = !dlg_strcmp(ItemStatus(i), "on");
}
dlg_align_columns(&listitems[0].text, (int) sizeof(DIALOG_LISTITEM), item_no);
@@ -687,31 +641,16 @@
show_status = TRUE;
break;
case DLG_EXIT_HELP:
- dlg_add_result("HELP ");
- show_status = dialog_vars.help_status;
- if (USE_ITEM_HELP(listitems[current].help)) {
- if (show_status) {
- if (separate_output) {
- dlg_add_string(listitems[current].help);
- dlg_add_separator();
- } else {
- dlg_add_quoted(listitems[current].help);
- }
+ dlg_add_help_listitem(&result, &help_result, &listitems[current]);
+ if ((show_status = dialog_vars.help_status)) {
+ if (separate_output) {
+ dlg_add_string(help_result);
+ dlg_add_separator();
} else {
- dlg_add_string(listitems[current].help);
+ dlg_add_quoted(help_result);
}
- result = DLG_EXIT_ITEM_HELP;
} else {
- if (show_status) {
- if (separate_output) {
- dlg_add_string(listitems[current].name);
- dlg_add_separator();
- } else {
- dlg_add_quoted(listitems[current].name);
- }
- } else {
- dlg_add_string(listitems[current].name);
- }
+ dlg_add_string(help_result);
}
break;
}
@@ -725,10 +664,14 @@
} else {
if (dlg_need_separator())
dlg_add_separator();
- dlg_add_string(listitems[i].name);
+ if (flag == FLAG_CHECK)
+ dlg_add_quoted(listitems[i].name);
+ else
+ dlg_add_string(listitems[i].name);
}
}
}
+ dlg_add_last_key(separate_output);
}
dlg_free_columns(&listitems[0].text, (int) sizeof(DIALOG_LISTITEM), item_no);
Modified: vendor/dialog/dist/columns.c
===================================================================
--- vendor/dialog/dist/columns.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/columns.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
/*
- * $Id: columns.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: columns.c,v 1.10 2011/10/20 20:53:55 tom Exp $
*
* columns.c -- implements column-alignment
*
Modified: vendor/dialog/dist/config.guess
===================================================================
--- vendor/dialog/dist/config.guess 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/config.guess 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,14 +1,12 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2911 Free Software Foundation, Inc.
+# Copyright 1992-2013 Free Software Foundation, Inc.
-timestamp='2011-01-01'
+timestamp='2013-06-10'
# This file 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
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -17,27 +15,23 @@
# 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner. Please send patches (context
-# diff format) to <config-patches at gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
#
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
+# Originally written by Per Bothner.
#
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches at gnu.org.
+
me=`echo "$0" | sed -e 's,.*/,,'`
usage="\
@@ -56,9 +50,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -140,12 +132,33 @@
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+ # If the system lacks a compiler, then just pick glibc.
+ # We could probably try harder.
+ LIBC=gnu
+
+ eval $set_cc_for_build
+ cat <<-EOF > $dummy.c
+ #include <features.h>
+ #if defined(__UCLIBC__)
+ LIBC=uclibc
+ #elif defined(__dietlibc__)
+ LIBC=dietlibc
+ #else
+ LIBC=gnu
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ ;;
+esac
+
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or
- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
# switched to ELF, *-*-netbsd* would select the old
# object file format. This provides both forward
@@ -202,6 +215,10 @@
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
exit ;;
+ *:Bitrig:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+ exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -220,10 +237,10 @@
exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
- *4.0)
+ *4.0)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
;;
- *5.*)
+ *5.*)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
;;
esac
@@ -304,7 +321,7 @@
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)
+ arm*:riscos:*:*|arm*:RISCOS:*:*)
echo arm-unknown-riscos
exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -600,50 +617,50 @@
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+ 532) # CPU_PA_RISC2_0
+ case "${sc_kernel_bits}" in
+ 32) HP_ARCH="hppa2.0n" ;;
+ 64) HP_ARCH="hppa2.0w" ;;
'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;
- esac
+ esac ;;
+ esac
fi
if [ "${HP_ARCH}" = "" ]; then
eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ sed 's/^ //' << EOF >$dummy.c
- #define _HPUX_SOURCE
- #include <stdlib.h>
- #include <unistd.h>
+ #define _HPUX_SOURCE
+ #include <stdlib.h>
+ #include <unistd.h>
- int main ()
- {
- #if defined(_SC_KERNEL_BITS)
- long bits = sysconf(_SC_KERNEL_BITS);
- #endif
- long cpu = sysconf (_SC_CPU_VERSION);
+ int main ()
+ {
+ #if defined(_SC_KERNEL_BITS)
+ long bits = sysconf(_SC_KERNEL_BITS);
+ #endif
+ long cpu = sysconf (_SC_CPU_VERSION);
- switch (cpu)
- {
- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
- case CPU_PA_RISC2_0:
- #if defined(_SC_KERNEL_BITS)
- switch (bits)
- {
- case 64: puts ("hppa2.0w"); break;
- case 32: puts ("hppa2.0n"); break;
- default: puts ("hppa2.0"); break;
- } break;
- #else /* !defined(_SC_KERNEL_BITS) */
- puts ("hppa2.0"); break;
- #endif
- default: puts ("hppa1.0"); break;
- }
- exit (0);
- }
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+ case CPU_PA_RISC2_0:
+ #if defined(_SC_KERNEL_BITS)
+ switch (bits)
+ {
+ case 64: puts ("hppa2.0w"); break;
+ case 32: puts ("hppa2.0n"); break;
+ default: puts ("hppa2.0"); break;
+ } break;
+ #else /* !defined(_SC_KERNEL_BITS) */
+ puts ("hppa2.0"); break;
+ #endif
+ default: puts ("hppa1.0"); break;
+ }
+ exit (0);
+ }
EOF
(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -792,21 +809,26 @@
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit ;;
*:FreeBSD:*:*)
- case ${UNAME_MACHINE} in
- pc98)
- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ case ${UNAME_PROCESSOR} in
amd64)
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
*)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
esac
exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
+ *:MINGW64*:*)
+ echo ${UNAME_MACHINE}-pc-mingw64
+ exit ;;
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
+ i*:MSYS*:*)
+ echo ${UNAME_MACHINE}-pc-msys
+ exit ;;
i*:windows32*:*)
# uname -m includes "-pc" on this system.
echo ${UNAME_MACHINE}-mingw32
@@ -852,70 +874,81 @@
exit ;;
*:GNU:*:*)
# the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
+ aarch64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ aarch64_be:Linux:*:*)
+ UNAME_MACHINE=aarch64_be
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- EV5) UNAME_MACHINE=alphaev5 ;;
- EV56) UNAME_MACHINE=alphaev56 ;;
- PCA56) UNAME_MACHINE=alphapca56 ;;
- PCA57) UNAME_MACHINE=alphapca56 ;;
- EV6) UNAME_MACHINE=alphaev6 ;;
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
+ EV5) UNAME_MACHINE=alphaev5 ;;
+ EV56) UNAME_MACHINE=alphaev56 ;;
+ PCA56) UNAME_MACHINE=alphapca56 ;;
+ PCA57) UNAME_MACHINE=alphapca56 ;;
+ EV6) UNAME_MACHINE=alphaev6 ;;
+ EV67) UNAME_MACHINE=alphaev67 ;;
+ EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
+ arc:Linux:*:* | arceb:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
- if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null | \
- grep -q __ARM_EABI__
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
then
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+ fi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
cris:Linux:*:*)
- echo cris-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
crisv32:Linux:*:*)
- echo crisv32-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
frv:Linux:*:*)
- echo frv-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
+ hexagon:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
i*86:Linux:*:*)
- LIBC=gnu
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
@@ -934,54 +967,63 @@
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
+ or1k:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
or32:Linux:*:*)
- echo or32-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
padre:Linux:*:*)
- echo sparc-unknown-linux-gnu
+ echo sparc-unknown-linux-${LIBC}
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
+ echo hppa64-unknown-linux-${LIBC}
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-gnu ;;
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
- *) echo hppa-unknown-linux-gnu ;;
+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+ *) echo hppa-unknown-linux-${LIBC} ;;
esac
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
+ echo powerpc64-unknown-linux-${LIBC}
exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
+ echo powerpc-unknown-linux-${LIBC}
exit ;;
+ ppc64le:Linux:*:*)
+ echo powerpc64le-unknown-linux-${LIBC}
+ exit ;;
+ ppcle:Linux:*:*)
+ echo powerpcle-unknown-linux-${LIBC}
+ exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-tilera-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-gnu
+ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;;
x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1096,7 +1138,7 @@
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;
+ && { echo i486-ncr-sysv4; exit; } ;;
NCR*:*:4.2:* | MPRAS*:*:4.2:*)
OS_REL='.3'
test -r /etc/.relid \
@@ -1139,8 +1181,8 @@
echo ns32k-sni-sysv
fi
exit ;;
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says <Richard.M.Bartel at ccMail.Census.GOV>
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ # says <Richard.M.Bartel at ccMail.Census.GOV>
echo i586-unisys-sysv4
exit ;;
*:UNIX_System_V:4*:FTX*)
@@ -1168,9 +1210,9 @@
exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
+ echo mips-nec-sysv${UNAME_RELEASE}
else
- echo mips-unknown-sysv${UNAME_RELEASE}
+ echo mips-unknown-sysv${UNAME_RELEASE}
fi
exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
@@ -1185,6 +1227,9 @@
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
echo i586-pc-haiku
exit ;;
+ x86_64:Haiku:*:*)
+ echo x86_64-unknown-haiku
+ exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
exit ;;
@@ -1211,26 +1256,28 @@
exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- case $UNAME_PROCESSOR in
- i386)
- eval $set_cc_for_build
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- UNAME_PROCESSOR="x86_64"
- fi
- fi ;;
- unknown) UNAME_PROCESSOR=powerpc ;;
- esac
+ eval $set_cc_for_build
+ if test "$UNAME_PROCESSOR" = unknown ; then
+ UNAME_PROCESSOR=powerpc
+ fi
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ case $UNAME_PROCESSOR in
+ i386) UNAME_PROCESSOR=x86_64 ;;
+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
+ esac
+ fi
+ fi
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
if test "$UNAME_PROCESSOR" = "x86"; then
- UNAME_PROCESSOR=i386
- UNAME_MACHINE=pc
+ UNAME_PROCESSOR=i386
+ UNAME_MACHINE=pc
fi
echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
exit ;;
@@ -1240,7 +1287,7 @@
NEO-?:NONSTOP_KERNEL:*:*)
echo neo-tandem-nsk${UNAME_RELEASE}
exit ;;
- NSE-?:NONSTOP_KERNEL:*:*)
+ NSE-*:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
NSR-?:NONSTOP_KERNEL:*:*)
@@ -1309,11 +1356,11 @@
i*86:AROS:*:*)
echo ${UNAME_MACHINE}-pc-aros
exit ;;
+ x86_64:VMkernel:*:*)
+ echo ${UNAME_MACHINE}-unknown-esx
+ exit ;;
esac
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
eval $set_cc_for_build
cat >$dummy.c <<EOF
#ifdef _SEQUENT_
@@ -1331,11 +1378,11 @@
#include <sys/param.h>
printf ("m68k-sony-newsos%s\n",
#ifdef NEWSOS4
- "4"
+ "4"
#else
- ""
+ ""
#endif
- ); exit (0);
+ ); exit (0);
#endif
#endif
Property changes on: vendor/dialog/dist/config.guess
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/config.sub
===================================================================
--- vendor/dialog/dist/config.sub 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/config.sub 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,38 +1,31 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-# 2011 Free Software Foundation, Inc.
+# Copyright 1992-2013 Free Software Foundation, Inc.
-timestamp='2011-04-01'
+timestamp='2013-09-05'
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine. It does not imply ALL GNU software can.
-#
-# This file 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
+# This file 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 3 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.
+# 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
-# Please send patches to <config-patches at gnu.org>. Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches with a ChangeLog entry to config-patches at gnu.org.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
@@ -75,9 +68,7 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -125,7 +116,7 @@
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
@@ -132,6 +123,10 @@
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
+ android-linux)
+ os=-linux-android
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+ ;;
*)
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
if [ $basic_machine != $1 ]
@@ -154,7 +149,7 @@
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray | -microblaze)
+ -apple | -axis | -knuth | -cray | -microblaze*)
os=
basic_machine=$1
;;
@@ -223,6 +218,12 @@
-isc*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
+ -lynx*178)
+ os=-lynxos178
+ ;;
+ -lynx*5)
+ os=-lynxos5
+ ;;
-lynx*)
os=-lynxos
;;
@@ -247,20 +248,27 @@
# Some are omitted here because they have special meanings below.
1750a | 580 \
| a29k \
+ | aarch64 | aarch64_be \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ | arc | arceb \
+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+ | avr | avr32 \
+ | be32 | be64 \
| bfin \
- | c4x | clipper \
+ | c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
+ | epiphany \
| fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | hexagon \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
+ | le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep | metag \
+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -278,6 +286,7 @@
| mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
+ | mipsr5900 | mipsr5900el \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
| moxie \
@@ -284,14 +293,14 @@
| mt \
| msp430 \
| nds32 | nds32le | nds32be \
- | nios | nios2 \
+ | nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
| open8 \
- | or32 \
+ | or1k | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
- | rx \
+ | rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
@@ -300,7 +309,7 @@
| spu \
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
- | v850 | v850e \
+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
@@ -315,8 +324,7 @@
c6x)
basic_machine=tic6x-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
- # Motorola 68HC11/12.
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
@@ -325,21 +333,28 @@
ms1)
basic_machine=mt-unknown
;;
+
strongarm | thumb | xscale)
basic_machine=arm-unknown
;;
+ xgate)
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
xscaleeb)
basic_machine=armeb-unknown
;;
+
xscaleel)
basic_machine=armel-unknown
;;
+
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
i*86 | x86_64)
- basic_machine=$basic_machine-pc
- ;;
+ basic_machine=$basic_machine-pc
+ ;;
# Object if more than one company name word.
*-*-*)
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
@@ -348,25 +363,30 @@
# Recognize the basic CPU types with company name.
580-* \
| a29k-* \
+ | aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
+ | be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
- | clipper-* | craynv-* | cydra-* \
+ | c8051-* | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
+ | le32-* | le64-* \
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+ | microblaze-* | microblazeel-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -384,12 +404,13 @@
| mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipsr5900-* | mipsr5900el-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
| mt-* \
| msp430-* \
| nds32-* | nds32le-* | nds32be-* \
- | nios-* | nios2-* \
+ | nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
| orion-* \
@@ -396,7 +417,7 @@
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
- | romp-* | rs6000-* | rx-* \
+ | rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -404,10 +425,11 @@
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
| tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tile-* | tilegx-* \
+ | tile*-* \
| tron-* \
| ubicom32-* \
- | v850-* | v850e-* | vax-* \
+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+ | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
@@ -707,7 +729,6 @@
i370-ibm* | ibm*)
basic_machine=i370-ibm
;;
-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
i*86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv32
@@ -765,11 +786,15 @@
basic_machine=ns32k-utek
os=-sysv
;;
- microblaze)
+ microblaze*)
basic_machine=microblaze-xilinx
;;
+ mingw64)
+ basic_machine=x86_64-pc
+ os=-mingw64
+ ;;
mingw32)
- basic_machine=i386-pc
+ basic_machine=i686-pc
os=-mingw32
;;
mingw32ce)
@@ -804,10 +829,18 @@
ms1-*)
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;;
+ msys)
+ basic_machine=i686-pc
+ os=-msys
+ ;;
mvs)
basic_machine=i370-ibm
os=-mvs
;;
+ nacl)
+ basic_machine=le32-unknown
+ os=-nacl
+ ;;
ncr3000)
basic_machine=i486-ncr
os=-sysv4
@@ -836,10 +869,10 @@
basic_machine=v70-nec
os=-sysv
;;
- next | m*-next)
+ next | m*-next )
basic_machine=m68k-next
case $os in
- -nextstep*)
+ -nextstep* )
;;
-ns2*)
os=-nextstep2
@@ -958,11 +991,9 @@
pn)
basic_machine=pn-gould
;;
- power)
- basic_machine=power-ibm
+ power) basic_machine=power-ibm
;;
- ppc | ppcbe)
- basic_machine=powerpc-unknown
+ ppc | ppcbe) basic_machine=powerpc-unknown
;;
ppc-* | ppcbe-*)
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
@@ -973,11 +1004,9 @@
ppcle-* | powerpclittle-*)
basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- ppc64)
- basic_machine=powerpc64-unknown
+ ppc64) basic_machine=powerpc64-unknown
;;
- ppc64-*)
- basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
basic_machine=powerpc64le-unknown
@@ -992,7 +1021,11 @@
basic_machine=i586-unknown
os=-pw32
;;
- rdos)
+ rdos | rdos64)
+ basic_machine=x86_64-pc
+ os=-rdos
+ ;;
+ rdos32)
basic_machine=i386-pc
os=-rdos
;;
@@ -1120,13 +1153,8 @@
basic_machine=t90-cray
os=-unicos
;;
- # This must be matched before tile*.
- tilegx*)
- basic_machine=tilegx-unknown
- os=-linux-gnu
- ;;
tile*)
- basic_machine=tile-unknown
+ basic_machine=$basic_machine-unknown
os=-linux-gnu
;;
tx39)
@@ -1324,21 +1352,21 @@
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- | -sym* | -kopensolaris* \
+ | -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
- | -openbsd* | -solidbsd* \
+ | -bitrig* | -openbsd* | -solidbsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-android* \
- | -linux-newlib* | -linux-uclibc* \
+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1421,7 +1449,7 @@
-nova*)
os=-rtmk-nova
;;
- -ns2)
+ -ns2 )
os=-nextstep2
;;
-nsk*)
@@ -1470,9 +1498,6 @@
-aros*)
os=-aros
;;
- -kaos*)
- os=-kaos
- ;;
-zvmoe)
os=-zvmoe
;;
@@ -1521,6 +1546,12 @@
c4x-* | tic4x-*)
os=-coff
;;
+ c8051-*)
+ os=-elf
+ ;;
+ hexagon-*)
+ os=-elf
+ ;;
tic54x-*)
os=-coff
;;
@@ -1548,9 +1579,6 @@
;;
m68000-sun)
os=-sunos3
- # This also exists in the configure program, but was not the
- # default.
- # os=-sunos4
;;
m68*-cisco)
os=-aout
@@ -1564,6 +1592,9 @@
mips*-*)
os=-elf
;;
+ or1k-*)
+ os=-elf
+ ;;
or32-*)
os=-coff
;;
@@ -1618,7 +1649,7 @@
m88k-omron*)
os=-luna
;;
- *-next)
+ *-next )
os=-nextstep
;;
*-sequent)
Property changes on: vendor/dialog/dist/config.sub
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/configure
===================================================================
--- vendor/dialog/dist/configure 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/configure 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20101002.
+# Generated by Autoconf 2.52.20121002.
#
# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
@@ -170,7 +170,8 @@
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'
@@ -177,8 +178,8 @@
libdir='${exec_prefix}/lib'
includedir='${prefix}/include'
oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
+infodir='${datarootdir}/info'
+mandir='${datarootdir}/man'
# Identity of this package.
PACKAGE_NAME=
@@ -229,6 +230,13 @@
| --da=*)
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.
@@ -504,7 +512,7 @@
done
# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir \
localstatedir libdir includedir oldincludedir infodir mandir
do
eval ac_val=$`echo $ac_var`
@@ -641,7 +649,8 @@
--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]
+ --datarootdir=DIR read-only architecture-independent data [PREFIX/share]
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
--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]
@@ -648,8 +657,8 @@
--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]
+ --infodir=DIR info documentation [DATAROOTDIR/info]
+ --mandir=DIR man documentation [DATAROOTDIR/man]
EOF
cat <<\EOF
@@ -677,9 +686,10 @@
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --disable-echo display "compiling" commands
+ --disable-echo do not display "compiling" commands
--disable-largefile omit support for large files
--with-warnings test: turn on gcc warnings
+ --with-pkg-config{=path} enable/disable use of pkg-config
--with-package=XXX rename dialog to XXX, library to libXXX.a, etc
--enable-header-subdir install dlg_XXX headers to subdirectory
--with-libiconv-prefix=DIR
@@ -694,15 +704,22 @@
--with-valgrind test: use valgrind
--with-no-leaks test: free permanent memory, analyze leaks
--disable-trace do not support --trace option
+ --with-rel-version=XXX override derived release version
+ --with-abi-version=XXX override derived ABI version
--disable-libtool-version enable to use libtool's incompatible naming scheme
--with-libtool generate libraries with libtool
--with-libtool-opts=XXX specify additional libtool options
+ --with-shared generate shared-libraries
+ --with-shlib-version=X Specify rel or abi version for shared libs
--with-curses-dir=DIR directory in which (n)curses is installed
+ --enable-rpath use rpath option when generating shared libraries
--with-ncurses compile/link with ncurses library
--with-ncursesw compile/link with wide-char ncurses library
--disable-extras do not include extra dialogs
--disable-rc-file do not include config-file support
- --disable-Xdialog do not include Xdialog-style dialogs
+ --disable-Xdialog do not include Xdialog-style dialogs (1.1)
+ --disable-Xdialog2 do not include extra Xdialog-style dialogs (1.2)
+ --disable-whiptail do not map extra whiptail options
--disable-form do not include the form dialog
--disable-gauge do not include the gauge dialogs
--disable-tailbox do not include the tailbox dialog
@@ -779,7 +796,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20101002. Invocation command line was
+generated by GNU Autoconf 2.52.20121002. Invocation command line was
$ $0 $@
@@ -903,7 +920,7 @@
fi
for ac_site_file in $CONFIG_SITE; do
if test -r "$ac_site_file"; then
- { echo "$as_me:906: loading site script $ac_site_file" >&5
+ { echo "$as_me:923: loading site script $ac_site_file" >&5
echo "$as_me: loading site script $ac_site_file" >&6;}
cat "$ac_site_file" >&5
. "$ac_site_file"
@@ -914,7 +931,7 @@
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
- { echo "$as_me:917: loading cache $cache_file" >&5
+ { echo "$as_me:934: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -922,7 +939,7 @@
esac
fi
else
- { echo "$as_me:925: creating cache $cache_file" >&5
+ { echo "$as_me:942: creating cache $cache_file" >&5
echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -938,21 +955,21 @@
eval ac_new_val="\$ac_env_${ac_var}_value"
case $ac_old_set,$ac_new_set in
set,)
- { echo "$as_me:941: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ { echo "$as_me:958: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { echo "$as_me:945: error: \`$ac_var' was not set in the previous run" >&5
+ { echo "$as_me:962: error: \`$ac_var' was not set in the previous run" >&5
echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:951: error: \`$ac_var' has changed since the previous run:" >&5
+ { echo "$as_me:968: error: \`$ac_var' has changed since the previous run:" >&5
echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:953: former value: $ac_old_val" >&5
+ { echo "$as_me:970: former value: $ac_old_val" >&5
echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:955: current value: $ac_new_val" >&5
+ { echo "$as_me:972: current value: $ac_new_val" >&5
echo "$as_me: current value: $ac_new_val" >&2;}
ac_cache_corrupted=:
fi;;
@@ -971,9 +988,9 @@
fi
done
if $ac_cache_corrupted; then
- { echo "$as_me:974: error: changes in the environment can compromise the build" >&5
+ { echo "$as_me:991: error: changes in the environment can compromise the build" >&5
echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { echo "$as_me:976: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ { { echo "$as_me:993: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -994,10 +1011,10 @@
echo "#! $SHELL" >conftest.sh
echo "exit 0" >>conftest.sh
chmod +x conftest.sh
-if { (echo "$as_me:997: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1014: PATH=\".;.\"; conftest.sh") >&5
(PATH=".;."; conftest.sh) 2>&5
ac_status=$?
- echo "$as_me:1000: \$? = $ac_status" >&5
+ echo "$as_me:1017: \$? = $ac_status" >&5
(exit $ac_status); }; then
ac_path_separator=';'
else
@@ -1032,7 +1049,7 @@
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:1035: checking for $ac_word" >&5
+echo "$as_me:1052: 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
@@ -1047,7 +1064,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1050: found $ac_dir/$ac_word" >&5
+echo "$as_me:1067: found $ac_dir/$ac_word" >&5
break
done
@@ -1055,10 +1072,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1058: result: $CC" >&5
+ echo "$as_me:1075: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1061: result: no" >&5
+ echo "$as_me:1078: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1067,7 +1084,7 @@
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:1070: checking for $ac_word" >&5
+echo "$as_me:1087: 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
@@ -1082,7 +1099,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1085: found $ac_dir/$ac_word" >&5
+echo "$as_me:1102: found $ac_dir/$ac_word" >&5
break
done
@@ -1090,10 +1107,10 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1093: result: $ac_ct_CC" >&5
+ echo "$as_me:1110: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
- echo "$as_me:1096: result: no" >&5
+ echo "$as_me:1113: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1106,7 +1123,7 @@
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:1109: checking for $ac_word" >&5
+echo "$as_me:1126: 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
@@ -1121,7 +1138,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1124: found $ac_dir/$ac_word" >&5
+echo "$as_me:1141: found $ac_dir/$ac_word" >&5
break
done
@@ -1129,10 +1146,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1132: result: $CC" >&5
+ echo "$as_me:1149: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1135: result: no" >&5
+ echo "$as_me:1152: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1141,7 +1158,7 @@
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:1144: checking for $ac_word" >&5
+echo "$as_me:1161: 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
@@ -1156,7 +1173,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1159: found $ac_dir/$ac_word" >&5
+echo "$as_me:1176: found $ac_dir/$ac_word" >&5
break
done
@@ -1164,10 +1181,10 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1167: result: $ac_ct_CC" >&5
+ echo "$as_me:1184: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
- echo "$as_me:1170: result: no" >&5
+ echo "$as_me:1187: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1180,7 +1197,7 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-echo "$as_me:1183: checking for $ac_word" >&5
+echo "$as_me:1200: 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
@@ -1200,7 +1217,7 @@
continue
fi
ac_cv_prog_CC="cc"
-echo "$as_me:1203: found $ac_dir/$ac_word" >&5
+echo "$as_me:1220: found $ac_dir/$ac_word" >&5
break
done
@@ -1222,10 +1239,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1225: result: $CC" >&5
+ echo "$as_me:1242: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1228: result: no" >&5
+ echo "$as_me:1245: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1236,7 +1253,7 @@
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:1239: checking for $ac_word" >&5
+echo "$as_me:1256: 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
@@ -1251,7 +1268,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1254: found $ac_dir/$ac_word" >&5
+echo "$as_me:1271: found $ac_dir/$ac_word" >&5
break
done
@@ -1259,10 +1276,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1262: result: $CC" >&5
+ echo "$as_me:1279: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1265: result: no" >&5
+ echo "$as_me:1282: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1275,7 +1292,7 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:1278: checking for $ac_word" >&5
+echo "$as_me:1295: 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
@@ -1290,7 +1307,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1293: found $ac_dir/$ac_word" >&5
+echo "$as_me:1310: found $ac_dir/$ac_word" >&5
break
done
@@ -1298,10 +1315,10 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1301: result: $ac_ct_CC" >&5
+ echo "$as_me:1318: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
- echo "$as_me:1304: result: no" >&5
+ echo "$as_me:1321: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1313,32 +1330,32 @@
fi
-test -z "$CC" && { { echo "$as_me:1316: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1333: error: no acceptable cc found in \$PATH" >&5
echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
-echo "$as_me:1321:" \
+echo "$as_me:1338:" \
"checking for C compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1324: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1341: \"$ac_compiler --version </dev/null >&5\"") >&5
(eval $ac_compiler --version </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1327: \$? = $ac_status" >&5
+ echo "$as_me:1344: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:1329: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1346: \"$ac_compiler -v </dev/null >&5\"") >&5
(eval $ac_compiler -v </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1332: \$? = $ac_status" >&5
+ echo "$as_me:1349: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:1334: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1351: \"$ac_compiler -V </dev/null >&5\"") >&5
(eval $ac_compiler -V </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1337: \$? = $ac_status" >&5
+ echo "$as_me:1354: \$? = $ac_status" >&5
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
-#line 1341 "configure"
+#line 1358 "configure"
#include "confdefs.h"
int
@@ -1354,13 +1371,13 @@
# 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:1357: checking for C compiler default output" >&5
+echo "$as_me:1374: checking for C compiler default output" >&5
echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1360: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1377: \"$ac_link_default\"") >&5
(eval $ac_link_default) 2>&5
ac_status=$?
- echo "$as_me:1363: \$? = $ac_status" >&5
+ echo "$as_me:1380: \$? = $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
@@ -1383,27 +1400,27 @@
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-{ { echo "$as_me:1386: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1403: error: C compiler cannot create executables" >&5
echo "$as_me: error: C compiler cannot create executables" >&2;}
{ (exit 77); exit 77; }; }
fi
ac_exeext=$ac_cv_exeext
-echo "$as_me:1392: result: $ac_file" >&5
+echo "$as_me:1409: result: $ac_file" >&5
echo "${ECHO_T}$ac_file" >&6
# Check the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-echo "$as_me:1397: checking whether the C compiler works" >&5
+echo "$as_me:1414: 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:1403: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1420: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1406: \$? = $ac_status" >&5
+ echo "$as_me:1423: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cross_compiling=no
else
@@ -1410,7 +1427,7 @@
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { echo "$as_me:1413: error: cannot run C compiled programs.
+ { { echo "$as_me:1430: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'." >&5
echo "$as_me: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'." >&2;}
@@ -1418,7 +1435,7 @@
fi
fi
fi
-echo "$as_me:1421: result: yes" >&5
+echo "$as_me:1438: result: yes" >&5
echo "${ECHO_T}yes" >&6
rm -f a.out a.exe conftest$ac_cv_exeext
@@ -1425,17 +1442,17 @@
ac_clean_files=$ac_clean_files_save
# Check the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-echo "$as_me:1428: checking whether we are cross compiling" >&5
+echo "$as_me:1445: checking whether we are cross compiling" >&5
echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1430: result: $cross_compiling" >&5
+echo "$as_me:1447: result: $cross_compiling" >&5
echo "${ECHO_T}$cross_compiling" >&6
-echo "$as_me:1433: checking for executable suffix" >&5
+echo "$as_me:1450: checking for executable suffix" >&5
echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1435: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1452: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:1438: \$? = $ac_status" >&5
+ echo "$as_me:1455: \$? = $ac_status" >&5
(exit $ac_status); }; then
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
@@ -1451,25 +1468,25 @@
esac
done
else
- { { echo "$as_me:1454: error: cannot compute EXEEXT: cannot compile and link" >&5
+ { { echo "$as_me:1471: error: cannot compute EXEEXT: cannot compile and link" >&5
echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
{ (exit 1); exit 1; }; }
fi
rm -f conftest$ac_cv_exeext
-echo "$as_me:1460: result: $ac_cv_exeext" >&5
+echo "$as_me:1477: 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:1466: checking for object suffix" >&5
+echo "$as_me:1483: checking for object suffix" >&5
echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 1472 "configure"
+#line 1489 "configure"
#include "confdefs.h"
int
@@ -1481,10 +1498,10 @@
}
_ACEOF
rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1484: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1501: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1487: \$? = $ac_status" >&5
+ echo "$as_me:1504: \$? = $ac_status" >&5
(exit $ac_status); }; then
for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
case $ac_file in
@@ -1496,7 +1513,7 @@
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-{ { echo "$as_me:1499: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1516: error: cannot compute OBJEXT: cannot compile" >&5
echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1503,17 +1520,17 @@
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-echo "$as_me:1506: result: $ac_cv_objext" >&5
+echo "$as_me:1523: result: $ac_cv_objext" >&5
echo "${ECHO_T}$ac_cv_objext" >&6
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-echo "$as_me:1510: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1527: 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
cat >conftest.$ac_ext <<_ACEOF
-#line 1516 "configure"
+#line 1533 "configure"
#include "confdefs.h"
int
@@ -1528,16 +1545,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1531: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1548: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1534: \$? = $ac_status" >&5
+ echo "$as_me:1551: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1537: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1554: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1540: \$? = $ac_status" >&5
+ echo "$as_me:1557: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_compiler_gnu=yes
else
@@ -1549,19 +1566,19 @@
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:1552: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1569: 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:1558: checking whether $CC accepts -g" >&5
+echo "$as_me:1575: 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
cat >conftest.$ac_ext <<_ACEOF
-#line 1564 "configure"
+#line 1581 "configure"
#include "confdefs.h"
int
@@ -1573,16 +1590,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1576: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1593: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1579: \$? = $ac_status" >&5
+ echo "$as_me:1596: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1582: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1599: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1585: \$? = $ac_status" >&5
+ echo "$as_me:1602: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_prog_cc_g=yes
else
@@ -1592,7 +1609,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:1595: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1612: 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
@@ -1619,16 +1636,16 @@
#endif
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1622: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1639: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1625: \$? = $ac_status" >&5
+ echo "$as_me:1642: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1628: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1645: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1631: \$? = $ac_status" >&5
+ echo "$as_me:1648: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
for ac_declaration in \
''\
@@ -1640,7 +1657,7 @@
'void exit (int);'
do
cat >conftest.$ac_ext <<_ACEOF
-#line 1643 "configure"
+#line 1660 "configure"
#include "confdefs.h"
#include <stdlib.h>
$ac_declaration
@@ -1653,16 +1670,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1656: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1673: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1659: \$? = $ac_status" >&5
+ echo "$as_me:1676: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1662: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1679: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1665: \$? = $ac_status" >&5
+ echo "$as_me:1682: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -1672,7 +1689,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 1675 "configure"
+#line 1692 "configure"
#include "confdefs.h"
$ac_declaration
int
@@ -1684,16 +1701,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1687: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1704: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1690: \$? = $ac_status" >&5
+ echo "$as_me:1707: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1693: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1710: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1696: \$? = $ac_status" >&5
+ echo "$as_me:1713: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -1721,6 +1738,207 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_main_return=return
+GCC_VERSION=none
+if test "$GCC" = yes ; then
+ echo "$as_me:1743: checking version of $CC" >&5
+echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
+ GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ test -z "$GCC_VERSION" && GCC_VERSION=unknown
+ echo "$as_me:1747: result: $GCC_VERSION" >&5
+echo "${ECHO_T}$GCC_VERSION" >&6
+fi
+
+echo "$as_me:1751: 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 $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_prog_cc_stdc=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+#line 1759 "configure"
+#include "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;
+}
+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
+# 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__"
+do
+ CC="$ac_save_CC $ac_arg"
+ rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1808: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:1811: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:1814: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:1817: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_prog_cc_stdc=$ac_arg
+break
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext
+done
+rm -f conftest.$ac_ext conftest.$ac_objext
+CC=$ac_save_CC
+
+fi
+
+case "x$ac_cv_prog_cc_stdc" in
+ x|xno)
+ echo "$as_me:1834: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6 ;;
+ *)
+ echo "$as_me:1837: result: $ac_cv_prog_cc_stdc" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+ CC="$CC $ac_cv_prog_cc_stdc" ;;
+esac
+
+# This should have been defined by AC_PROG_CC
+: ${CC:=cc}
+
+echo "$as_me:1845: checking \$CC variable" >&5
+echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+case "$CC" in #(vi
+*[\ \ ]-[IUD]*)
+ echo "$as_me:1849: result: broken" >&5
+echo "${ECHO_T}broken" >&6
+ { echo "$as_me:1851: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
+ # humor him...
+ cf_flags=`echo "$CC" | sed -e 's/^[^ ]*[ ]//'`
+ CC=`echo "$CC" | sed -e 's/[ ].*//'`
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_flags
+do
+case $cf_fix_cppflags in
+no)
+ case $cf_add_cflags in #(vi
+ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+ case $cf_add_cflags in
+ -D*)
+ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+ test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ && test -z "${cf_tst_cflags}" \
+ && cf_fix_cppflags=yes
+
+ if test $cf_fix_cppflags = yes ; then
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+ continue
+ elif test "${cf_tst_cflags}" = "\"'" ; then
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+ continue
+ fi
+ ;;
+ esac
+ case "$CPPFLAGS" in
+ *$cf_add_cflags) #(vi
+ ;;
+ *) #(vi
+ case $cf_add_cflags in #(vi
+ -D*)
+ cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'`
+
+ ;;
+ esac
+ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+ ;;
+ esac
+ ;;
+ *)
+ cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+ ;;
+ esac
+ ;;
+yes)
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+ test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ && test -z "${cf_tst_cflags}" \
+ && cf_fix_cppflags=no
+ ;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+ CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+ CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
+ ;;
+*)
+ echo "$as_me:1937: result: ok" >&5
+echo "${ECHO_T}ok" >&6
+ ;;
+esac
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -1727,7 +1945,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_main_return=return
-echo "$as_me:1730: checking how to run the C preprocessor" >&5
+echo "$as_me:1948: 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
@@ -1748,18 +1966,18 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
-#line 1751 "configure"
+#line 1969 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax error
_ACEOF
-if { (eval echo "$as_me:1756: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1974: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:1762: \$? = $ac_status" >&5
+ echo "$as_me:1980: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1782,17 +2000,17 @@
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
-#line 1785 "configure"
+#line 2003 "configure"
#include "confdefs.h"
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:1789: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2007: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:1795: \$? = $ac_status" >&5
+ echo "$as_me:2013: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1829,7 +2047,7 @@
else
ac_cv_prog_CPP=$CPP
fi
-echo "$as_me:1832: result: $CPP" >&5
+echo "$as_me:2050: result: $CPP" >&5
echo "${ECHO_T}$CPP" >&6
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
@@ -1839,18 +2057,18 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
-#line 1842 "configure"
+#line 2060 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax error
_ACEOF
-if { (eval echo "$as_me:1847: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2065: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:1853: \$? = $ac_status" >&5
+ echo "$as_me:2071: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1873,17 +2091,17 @@
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
-#line 1876 "configure"
+#line 2094 "configure"
#include "confdefs.h"
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:1880: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2098: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:1886: \$? = $ac_status" >&5
+ echo "$as_me:2104: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1911,7 +2129,7 @@
if $ac_preproc_ok; then
:
else
- { { echo "$as_me:1914: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ { { echo "$as_me:2132: error: C preprocessor \"$CPP\" fails sanity check" >&5
echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1923,50 +2141,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_main_return=return
-if test $ac_cv_c_compiler_gnu = yes; then
- echo "$as_me:1927: checking whether $CC needs -traditional" >&5
-echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
-if test "${ac_cv_prog_gcc_traditional+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_pattern="Autoconf.*'x'"
- cat >conftest.$ac_ext <<_ACEOF
-#line 1934 "configure"
-#include "confdefs.h"
-#include <sgtty.h>
-int Autoconf = TIOCGETP;
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "$ac_pattern" >/dev/null 2>&1; then
- ac_cv_prog_gcc_traditional=yes
-else
- ac_cv_prog_gcc_traditional=no
-fi
-rm -rf conftest*
-
- if test $ac_cv_prog_gcc_traditional = no; then
- cat >conftest.$ac_ext <<_ACEOF
-#line 1949 "configure"
-#include "confdefs.h"
-#include <termio.h>
-int Autoconf = TCGETA;
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "$ac_pattern" >/dev/null 2>&1; then
- ac_cv_prog_gcc_traditional=yes
-fi
-rm -rf conftest*
-
- fi
-fi
-echo "$as_me:1962: result: $ac_cv_prog_gcc_traditional" >&5
-echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
- if test $ac_cv_prog_gcc_traditional = yes; then
- CC="$CC -traditional"
- fi
-fi
-
-echo "$as_me:1969: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:2144: 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
@@ -1986,11 +2161,11 @@
rm -f conftest.make
fi
if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
- echo "$as_me:1989: result: yes" >&5
+ echo "$as_me:2164: result: yes" >&5
echo "${ECHO_T}yes" >&6
SET_MAKE=
else
- echo "$as_me:1993: result: no" >&5
+ echo "$as_me:2168: result: no" >&5
echo "${ECHO_T}no" >&6
SET_MAKE="MAKE=${MAKE-make}"
fi
@@ -1998,7 +2173,7 @@
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:2001: checking for $ac_word" >&5
+echo "$as_me:2176: 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
@@ -2013,7 +2188,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:2016: found $ac_dir/$ac_word" >&5
+echo "$as_me:2191: found $ac_dir/$ac_word" >&5
break
done
@@ -2021,10 +2196,10 @@
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- echo "$as_me:2024: result: $RANLIB" >&5
+ echo "$as_me:2199: result: $RANLIB" >&5
echo "${ECHO_T}$RANLIB" >&6
else
- echo "$as_me:2027: result: no" >&5
+ echo "$as_me:2202: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -2033,7 +2208,7 @@
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:2036: checking for $ac_word" >&5
+echo "$as_me:2211: 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
@@ -2048,7 +2223,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:2051: found $ac_dir/$ac_word" >&5
+echo "$as_me:2226: found $ac_dir/$ac_word" >&5
break
done
@@ -2057,10 +2232,10 @@
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- echo "$as_me:2060: result: $ac_ct_RANLIB" >&5
+ echo "$as_me:2235: result: $ac_ct_RANLIB" >&5
echo "${ECHO_T}$ac_ct_RANLIB" >&6
else
- echo "$as_me:2063: result: no" >&5
+ echo "$as_me:2238: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -2086,7 +2261,7 @@
fi
done
if test -z "$ac_aux_dir"; then
- { { echo "$as_me:2089: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+ { { echo "$as_me:2264: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -2106,7 +2281,7 @@
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:2109: checking for a BSD compatible install" >&5
+echo "$as_me:2284: 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
@@ -2155,7 +2330,7 @@
INSTALL=$ac_install_sh
fi
fi
-echo "$as_me:2158: result: $INSTALL" >&5
+echo "$as_me:2333: result: $INSTALL" >&5
echo "${ECHO_T}$INSTALL" >&6
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2166,11 +2341,39 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+echo "$as_me:2344: 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:2348: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+ echo "$as_me:2351: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6
+fi
+
+echo "$as_me:2355: checking if $LN_S -f options work" >&5
+echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6
+
+rm -f conf$$.src conf$$dst
+echo >conf$$.dst
+echo first >conf$$.src
+if $LN_S -f conf$$.src conf$$.dst 2>/dev/null; then
+ cf_prog_ln_sf=yes
+else
+ cf_prog_ln_sf=no
+fi
+rm -f conf$$.dst conf$$src
+echo "$as_me:2367: result: $cf_prog_ln_sf" >&5
+echo "${ECHO_T}$cf_prog_ln_sf" >&6
+
+test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
+
for ac_prog in tdlint lint alint splint lclint
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:2173: checking for $ac_word" >&5
+echo "$as_me:2376: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_LINT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2185,7 +2388,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:2188: found $ac_dir/$ac_word" >&5
+echo "$as_me:2391: found $ac_dir/$ac_word" >&5
break
done
@@ -2193,10 +2396,10 @@
fi
LINT=$ac_cv_prog_LINT
if test -n "$LINT"; then
- echo "$as_me:2196: result: $LINT" >&5
+ echo "$as_me:2399: result: $LINT" >&5
echo "${ECHO_T}$LINT" >&6
else
- echo "$as_me:2199: result: no" >&5
+ echo "$as_me:2402: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -2206,7 +2409,7 @@
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:2209: checking for $ac_word" >&5
+echo "$as_me:2412: 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
@@ -2221,7 +2424,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:2224: found $ac_dir/$ac_word" >&5
+echo "$as_me:2427: found $ac_dir/$ac_word" >&5
break
done
@@ -2229,10 +2432,10 @@
fi
AR=$ac_cv_prog_AR
if test -n "$AR"; then
- echo "$as_me:2232: result: $AR" >&5
+ echo "$as_me:2435: result: $AR" >&5
echo "${ECHO_T}$AR" >&6
else
- echo "$as_me:2235: result: no" >&5
+ echo "$as_me:2438: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -2241,7 +2444,7 @@
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:2244: checking for $ac_word" >&5
+echo "$as_me:2447: 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
@@ -2256,7 +2459,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:2259: found $ac_dir/$ac_word" >&5
+echo "$as_me:2462: found $ac_dir/$ac_word" >&5
break
done
@@ -2265,10 +2468,10 @@
fi
ac_ct_AR=$ac_cv_prog_ac_ct_AR
if test -n "$ac_ct_AR"; then
- echo "$as_me:2268: result: $ac_ct_AR" >&5
+ echo "$as_me:2471: result: $ac_ct_AR" >&5
echo "${ECHO_T}$ac_ct_AR" >&6
else
- echo "$as_me:2271: result: no" >&5
+ echo "$as_me:2474: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -2277,215 +2480,7 @@
AR="$ac_cv_prog_AR"
fi
-echo "$as_me:2280: checking for POSIXized ISC" >&5
-echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
-if test -d /etc/conf/kconfig.d &&
- grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
-then
- echo "$as_me:2285: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- ISC=yes # If later tests want to check for ISC.
-
-cat >>confdefs.h <<\EOF
-#define _POSIX_SOURCE 1
-EOF
-
- if test "$GCC" = yes; then
- CC="$CC -posix"
- else
- CC="$CC -Xp"
- fi
-else
- echo "$as_me:2299: result: no" >&5
-echo "${ECHO_T}no" >&6
- ISC=
-fi
-
-echo "$as_me:2304: 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 $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_prog_cc_stdc=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-#line 2312 "configure"
-#include "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;
-}
-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
-# 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__"
-do
- CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2361: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:2364: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2367: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2370: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_prog_cc_stdc=$ac_arg
-break
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext
-done
-rm -f conftest.$ac_ext conftest.$ac_objext
-CC=$ac_save_CC
-
-fi
-
-case "x$ac_cv_prog_cc_stdc" in
- x|xno)
- echo "$as_me:2387: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
- *)
- echo "$as_me:2390: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
- CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
-
-echo "$as_me:2395: 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
- cat >conftest.$ac_ext <<_ACEOF
-#line 2401 "configure"
-#include "confdefs.h"
-
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
- typedef int charset[2];
- const charset x;
- /* SunOS 4.1.1 cc rejects this. */
- char const *const *ccp;
- char **p;
- /* NEC SVR4.0.2 mips cc rejects this. */
- struct point {int x, y;};
- static struct point const zero = {0,0};
- /* AIX XL C 1.02.0.0 rejects this.
- It does not let you subtract one const X* pointer from another in
- an arm of an if-expression whose if-part is not a constant
- expression */
- const char *g = "string";
- ccp = &g + (g ? g-g : 0);
- /* HPUX 7.0 cc rejects these. */
- ++ccp;
- p = (char**) ccp;
- ccp = (char const *const *) p;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
- char const *s = 0 ? (char *) 0 : (char const *) 0;
-
- *t++ = 0;
- }
- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
- int x[] = {25, 17};
- const int *foo = &x[0];
- ++foo;
- }
- { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
- typedef const int *iptr;
- iptr p = 0;
- ++p;
- }
- { /* AIX XL C 1.02.0.0 rejects this saying
- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
- struct s { int j; const int *ap[3]; };
- struct s *b; b->j = 5;
- }
- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
- const int foo = 10;
- }
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2459: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:2462: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2465: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2468: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_c_const=yes
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_c_const=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:2478: 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 <<\EOF
-#define const
-EOF
-
-fi
-
-echo "$as_me:2488: checking for makeflags variable" >&5
+echo "$as_me:2483: checking for makeflags variable" >&5
echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
if test "${cf_cv_makeflags+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2519,10 +2514,10 @@
rm -f cf_makeflags.tmp
fi
-echo "$as_me:2522: result: $cf_cv_makeflags" >&5
+echo "$as_me:2517: result: $cf_cv_makeflags" >&5
echo "${ECHO_T}$cf_cv_makeflags" >&6
-echo "$as_me:2525: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:2520: checking if filesystem supports mixed-case filenames" >&5
echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
if test "${cf_cv_mixedcase+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2530,7 +2525,7 @@
if test "$cross_compiling" = yes ; then
case $target_alias in #(vi
- *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi
+ *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw32*|*-uwin*) #(vi
cf_cv_mixedcase=no
;;
*)
@@ -2549,9 +2544,10 @@
fi
fi
-echo "$as_me:2552: result: $cf_cv_mixedcase" >&5
+echo "$as_me:2547: result: $cf_cv_mixedcase" >&5
echo "${ECHO_T}$cf_cv_mixedcase" >&6
-test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
+test "$cf_cv_mixedcase" = yes &&
+cat >>confdefs.h <<\EOF
#define MIXEDCASE_FILENAMES 1
EOF
@@ -2559,7 +2555,7 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:2562: checking for $ac_word" >&5
+echo "$as_me:2558: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CTAGS+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2574,7 +2570,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:2577: found $ac_dir/$ac_word" >&5
+echo "$as_me:2573: found $ac_dir/$ac_word" >&5
break
done
@@ -2582,10 +2578,10 @@
fi
CTAGS=$ac_cv_prog_CTAGS
if test -n "$CTAGS"; then
- echo "$as_me:2585: result: $CTAGS" >&5
+ echo "$as_me:2581: result: $CTAGS" >&5
echo "${ECHO_T}$CTAGS" >&6
else
- echo "$as_me:2588: result: no" >&5
+ echo "$as_me:2584: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -2596,7 +2592,7 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:2599: checking for $ac_word" >&5
+echo "$as_me:2595: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ETAGS+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2611,7 +2607,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:2614: found $ac_dir/$ac_word" >&5
+echo "$as_me:2610: found $ac_dir/$ac_word" >&5
break
done
@@ -2619,10 +2615,10 @@
fi
ETAGS=$ac_cv_prog_ETAGS
if test -n "$ETAGS"; then
- echo "$as_me:2622: result: $ETAGS" >&5
+ echo "$as_me:2618: result: $ETAGS" >&5
echo "${ECHO_T}$ETAGS" >&6
else
- echo "$as_me:2625: result: no" >&5
+ echo "$as_me:2621: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -2631,7 +2627,7 @@
# Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:2634: checking for $ac_word" >&5
+echo "$as_me:2630: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2646,7 +2642,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:2649: found $ac_dir/$ac_word" >&5
+echo "$as_me:2645: found $ac_dir/$ac_word" >&5
break
done
@@ -2655,10 +2651,10 @@
fi
MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
if test -n "$MAKE_LOWER_TAGS"; then
- echo "$as_me:2658: result: $MAKE_LOWER_TAGS" >&5
+ echo "$as_me:2654: result: $MAKE_LOWER_TAGS" >&5
echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
else
- echo "$as_me:2661: result: no" >&5
+ echo "$as_me:2657: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -2665,7 +2661,7 @@
if test "$cf_cv_mixedcase" = yes ; then
# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
set dummy ${ETAGS:-etags}; ac_word=$2
-echo "$as_me:2668: checking for $ac_word" >&5
+echo "$as_me:2664: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2680,7 +2676,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:2683: found $ac_dir/$ac_word" >&5
+echo "$as_me:2679: found $ac_dir/$ac_word" >&5
break
done
@@ -2689,10 +2685,10 @@
fi
MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
if test -n "$MAKE_UPPER_TAGS"; then
- echo "$as_me:2692: result: $MAKE_UPPER_TAGS" >&5
+ echo "$as_me:2688: result: $MAKE_UPPER_TAGS" >&5
echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
else
- echo "$as_me:2695: result: no" >&5
+ echo "$as_me:2691: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -2712,7 +2708,7 @@
MAKE_LOWER_TAGS="#"
fi
-echo "$as_me:2715: checking if you want to see long compiling messages" >&5
+echo "$as_me:2711: checking if you want to see long compiling messages" >&5
echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
# Check whether --enable-echo or --disable-echo was given.
@@ -2746,16 +2742,16 @@
ECHO_CC=''
fi;
-echo "$as_me:2749: result: $enableval" >&5
+echo "$as_me:2745: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
# Make sure we can run config.sub.
$ac_config_sub sun4 >/dev/null 2>&1 ||
- { { echo "$as_me:2754: error: cannot run $ac_config_sub" >&5
+ { { echo "$as_me:2750: error: cannot run $ac_config_sub" >&5
echo "$as_me: error: cannot run $ac_config_sub" >&2;}
{ (exit 1); exit 1; }; }
-echo "$as_me:2758: checking build system type" >&5
+echo "$as_me:2754: 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
@@ -2764,16 +2760,16 @@
test -z "$ac_cv_build_alias" &&
ac_cv_build_alias=`$ac_config_guess`
test -z "$ac_cv_build_alias" &&
- { { echo "$as_me:2767: error: cannot guess build type; you must specify one" >&5
+ { { echo "$as_me:2763: 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:2771: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ { { echo "$as_me:2767: error: $ac_config_sub $ac_cv_build_alias failed." >&5
echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:2776: result: $ac_cv_build" >&5
+echo "$as_me:2772: result: $ac_cv_build" >&5
echo "${ECHO_T}$ac_cv_build" >&6
build=$ac_cv_build
build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -2781,7 +2777,7 @@
build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
- echo "$as_me:2784: checking host system type" >&5
+ echo "$as_me:2780: 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
@@ -2790,12 +2786,12 @@
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:2793: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ { { echo "$as_me:2789: error: $ac_config_sub $ac_cv_host_alias failed" >&5
echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:2798: result: $ac_cv_host" >&5
+echo "$as_me:2794: result: $ac_cv_host" >&5
echo "${ECHO_T}$ac_cv_host" >&6
host=$ac_cv_host
host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -2809,7 +2805,8 @@
system_name="`(hostname) 2>/dev/null`"
fi
fi
-test -n "$system_name" && cat >>confdefs.h <<EOF
+test -n "$system_name" &&
+cat >>confdefs.h <<EOF
#define SYSTEM_NAME "$system_name"
EOF
@@ -2820,13 +2817,13 @@
fi
test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:2823: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:2820: result: Configuring for $cf_cv_system_name" >&5
echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
if test ".$system_name" != ".$cf_cv_system_name" ; then
- echo "$as_me:2827: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+ echo "$as_me:2824: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
- { { echo "$as_me:2829: error: \"Please remove config.cache and try again.\"" >&5
+ { { echo "$as_me:2826: error: \"Please remove config.cache and try again.\"" >&5
echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -2844,15 +2841,21 @@
PROG_EXT="$EXEEXT"
-test -n "$PROG_EXT" && cat >>confdefs.h <<EOF
+test -n "$PROG_EXT" &&
+cat >>confdefs.h <<EOF
#define PROG_EXT "$PROG_EXT"
EOF
+ echo "$as_me:2849: checking for PATH separator" >&5
+echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
case $cf_cv_system_name in
os2*) PATH_SEPARATOR=';' ;;
- *) PATH_SEPARATOR=':' ;;
+ *) ${PATH_SEPARATOR:=':'} ;;
esac
+ echo "$as_me:2856: result: $PATH_SEPARATOR" >&5
+echo "${ECHO_T}$PATH_SEPARATOR" >&6
+
case $cf_cv_system_name in #(vi
OS/2*|os2*) #(vi
LIB_PREFIX=''
@@ -2869,7 +2872,7 @@
aix[4-7]*) #(vi
cf_xopen_source="-D_ALL_SOURCE"
;;
-cygwin) #(vi
+cygwin|msys) #(vi
cf_XOPEN_SOURCE=600
;;
darwin[0-8].*) #(vi
@@ -2877,6 +2880,7 @@
;;
darwin*) #(vi
cf_xopen_source="-D_DARWIN_C_SOURCE"
+ cf_XOPEN_SOURCE=
;;
freebsd*|dragonfly*) #(vi
# 5.x headers associate
@@ -2894,10 +2898,11 @@
;;
irix[56].*) #(vi
cf_xopen_source="-D_SGI_SOURCE"
+ cf_XOPEN_SOURCE=
;;
linux*|gnu*|mint*|k*bsd*-gnu) #(vi
-echo "$as_me:2900: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:2905: checking if we must define _GNU_SOURCE" >&5
echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
if test "${cf_cv_gnu_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2904,7 +2909,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-#line 2907 "configure"
+#line 2912 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -2919,16 +2924,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2922: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2927: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2925: \$? = $ac_status" >&5
+ echo "$as_me:2930: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2928: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2933: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2931: \$? = $ac_status" >&5
+ echo "$as_me:2936: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_gnu_source=no
else
@@ -2937,7 +2942,7 @@
cf_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
cat >conftest.$ac_ext <<_ACEOF
-#line 2940 "configure"
+#line 2945 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -2952,16 +2957,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2955: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2960: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2958: \$? = $ac_status" >&5
+ echo "$as_me:2963: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2961: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2966: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2964: \$? = $ac_status" >&5
+ echo "$as_me:2969: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_gnu_source=no
else
@@ -2976,17 +2981,261 @@
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:2979: result: $cf_cv_gnu_source" >&5
+echo "$as_me:2984: result: $cf_cv_gnu_source" >&5
echo "${ECHO_T}$cf_cv_gnu_source" >&6
test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
;;
mirbsd*) #(vi
- # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
+ # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types
+ cf_XOPEN_SOURCE=
+
+cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
+
+cf_save_CFLAGS="$CFLAGS"
+cf_save_CPPFLAGS="$CPPFLAGS"
+
+cf_trim_CFLAGS=`echo "$cf_save_CFLAGS" | \
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+echo "$as_me:3006: checking if we should define _POSIX_C_SOURCE" >&5
+echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
+if test "${cf_cv_posix_c_source+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+echo "${as_me:-configure}:3012: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+#line 3015 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+int
+main ()
+{
+
+#ifndef _POSIX_C_SOURCE
+make an error
+#endif
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3030: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:3033: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:3036: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3039: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_posix_c_source=no
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_want_posix_source=no
+ case .$cf_POSIX_C_SOURCE in #(vi
+ .[12]??*) #(vi
+ cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
+ ;;
+ .2) #(vi
+ cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
+ cf_want_posix_source=yes
+ ;;
+ .*)
+ cf_want_posix_source=yes
+ ;;
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >conftest.$ac_ext <<_ACEOF
+#line 3060 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+int
+main ()
+{
+
+#ifdef _POSIX_SOURCE
+make an error
+#endif
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3075: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:3078: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:3081: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3084: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+
+echo "${as_me:-configure}:3095: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
+
+echo "${as_me:-configure}:3100: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+#line 3103 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+int
+main ()
+{
+
+#ifndef _POSIX_C_SOURCE
+make an error
+#endif
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3118: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:3121: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:3124: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3127: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_posix_c_source=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$cf_save_CFLAGS"
+ CPPFLAGS="$cf_save_CPPFLAGS"
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+fi
+echo "$as_me:3143: result: $cf_cv_posix_c_source" >&5
+echo "${ECHO_T}$cf_cv_posix_c_source" >&6
+
+if test "$cf_cv_posix_c_source" != no ; then
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_cv_posix_c_source
+do
+case $cf_fix_cppflags in
+no)
+ case $cf_add_cflags in #(vi
+ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+ case $cf_add_cflags in
+ -D*)
+ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+ test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ && test -z "${cf_tst_cflags}" \
+ && cf_fix_cppflags=yes
+
+ if test $cf_fix_cppflags = yes ; then
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+ continue
+ elif test "${cf_tst_cflags}" = "\"'" ; then
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+ continue
+ fi
+ ;;
+ esac
+ case "$CPPFLAGS" in
+ *$cf_add_cflags) #(vi
+ ;;
+ *) #(vi
+ case $cf_add_cflags in #(vi
+ -D*)
+ cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'`
+
+ ;;
+ esac
+ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+ ;;
+ esac
+ ;;
+ *)
+ cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+ ;;
+ esac
;;
+yes)
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+ test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ && test -z "${cf_tst_cflags}" \
+ && cf_fix_cppflags=no
+ ;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+ CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+ CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
+fi
+
+ ;;
netbsd*) #(vi
cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
;;
+openbsd[4-9]*) #(vi
+ # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
+ cf_xopen_source="-D_BSD_SOURCE"
+ cf_XOPEN_SOURCE=600
+ ;;
openbsd*) #(vi
# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
;;
@@ -2999,14 +3248,12 @@
sco*) #(vi
# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
;;
-solaris2.1[0-9]) #(vi
- cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- ;;
-solaris2.[1-9]) #(vi
+solaris2.*) #(vi
cf_xopen_source="-D__EXTENSIONS__"
;;
*)
- echo "$as_me:3009: checking if we should define _XOPEN_SOURCE" >&5
+
+echo "$as_me:3256: checking if we should define _XOPEN_SOURCE" >&5
echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
if test "${cf_cv_xopen_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3013,9 +3260,13 @@
else
cat >conftest.$ac_ext <<_ACEOF
-#line 3016 "configure"
+#line 3263 "configure"
#include "confdefs.h"
+
+#include <stdlib.h>
+#include <string.h>
#include <sys/types.h>
+
int
main ()
{
@@ -3028,16 +3279,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3031: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3282: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3034: \$? = $ac_status" >&5
+ echo "$as_me:3285: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3037: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3288: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3040: \$? = $ac_status" >&5
+ echo "$as_me:3291: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xopen_source=no
else
@@ -3046,9 +3297,13 @@
cf_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
cat >conftest.$ac_ext <<_ACEOF
-#line 3049 "configure"
+#line 3300 "configure"
#include "confdefs.h"
+
+#include <stdlib.h>
+#include <string.h>
#include <sys/types.h>
+
int
main ()
{
@@ -3061,16 +3316,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3064: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3319: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3067: \$? = $ac_status" >&5
+ echo "$as_me:3322: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3070: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3325: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3073: \$? = $ac_status" >&5
+ echo "$as_me:3328: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xopen_source=no
else
@@ -3085,10 +3340,11 @@
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:3088: result: $cf_cv_xopen_source" >&5
+echo "$as_me:3343: result: $cf_cv_xopen_source" >&5
echo "${ECHO_T}$cf_cv_xopen_source" >&6
- if test "$cf_cv_xopen_source" != no ; then
+if test "$cf_cv_xopen_source" != no ; then
+
CFLAGS=`echo "$CFLAGS" | \
sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
-e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'`
@@ -3097,7 +3353,7 @@
sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
-e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'`
- cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
+ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
cf_fix_cppflags=no
cf_new_cflags=
@@ -3177,7 +3433,7 @@
EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
fi
- fi
+fi
cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
@@ -3192,16 +3448,16 @@
sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
-echo "$as_me:3195: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:3451: checking if we should define _POSIX_C_SOURCE" >&5
echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
if test "${cf_cv_posix_c_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-echo "${as_me:-configure}:3201: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:3457: testing if the symbol is already defined go no further ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 3204 "configure"
+#line 3460 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -3216,16 +3472,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3219: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3475: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3222: \$? = $ac_status" >&5
+ echo "$as_me:3478: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3225: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3481: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3228: \$? = $ac_status" >&5
+ echo "$as_me:3484: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_posix_c_source=no
else
@@ -3246,7 +3502,7 @@
esac
if test "$cf_want_posix_source" = yes ; then
cat >conftest.$ac_ext <<_ACEOF
-#line 3249 "configure"
+#line 3505 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -3261,16 +3517,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3264: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3520: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3267: \$? = $ac_status" >&5
+ echo "$as_me:3523: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3270: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3526: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3273: \$? = $ac_status" >&5
+ echo "$as_me:3529: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -3281,15 +3537,15 @@
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "${as_me:-configure}:3284: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:3540: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
CFLAGS="$cf_trim_CFLAGS"
CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
-echo "${as_me:-configure}:3289: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:3545: testing if the second compile does not leave our definition intact error ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 3292 "configure"
+#line 3548 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -3304,16 +3560,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3307: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3563: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3310: \$? = $ac_status" >&5
+ echo "$as_me:3566: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3313: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3569: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3316: \$? = $ac_status" >&5
+ echo "$as_me:3572: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -3329,7 +3585,7 @@
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:3332: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:3588: result: $cf_cv_posix_c_source" >&5
echo "${ECHO_T}$cf_cv_posix_c_source" >&6
if test "$cf_cv_posix_c_source" != no ; then
@@ -3501,6 +3757,273 @@
fi
+if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+ echo "$as_me:3761: checking if _XOPEN_SOURCE really is set" >&5
+echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+#line 3764 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+int
+main ()
+{
+
+#ifndef _XOPEN_SOURCE
+make an error
+#endif
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3779: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:3782: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:3785: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3788: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_XOPEN_SOURCE_set=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_XOPEN_SOURCE_set=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ echo "$as_me:3797: result: $cf_XOPEN_SOURCE_set" >&5
+echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
+ if test $cf_XOPEN_SOURCE_set = yes
+ then
+ cat >conftest.$ac_ext <<_ACEOF
+#line 3802 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+int
+main ()
+{
+
+#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
+make an error
+#endif
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3817: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:3820: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:3823: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3826: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_XOPEN_SOURCE_set_ok=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_XOPEN_SOURCE_set_ok=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ if test $cf_XOPEN_SOURCE_set_ok = no
+ then
+ { echo "$as_me:3837: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ fi
+ else
+
+echo "$as_me:3842: checking if we should define _XOPEN_SOURCE" >&5
+echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
+if test "${cf_cv_xopen_source+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ cat >conftest.$ac_ext <<_ACEOF
+#line 3849 "configure"
+#include "confdefs.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+
+int
+main ()
+{
+
+#ifndef _XOPEN_SOURCE
+make an error
+#endif
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3868: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:3871: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:3874: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3877: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_xopen_source=no
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_save="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 3886 "configure"
+#include "confdefs.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+
+int
+main ()
+{
+
+#ifdef _XOPEN_SOURCE
+make an error
+#endif
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3905: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:3908: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:3911: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3914: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_xopen_source=no
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_xopen_source=$cf_XOPEN_SOURCE
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ CPPFLAGS="$cf_save"
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+fi
+echo "$as_me:3929: result: $cf_cv_xopen_source" >&5
+echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+if test "$cf_cv_xopen_source" != no ; then
+
+CFLAGS=`echo "$CFLAGS" | \
+ sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+ sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_temp_xopen_source
+do
+case $cf_fix_cppflags in
+no)
+ case $cf_add_cflags in #(vi
+ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+ case $cf_add_cflags in
+ -D*)
+ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+ test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ && test -z "${cf_tst_cflags}" \
+ && cf_fix_cppflags=yes
+
+ if test $cf_fix_cppflags = yes ; then
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+ continue
+ elif test "${cf_tst_cflags}" = "\"'" ; then
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+ continue
+ fi
+ ;;
+ esac
+ case "$CPPFLAGS" in
+ *$cf_add_cflags) #(vi
+ ;;
+ *) #(vi
+ case $cf_add_cflags in #(vi
+ -D*)
+ cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'`
+
+ ;;
+ esac
+ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+ ;;
+ esac
+ ;;
+ *)
+ cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+ ;;
+ esac
+ ;;
+yes)
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+ test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ && test -z "${cf_tst_cflags}" \
+ && cf_fix_cppflags=no
+ ;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+ CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+ CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
+fi
+
+ fi
+fi
+
# Check whether --enable-largefile or --disable-largefile was given.
if test "${enable_largefile+set}" = set; then
enableval="$enable_largefile"
@@ -3508,7 +4031,7 @@
fi;
if test "$enable_largefile" != no; then
- echo "$as_me:3511: checking for special C compiler options needed for large files" >&5
+ echo "$as_me:4034: 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
@@ -3520,7 +4043,7 @@
# IRIX 6.2 and later do not support large files by default,
# so use the C compiler's -n32 option if that helps.
cat >conftest.$ac_ext <<_ACEOF
-#line 3523 "configure"
+#line 4046 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -3540,16 +4063,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3543: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4066: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3546: \$? = $ac_status" >&5
+ echo "$as_me:4069: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3549: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4072: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3552: \$? = $ac_status" >&5
+ echo "$as_me:4075: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -3559,16 +4082,16 @@
rm -f conftest.$ac_objext
CC="$CC -n32"
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3562: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4085: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3565: \$? = $ac_status" >&5
+ echo "$as_me:4088: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3568: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4091: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3571: \$? = $ac_status" >&5
+ echo "$as_me:4094: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sys_largefile_CC=' -n32'; break
else
@@ -3582,13 +4105,13 @@
rm -f conftest.$ac_ext
fi
fi
-echo "$as_me:3585: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:4108: 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:3591: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+ echo "$as_me:4114: 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
@@ -3596,7 +4119,7 @@
while :; do
ac_cv_sys_file_offset_bits=no
cat >conftest.$ac_ext <<_ACEOF
-#line 3599 "configure"
+#line 4122 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -3616,16 +4139,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3619: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4142: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3622: \$? = $ac_status" >&5
+ echo "$as_me:4145: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3625: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4148: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3628: \$? = $ac_status" >&5
+ echo "$as_me:4151: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -3634,7 +4157,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 3637 "configure"
+#line 4160 "configure"
#include "confdefs.h"
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
@@ -3655,16 +4178,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3658: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4181: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3661: \$? = $ac_status" >&5
+ echo "$as_me:4184: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3664: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4187: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3667: \$? = $ac_status" >&5
+ echo "$as_me:4190: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sys_file_offset_bits=64; break
else
@@ -3675,7 +4198,7 @@
break
done
fi
-echo "$as_me:3678: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:4201: 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
@@ -3685,7 +4208,7 @@
fi
rm -rf conftest*
- echo "$as_me:3688: checking for _LARGE_FILES value needed for large files" >&5
+ echo "$as_me:4211: 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
@@ -3693,7 +4216,7 @@
while :; do
ac_cv_sys_large_files=no
cat >conftest.$ac_ext <<_ACEOF
-#line 3696 "configure"
+#line 4219 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -3713,16 +4236,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3716: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4239: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3719: \$? = $ac_status" >&5
+ echo "$as_me:4242: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3722: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4245: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3725: \$? = $ac_status" >&5
+ echo "$as_me:4248: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -3731,7 +4254,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 3734 "configure"
+#line 4257 "configure"
#include "confdefs.h"
#define _LARGE_FILES 1
#include <sys/types.h>
@@ -3752,16 +4275,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3755: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4278: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3758: \$? = $ac_status" >&5
+ echo "$as_me:4281: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3761: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4284: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3764: \$? = $ac_status" >&5
+ echo "$as_me:4287: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sys_large_files=1; break
else
@@ -3772,7 +4295,7 @@
break
done
fi
-echo "$as_me:3775: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:4298: 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
@@ -3785,7 +4308,7 @@
fi
if test "$enable_largefile" != no ; then
- echo "$as_me:3788: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+ echo "$as_me:4311: checking for _LARGEFILE_SOURCE value needed for large files" >&5
echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
if test "${ac_cv_sys_largefile_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3793,7 +4316,7 @@
while :; do
ac_cv_sys_largefile_source=no
cat >conftest.$ac_ext <<_ACEOF
-#line 3796 "configure"
+#line 4319 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -3805,16 +4328,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3808: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4331: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3811: \$? = $ac_status" >&5
+ echo "$as_me:4334: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3814: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4337: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3817: \$? = $ac_status" >&5
+ echo "$as_me:4340: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -3823,7 +4346,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 3826 "configure"
+#line 4349 "configure"
#include "confdefs.h"
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
@@ -3836,16 +4359,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3839: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4362: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3842: \$? = $ac_status" >&5
+ echo "$as_me:4365: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3845: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4368: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3848: \$? = $ac_status" >&5
+ echo "$as_me:4371: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sys_largefile_source=1; break
else
@@ -3856,7 +4379,7 @@
break
done
fi
-echo "$as_me:3859: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:4382: result: $ac_cv_sys_largefile_source" >&5
echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
if test "$ac_cv_sys_largefile_source" != no; then
@@ -3870,13 +4393,13 @@
# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
# in glibc 2.1.3, but that breaks too many other things.
# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:3873: checking for fseeko" >&5
+echo "$as_me:4396: checking for fseeko" >&5
echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
if test "${ac_cv_func_fseeko+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 3879 "configure"
+#line 4402 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -3888,16 +4411,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3891: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4414: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:3894: \$? = $ac_status" >&5
+ echo "$as_me:4417: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:3897: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4420: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3900: \$? = $ac_status" >&5
+ echo "$as_me:4423: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_fseeko=yes
else
@@ -3907,7 +4430,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:3910: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:4433: result: $ac_cv_func_fseeko" >&5
echo "${ECHO_T}$ac_cv_func_fseeko" >&6
if test $ac_cv_func_fseeko = yes; then
@@ -3928,7 +4451,7 @@
test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
- echo "$as_me:3931: checking whether to use struct dirent64" >&5
+ echo "$as_me:4454: checking whether to use struct dirent64" >&5
echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
if test "${cf_cv_struct_dirent64+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3935,7 +4458,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-#line 3938 "configure"
+#line 4461 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -3956,16 +4479,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3959: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4482: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3962: \$? = $ac_status" >&5
+ echo "$as_me:4485: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3965: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4488: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3968: \$? = $ac_status" >&5
+ echo "$as_me:4491: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_struct_dirent64=yes
else
@@ -3976,27 +4499,18 @@
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:3979: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:4502: result: $cf_cv_struct_dirent64" >&5
echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
- test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
+ test "$cf_cv_struct_dirent64" = yes &&
+cat >>confdefs.h <<\EOF
#define HAVE_STRUCT_DIRENT64 1
EOF
fi
-GCC_VERSION=none
-if test "$GCC" = yes ; then
- echo "$as_me:3989: checking version of $CC" >&5
-echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
- GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
- test -z "$GCC_VERSION" && GCC_VERSION=unknown
- echo "$as_me:3993: result: $GCC_VERSION" >&5
-echo "${ECHO_T}$GCC_VERSION" >&6
-fi
-
if ( test "$GCC" = yes || test "$GXX" = yes )
then
-echo "$as_me:3999: checking if you want to check for gcc warnings" >&5
+echo "$as_me:4513: checking if you want to check for gcc warnings" >&5
echo $ECHO_N "checking if you want to check for gcc warnings... $ECHO_C" >&6
# Check whether --with-warnings or --without-warnings was given.
@@ -4006,7 +4520,7 @@
else
cf_opt_with_warnings=no
fi;
-echo "$as_me:4009: result: $cf_opt_with_warnings" >&5
+echo "$as_me:4523: result: $cf_opt_with_warnings" >&5
echo "${ECHO_T}$cf_opt_with_warnings" >&6
if test "$cf_opt_with_warnings" != no ; then
@@ -4028,10 +4542,10 @@
EOF
if test "$GCC" = yes
then
- { echo "$as_me:4031: checking for $CC __attribute__ directives..." >&5
+ { echo "$as_me:4545: checking for $CC __attribute__ directives..." >&5
echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
cat > conftest.$ac_ext <<EOF
-#line 4034 "${as_me:-configure}"
+#line 4548 "${as_me:-configure}"
#include "confdefs.h"
#include "conftest.h"
#include "conftest.i"
@@ -4080,37 +4594,61 @@
;;
esac
- if { (eval echo "$as_me:4083: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:4597: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4086: \$? = $ac_status" >&5
+ echo "$as_me:4600: \$? = $ac_status" >&5
(exit $ac_status); }; then
- test -n "$verbose" && echo "$as_me:4088: result: ... $cf_attribute" >&5
+ test -n "$verbose" && echo "$as_me:4602: result: ... $cf_attribute" >&5
echo "${ECHO_T}... $cf_attribute" >&6
cat conftest.h >>confdefs.h
case $cf_attribute in #(vi
+ noreturn) #(vi
+
+cat >>confdefs.h <<EOF
+#define GCC_NORETURN $cf_directive
+EOF
+
+ ;;
printf) #(vi
- if test "$cf_printf_attribute" = no ; then
- cat >>confdefs.h <<EOF
-#define GCC_PRINTFLIKE(fmt,var) /* nothing */
+ cf_value='/* nothing */'
+ if test "$cf_printf_attribute" != no ; then
+ cf_value='__attribute__((format(printf,fmt,var)))'
+
+cat >>confdefs.h <<\EOF
+#define GCC_PRINTF 1
EOF
- else
- cat >>confdefs.h <<EOF
-#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
+
+ fi
+
+cat >>confdefs.h <<EOF
+#define GCC_PRINTFLIKE(fmt,var) $cf_value
EOF
- fi
+
;;
scanf) #(vi
- if test "$cf_scanf_attribute" = no ; then
- cat >>confdefs.h <<EOF
-#define GCC_SCANFLIKE(fmt,var) /* nothing */
+ cf_value='/* nothing */'
+ if test "$cf_scanf_attribute" != no ; then
+ cf_value='__attribute__((format(scanf,fmt,var)))'
+
+cat >>confdefs.h <<\EOF
+#define GCC_SCANF 1
EOF
- else
- cat >>confdefs.h <<EOF
-#define GCC_SCANFLIKE(fmt,var) __attribute__((format(scanf,fmt,var)))
+
+ fi
+
+cat >>confdefs.h <<EOF
+#define GCC_SCANFLIKE(fmt,var) $cf_value
EOF
- fi
+
;;
+ unused) #(vi
+
+cat >>confdefs.h <<EOF
+#define GCC_UNUSED $cf_directive
+EOF
+
+ ;;
esac
fi
done
@@ -4125,12 +4663,12 @@
if test "$GCC" = yes ; then
case $host_os in
linux*|gnu*)
- echo "$as_me:4128: checking if this is really Intel C compiler" >&5
+ echo "$as_me:4666: checking if this is really Intel C compiler" >&5
echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
cf_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -no-gcc"
cat >conftest.$ac_ext <<_ACEOF
-#line 4133 "configure"
+#line 4671 "configure"
#include "confdefs.h"
int
@@ -4147,16 +4685,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4150: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4688: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4153: \$? = $ac_status" >&5
+ echo "$as_me:4691: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4156: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4694: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4159: \$? = $ac_status" >&5
+ echo "$as_me:4697: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
INTEL_COMPILER=yes
cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
@@ -4167,14 +4705,63 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
CFLAGS="$cf_save_CFLAGS"
- echo "$as_me:4170: result: $INTEL_COMPILER" >&5
+ echo "$as_me:4708: result: $INTEL_COMPILER" >&5
echo "${ECHO_T}$INTEL_COMPILER" >&6
;;
esac
fi
+CLANG_COMPILER=no
+
+if test "$GCC" = yes ; then
+ echo "$as_me:4717: checking if this is really Clang C compiler" >&5
+echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
+ cf_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Qunused-arguments"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 4722 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+#ifdef __clang__
+#else
+make an error
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4739: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:4742: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:4745: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:4748: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ CLANG_COMPILER=yes
+cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
+
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$cf_save_CFLAGS"
+ echo "$as_me:4759: result: $CLANG_COMPILER" >&5
+echo "${ECHO_T}$CLANG_COMPILER" >&6
+fi
+
cat > conftest.$ac_ext <<EOF
-#line 4177 "${as_me:-configure}"
+#line 4764 "${as_me:-configure}"
int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
EOF
@@ -4191,7 +4778,7 @@
# remark #981: operands are evaluated in unspecified order
# warning #279: controlling expression is constant
- { echo "$as_me:4194: checking for $CC warning options..." >&5
+ { echo "$as_me:4781: checking for $CC warning options..." >&5
echo "$as_me: checking for $CC warning options..." >&6;}
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS="-Wall"
@@ -4207,12 +4794,12 @@
wd981
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
- if { (eval echo "$as_me:4210: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:4797: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4213: \$? = $ac_status" >&5
+ echo "$as_me:4800: \$? = $ac_status" >&5
(exit $ac_status); }; then
- test -n "$verbose" && echo "$as_me:4215: result: ... -$cf_opt" >&5
+ test -n "$verbose" && echo "$as_me:4802: result: ... -$cf_opt" >&5
echo "${ECHO_T}... -$cf_opt" >&6
EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
fi
@@ -4221,7 +4808,7 @@
elif test "$GCC" = yes
then
- { echo "$as_me:4224: checking for $CC warning options..." >&5
+ { echo "$as_me:4811: checking for $CC warning options..." >&5
echo "$as_me: checking for $CC warning options..." >&6;}
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS=
@@ -4241,12 +4828,12 @@
Wundef $cf_warn_CONST
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
- if { (eval echo "$as_me:4244: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:4831: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4247: \$? = $ac_status" >&5
+ echo "$as_me:4834: \$? = $ac_status" >&5
(exit $ac_status); }; then
- test -n "$verbose" && echo "$as_me:4249: result: ... -$cf_opt" >&5
+ test -n "$verbose" && echo "$as_me:4836: result: ... -$cf_opt" >&5
echo "${ECHO_T}... -$cf_opt" >&6
case $cf_opt in #(vi
Wcast-qual) #(vi
@@ -4257,11 +4844,21 @@
[34].*)
test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
-echo "${as_me:-configure}:4260: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:4847: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
continue;;
esac
;;
+ Wpointer-arith) #(vi
+ case $GCC_VERSION in
+ [12].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+echo "${as_me:-configure}:4857: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+ ;;
esac
EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
fi
@@ -4273,6 +4870,154 @@
fi
fi
+echo "$as_me:4873: checking if you want to use pkg-config" >&5
+echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
+
+# Check whether --with-pkg-config or --without-pkg-config was given.
+if test "${with_pkg_config+set}" = set; then
+ withval="$with_pkg_config"
+ cf_pkg_config=$withval
+else
+ cf_pkg_config=yes
+fi;
+echo "$as_me:4883: result: $cf_pkg_config" >&5
+echo "${ECHO_T}$cf_pkg_config" >&6
+
+case $cf_pkg_config in #(vi
+no) #(vi
+ PKG_CONFIG=none
+ ;;
+yes) #(vi
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+echo "$as_me:4895: 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
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ if $as_executable_p "$ac_dir/$ac_word"; then
+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
+ echo "$as_me:4912: found $ac_dir/$ac_word" >&5
+ break
+fi
+done
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+ echo "$as_me:4923: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+ echo "$as_me:4926: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # 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:4935: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ if $as_executable_p "$ac_dir/$ac_word"; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
+ echo "$as_me:4952: found $ac_dir/$ac_word" >&5
+ break
+fi
+done
+
+ test -z "$ac_cv_path_ac_pt_PKG_CONFIG" && ac_cv_path_ac_pt_PKG_CONFIG="none"
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+
+if test -n "$ac_pt_PKG_CONFIG"; then
+ echo "$as_me:4964: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+else
+ echo "$as_me:4967: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+ ;;
+*)
+ PKG_CONFIG=$withval
+ ;;
+esac
+
+test -z "$PKG_CONFIG" && PKG_CONFIG=none
+if test "$PKG_CONFIG" != none ; then
+
+if test "x$prefix" != xNONE; then
+ cf_path_syntax="$prefix"
+else
+ cf_path_syntax="$ac_default_prefix"
+fi
+
+case ".$PKG_CONFIG" in #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+ ;;
+..|./*|.\\*) #(vi
+ ;;
+.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+ ;;
+.\${*prefix}*|.\${*dir}*) #(vi
+ eval PKG_CONFIG="$PKG_CONFIG"
+ case ".$PKG_CONFIG" in #(vi
+ .NONE/*)
+ PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;; #(vi
+.no|.NONE/*)
+ PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+*)
+ { { echo "$as_me:5010: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+esac
+
+fi
+
+echo "$as_me:5018: checking for this package's name" >&5
+echo $ECHO_N "checking for this package's name... $ECHO_C" >&6
+
# Check whether --with-package or --without-package was given.
if test "${with_package+set}" = set; then
withval="$with_package"
@@ -4280,9 +5025,11 @@
else
PACKAGE=dialog
fi;
+echo "$as_me:5028: result: $PACKAGE" >&5
+echo "${ECHO_T}$PACKAGE" >&6
if test -f $srcdir/VERSION ; then
- echo "$as_me:4285: checking for package version" >&5
+ echo "$as_me:5032: checking for package version" >&5
echo $ECHO_N "checking for package version... $ECHO_C" >&6
# if there are not enough fields, cut returns the last one...
@@ -4294,24 +5041,24 @@
VERSION="$cf_field1"
VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`
- test -z "$VERSION_MAJOR" && { { echo "$as_me:4297: error: missing major-version" >&5
+ test -z "$VERSION_MAJOR" && { { echo "$as_me:5044: error: missing major-version" >&5
echo "$as_me: error: missing major-version" >&2;}
{ (exit 1); exit 1; }; }
VERSION_MINOR=`echo "$cf_field2" | sed -e 's/^[^.]*\.//' -e 's/-.*//'`
- test -z "$VERSION_MINOR" && { { echo "$as_me:4302: error: missing minor-version" >&5
+ test -z "$VERSION_MINOR" && { { echo "$as_me:5049: error: missing minor-version" >&5
echo "$as_me: error: missing minor-version" >&2;}
{ (exit 1); exit 1; }; }
- echo "$as_me:4306: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
+ echo "$as_me:5053: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6
- echo "$as_me:4309: checking for package patch date" >&5
+ echo "$as_me:5056: checking for package patch date" >&5
echo $ECHO_N "checking for package patch date... $ECHO_C" >&6
VERSION_PATCH=`echo "$cf_field3" | sed -e 's/^[^-]*-//'`
case .$VERSION_PATCH in
.)
- { { echo "$as_me:4314: error: missing patch-date $VERSION_PATCH" >&5
+ { { echo "$as_me:5061: error: missing patch-date $VERSION_PATCH" >&5
echo "$as_me: error: missing patch-date $VERSION_PATCH" >&2;}
{ (exit 1); exit 1; }; }
;;
@@ -4318,39 +5065,40 @@
.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9])
;;
*)
- { { echo "$as_me:4321: error: illegal patch-date $VERSION_PATCH" >&5
+ { { echo "$as_me:5068: error: illegal patch-date $VERSION_PATCH" >&5
echo "$as_me: error: illegal patch-date $VERSION_PATCH" >&2;}
{ (exit 1); exit 1; }; }
;;
esac
- echo "$as_me:4326: result: $VERSION_PATCH" >&5
+ echo "$as_me:5073: result: $VERSION_PATCH" >&5
echo "${ECHO_T}$VERSION_PATCH" >&6
else
- { { echo "$as_me:4329: error: did not find $srcdir/VERSION" >&5
+ { { echo "$as_me:5076: error: did not find $srcdir/VERSION" >&5
echo "$as_me: error: did not find $srcdir/VERSION" >&2;}
{ (exit 1); exit 1; }; }
fi
# show the actual data that we have for versions:
-test -n "$verbose" && echo " VERSION $VERSION" 1>&6
+test -n "$verbose" && echo " ABI VERSION $VERSION" 1>&6
-echo "${as_me:-configure}:4337: testing VERSION $VERSION ..." 1>&5
+echo "${as_me:-configure}:5084: testing ABI VERSION $VERSION ..." 1>&5
test -n "$verbose" && echo " VERSION_MAJOR $VERSION_MAJOR" 1>&6
-echo "${as_me:-configure}:4341: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
+echo "${as_me:-configure}:5088: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
test -n "$verbose" && echo " VERSION_MINOR $VERSION_MINOR" 1>&6
-echo "${as_me:-configure}:4345: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
+echo "${as_me:-configure}:5092: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
test -n "$verbose" && echo " VERSION_PATCH $VERSION_PATCH" 1>&6
-echo "${as_me:-configure}:4349: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
+echo "${as_me:-configure}:5096: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
cf_PACKAGE=dialog
PACKAGE=$PACKAGE
- cat >>confdefs.h <<EOF
+
+cat >>confdefs.h <<EOF
#define PACKAGE "$PACKAGE"
EOF
@@ -4364,6 +5112,13 @@
#define ${cf_PACKAGE}_PATCHDATE ${VERSION_PATCH}
EOF
+CFG_ROOTNAME=$PACKAGE
+HDR_ROOTNAME=$PACKAGE
+LIB_ROOTNAME=$PACKAGE
+
+echo "$as_me:5119: checking if we should install dlg_XXX headers to subdirectory" >&5
+echo $ECHO_N "checking if we should install dlg_XXX headers to subdirectory... $ECHO_C" >&6
+
# Check whether --enable-header-subdir or --disable-header-subdir was given.
if test "${enable_header_subdir+set}" = set; then
enableval="$enable_header_subdir"
@@ -4371,15 +5126,18 @@
else
SUB_INC=no
fi;
+echo "$as_me:5129: result: $SUB_INC" >&5
+echo "${ECHO_T}$SUB_INC" >&6
EXTRAOBJS=""
-echo "$as_me:4376: checking for ANSI C header files" >&5
+
+echo "$as_me:5134: 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
cat >conftest.$ac_ext <<_ACEOF
-#line 4382 "configure"
+#line 5140 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -4387,13 +5145,13 @@
#include <float.h>
_ACEOF
-if { (eval echo "$as_me:4390: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5148: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:4396: \$? = $ac_status" >&5
+ echo "$as_me:5154: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4415,7 +5173,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
-#line 4418 "configure"
+#line 5176 "configure"
#include "confdefs.h"
#include <string.h>
@@ -4433,7 +5191,7 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
-#line 4436 "configure"
+#line 5194 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -4454,7 +5212,7 @@
:
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4457 "configure"
+#line 5215 "configure"
#include "confdefs.h"
#include <ctype.h>
#if ((' ' & 0x0FF) == 0x020)
@@ -4480,15 +5238,15 @@
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4483: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5241: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4486: \$? = $ac_status" >&5
+ echo "$as_me:5244: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:4488: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5246: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4491: \$? = $ac_status" >&5
+ echo "$as_me:5249: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -4501,7 +5259,7 @@
fi
fi
fi
-echo "$as_me:4504: result: $ac_cv_header_stdc" >&5
+echo "$as_me:5262: result: $ac_cv_header_stdc" >&5
echo "${ECHO_T}$ac_cv_header_stdc" >&6
if test $ac_cv_header_stdc = yes; then
@@ -4511,7 +5269,7 @@
fi
-echo "$as_me:4514: checking for inline" >&5
+echo "$as_me:5272: 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
@@ -4519,7 +5277,7 @@
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat >conftest.$ac_ext <<_ACEOF
-#line 4522 "configure"
+#line 5280 "configure"
#include "confdefs.h"
#ifndef __cplusplus
static $ac_kw int static_foo () {return 0; }
@@ -4528,16 +5286,16 @@
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4531: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5289: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4534: \$? = $ac_status" >&5
+ echo "$as_me:5292: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4537: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5295: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4540: \$? = $ac_status" >&5
+ echo "$as_me:5298: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_c_inline=$ac_kw; break
else
@@ -4548,7 +5306,7 @@
done
fi
-echo "$as_me:4551: result: $ac_cv_c_inline" >&5
+echo "$as_me:5309: result: $ac_cv_c_inline" >&5
echo "${ECHO_T}$ac_cv_c_inline" >&6
case $ac_cv_c_inline in
inline | yes) ;;
@@ -4569,28 +5327,28 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4572: checking for $ac_header" >&5
+echo "$as_me:5330: 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 $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4578 "configure"
+#line 5336 "configure"
#include "confdefs.h"
$ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4584: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5342: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4587: \$? = $ac_status" >&5
+ echo "$as_me:5345: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4590: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5348: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4593: \$? = $ac_status" >&5
+ echo "$as_me:5351: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Header=yes"
else
@@ -4600,7 +5358,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:4603: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5361: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -4610,13 +5368,13 @@
fi
done
-echo "$as_me:4613: checking for off_t" >&5
+echo "$as_me:5371: 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
cat >conftest.$ac_ext <<_ACEOF
-#line 4619 "configure"
+#line 5377 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4631,16 +5389,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4634: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5392: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4637: \$? = $ac_status" >&5
+ echo "$as_me:5395: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4640: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5398: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4643: \$? = $ac_status" >&5
+ echo "$as_me:5401: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_off_t=yes
else
@@ -4650,7 +5408,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:4653: result: $ac_cv_type_off_t" >&5
+echo "$as_me:5411: 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
:
@@ -4662,13 +5420,13 @@
fi
-echo "$as_me:4665: checking for size_t" >&5
+echo "$as_me:5423: 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
cat >conftest.$ac_ext <<_ACEOF
-#line 4671 "configure"
+#line 5429 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4683,16 +5441,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4686: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5444: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4689: \$? = $ac_status" >&5
+ echo "$as_me:5447: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4692: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5450: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4695: \$? = $ac_status" >&5
+ echo "$as_me:5453: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_size_t=yes
else
@@ -4702,7 +5460,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:4705: result: $ac_cv_type_size_t" >&5
+echo "$as_me:5463: 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
:
@@ -4716,13 +5474,13 @@
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
-echo "$as_me:4719: checking for working alloca.h" >&5
+echo "$as_me:5477: 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
cat >conftest.$ac_ext <<_ACEOF
-#line 4725 "configure"
+#line 5483 "configure"
#include "confdefs.h"
#include <alloca.h>
int
@@ -4734,16 +5492,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4737: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5495: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4740: \$? = $ac_status" >&5
+ echo "$as_me:5498: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4743: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5501: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4746: \$? = $ac_status" >&5
+ echo "$as_me:5504: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_working_alloca_h=yes
else
@@ -4753,7 +5511,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:4756: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:5514: 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
@@ -4763,13 +5521,13 @@
fi
-echo "$as_me:4766: checking for alloca" >&5
+echo "$as_me:5524: 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
cat >conftest.$ac_ext <<_ACEOF
-#line 4772 "configure"
+#line 5530 "configure"
#include "confdefs.h"
#ifdef __GNUC__
# define alloca __builtin_alloca
@@ -4801,16 +5559,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4804: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5562: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4807: \$? = $ac_status" >&5
+ echo "$as_me:5565: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4810: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5568: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4813: \$? = $ac_status" >&5
+ echo "$as_me:5571: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_alloca_works=yes
else
@@ -4820,7 +5578,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:4823: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:5581: 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
@@ -4841,13 +5599,13 @@
#define C_ALLOCA 1
EOF
-echo "$as_me:4844: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:5602: 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
cat >conftest.$ac_ext <<_ACEOF
-#line 4850 "configure"
+#line 5608 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -4865,18 +5623,18 @@
rm -rf conftest*
fi
-echo "$as_me:4868: result: $ac_cv_os_cray" >&5
+echo "$as_me:5626: 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:4873: checking for $ac_func" >&5
+echo "$as_me:5631: 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 $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4879 "configure"
+#line 5637 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -4899,7 +5657,7 @@
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-f = $ac_func;
+f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
#endif
;
@@ -4907,16 +5665,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4910: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5668: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4913: \$? = $ac_status" >&5
+ echo "$as_me:5671: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4916: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5674: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4919: \$? = $ac_status" >&5
+ echo "$as_me:5677: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -4926,7 +5684,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:4929: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5687: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
@@ -4940,7 +5698,7 @@
done
fi
-echo "$as_me:4943: checking stack direction for C alloca" >&5
+echo "$as_me:5701: 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
@@ -4949,7 +5707,7 @@
ac_cv_c_stack_direction=0
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4952 "configure"
+#line 5710 "configure"
#include "confdefs.h"
int
find_stack_direction ()
@@ -4972,15 +5730,15 @@
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4975: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5733: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4978: \$? = $ac_status" >&5
+ echo "$as_me:5736: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:4980: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5738: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4983: \$? = $ac_status" >&5
+ echo "$as_me:5741: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_c_stack_direction=1
else
@@ -4992,7 +5750,7 @@
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-echo "$as_me:4995: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:5753: result: $ac_cv_c_stack_direction" >&5
echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
cat >>confdefs.h <<EOF
@@ -5004,23 +5762,23 @@
for ac_header in stdlib.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5007: checking for $ac_header" >&5
+echo "$as_me:5765: 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 $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 5013 "configure"
+#line 5771 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:5017: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5775: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:5023: \$? = $ac_status" >&5
+ echo "$as_me:5781: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5039,7 +5797,7 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:5042: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5800: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -5052,13 +5810,13 @@
for ac_func in getpagesize
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5055: checking for $ac_func" >&5
+echo "$as_me:5813: 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 $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 5061 "configure"
+#line 5819 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -5081,7 +5839,7 @@
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-f = $ac_func;
+f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
#endif
;
@@ -5089,16 +5847,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5092: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5850: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5095: \$? = $ac_status" >&5
+ echo "$as_me:5853: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5098: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5856: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5101: \$? = $ac_status" >&5
+ echo "$as_me:5859: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -5108,7 +5866,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:5111: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5869: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -5118,7 +5876,7 @@
fi
done
-echo "$as_me:5121: checking for working mmap" >&5
+echo "$as_me:5879: 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
@@ -5127,7 +5885,7 @@
ac_cv_func_mmap_fixed_mapped=no
else
cat >conftest.$ac_ext <<_ACEOF
-#line 5130 "configure"
+#line 5888 "configure"
#include "confdefs.h"
$ac_includes_default
/* Thanks to Mike Haertel and Jim Avera for this test.
@@ -5254,15 +6012,15 @@
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5257: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6015: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5260: \$? = $ac_status" >&5
+ echo "$as_me:6018: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:5262: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6020: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5265: \$? = $ac_status" >&5
+ echo "$as_me:6023: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_mmap_fixed_mapped=yes
else
@@ -5274,7 +6032,7 @@
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-echo "$as_me:5277: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:6035: 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
@@ -5285,13 +6043,13 @@
fi
rm -f conftest.mmap
- echo "$as_me:5288: checking whether we are using the GNU C Library 2.1 or newer" >&5
+ echo "$as_me:6046: 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
cat >conftest.$ac_ext <<_ACEOF
-#line 5294 "configure"
+#line 6052 "configure"
#include "confdefs.h"
#include <features.h>
@@ -5311,7 +6069,7 @@
rm -rf conftest*
fi
-echo "$as_me:5314: result: $ac_cv_gnu_library_2_1" >&5
+echo "$as_me:6072: 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"
@@ -5324,7 +6082,7 @@
: ${CONFIG_H:=config.h}
if test -z "$PACKAGE" ; then
- { { echo "$as_me:5327: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5
+ { { echo "$as_me:6085: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5
echo "$as_me: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -5341,23 +6099,23 @@
stdlib.h string.h unistd.h sys/param.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5344: checking for $ac_header" >&5
+echo "$as_me:6102: 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 $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 5350 "configure"
+#line 6108 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:5354: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6112: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:5360: \$? = $ac_status" >&5
+ echo "$as_me:6118: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5376,7 +6134,7 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:5379: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:6137: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -5391,13 +6149,13 @@
strdup strtoul tsearch __argz_count __argz_stringify __argz_next
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5394: checking for $ac_func" >&5
+echo "$as_me:6152: 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 $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 5400 "configure"
+#line 6158 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -5420,7 +6178,7 @@
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-f = $ac_func;
+f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
#endif
;
@@ -5428,16 +6186,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5431: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6189: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5434: \$? = $ac_status" >&5
+ echo "$as_me:6192: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5437: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6195: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5440: \$? = $ac_status" >&5
+ echo "$as_me:6198: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -5447,7 +6205,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:5450: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6208: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -5495,7 +6253,7 @@
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 5498 "configure"
+#line 6256 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -5507,16 +6265,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5510: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6268: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5513: \$? = $ac_status" >&5
+ echo "$as_me:6271: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5516: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6274: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5519: \$? = $ac_status" >&5
+ echo "$as_me:6277: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -5533,7 +6291,7 @@
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:5536: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6294: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -5574,7 +6332,7 @@
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 5577 "configure"
+#line 6335 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -5586,16 +6344,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5589: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6347: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5592: \$? = $ac_status" >&5
+ echo "$as_me:6350: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5595: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6353: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5598: \$? = $ac_status" >&5
+ echo "$as_me:6356: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -5612,7 +6370,7 @@
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:5615: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6373: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -5628,7 +6386,7 @@
fi
else
-{ { echo "$as_me:5631: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:6389: error: cannot find libiconv under $withval" >&5
echo "$as_me: error: cannot find libiconv under $withval" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -5653,7 +6411,7 @@
if test "$cf_have_libdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6
-echo "${as_me:-configure}:5656: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6414: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -5682,7 +6440,7 @@
if test "$cf_have_libdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6
-echo "${as_me:-configure}:5685: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6443: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -5691,7 +6449,7 @@
fi
else
-{ { echo "$as_me:5694: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:6452: error: cannot find libiconv under $withval" >&5
echo "$as_me: error: cannot find libiconv under $withval" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -5702,7 +6460,7 @@
fi;
- echo "$as_me:5705: checking for iconv" >&5
+ echo "$as_me:6463: 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
@@ -5713,12 +6471,12 @@
cf_cv_header_path_iconv=
cf_cv_library_path_iconv=
-echo "${as_me:-configure}:5716: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:6474: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
cf_save_LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 5721 "configure"
+#line 6479 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -5737,16 +6495,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5740: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6498: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5743: \$? = $ac_status" >&5
+ echo "$as_me:6501: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5746: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6504: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5749: \$? = $ac_status" >&5
+ echo "$as_me:6507: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_iconv=yes
@@ -5760,7 +6518,7 @@
LIBS="-liconv $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 5763 "configure"
+#line 6521 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -5779,16 +6537,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5782: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6540: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5785: \$? = $ac_status" >&5
+ echo "$as_me:6543: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5788: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6546: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5791: \$? = $ac_status" >&5
+ echo "$as_me:6549: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_iconv=yes
@@ -5805,9 +6563,9 @@
test -n "$verbose" && echo " find linkage for iconv library" 1>&6
-echo "${as_me:-configure}:5808: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:6566: testing find linkage for iconv library ..." 1>&5
-echo "${as_me:-configure}:5810: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:6568: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
cf_save_CPPFLAGS="$CPPFLAGS"
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -5920,11 +6678,11 @@
if test -d $cf_cv_header_path_iconv ; then
test -n "$verbose" && echo " ... testing $cf_cv_header_path_iconv" 1>&6
-echo "${as_me:-configure}:5923: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:6681: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv"
cat >conftest.$ac_ext <<_ACEOF
-#line 5927 "configure"
+#line 6685 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -5943,21 +6701,21 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5946: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6704: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5949: \$? = $ac_status" >&5
+ echo "$as_me:6707: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5952: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6710: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5955: \$? = $ac_status" >&5
+ echo "$as_me:6713: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found iconv headers in $cf_cv_header_path_iconv" 1>&6
-echo "${as_me:-configure}:5960: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:6718: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
cf_cv_find_linkage_iconv=maybe
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -5975,7 +6733,7 @@
if test "$cf_cv_find_linkage_iconv" = maybe ; then
-echo "${as_me:-configure}:5978: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:6736: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
cf_save_LIBS="$LIBS"
cf_save_LDFLAGS="$LDFLAGS"
@@ -6072,13 +6830,13 @@
if test -d $cf_cv_library_path_iconv ; then
test -n "$verbose" && echo " ... testing $cf_cv_library_path_iconv" 1>&6
-echo "${as_me:-configure}:6075: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:6833: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
CPPFLAGS="$cf_test_CPPFLAGS"
LIBS="-liconv $cf_save_LIBS"
LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_iconv"
cat >conftest.$ac_ext <<_ACEOF
-#line 6081 "configure"
+#line 6839 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -6097,21 +6855,21 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6100: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6858: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6103: \$? = $ac_status" >&5
+ echo "$as_me:6861: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:6106: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6864: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6109: \$? = $ac_status" >&5
+ echo "$as_me:6867: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found iconv library in $cf_cv_library_path_iconv" 1>&6
-echo "${as_me:-configure}:6114: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:6872: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
cf_cv_find_linkage_iconv=yes
cf_cv_library_file_iconv="-liconv"
@@ -6151,7 +6909,7 @@
fi
fi
-echo "$as_me:6154: result: $am_cv_func_iconv" >&5
+echo "$as_me:6912: result: $am_cv_func_iconv" >&5
echo "${ECHO_T}$am_cv_func_iconv" >&6
if test "$am_cv_func_iconv" = yes; then
@@ -6160,7 +6918,7 @@
#define HAVE_ICONV 1
EOF
- echo "$as_me:6163: checking if the declaration of iconv() needs const." >&5
+ echo "$as_me:6921: checking if the declaration of iconv() needs const." >&5
echo $ECHO_N "checking if the declaration of iconv() needs const.... $ECHO_C" >&6
if test "${am_cv_proto_iconv_const+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6167,7 +6925,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-#line 6170 "configure"
+#line 6928 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -6192,16 +6950,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6195: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6953: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6198: \$? = $ac_status" >&5
+ echo "$as_me:6956: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6201: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6959: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6204: \$? = $ac_status" >&5
+ echo "$as_me:6962: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
am_cv_proto_iconv_const=no
else
@@ -6211,7 +6969,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:6214: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:6972: result: $am_cv_proto_iconv_const" >&5
echo "${ECHO_T}$am_cv_proto_iconv_const" >&6
if test "$am_cv_proto_iconv_const" = yes ; then
@@ -6253,7 +7011,7 @@
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 6256 "configure"
+#line 7014 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -6265,16 +7023,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6268: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7026: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6271: \$? = $ac_status" >&5
+ echo "$as_me:7029: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6274: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7032: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6277: \$? = $ac_status" >&5
+ echo "$as_me:7035: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -6291,7 +7049,7 @@
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:6294: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7052: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -6328,7 +7086,7 @@
if test "$cf_have_libdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6
-echo "${as_me:-configure}:6331: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7089: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -6339,13 +7097,13 @@
fi
fi
- echo "$as_me:6342: checking for nl_langinfo and CODESET" >&5
+ echo "$as_me:7100: 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
cat >conftest.$ac_ext <<_ACEOF
-#line 6348 "configure"
+#line 7106 "configure"
#include "confdefs.h"
#include <langinfo.h>
int
@@ -6357,16 +7115,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6360: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7118: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6363: \$? = $ac_status" >&5
+ echo "$as_me:7121: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:6366: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7124: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6369: \$? = $ac_status" >&5
+ echo "$as_me:7127: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
am_cv_langinfo_codeset=yes
else
@@ -6377,7 +7135,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:6380: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:7138: result: $am_cv_langinfo_codeset" >&5
echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
if test $am_cv_langinfo_codeset = yes; then
@@ -6388,13 +7146,13 @@
fi
if test $ac_cv_header_locale_h = yes; then
- echo "$as_me:6391: checking for LC_MESSAGES" >&5
+ echo "$as_me:7149: checking for LC_MESSAGES" >&5
echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
if test "${am_cv_val_LC_MESSAGES+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 6397 "configure"
+#line 7155 "configure"
#include "confdefs.h"
#include <locale.h>
int
@@ -6406,16 +7164,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6409: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7167: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6412: \$? = $ac_status" >&5
+ echo "$as_me:7170: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:6415: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7173: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6418: \$? = $ac_status" >&5
+ echo "$as_me:7176: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
am_cv_val_LC_MESSAGES=yes
else
@@ -6425,7 +7183,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:6428: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:7186: result: $am_cv_val_LC_MESSAGES" >&5
echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
if test $am_cv_val_LC_MESSAGES = yes; then
@@ -6435,7 +7193,7 @@
fi
fi
- echo "$as_me:6438: checking whether NLS is requested" >&5
+ echo "$as_me:7196: 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.
@@ -6445,7 +7203,7 @@
else
USE_NLS=no
fi;
- echo "$as_me:6448: result: $USE_NLS" >&5
+ echo "$as_me:7206: result: $USE_NLS" >&5
echo "${ECHO_T}$USE_NLS" >&6
BUILD_INCLUDED_LIBINTL=no
@@ -6458,7 +7216,7 @@
#define ENABLE_NLS 1
EOF
- echo "$as_me:6461: checking whether included gettext is requested" >&5
+ echo "$as_me:7219: 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.
@@ -6468,7 +7226,7 @@
else
nls_cv_force_use_gnu_gettext=no
fi;
- echo "$as_me:6471: result: $nls_cv_force_use_gnu_gettext" >&5
+ echo "$as_me:7229: 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"
@@ -6477,7 +7235,7 @@
cf_save_LIBS_1="$LIBS"
LIBS="$LIBICONV $LIBS"
- echo "$as_me:6480: checking for libintl.h and gettext()" >&5
+ echo "$as_me:7238: checking for libintl.h and gettext()" >&5
echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6
if test "${cf_cv_func_gettext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6488,12 +7246,12 @@
cf_cv_header_path_intl=
cf_cv_library_path_intl=
-echo "${as_me:-configure}:6491: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:7249: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
cf_save_LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 6496 "configure"
+#line 7254 "configure"
#include "confdefs.h"
#include <libintl.h>
@@ -6513,16 +7271,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6516: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7274: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6519: \$? = $ac_status" >&5
+ echo "$as_me:7277: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:6522: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7280: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6525: \$? = $ac_status" >&5
+ echo "$as_me:7283: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_intl=yes
@@ -6536,7 +7294,7 @@
LIBS="-lintl $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 6539 "configure"
+#line 7297 "configure"
#include "confdefs.h"
#include <libintl.h>
@@ -6556,16 +7314,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6559: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7317: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6562: \$? = $ac_status" >&5
+ echo "$as_me:7320: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:6565: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7323: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6568: \$? = $ac_status" >&5
+ echo "$as_me:7326: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_intl=yes
@@ -6582,9 +7340,9 @@
test -n "$verbose" && echo " find linkage for intl library" 1>&6
-echo "${as_me:-configure}:6585: testing find linkage for intl library ..." 1>&5
+echo "${as_me:-configure}:7343: testing find linkage for intl library ..." 1>&5
-echo "${as_me:-configure}:6587: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:7345: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
cf_save_CPPFLAGS="$CPPFLAGS"
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -6697,11 +7455,11 @@
if test -d $cf_cv_header_path_intl ; then
test -n "$verbose" && echo " ... testing $cf_cv_header_path_intl" 1>&6
-echo "${as_me:-configure}:6700: testing ... testing $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:7458: testing ... testing $cf_cv_header_path_intl ..." 1>&5
CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_intl"
cat >conftest.$ac_ext <<_ACEOF
-#line 6704 "configure"
+#line 7462 "configure"
#include "confdefs.h"
#include <libintl.h>
@@ -6721,21 +7479,21 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6724: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7482: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6727: \$? = $ac_status" >&5
+ echo "$as_me:7485: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6730: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7488: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6733: \$? = $ac_status" >&5
+ echo "$as_me:7491: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found intl headers in $cf_cv_header_path_intl" 1>&6
-echo "${as_me:-configure}:6738: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:7496: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
cf_cv_find_linkage_intl=maybe
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -6753,7 +7511,7 @@
if test "$cf_cv_find_linkage_intl" = maybe ; then
-echo "${as_me:-configure}:6756: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:7514: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
cf_save_LIBS="$LIBS"
cf_save_LDFLAGS="$LDFLAGS"
@@ -6850,13 +7608,13 @@
if test -d $cf_cv_library_path_intl ; then
test -n "$verbose" && echo " ... testing $cf_cv_library_path_intl" 1>&6
-echo "${as_me:-configure}:6853: testing ... testing $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:7611: testing ... testing $cf_cv_library_path_intl ..." 1>&5
CPPFLAGS="$cf_test_CPPFLAGS"
LIBS="-lintl $cf_save_LIBS"
LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_intl"
cat >conftest.$ac_ext <<_ACEOF
-#line 6859 "configure"
+#line 7617 "configure"
#include "confdefs.h"
#include <libintl.h>
@@ -6876,21 +7634,21 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6879: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7637: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6882: \$? = $ac_status" >&5
+ echo "$as_me:7640: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:6885: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7643: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6888: \$? = $ac_status" >&5
+ echo "$as_me:7646: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found intl library in $cf_cv_library_path_intl" 1>&6
-echo "${as_me:-configure}:6893: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:7651: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
cf_cv_find_linkage_intl=yes
cf_cv_library_file_intl="-lintl"
@@ -6930,12 +7688,13 @@
fi
fi
-echo "$as_me:6933: result: $cf_cv_func_gettext" >&5
+echo "$as_me:7691: result: $cf_cv_func_gettext" >&5
echo "${ECHO_T}$cf_cv_func_gettext" >&6
LIBS="$cf_save_LIBS_1"
if test "$cf_cv_func_gettext" = yes ; then
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_LIBINTL_H 1
EOF
@@ -6969,7 +7728,7 @@
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 6972 "configure"
+#line 7731 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -6981,16 +7740,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6984: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7743: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6987: \$? = $ac_status" >&5
+ echo "$as_me:7746: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6990: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7749: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6993: \$? = $ac_status" >&5
+ echo "$as_me:7752: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -7007,7 +7766,7 @@
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:7010: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7769: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -7044,7 +7803,7 @@
if test "$cf_have_libdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6
-echo "${as_me:-configure}:7047: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7806: testing adding $cf_add_libdir to library-path ..." 1>&5
INTLLIBS="-L$cf_add_libdir $INTLLIBS"
fi
@@ -7060,13 +7819,13 @@
for ac_func in dcgettext
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7063: checking for $ac_func" >&5
+echo "$as_me:7822: 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 $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 7069 "configure"
+#line 7828 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -7089,7 +7848,7 @@
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-f = $ac_func;
+f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
#endif
;
@@ -7097,16 +7856,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7100: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7859: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7103: \$? = $ac_status" >&5
+ echo "$as_me:7862: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7106: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7865: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7109: \$? = $ac_status" >&5
+ echo "$as_me:7868: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -7116,7 +7875,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:7119: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7878: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -7131,7 +7890,7 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
-echo "$as_me:7134: checking for $ac_word" >&5
+echo "$as_me:7893: 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
@@ -7158,16 +7917,16 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != ":"; then
- echo "$as_me:7161: result: $MSGFMT" >&5
+ echo "$as_me:7920: result: $MSGFMT" >&5
echo "${ECHO_T}$MSGFMT" >&6
else
- echo "$as_me:7164: result: no" >&5
+ echo "$as_me:7923: 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:7170: checking for $ac_word" >&5
+echo "$as_me:7929: 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
@@ -7184,7 +7943,7 @@
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
- echo "$as_me:7187: found $ac_dir/$ac_word" >&5
+ echo "$as_me:7946: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -7196,10 +7955,10 @@
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
- echo "$as_me:7199: result: $GMSGFMT" >&5
+ echo "$as_me:7958: result: $GMSGFMT" >&5
echo "${ECHO_T}$GMSGFMT" >&6
else
- echo "$as_me:7202: result: no" >&5
+ echo "$as_me:7961: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -7206,7 +7965,7 @@
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
-echo "$as_me:7209: checking for $ac_word" >&5
+echo "$as_me:7968: 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
@@ -7233,10 +7992,10 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
- echo "$as_me:7236: result: $XGETTEXT" >&5
+ echo "$as_me:7995: result: $XGETTEXT" >&5
echo "${ECHO_T}$XGETTEXT" >&6
else
- echo "$as_me:7239: result: no" >&5
+ echo "$as_me:7998: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -7251,7 +8010,7 @@
if test "$nls_cv_use_gnu_gettext" = "yes"; then
if test ! -d $srcdir/intl ; then
- { { echo "$as_me:7254: error: no NLS library is packaged with this application" >&5
+ { { echo "$as_me:8013: error: no NLS library is packaged with this application" >&5
echo "$as_me: error: no NLS library is packaged with this application" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -7259,7 +8018,7 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
-echo "$as_me:7262: checking for $ac_word" >&5
+echo "$as_me:8021: 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
@@ -7286,16 +8045,16 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != ":"; then
- echo "$as_me:7289: result: $MSGFMT" >&5
+ echo "$as_me:8048: result: $MSGFMT" >&5
echo "${ECHO_T}$MSGFMT" >&6
else
- echo "$as_me:7292: result: no" >&5
+ echo "$as_me:8051: 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:7298: checking for $ac_word" >&5
+echo "$as_me:8057: 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
@@ -7312,7 +8071,7 @@
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
- echo "$as_me:7315: found $ac_dir/$ac_word" >&5
+ echo "$as_me:8074: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -7324,10 +8083,10 @@
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
- echo "$as_me:7327: result: $GMSGFMT" >&5
+ echo "$as_me:8086: result: $GMSGFMT" >&5
echo "${ECHO_T}$GMSGFMT" >&6
else
- echo "$as_me:7330: result: no" >&5
+ echo "$as_me:8089: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -7334,7 +8093,7 @@
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
-echo "$as_me:7337: checking for $ac_word" >&5
+echo "$as_me:8096: 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
@@ -7361,10 +8120,10 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
- echo "$as_me:7364: result: $XGETTEXT" >&5
+ echo "$as_me:8123: result: $XGETTEXT" >&5
echo "${ECHO_T}$XGETTEXT" >&6
else
- echo "$as_me:7367: result: no" >&5
+ echo "$as_me:8126: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -7379,7 +8138,7 @@
if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
: ;
else
- echo "$as_me:7382: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+ echo "$as_me:8141: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
GMSGFMT=":"
fi
@@ -7389,7 +8148,7 @@
if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
: ;
else
- echo "$as_me:7392: result: found xgettext program is not GNU xgettext; ignore it" >&5
+ echo "$as_me:8151: 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
@@ -7409,7 +8168,7 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:7412: checking for $ac_word" >&5
+echo "$as_me:8171: 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
@@ -7424,7 +8183,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_INTLBISON="$ac_prog"
-echo "$as_me:7427: found $ac_dir/$ac_word" >&5
+echo "$as_me:8186: found $ac_dir/$ac_word" >&5
break
done
@@ -7432,10 +8191,10 @@
fi
INTLBISON=$ac_cv_prog_INTLBISON
if test -n "$INTLBISON"; then
- echo "$as_me:7435: result: $INTLBISON" >&5
+ echo "$as_me:8194: result: $INTLBISON" >&5
echo "${ECHO_T}$INTLBISON" >&6
else
- echo "$as_me:7438: result: no" >&5
+ echo "$as_me:8197: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -7445,7 +8204,7 @@
if test -z "$INTLBISON"; then
ac_verc_fail=yes
else
- echo "$as_me:7448: checking version of bison" >&5
+ echo "$as_me:8207: 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
@@ -7454,7 +8213,7 @@
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:7457: result: $ac_prog_version" >&5
+ echo "$as_me:8216: result: $ac_prog_version" >&5
echo "${ECHO_T}$ac_prog_version" >&6
fi
if test $ac_verc_fail = yes; then
@@ -7480,7 +8239,7 @@
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
- echo "$as_me:7483: checking for catalogs to be installed" >&5
+ echo "$as_me:8242: checking for catalogs to be installed" >&5
echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
@@ -7500,7 +8259,7 @@
fi
done
LINGUAS=$NEW_LINGUAS
- echo "$as_me:7503: result: $LINGUAS" >&5
+ echo "$as_me:8262: result: $LINGUAS" >&5
echo "${ECHO_T}$LINGUAS" >&6
fi
@@ -7520,7 +8279,8 @@
else
NLS_TEXTDOMAIN=$PACKAGE
fi;
- cat >>confdefs.h <<EOF
+
+cat >>confdefs.h <<EOF
#define NLS_TEXTDOMAIN "$NLS_TEXTDOMAIN"
EOF
@@ -7535,7 +8295,7 @@
use_our_messages=no
if test "$USE_NLS" = yes ; then
if test -d $srcdir/po ; then
-echo "$as_me:7538: checking if we should use included message-library" >&5
+echo "$as_me:8298: checking if we should use included message-library" >&5
echo $ECHO_N "checking if we should use included message-library... $ECHO_C" >&6
# Check whether --enable-included-msgs or --disable-included-msgs was given.
@@ -7546,7 +8306,7 @@
use_our_messages=yes
fi;
fi
-echo "$as_me:7549: result: $use_our_messages" >&5
+echo "$as_me:8309: result: $use_our_messages" >&5
echo "${ECHO_T}$use_our_messages" >&6
fi
@@ -7566,7 +8326,8 @@
INTLDIR_MAKE="#"
fi
if test -z "$INTLDIR_MAKE"; then
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_LIBGETTEXT_H 1
EOF
@@ -7587,23 +8348,23 @@
for ac_header in libintl.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7590: checking for $ac_header" >&5
+echo "$as_me:8351: 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 $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 7596 "configure"
+#line 8357 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:7600: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8361: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:7606: \$? = $ac_status" >&5
+ echo "$as_me:8367: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7622,7 +8383,7 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:7625: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8386: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -7649,18 +8410,21 @@
if test "$USE_INCLUDED_LIBINTL" = yes ; then
if test "$nls_cv_force_use_gnu_gettext" = yes ; then
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_GETTEXT 1
EOF
elif test "$nls_cv_use_gnu_gettext" = yes ; then
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_GETTEXT 1
EOF
fi
if test -n "$nls_cv_header_intl" ; then
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_LIBINTL_H 1
EOF
@@ -7667,7 +8431,7 @@
fi
fi
-echo "$as_me:7670: checking if -lm needed for math functions" >&5
+echo "$as_me:8434: checking if -lm needed for math functions" >&5
echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
if test "${cf_cv_need_libm+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7674,7 +8438,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-#line 7677 "configure"
+#line 8441 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -7689,16 +8453,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7692: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8456: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7695: \$? = $ac_status" >&5
+ echo "$as_me:8459: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7698: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8462: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7701: \$? = $ac_status" >&5
+ echo "$as_me:8465: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_need_libm=no
else
@@ -7708,7 +8472,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:7711: result: $cf_cv_need_libm" >&5
+echo "$as_me:8475: result: $cf_cv_need_libm" >&5
echo "${ECHO_T}$cf_cv_need_libm" >&6
if test "$cf_cv_need_libm" = yes
then
@@ -7717,13 +8481,14 @@
fi
-echo "$as_me:7720: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:8484: checking if you want to use dmalloc for testing" >&5
echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
# Check whether --with-dmalloc or --without-dmalloc was given.
if test "${with_dmalloc+set}" = set; then
withval="$with_dmalloc"
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<EOF
#define USE_DMALLOC 1
EOF
@@ -7733,7 +8498,7 @@
else
with_dmalloc=
fi;
-echo "$as_me:7736: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:8501: result: ${with_dmalloc:-no}" >&5
echo "${ECHO_T}${with_dmalloc:-no}" >&6
case .$with_cflags in #(vi
@@ -7827,23 +8592,23 @@
esac
if test "$with_dmalloc" = yes ; then
- echo "$as_me:7830: checking for dmalloc.h" >&5
+ echo "$as_me:8595: checking for dmalloc.h" >&5
echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
if test "${ac_cv_header_dmalloc_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 7836 "configure"
+#line 8601 "configure"
#include "confdefs.h"
#include <dmalloc.h>
_ACEOF
-if { (eval echo "$as_me:7840: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8605: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:7846: \$? = $ac_status" >&5
+ echo "$as_me:8611: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7862,11 +8627,11 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:7865: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:8630: result: $ac_cv_header_dmalloc_h" >&5
echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
if test $ac_cv_header_dmalloc_h = yes; then
-echo "$as_me:7869: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:8634: checking for dmalloc_debug in -ldmalloc" >&5
echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7874,7 +8639,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldmalloc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 7877 "configure"
+#line 8642 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -7893,16 +8658,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7896: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8661: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7899: \$? = $ac_status" >&5
+ echo "$as_me:8664: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7902: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8667: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7905: \$? = $ac_status" >&5
+ echo "$as_me:8670: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dmalloc_dmalloc_debug=yes
else
@@ -7913,7 +8678,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:7916: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:8681: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
cat >>confdefs.h <<EOF
@@ -7928,13 +8693,14 @@
fi
-echo "$as_me:7931: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:8696: checking if you want to use dbmalloc for testing" >&5
echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
# Check whether --with-dbmalloc or --without-dbmalloc was given.
if test "${with_dbmalloc+set}" = set; then
withval="$with_dbmalloc"
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<EOF
#define USE_DBMALLOC 1
EOF
@@ -7944,7 +8710,7 @@
else
with_dbmalloc=
fi;
-echo "$as_me:7947: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:8713: result: ${with_dbmalloc:-no}" >&5
echo "${ECHO_T}${with_dbmalloc:-no}" >&6
case .$with_cflags in #(vi
@@ -8038,23 +8804,23 @@
esac
if test "$with_dbmalloc" = yes ; then
- echo "$as_me:8041: checking for dbmalloc.h" >&5
+ echo "$as_me:8807: checking for dbmalloc.h" >&5
echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
if test "${ac_cv_header_dbmalloc_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 8047 "configure"
+#line 8813 "configure"
#include "confdefs.h"
#include <dbmalloc.h>
_ACEOF
-if { (eval echo "$as_me:8051: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8817: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:8057: \$? = $ac_status" >&5
+ echo "$as_me:8823: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8073,11 +8839,11 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:8076: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:8842: result: $ac_cv_header_dbmalloc_h" >&5
echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
if test $ac_cv_header_dbmalloc_h = yes; then
-echo "$as_me:8080: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:8846: checking for debug_malloc in -ldbmalloc" >&5
echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8085,7 +8851,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldbmalloc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 8088 "configure"
+#line 8854 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -8104,16 +8870,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8107: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8873: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8110: \$? = $ac_status" >&5
+ echo "$as_me:8876: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8113: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8879: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8116: \$? = $ac_status" >&5
+ echo "$as_me:8882: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dbmalloc_debug_malloc=yes
else
@@ -8124,7 +8890,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:8127: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:8893: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
cat >>confdefs.h <<EOF
@@ -8139,13 +8905,14 @@
fi
-echo "$as_me:8142: checking if you want to use purify for testing" >&5
+echo "$as_me:8908: checking if you want to use purify for testing" >&5
echo $ECHO_N "checking if you want to use purify for testing... $ECHO_C" >&6
# Check whether --with-purify or --without-purify was given.
if test "${with_purify+set}" = set; then
withval="$with_purify"
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<EOF
#define USE_PURIFY 1
EOF
@@ -8155,7 +8922,7 @@
else
with_purify=
fi;
-echo "$as_me:8158: result: ${with_purify:-no}" >&5
+echo "$as_me:8925: result: ${with_purify:-no}" >&5
echo "${ECHO_T}${with_purify:-no}" >&6
case .$with_cflags in #(vi
@@ -8248,13 +9015,14 @@
;;
esac
-echo "$as_me:8251: checking if you want to use valgrind for testing" >&5
+echo "$as_me:9018: checking if you want to use valgrind for testing" >&5
echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
# Check whether --with-valgrind or --without-valgrind was given.
if test "${with_valgrind+set}" = set; then
withval="$with_valgrind"
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<EOF
#define USE_VALGRIND 1
EOF
@@ -8264,7 +9032,7 @@
else
with_valgrind=
fi;
-echo "$as_me:8267: result: ${with_valgrind:-no}" >&5
+echo "$as_me:9035: result: ${with_valgrind:-no}" >&5
echo "${ECHO_T}${with_valgrind:-no}" >&6
case .$with_cflags in #(vi
@@ -8357,13 +9125,14 @@
;;
esac
-echo "$as_me:8360: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:9128: checking if you want to perform memory-leak testing" >&5
echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
# Check whether --with-no-leaks or --without-no-leaks was given.
if test "${with_no_leaks+set}" = set; then
withval="$with_no_leaks"
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define NO_LEAKS 1
EOF
@@ -8370,7 +9139,8 @@
cf_doalloc=".${with_dmalloc}${with_dbmalloc}${with_purify}${with_valgrind}"
case ${cf_doalloc} in #(vi
*yes*) ;;
- *) cat >>confdefs.h <<\EOF
+ *)
+cat >>confdefs.h <<\EOF
#define DOALLOC 10000
EOF
;;
@@ -8379,10 +9149,10 @@
else
with_no_leaks=
fi;
-echo "$as_me:8382: result: $with_no_leaks" >&5
+echo "$as_me:9152: result: $with_no_leaks" >&5
echo "${ECHO_T}$with_no_leaks" >&6
-echo "$as_me:8385: checking if you want --trace option" >&5
+echo "$as_me:9155: checking if you want --trace option" >&5
echo $ECHO_N "checking if you want --trace option... $ECHO_C" >&6
# Check whether --enable-trace or --disable-trace was given.
@@ -8392,11 +9162,12 @@
else
enableval=yes
fi;
-echo "$as_me:8395: result: $enableval" >&5
+echo "$as_me:9165: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
if test "$enableval" != no ; then
EXTRAOBJS="$EXTRAOBJS trace\$o"
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_DLG_TRACE 1
EOF
@@ -8404,9 +9175,170 @@
:
fi
+LD_RPATH_OPT=
+echo "$as_me:9179: checking for an rpath option" >&5
+echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+case $cf_cv_system_name in #(vi
+irix*) #(vi
+ if test "$GCC" = yes; then
+ LD_RPATH_OPT="-Wl,-rpath,"
+ else
+ LD_RPATH_OPT="-rpath "
+ fi
+ ;;
+linux*|gnu*|k*bsd*-gnu) #(vi
+ LD_RPATH_OPT="-Wl,-rpath,"
+ ;;
+openbsd[2-9].*|mirbsd*) #(vi
+ LD_RPATH_OPT="-Wl,-rpath,"
+ ;;
+dragonfly*|freebsd*) #(vi
+ LD_RPATH_OPT="-rpath "
+ ;;
+netbsd*) #(vi
+ LD_RPATH_OPT="-Wl,-rpath,"
+ ;;
+osf*|mls+*) #(vi
+ LD_RPATH_OPT="-rpath "
+ ;;
+solaris2*) #(vi
+ LD_RPATH_OPT="-R"
+ ;;
+*)
+ ;;
+esac
+echo "$as_me:9210: result: $LD_RPATH_OPT" >&5
+echo "${ECHO_T}$LD_RPATH_OPT" >&6
+
+case "x$LD_RPATH_OPT" in #(vi
+x-R*)
+ echo "$as_me:9215: checking if we need a space after rpath option" >&5
+echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
+ cf_save_LIBS="$LIBS"
+ LIBS="${LD_RPATH_OPT}$libdir $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 9220 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:9232: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:9235: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:9238: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:9241: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_rpath_space=no
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_rpath_space=yes
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS="$cf_save_LIBS"
+ echo "$as_me:9251: result: $cf_rpath_space" >&5
+echo "${ECHO_T}$cf_rpath_space" >&6
+ test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ ;;
+esac
+
+REL_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}
+ABI_VERSION=`echo "$VERSION" |sed -e 's/:/./g'`
+cf_cv_rel_version=$REL_VERSION
+
+test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
+
+# Check whether --with-rel-version or --without-rel-version was given.
+if test "${with_rel_version+set}" = set; then
+ withval="$with_rel_version"
+ { echo "$as_me:9266: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
+echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;}
+ cf_cv_rel_version=$withval
+fi;
+
+ DIALOG_MAJOR=`echo "$cf_cv_rel_version" | sed -e 's/\..*//'`
+ DIALOG_MINOR=`echo "$cf_cv_rel_version" | sed -e 's/^[^.]*//' -e 's/^\.//' -e 's/\..*//'`
+
+if test -n "$DIALOG_MAJOR" ; then
+ case $DIALOG_MAJOR in #(vi
+ [0-9]*) #(vi
+ ;;
+ *)
+ { { echo "$as_me:9279: error: Release major-version is not a number: $DIALOG_MAJOR" >&5
+echo "$as_me: error: Release major-version is not a number: $DIALOG_MAJOR" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+else
+ { { echo "$as_me:9285: error: Release major-version value is empty" >&5
+echo "$as_me: error: Release major-version value is empty" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+if test -n "$DIALOG_MINOR" ; then
+ case $DIALOG_MINOR in #(vi
+ [0-9]*) #(vi
+ ;;
+ *)
+ { { echo "$as_me:9295: error: Release minor-version is not a number: $DIALOG_MINOR" >&5
+echo "$as_me: error: Release minor-version is not a number: $DIALOG_MINOR" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+else
+ { { echo "$as_me:9301: error: Release minor-version value is empty" >&5
+echo "$as_me: error: Release minor-version value is empty" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+test -z "$cf_cv_abi_version" && cf_cv_abi_version=0
+
+# Check whether --with-abi-version or --without-abi-version was given.
+if test "${with_abi_version+set}" = set; then
+ withval="$with_abi_version"
+ { echo "$as_me:9311: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
+echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
+ cf_cv_abi_version=$withval
+fi;
+
+if test -n "$cf_cv_abi_version" ; then
+ case $cf_cv_abi_version in #(vi
+ [0-9]*) #(vi
+ ;;
+ *)
+ { { echo "$as_me:9321: error: ABI version is not a number: $cf_cv_abi_version" >&5
+echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+else
+ { { echo "$as_me:9327: error: ABI version value is empty" >&5
+echo "$as_me: error: ABI version value is empty" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+LIB_MODEL=static
+DFT_LWR_MODEL=$LIB_MODEL
LIBTOOL_MAKE="#"
-echo "$as_me:8409: checking if libtool -version-number should be used" >&5
+# use to comment-out makefile lines
+MAKE_NORMAL=
+MAKE_STATIC=
+MAKE_SHARED="#"
+
+echo "$as_me:9341: checking if libtool -version-number should be used" >&5
echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6
# Check whether --enable-libtool-version or --disable-libtool-version was given.
@@ -8423,7 +9355,7 @@
cf_libtool_version=yes
fi;
-echo "$as_me:8426: result: $cf_libtool_version" >&5
+echo "$as_me:9358: result: $cf_libtool_version" >&5
echo "${ECHO_T}$cf_libtool_version" >&6
if test "$cf_libtool_version" = yes ; then
@@ -8448,7 +9380,7 @@
LIB_INSTALL=
LIB_UNINSTALL=
-echo "$as_me:8451: checking if you want to build libraries with libtool" >&5
+echo "$as_me:9383: checking if you want to build libraries with libtool" >&5
echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
# Check whether --with-libtool or --without-libtool was given.
@@ -8458,7 +9390,7 @@
else
with_libtool=no
fi;
-echo "$as_me:8461: result: $with_libtool" >&5
+echo "$as_me:9393: result: $with_libtool" >&5
echo "${ECHO_T}$with_libtool" >&6
if test "$with_libtool" != "no"; then
@@ -8477,7 +9409,7 @@
;;
.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
;;
-.\${*prefix}*) #(vi
+.\${*prefix}*|.\${*dir}*) #(vi
eval with_libtool="$with_libtool"
case ".$with_libtool" in #(vi
.NONE/*)
@@ -8489,7 +9421,7 @@
with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:8492: error: expected a pathname, not \"$with_libtool\"" >&5
+ { { echo "$as_me:9424: error: expected a pathname, not \"$with_libtool\"" >&5
echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
{ (exit 1); exit 1; }; }
;;
@@ -8497,46 +9429,195 @@
LIBTOOL=$with_libtool
else
- # Extract the first word of "libtool", so it can be a program name with args.
-set dummy libtool; ac_word=$2
-echo "$as_me:8502: checking for $ac_word" >&5
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in libtool glibtool
+ 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:9437: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_LIBTOOL+set}" = set; then
+if test "${ac_cv_prog_LIBTOOL+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case $LIBTOOL in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_LIBTOOL="$LIBTOOL" # Let the user override the test with a path.
- ;;
- *)
+ if test -n "$LIBTOOL"; then
+ ac_cv_prog_LIBTOOL="$LIBTOOL" # Let the user override the test.
+else
ac_save_IFS=$IFS; IFS=$ac_path_separator
ac_dummy="$PATH"
for ac_dir in $ac_dummy; do
IFS=$ac_save_IFS
test -z "$ac_dir" && ac_dir=.
- if $as_executable_p "$ac_dir/$ac_word"; then
- ac_cv_path_LIBTOOL="$ac_dir/$ac_word"
- echo "$as_me:8519: found $ac_dir/$ac_word" >&5
- break
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
+echo "$as_me:9452: found $ac_dir/$ac_word" >&5
+break
+done
+
fi
+fi
+LIBTOOL=$ac_cv_prog_LIBTOOL
+if test -n "$LIBTOOL"; then
+ echo "$as_me:9460: result: $LIBTOOL" >&5
+echo "${ECHO_T}$LIBTOOL" >&6
+else
+ echo "$as_me:9463: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ test -n "$LIBTOOL" && break
+ done
+fi
+if test -z "$LIBTOOL"; then
+ ac_ct_LIBTOOL=$LIBTOOL
+ for ac_prog in libtool glibtool
+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:9476: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_LIBTOOL"; then
+ ac_cv_prog_ac_ct_LIBTOOL="$ac_ct_LIBTOOL" # Let the user override the test.
+else
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
+echo "$as_me:9491: found $ac_dir/$ac_word" >&5
+break
done
- ;;
-esac
fi
-LIBTOOL=$ac_cv_path_LIBTOOL
+fi
+ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+if test -n "$ac_ct_LIBTOOL"; then
+ echo "$as_me:9499: result: $ac_ct_LIBTOOL" >&5
+echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+else
+ echo "$as_me:9502: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+ test -n "$ac_ct_LIBTOOL" && break
+done
+test -n "$ac_ct_LIBTOOL" || ac_ct_LIBTOOL="none"
+
+ LIBTOOL=$ac_ct_LIBTOOL
+fi
+
+if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+then
+ cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'`
+else
+ cf_cv_libtool_version=
+fi
+test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+
+ if test -z "$cf_cv_libtool_version" && test "$LIBTOOL" = libtool
+ then
+
+unset ac_cv_prog_ac_ct_LIBTOOL
+unset ac_ct_LIBTOOL
+unset LIBTOOL
+
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in glibtool
+ 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:9533: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_LIBTOOL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$LIBTOOL"; then
+ ac_cv_prog_LIBTOOL="$LIBTOOL" # Let the user override the test.
+else
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
+echo "$as_me:9548: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+LIBTOOL=$ac_cv_prog_LIBTOOL
if test -n "$LIBTOOL"; then
- echo "$as_me:8530: result: $LIBTOOL" >&5
+ echo "$as_me:9556: result: $LIBTOOL" >&5
echo "${ECHO_T}$LIBTOOL" >&6
else
- echo "$as_me:8533: result: no" >&5
+ echo "$as_me:9559: result: no" >&5
echo "${ECHO_T}no" >&6
fi
+ test -n "$LIBTOOL" && break
+ done
+fi
+if test -z "$LIBTOOL"; then
+ ac_ct_LIBTOOL=$LIBTOOL
+ for ac_prog in glibtool
+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:9572: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_LIBTOOL"; then
+ ac_cv_prog_ac_ct_LIBTOOL="$ac_ct_LIBTOOL" # Let the user override the test.
+else
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
+echo "$as_me:9587: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+if test -n "$ac_ct_LIBTOOL"; then
+ echo "$as_me:9595: result: $ac_ct_LIBTOOL" >&5
+echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+else
+ echo "$as_me:9598: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ test -n "$ac_ct_LIBTOOL" && break
+done
+test -n "$ac_ct_LIBTOOL" || ac_ct_LIBTOOL="none"
+
+ LIBTOOL=$ac_ct_LIBTOOL
+fi
+
+if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+then
+ cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'`
+else
+ cf_cv_libtool_version=
+fi
+test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+
+ fi
fi
if test -z "$LIBTOOL" ; then
- { { echo "$as_me:8539: error: Cannot find libtool" >&5
+ { { echo "$as_me:9620: error: Cannot find libtool" >&5
echo "$as_me: error: Cannot find libtool" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -8550,26 +9631,36 @@
LIB_UNINSTALL='${LIBTOOL} --mode=uninstall'
LIB_PREP=:
- # Show the version of libtool
- echo "$as_me:8554: checking version of libtool" >&5
-echo $ECHO_N "checking version of libtool... $ECHO_C" >&6
+if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+then
+ echo "$as_me:9636: checking version of $LIBTOOL" >&5
+echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
- # Save the version in a cache variable - this is not entirely a good
- # thing, but the version string from libtool is very ugly, and for
- # bug reports it might be useful to have the original string. "("
+if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+then
cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'`
- echo "$as_me:8561: result: $cf_cv_libtool_version" >&5
+else
+ cf_cv_libtool_version=
+fi
+test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+
+ echo "$as_me:9647: result: $cf_cv_libtool_version" >&5
echo "${ECHO_T}$cf_cv_libtool_version" >&6
if test -z "$cf_cv_libtool_version" ; then
- { { echo "$as_me:8564: error: This is not GNU libtool" >&5
+ { { echo "$as_me:9650: error: This is not GNU libtool" >&5
echo "$as_me: error: This is not GNU libtool" >&2;}
{ (exit 1); exit 1; }; }
fi
+else
+ { { echo "$as_me:9655: error: GNU libtool has not been found" >&5
+echo "$as_me: error: GNU libtool has not been found" >&2;}
+ { (exit 1); exit 1; }; }
+fi
# special hack to add -no-undefined (which libtool should do for itself)
LT_UNDEF=
case "$cf_cv_system_name" in #(vi
- cygwin*|mingw32*|uwin*|aix[4-7]) #(vi
+ cygwin*|msys*|mingw32*|uwin*|aix[4-7]) #(vi
LT_UNDEF=-no-undefined
;;
esac
@@ -8591,11 +9682,15 @@
test -z "$LIBTOOL" && ECHO_LT=
+LIB_CREATE="$LIB_CREATE \$@"
+
if test "$with_libtool" = "yes" ; then
OBJEXT="lo"
+ LIB_MODEL=libtool
+ DFT_LWR_MODEL=$LIB_MODEL
LIBTOOL_MAKE=
-echo "$as_me:8598: checking for additional libtool options" >&5
+echo "$as_me:9693: checking for additional libtool options" >&5
echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6
# Check whether --with-libtool-opts or --without-libtool-opts was given.
@@ -8605,7 +9700,7 @@
else
with_libtool_opts=no
fi;
-echo "$as_me:8608: result: $with_libtool_opts" >&5
+echo "$as_me:9703: result: $with_libtool_opts" >&5
echo "${ECHO_T}$with_libtool_opts" >&6
case .$with_libtool_opts in
@@ -8616,9 +9711,618 @@
;;
esac
+ MAKE_NORMAL="#"
+ MAKE_STATIC="#"
+ MAKE_SHARED=
+else
+ echo "$as_me:9718: checking if you want to build shared libraries" >&5
+echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
+
+# Check whether --with-shared or --without-shared was given.
+if test "${with_shared+set}" = set; then
+ withval="$with_shared"
+ with_shared=$withval
+else
+ with_shared=no
+fi;
+ echo "$as_me:9728: result: $with_shared" >&5
+echo "${ECHO_T}$with_shared" >&6
+ if test "$with_shared" = "yes" ; then
+ LIB_MODEL=shared
+ DFT_LWR_MODEL=$LIB_MODEL
+
+ RM_SHARED_OPTS=
+ LOCAL_LDFLAGS=
+ LOCAL_LDFLAGS2=
+ LD_SHARED_OPTS=
+ INSTALL_LIB="-m 644"
+ : ${rel_builddir:=.}
+
+ cf_cv_do_symlinks=no
+ cf_ld_rpath_opt=
+ test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+
+ echo "$as_me:9745: checking if release/abi version should be used for shared libs" >&5
+echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
+
+# Check whether --with-shlib-version or --without-shlib-version was given.
+if test "${with_shlib_version+set}" = set; then
+ withval="$with_shlib_version"
+ test -z "$withval" && withval=auto
+ case $withval in #(vi
+ yes) #(vi
+ cf_cv_shlib_version=auto
+ ;;
+ rel|abi|auto|no) #(vi
+ cf_cv_shlib_version=$withval
+ ;;
+ *)
+ { { echo "$as_me:9760: error: option value must be one of: rel, abi, auto or no" >&5
+echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+
+else
+ cf_cv_shlib_version=auto
+fi;
+ echo "$as_me:9769: result: $cf_cv_shlib_version" >&5
+echo "${ECHO_T}$cf_cv_shlib_version" >&6
+
+ cf_cv_rm_so_locs=no
+ cf_try_cflags=
+
+ # Some less-capable ports of gcc support only -fpic
+ CC_SHARED_OPTS=
+ if test "$GCC" = yes
+ then
+ echo "$as_me:9779: checking which $CC option to use" >&5
+echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
+ cf_save_CFLAGS="$CFLAGS"
+ for CC_SHARED_OPTS in -fPIC -fpic ''
+ do
+ CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 9786 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int
+main ()
+{
+int x = 1
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:9798: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:9801: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:9804: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:9807: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ break
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ echo "$as_me:9816: result: $CC_SHARED_OPTS" >&5
+echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ CFLAGS="$cf_save_CFLAGS"
+ fi
-echo "$as_me:8621: checking for specific curses-directory" >&5
+ cf_cv_shlib_version_infix=no
+
+ case $cf_cv_system_name in #(vi
+ aix4.3-9*|aix[5-7]*) #(vi
+ if test "$GCC" = yes; then
+ CC_SHARED_OPTS=
+ MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@'
+ else
+ # CC_SHARED_OPTS='-qpic=large -G'
+ # perhaps "-bM:SRE -bnoentry -bexpall"
+ MK_SHARED_LIB='${CC} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@'
+ fi
+ ;;
+ beos*) #(vi
+ MK_SHARED_LIB='${CC} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0'
+ ;;
+ cygwin*) #(vi
+ CC_SHARED_OPTS=
+ MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh $@ ${CC} ${CFLAGS}'
+ RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
+ cf_cv_shlib_version=cygdll
+ cf_cv_shlib_version_infix=cygdll
+ cat >mk_shared_lib.sh <<-CF_EOF
+ #!/bin/sh
+ SHARED_LIB=\$1
+ IMPORT_LIB=\`echo "\$1" | sed -e 's/cyg/lib/' -e 's/[0-9]*\.dll$/.dll.a/'\`
+ shift
+ cat <<-EOF
+ Linking shared library
+ ** SHARED_LIB \$SHARED_LIB
+ ** IMPORT_LIB \$IMPORT_LIB
+EOF
+ exec \$* -shared -Wl,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB}
+CF_EOF
+ chmod +x mk_shared_lib.sh
+ ;;
+ msys*) #(vi
+ CC_SHARED_OPTS=
+ MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh $@ ${CC} ${CFLAGS}'
+ RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
+ cf_cv_shlib_version=msysdll
+ cf_cv_shlib_version_infix=msysdll
+ cat >mk_shared_lib.sh <<-CF_EOF
+ #!/bin/sh
+ SHARED_LIB=\$1
+ IMPORT_LIB=\`echo "\$1" | sed -e 's/msys-/lib/' -e 's/[0-9]*\.dll$/.dll.a/'\`
+ shift
+ cat <<-EOF
+ Linking shared library
+ ** SHARED_LIB \$SHARED_LIB
+ ** IMPORT_LIB \$IMPORT_LIB
+EOF
+ exec \$* -shared -Wl,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB}
+CF_EOF
+ chmod +x mk_shared_lib.sh
+ ;;
+ darwin*) #(vi
+ cf_try_cflags="no-cpp-precomp"
+ CC_SHARED_OPTS="-dynamic"
+ MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
+ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
+ cf_cv_shlib_version_infix=yes
+ echo "$as_me:9883: checking if ld -search_paths_first works" >&5
+echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
+if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ cf_save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 9892 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+int i;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:9904: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:9907: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:9910: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:9913: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_ldflags_search_paths_first=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_ldflags_search_paths_first=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS=$cf_save_LDFLAGS
+fi
+echo "$as_me:9924: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
+ if test $cf_cv_ldflags_search_paths_first = yes; then
+ LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ fi
+ ;;
+ hpux[7-8]*) #(vi
+ # HP-UX 8.07 ld lacks "+b" option used for libdir search-list
+ if test "$GCC" != yes; then
+ CC_SHARED_OPTS='+Z'
+ fi
+ MK_SHARED_LIB='${LD} -b -o $@'
+ INSTALL_LIB="-m 555"
+ ;;
+ hpux*) #(vi
+ # (tested with gcc 2.7.2 -- I don't have c89)
+ if test "$GCC" = yes; then
+ LD_SHARED_OPTS='-Xlinker +b -Xlinker ${libdir}'
+ else
+ CC_SHARED_OPTS='+Z'
+ LD_SHARED_OPTS='-Wl,+b,${libdir}'
+ fi
+ MK_SHARED_LIB='${LD} +b ${libdir} -b -o $@'
+ # HP-UX shared libraries must be executable, and should be
+ # readonly to exploit a quirk in the memory manager.
+ INSTALL_LIB="-m 555"
+ ;;
+ interix*)
+ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
+ if test "$cf_cv_shlib_version" = rel; then
+ cf_shared_soname='`basename .${REL_VERSION}`.${ABI_VERSION}'
+ else
+ cf_shared_soname='`basename `'
+ fi
+ CC_SHARED_OPTS=
+ MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o '
+ ;;
+ irix*) #(vi
+ if test "$cf_cv_enable_rpath" = yes ; then
+ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
+ fi
+ # tested with IRIX 5.2 and 'cc'.
+ if test "$GCC" != yes; then
+ CC_SHARED_OPTS='-KPIC'
+ MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $@` -o $@'
+ else
+ MK_SHARED_LIB='${CC} -shared -Wl,-soname,`basename $@` -o $@'
+ fi
+ cf_cv_rm_so_locs=yes
+ ;;
+ linux*|gnu*|k*bsd*-gnu) #(vi
+ if test "$DFT_LWR_MODEL" = "shared" ; then
+ LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ fi
+ if test "$cf_cv_enable_rpath" = yes ; then
+ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
+ fi
+
+ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
+ if test "$cf_cv_shlib_version" = rel; then
+ cf_cv_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
+ else
+ cf_cv_shared_soname='`basename $@`'
+ fi
+
+ MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
+ ;;
+ mingw*) #(vi
+ cf_cv_shlib_version=mingw
+ cf_cv_shlib_version_infix=mingw
+ if test "$DFT_LWR_MODEL" = "shared" ; then
+ LOCAL_LDFLAGS="-Wl,--enable-auto-import"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ EXTRA_LDFLAGS="-Wl,--enable-auto-import $EXTRA_LDFLAGS"
+ fi
+ CC_SHARED_OPTS=
+ MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh $@ ${CC} ${CFLAGS}'
+ RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
+ cat >mk_shared_lib.sh <<-CF_EOF
+ #!/bin/sh
+ SHARED_LIB=\$1
+ IMPORT_LIB=\`echo "\$1" | sed -e 's/[0-9]*\.dll$/.dll.a/'\`
+ shift
+ cat <<-EOF
+ Linking shared library
+ ** SHARED_LIB \$SHARED_LIB
+ ** IMPORT_LIB \$IMPORT_LIB
+EOF
+ exec \$* -shared -Wl,--enable-auto-import,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB}
+CF_EOF
+ chmod +x mk_shared_lib.sh
+ ;;
+ openbsd[2-9].*|mirbsd*) #(vi
+ if test "$DFT_LWR_MODEL" = "shared" ; then
+ LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ fi
+ if test "$cf_cv_enable_rpath" = yes ; then
+ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
+ fi
+ CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
+
+ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
+ if test "$cf_cv_shlib_version" = rel; then
+ cf_cv_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
+ else
+ cf_cv_shared_soname='`basename $@`'
+ fi
+
+ MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
+ ;;
+ nto-qnx*|openbsd*|freebsd[12].*) #(vi
+ CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
+ MK_SHARED_LIB='${LD} -Bshareable -o $@'
+ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
+ ;;
+ dragonfly*|freebsd*) #(vi
+ CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
+ if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
+ LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
+ LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${RPATH_LIST} $LOCAL_LDFLAGS"
+ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
+ fi
+
+ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
+ if test "$cf_cv_shlib_version" = rel; then
+ cf_cv_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
+ else
+ cf_cv_shared_soname='`basename $@`'
+ fi
+
+ MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $@` -o $@'
+ ;;
+ netbsd*) #(vi
+ CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
+ if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
+ LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
+ if test "$cf_cv_shlib_version" = auto; then
+ if test -f /usr/libexec/ld.elf_so; then
+ cf_cv_shlib_version=abi
+ else
+ cf_cv_shlib_version=rel
+ fi
+ fi
+
+ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
+ if test "$cf_cv_shlib_version" = rel; then
+ cf_cv_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
+ else
+ cf_cv_shared_soname='`basename $@`'
+ fi
+
+ MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@'
+ else
+ MK_SHARED_LIB='${CC} -Wl,-shared -Wl,-Bshareable -o $@'
+ fi
+ ;;
+ osf*|mls+*) #(vi
+ # tested with OSF/1 V3.2 and 'cc'
+ # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't
+ # link with shared libs).
+ MK_SHARED_LIB='${LD} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $@`'
+ case $host_os in #(vi
+ osf4*)
+ MK_SHARED_LIB="${MK_SHARED_LIB} -msym"
+ ;;
+ esac
+ MK_SHARED_LIB="${MK_SHARED_LIB}"' -o $@'
+ if test "$DFT_LWR_MODEL" = "shared" ; then
+ LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ fi
+ cf_cv_rm_so_locs=yes
+ ;;
+ sco3.2v5*) # (also uw2* and UW7: hops 13-Apr-98
+ # tested with osr5.0.5
+ if test "$GCC" != yes; then
+ CC_SHARED_OPTS='-belf -KPIC'
+ fi
+ MK_SHARED_LIB='${LD} -dy -G -h `basename $@ .${REL_VERSION}`.${ABI_VERSION} -o $@'
+ if test "$cf_cv_enable_rpath" = yes ; then
+ # only way is to set LD_RUN_PATH but no switch for it
+ RUN_PATH=$libdir
+ fi
+ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
+ LINK_PROGS='LD_RUN_PATH=${libdir}'
+ LINK_TESTS='Pwd=`pwd`;LD_RUN_PATH=`dirname $${Pwd}`/lib'
+ ;;
+ sunos4*) #(vi
+ # tested with SunOS 4.1.1 and gcc 2.7.0
+ if test "$GCC" != yes; then
+ CC_SHARED_OPTS='-KPIC'
+ fi
+ MK_SHARED_LIB='${LD} -assert pure-text -o $@'
+ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
+ ;;
+ solaris2*) #(vi
+ # tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2
+ # tested with SunOS 5.10 (solaris 10) and gcc 3.4.3
+ if test "$DFT_LWR_MODEL" = "shared" ; then
+ LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ fi
+ if test "$cf_cv_enable_rpath" = yes ; then
+ EXTRA_LDFLAGS="-R \${libdir} $EXTRA_LDFLAGS"
+ fi
+
+ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
+ if test "$cf_cv_shlib_version" = rel; then
+ cf_cv_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
+ else
+ cf_cv_shared_soname='`basename $@`'
+ fi
+
+ if test "$GCC" != yes; then
+ cf_save_CFLAGS="$CFLAGS"
+ for cf_shared_opts in -xcode=pic32 -xcode=pic13 -KPIC -Kpic -O
+ do
+ CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 10147 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int
+main ()
+{
+printf("Hello\n");
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:10159: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:10162: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:10165: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:10168: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ break
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ CFLAGS="$cf_save_CFLAGS"
+ CC_SHARED_OPTS=$cf_shared_opts
+ MK_SHARED_LIB='${CC} -dy -G -h '$cf_cv_shared_soname' -o $@'
+ else
+ MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $@'
+ fi
+ ;;
+ sysv5uw7*|unix_sv*) #(vi
+ # tested with UnixWare 7.1.0 (gcc 2.95.2 and cc)
+ if test "$GCC" != yes; then
+ CC_SHARED_OPTS='-KPIC'
+ fi
+ MK_SHARED_LIB='${LD} -d y -G -o $@'
+ ;;
+ *)
+ CC_SHARED_OPTS='unknown'
+ MK_SHARED_LIB='echo unknown'
+ ;;
+ esac
+
+ # This works if the last tokens in $MK_SHARED_LIB are the -o target.
+ case "$cf_cv_shlib_version" in #(vi
+ rel|abi)
+ case "$MK_SHARED_LIB" in #(vi
+ *'-o $@') #(vi
+ test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ ;;
+ *)
+ { echo "$as_me:10205: WARNING: ignored --with-shlib-version" >&5
+echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ ;;
+ esac
+ ;;
+ esac
+
+ if test -n "$cf_try_cflags"
+ then
+cat > conftest.$ac_ext <<EOF
+#line 10215 "${as_me:-configure}"
+#include <stdio.h>
+int main(int argc, char *argv[])
+{
+ printf("hello\n");
+ return (argv[argc-1] == 0) ;
+}
+EOF
+ cf_save_CFLAGS="$CFLAGS"
+ for cf_opt in $cf_try_cflags
+ do
+ CFLAGS="$cf_save_CFLAGS -$cf_opt"
+ echo "$as_me:10227: checking if CFLAGS option -$cf_opt works" >&5
+echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
+ if { (eval echo "$as_me:10229: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:10232: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ echo "$as_me:10234: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ cf_save_CFLAGS="$CFLAGS"
+ else
+ echo "$as_me:10238: result: no" >&5
+echo "${ECHO_T}no" >&6
+ fi
+ done
+ CFLAGS="$cf_save_CFLAGS"
+ fi
+
+ # RPATH_LIST is a colon-separated list of directories
+ test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}"
+ test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}"
+
+ test $cf_cv_rm_so_locs = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations"
+
+ test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+
+echo "${as_me:-configure}:10253: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+
+ test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6
+
+echo "${as_me:-configure}:10257: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
+
+ LIB_PREP=:
+ LIB_CREATE="$MK_SHARED_LIB"
+ CFLAGS="$CFLAGS $CC_SHARED_OPTS"
+ MAKE_NORMAL="#"
+ MAKE_STATIC="#"
+ MAKE_SHARED=
+ fi
+fi
+
+LIB_SUFFIX=
+
+ case X$LIB_MODEL in #(vi
+ Xlibtool) #(vi
+ DFT_LIB_SUFFIX='.la'
+ DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ ;;
+ Xdebug) #(vi
+ DFT_LIB_SUFFIX='_g.a'
+ DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ ;;
+ Xprofile) #(vi
+ DFT_LIB_SUFFIX='_p.a'
+ DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ ;;
+ Xshared) #(vi
+ case $cf_cv_system_name in
+ aix[5-7]*) #(vi
+ DFT_LIB_SUFFIX='.a'
+ DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ ;;
+ cygwin*|msys*|mingw*) #(vi
+ DFT_LIB_SUFFIX='.dll'
+ DFT_DEP_SUFFIX='.dll.a'
+ ;;
+ darwin*) #(vi
+ DFT_LIB_SUFFIX='.dylib'
+ DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ ;;
+ hpux*) #(vi
+ case $target in
+ ia64*) #(vi
+ DFT_LIB_SUFFIX='.so'
+ DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ ;;
+ *) #(vi
+ DFT_LIB_SUFFIX='.sl'
+ DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ ;;
+ esac
+ ;;
+ *) #(vi
+ DFT_LIB_SUFFIX='.so'
+ DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ ;;
+ esac
+ ;;
+ *)
+ DFT_LIB_SUFFIX='.a'
+ DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ ;;
+ esac
+ test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}"
+ test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
+
+LIB_SUFFIX=$DFT_LIB_SUFFIX
+
+echo "$as_me:10325: checking for specific curses-directory" >&5
echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
# Check whether --with-curses-dir or --without-curses-dir was given.
@@ -8628,7 +10332,7 @@
else
cf_cv_curses_dir=no
fi;
-echo "$as_me:8631: result: $cf_cv_curses_dir" >&5
+echo "$as_me:10335: result: $cf_cv_curses_dir" >&5
echo "${ECHO_T}$cf_cv_curses_dir" >&6
if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
@@ -8647,7 +10351,7 @@
;;
.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
;;
-.\${*prefix}*) #(vi
+.\${*prefix}*|.\${*dir}*) #(vi
eval withval="$withval"
case ".$withval" in #(vi
.NONE/*)
@@ -8659,7 +10363,7 @@
withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:8662: error: expected a pathname, not \"$withval\"" >&5
+ { { echo "$as_me:10366: error: expected a pathname, not \"$withval\"" >&5
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
{ (exit 1); exit 1; }; }
;;
@@ -8692,7 +10396,7 @@
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 8695 "configure"
+#line 10399 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -8704,16 +10408,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8707: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10411: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:8710: \$? = $ac_status" >&5
+ echo "$as_me:10414: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:8713: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10417: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8716: \$? = $ac_status" >&5
+ echo "$as_me:10420: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -8730,7 +10434,7 @@
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:8733: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10437: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -8764,7 +10468,7 @@
if test "$cf_have_libdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6
-echo "${as_me:-configure}:8767: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:10471: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -8775,6 +10479,19 @@
fi
fi
+echo "$as_me:10482: checking if rpath option should be used" >&5
+echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
+
+# Check whether --enable-rpath or --disable-rpath was given.
+if test "${enable_rpath+set}" = set; then
+ enableval="$enable_rpath"
+ cf_cv_enable_rpath=$enableval
+else
+ cf_cv_enable_rpath=no
+fi;
+echo "$as_me:10492: result: $cf_cv_enable_rpath" >&5
+echo "${ECHO_T}$cf_cv_enable_rpath" >&6
+
use_ncurses=no
# Check whether --with-ncurses or --without-ncurses was given.
@@ -8792,7 +10509,7 @@
cf_wide_curses=yes
if test $use_ncurses = ncursesw ; then
-echo "$as_me:8795: checking for multibyte character support" >&5
+echo "$as_me:10512: checking for multibyte character support" >&5
echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
if test "${cf_cv_utf8_lib+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8800,7 +10517,7 @@
cf_save_LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 8803 "configure"
+#line 10520 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -8813,16 +10530,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8816: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10533: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8819: \$? = $ac_status" >&5
+ echo "$as_me:10536: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8822: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10539: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8825: \$? = $ac_status" >&5
+ echo "$as_me:10542: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_utf8_lib=yes
else
@@ -8834,12 +10551,12 @@
cf_cv_header_path_utf8=
cf_cv_library_path_utf8=
-echo "${as_me:-configure}:8837: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:10554: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
cf_save_LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 8842 "configure"
+#line 10559 "configure"
#include "confdefs.h"
#include <libutf8.h>
@@ -8852,16 +10569,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8855: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10572: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8858: \$? = $ac_status" >&5
+ echo "$as_me:10575: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8861: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10578: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8864: \$? = $ac_status" >&5
+ echo "$as_me:10581: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_utf8=yes
@@ -8875,7 +10592,7 @@
LIBS="-lutf8 $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 8878 "configure"
+#line 10595 "configure"
#include "confdefs.h"
#include <libutf8.h>
@@ -8888,16 +10605,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8891: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10608: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8894: \$? = $ac_status" >&5
+ echo "$as_me:10611: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8897: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10614: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8900: \$? = $ac_status" >&5
+ echo "$as_me:10617: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_utf8=yes
@@ -8914,9 +10631,9 @@
test -n "$verbose" && echo " find linkage for utf8 library" 1>&6
-echo "${as_me:-configure}:8917: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:10634: testing find linkage for utf8 library ..." 1>&5
-echo "${as_me:-configure}:8919: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:10636: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
cf_save_CPPFLAGS="$CPPFLAGS"
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -9029,11 +10746,11 @@
if test -d $cf_cv_header_path_utf8 ; then
test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6
-echo "${as_me:-configure}:9032: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:10749: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
cat >conftest.$ac_ext <<_ACEOF
-#line 9036 "configure"
+#line 10753 "configure"
#include "confdefs.h"
#include <libutf8.h>
@@ -9046,21 +10763,21 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9049: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10766: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9052: \$? = $ac_status" >&5
+ echo "$as_me:10769: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9055: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10772: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9058: \$? = $ac_status" >&5
+ echo "$as_me:10775: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
-echo "${as_me:-configure}:9063: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:10780: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
cf_cv_find_linkage_utf8=maybe
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -9078,7 +10795,7 @@
if test "$cf_cv_find_linkage_utf8" = maybe ; then
-echo "${as_me:-configure}:9081: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:10798: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
cf_save_LIBS="$LIBS"
cf_save_LDFLAGS="$LDFLAGS"
@@ -9175,13 +10892,13 @@
if test -d $cf_cv_library_path_utf8 ; then
test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6
-echo "${as_me:-configure}:9178: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:10895: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
CPPFLAGS="$cf_test_CPPFLAGS"
LIBS="-lutf8 $cf_save_LIBS"
LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
cat >conftest.$ac_ext <<_ACEOF
-#line 9184 "configure"
+#line 10901 "configure"
#include "confdefs.h"
#include <libutf8.h>
@@ -9194,21 +10911,21 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9197: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10914: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:9200: \$? = $ac_status" >&5
+ echo "$as_me:10917: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:9203: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10920: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9206: \$? = $ac_status" >&5
+ echo "$as_me:10923: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6
-echo "${as_me:-configure}:9211: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:10928: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
cf_cv_find_linkage_utf8=yes
cf_cv_library_file_utf8="-lutf8"
@@ -9250,13 +10967,14 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:9253: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:10970: result: $cf_cv_utf8_lib" >&5
echo "${ECHO_T}$cf_cv_utf8_lib" >&6
# HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
# ncurses/ncursesw:
if test "$cf_cv_utf8_lib" = "add-on" ; then
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_LIBUTF8_H 1
EOF
@@ -9284,7 +11002,7 @@
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 9287 "configure"
+#line 11005 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -9296,16 +11014,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9299: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11017: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9302: \$? = $ac_status" >&5
+ echo "$as_me:11020: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9305: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11023: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9308: \$? = $ac_status" >&5
+ echo "$as_me:11026: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -9322,7 +11040,7 @@
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:9325: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11043: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -9356,7 +11074,7 @@
if test "$cf_have_libdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6
-echo "${as_me:-configure}:9359: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11077: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -9372,49 +11090,88 @@
cf_ncuconfig_root=$use_ncurses
echo "Looking for ${cf_ncuconfig_root}-config"
-for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
+
+if test -n "$ac_tool_prefix"; then
+ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
+ 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:11099: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$NCURSES_CONFIG"; then
+ ac_cv_prog_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test.
+else
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+echo "$as_me:11114: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+if test -n "$NCURSES_CONFIG"; then
+ echo "$as_me:11122: result: $NCURSES_CONFIG" >&5
+echo "${ECHO_T}$NCURSES_CONFIG" >&6
+else
+ echo "$as_me:11125: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ test -n "$NCURSES_CONFIG" && break
+ done
+fi
+if test -z "$NCURSES_CONFIG"; then
+ ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG
+ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
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:9379: checking for $ac_word" >&5
+echo "$as_me:11138: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
+if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case $NCURSES_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a path.
- ;;
- *)
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # Let the user override the test.
+else
ac_save_IFS=$IFS; IFS=$ac_path_separator
ac_dummy="$PATH"
for ac_dir in $ac_dummy; do
IFS=$ac_save_IFS
test -z "$ac_dir" && ac_dir=.
- if $as_executable_p "$ac_dir/$ac_word"; then
- ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word"
- echo "$as_me:9396: found $ac_dir/$ac_word" >&5
- break
-fi
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
+echo "$as_me:11153: found $ac_dir/$ac_word" >&5
+break
done
- ;;
-esac
fi
-NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
-
-if test -n "$NCURSES_CONFIG"; then
- echo "$as_me:9407: result: $NCURSES_CONFIG" >&5
-echo "${ECHO_T}$NCURSES_CONFIG" >&6
+fi
+ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+if test -n "$ac_ct_NCURSES_CONFIG"; then
+ echo "$as_me:11161: result: $ac_ct_NCURSES_CONFIG" >&5
+echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
else
- echo "$as_me:9410: result: no" >&5
+ echo "$as_me:11164: result: no" >&5
echo "${ECHO_T}no" >&6
fi
- test -n "$NCURSES_CONFIG" && break
+ test -n "$ac_ct_NCURSES_CONFIG" && break
done
-test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none"
+test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none"
+ NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG
+fi
+
if test "$NCURSES_CONFIG" != none ; then
CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
@@ -9422,7 +11179,7 @@
# even with config script, some packages use no-override for curses.h
-echo "$as_me:9425: checking if we have identified curses headers" >&5
+echo "$as_me:11182: checking if we have identified curses headers" >&5
echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
if test "${cf_cv_ncurses_header+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9436,7 +11193,7 @@
curses.h
do
cat >conftest.$ac_ext <<_ACEOF
-#line 9439 "configure"
+#line 11196 "configure"
#include "confdefs.h"
#include <${cf_header}>
int
@@ -9448,16 +11205,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9451: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11208: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9454: \$? = $ac_status" >&5
+ echo "$as_me:11211: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9457: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11214: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9460: \$? = $ac_status" >&5
+ echo "$as_me:11217: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_header=$cf_header; break
else
@@ -9468,11 +11225,11 @@
done
fi
-echo "$as_me:9471: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:11228: result: $cf_cv_ncurses_header" >&5
echo "${ECHO_T}$cf_cv_ncurses_header" >&6
if test "$cf_cv_ncurses_header" = none ; then
- { { echo "$as_me:9475: error: No curses header-files found" >&5
+ { { echo "$as_me:11232: error: No curses header-files found" >&5
echo "$as_me: error: No curses header-files found" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -9482,23 +11239,23 @@
for ac_header in $cf_cv_ncurses_header
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9485: checking for $ac_header" >&5
+echo "$as_me:11242: 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 $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 9491 "configure"
+#line 11248 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:9495: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11252: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:9501: \$? = $ac_status" >&5
+ echo "$as_me:11258: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9517,7 +11274,7 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:9520: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11277: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -9570,7 +11327,7 @@
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 9573 "configure"
+#line 11330 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -9582,16 +11339,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9585: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11342: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9588: \$? = $ac_status" >&5
+ echo "$as_me:11345: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9591: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11348: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9594: \$? = $ac_status" >&5
+ echo "$as_me:11351: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -9608,7 +11365,7 @@
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:9611: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11368: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -9625,7 +11382,7 @@
}
-echo "$as_me:9628: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:11385: checking for $cf_ncuhdr_root header in include-path" >&5
echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
if test "${cf_cv_ncurses_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9637,7 +11394,7 @@
do
cat >conftest.$ac_ext <<_ACEOF
-#line 9640 "configure"
+#line 11397 "configure"
#include "confdefs.h"
#include <$cf_header>
@@ -9661,16 +11418,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9664: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11421: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9667: \$? = $ac_status" >&5
+ echo "$as_me:11424: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9670: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11427: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9673: \$? = $ac_status" >&5
+ echo "$as_me:11430: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_h=$cf_header
@@ -9685,7 +11442,7 @@
done
fi
-echo "$as_me:9688: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:11445: result: $cf_cv_ncurses_h" >&5
echo "${ECHO_T}$cf_cv_ncurses_h" >&6
if test "$cf_cv_ncurses_h" != no ; then
@@ -9692,7 +11449,7 @@
cf_cv_ncurses_header=$cf_cv_ncurses_h
else
-echo "$as_me:9695: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:11452: checking for $cf_ncuhdr_root include-path" >&5
echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
if test "${cf_cv_ncurses_h2+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9832,7 +11589,7 @@
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 9835 "configure"
+#line 11592 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -9844,16 +11601,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9847: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11604: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9850: \$? = $ac_status" >&5
+ echo "$as_me:11607: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9853: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11610: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9856: \$? = $ac_status" >&5
+ echo "$as_me:11613: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -9870,7 +11627,7 @@
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:9873: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11630: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -9891,7 +11648,7 @@
do
cat >conftest.$ac_ext <<_ACEOF
-#line 9894 "configure"
+#line 11651 "configure"
#include "confdefs.h"
#include <$cf_header>
@@ -9915,16 +11672,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9918: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11675: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9921: \$? = $ac_status" >&5
+ echo "$as_me:11678: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9924: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11681: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9927: \$? = $ac_status" >&5
+ echo "$as_me:11684: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_h2=$cf_header
@@ -9945,12 +11702,12 @@
CPPFLAGS="$cf_save2_CPPFLAGS"
test "$cf_cv_ncurses_h2" != no && break
done
- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9948: error: not found" >&5
+ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11705: error: not found" >&5
echo "$as_me: error: not found" >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:9953: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:11710: result: $cf_cv_ncurses_h2" >&5
echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
@@ -9983,7 +11740,7 @@
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 9986 "configure"
+#line 11743 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -9995,16 +11752,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9998: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11755: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:10001: \$? = $ac_status" >&5
+ echo "$as_me:11758: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:10004: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11761: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10007: \$? = $ac_status" >&5
+ echo "$as_me:11764: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -10021,7 +11778,7 @@
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:10024: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11781: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -10042,7 +11799,8 @@
case $cf_cv_ncurses_header in # (vi
*ncurses.h)
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_NCURSES_H 1
EOF
@@ -10051,13 +11809,15 @@
case $cf_cv_ncurses_header in # (vi
ncurses/curses.h|ncurses/ncurses.h)
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_NCURSES_NCURSES_H 1
EOF
;;
ncursesw/curses.h|ncursesw/ncurses.h)
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_NCURSESW_NCURSES_H 1
EOF
@@ -10064,7 +11824,7 @@
;;
esac
-echo "$as_me:10067: checking for terminfo header" >&5
+echo "$as_me:11827: checking for terminfo header" >&5
echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
if test "${cf_cv_term_header+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10082,7 +11842,7 @@
for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
do
cat >conftest.$ac_ext <<_ACEOF
-#line 10085 "configure"
+#line 11845 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -10097,16 +11857,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10100: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11860: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:10103: \$? = $ac_status" >&5
+ echo "$as_me:11863: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:10106: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11866: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10109: \$? = $ac_status" >&5
+ echo "$as_me:11869: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_term_header="$cf_test"
@@ -10122,7 +11882,7 @@
done
fi
-echo "$as_me:10125: result: $cf_cv_term_header" >&5
+echo "$as_me:11885: result: $cf_cv_term_header" >&5
echo "${ECHO_T}$cf_cv_term_header" >&6
# Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -10129,7 +11889,8 @@
case $cf_cv_term_header in # (vi
*term.h)
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_TERM_H 1
EOF
@@ -10138,13 +11899,15 @@
case $cf_cv_term_header in # (vi
ncurses/term.h) #(vi
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_NCURSES_TERM_H 1
EOF
;;
ncursesw/term.h)
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_NCURSESW_TERM_H 1
EOF
@@ -10152,11 +11915,12 @@
esac
# some applications need this, but should check for NCURSES_VERSION
+
cat >>confdefs.h <<\EOF
#define NCURSES 1
EOF
-echo "$as_me:10159: checking for ncurses version" >&5
+echo "$as_me:11923: checking for ncurses version" >&5
echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
if test "${cf_cv_ncurses_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10182,10 +11946,10 @@
#endif
EOF
cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
- { (eval echo "$as_me:10185: \"$cf_try\"") >&5
+ { (eval echo "$as_me:11949: \"$cf_try\"") >&5
(eval $cf_try) 2>&5
ac_status=$?
- echo "$as_me:10188: \$? = $ac_status" >&5
+ echo "$as_me:11952: \$? = $ac_status" >&5
(exit $ac_status); }
if test -f conftest.out ; then
cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -10195,7 +11959,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-#line 10198 "configure"
+#line 11962 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -10220,15 +11984,15 @@
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10223: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11987: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10226: \$? = $ac_status" >&5
+ echo "$as_me:11990: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:10228: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11992: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10231: \$? = $ac_status" >&5
+ echo "$as_me:11995: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10242,9 +12006,10 @@
rm -f $cf_tempfile
fi
-echo "$as_me:10245: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:12009: result: $cf_cv_ncurses_version" >&5
echo "${ECHO_T}$cf_cv_ncurses_version" >&6
-test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
+test "$cf_cv_ncurses_version" = no ||
+cat >>confdefs.h <<\EOF
#define NCURSES 1
EOF
@@ -10254,7 +12019,7 @@
# to link gpm.
cf_ncurses_LIBS=""
cf_ncurses_SAVE="$LIBS"
-echo "$as_me:10257: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:12022: checking for Gpm_Open in -lgpm" >&5
echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10262,7 +12027,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgpm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10265 "configure"
+#line 12030 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -10281,16 +12046,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10284: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12049: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10287: \$? = $ac_status" >&5
+ echo "$as_me:12052: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10290: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12055: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10293: \$? = $ac_status" >&5
+ echo "$as_me:12058: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_gpm_Gpm_Open=yes
else
@@ -10301,10 +12066,10 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10304: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:12069: result: $ac_cv_lib_gpm_Gpm_Open" >&5
echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
if test $ac_cv_lib_gpm_Gpm_Open = yes; then
- echo "$as_me:10307: checking for initscr in -lgpm" >&5
+ echo "$as_me:12072: checking for initscr in -lgpm" >&5
echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
if test "${ac_cv_lib_gpm_initscr+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10312,7 +12077,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgpm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10315 "configure"
+#line 12080 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -10331,16 +12096,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10334: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12099: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10337: \$? = $ac_status" >&5
+ echo "$as_me:12102: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10340: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12105: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10343: \$? = $ac_status" >&5
+ echo "$as_me:12108: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_gpm_initscr=yes
else
@@ -10351,7 +12116,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10354: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:12119: result: $ac_cv_lib_gpm_initscr" >&5
echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
if test $ac_cv_lib_gpm_initscr = yes; then
LIBS="$cf_ncurses_SAVE"
@@ -10366,7 +12131,7 @@
# This is only necessary if you are linking against an obsolete
# version of ncurses (but it should do no harm, since it's static).
if test "$cf_nculib_root" = ncurses ; then
- echo "$as_me:10369: checking for tgoto in -lmytinfo" >&5
+ echo "$as_me:12134: checking for tgoto in -lmytinfo" >&5
echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10374,7 +12139,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lmytinfo $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10377 "configure"
+#line 12142 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -10393,16 +12158,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10396: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12161: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10399: \$? = $ac_status" >&5
+ echo "$as_me:12164: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10402: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12167: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10405: \$? = $ac_status" >&5
+ echo "$as_me:12170: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_mytinfo_tgoto=yes
else
@@ -10413,7 +12178,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10416: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:12181: result: $ac_cv_lib_mytinfo_tgoto" >&5
echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
if test $ac_cv_lib_mytinfo_tgoto = yes; then
cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
@@ -10432,13 +12197,13 @@
eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
cf_libdir=""
- echo "$as_me:10435: checking for initscr" >&5
+ echo "$as_me:12200: checking for initscr" >&5
echo $ECHO_N "checking for initscr... $ECHO_C" >&6
if test "${ac_cv_func_initscr+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 10441 "configure"
+#line 12206 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char initscr (); below. */
@@ -10461,7 +12226,7 @@
#if defined (__stub_initscr) || defined (__stub___initscr)
choke me
#else
-f = initscr;
+f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
#endif
;
@@ -10469,16 +12234,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10472: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12237: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10475: \$? = $ac_status" >&5
+ echo "$as_me:12240: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10478: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12243: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10481: \$? = $ac_status" >&5
+ echo "$as_me:12246: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_initscr=yes
else
@@ -10488,7 +12253,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:10491: result: $ac_cv_func_initscr" >&5
+echo "$as_me:12256: result: $ac_cv_func_initscr" >&5
echo "${ECHO_T}$ac_cv_func_initscr" >&6
if test $ac_cv_func_initscr = yes; then
eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -10495,11 +12260,11 @@
else
cf_save_LIBS="$LIBS"
- echo "$as_me:10498: checking for initscr in -l$cf_nculib_root" >&5
+ echo "$as_me:12263: checking for initscr in -l$cf_nculib_root" >&5
echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
LIBS="-l$cf_nculib_root $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10502 "configure"
+#line 12267 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -10511,18 +12276,18 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10514: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12279: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10517: \$? = $ac_status" >&5
+ echo "$as_me:12282: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10520: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12285: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10523: \$? = $ac_status" >&5
+ echo "$as_me:12288: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:10525: result: yes" >&5
+ echo "$as_me:12290: result: yes" >&5
echo "${ECHO_T}yes" >&6
eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -10529,7 +12294,7 @@
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:10532: result: no" >&5
+echo "$as_me:12297: result: no" >&5
echo "${ECHO_T}no" >&6
cf_search=
@@ -10619,11 +12384,11 @@
for cf_libdir in $cf_search
do
- echo "$as_me:10622: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo "$as_me:12387: checking for -l$cf_nculib_root in $cf_libdir" >&5
echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10626 "configure"
+#line 12391 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -10635,18 +12400,18 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10638: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12403: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10641: \$? = $ac_status" >&5
+ echo "$as_me:12406: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10644: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12409: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10647: \$? = $ac_status" >&5
+ echo "$as_me:12412: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:10649: result: yes" >&5
+ echo "$as_me:12414: result: yes" >&5
echo "${ECHO_T}yes" >&6
eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
break
@@ -10653,7 +12418,7 @@
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:10656: result: no" >&5
+echo "$as_me:12421: result: no" >&5
echo "${ECHO_T}no" >&6
LIBS="$cf_save_LIBS"
fi
@@ -10668,7 +12433,7 @@
eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
if test $cf_found_library = no ; then
- { { echo "$as_me:10671: error: Cannot link $cf_nculib_root library" >&5
+ { { echo "$as_me:12436: error: Cannot link $cf_nculib_root library" >&5
echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -10676,7 +12441,7 @@
fi
if test -n "$cf_ncurses_LIBS" ; then
- echo "$as_me:10679: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo "$as_me:12444: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
cf_ncurses_SAVE="$LIBS"
for p in $cf_ncurses_LIBS ; do
@@ -10686,7 +12451,7 @@
fi
done
cat >conftest.$ac_ext <<_ACEOF
-#line 10689 "configure"
+#line 12454 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -10698,23 +12463,23 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10701: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12466: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10704: \$? = $ac_status" >&5
+ echo "$as_me:12469: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10707: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12472: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10710: \$? = $ac_status" >&5
+ echo "$as_me:12475: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:10712: result: yes" >&5
+ echo "$as_me:12477: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:10717: result: no" >&5
+echo "$as_me:12482: result: no" >&5
echo "${ECHO_T}no" >&6
LIBS="$cf_ncurses_SAVE"
fi
@@ -10732,7 +12497,7 @@
else
cf_wide_curses=no
-echo "$as_me:10735: checking for extra include directories" >&5
+echo "$as_me:12500: checking for extra include directories" >&5
echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
if test "${cf_cv_curses_incdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10758,11 +12523,11 @@
esac
fi
-echo "$as_me:10761: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:12526: result: $cf_cv_curses_incdir" >&5
echo "${ECHO_T}$cf_cv_curses_incdir" >&6
test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
-echo "$as_me:10765: checking if we have identified curses headers" >&5
+echo "$as_me:12530: checking if we have identified curses headers" >&5
echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
if test "${cf_cv_ncurses_header+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10774,7 +12539,7 @@
curses.h ncurses/ncurses.h ncurses/curses.h
do
cat >conftest.$ac_ext <<_ACEOF
-#line 10777 "configure"
+#line 12542 "configure"
#include "confdefs.h"
#include <${cf_header}>
int
@@ -10786,16 +12551,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10789: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12554: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:10792: \$? = $ac_status" >&5
+ echo "$as_me:12557: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:10795: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12560: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10798: \$? = $ac_status" >&5
+ echo "$as_me:12563: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_header=$cf_header; break
else
@@ -10806,11 +12571,11 @@
done
fi
-echo "$as_me:10809: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:12574: result: $cf_cv_ncurses_header" >&5
echo "${ECHO_T}$cf_cv_ncurses_header" >&6
if test "$cf_cv_ncurses_header" = none ; then
- { { echo "$as_me:10813: error: No curses header-files found" >&5
+ { { echo "$as_me:12578: error: No curses header-files found" >&5
echo "$as_me: error: No curses header-files found" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -10820,23 +12585,23 @@
for ac_header in $cf_cv_ncurses_header
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10823: checking for $ac_header" >&5
+echo "$as_me:12588: 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 $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 10829 "configure"
+#line 12594 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:10833: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12598: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:10839: \$? = $ac_status" >&5
+ echo "$as_me:12604: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10855,7 +12620,7 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:10858: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12623: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -10865,7 +12630,7 @@
fi
done
-echo "$as_me:10868: checking for terminfo header" >&5
+echo "$as_me:12633: checking for terminfo header" >&5
echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
if test "${cf_cv_term_header+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10883,7 +12648,7 @@
for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
do
cat >conftest.$ac_ext <<_ACEOF
-#line 10886 "configure"
+#line 12651 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -10898,16 +12663,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10901: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12666: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:10904: \$? = $ac_status" >&5
+ echo "$as_me:12669: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:10907: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12672: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10910: \$? = $ac_status" >&5
+ echo "$as_me:12675: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_term_header="$cf_test"
@@ -10923,7 +12688,7 @@
done
fi
-echo "$as_me:10926: result: $cf_cv_term_header" >&5
+echo "$as_me:12691: result: $cf_cv_term_header" >&5
echo "${ECHO_T}$cf_cv_term_header" >&6
# Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -10930,7 +12695,8 @@
case $cf_cv_term_header in # (vi
*term.h)
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_TERM_H 1
EOF
@@ -10939,13 +12705,15 @@
case $cf_cv_term_header in # (vi
ncurses/term.h) #(vi
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_NCURSES_TERM_H 1
EOF
;;
ncursesw/term.h)
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_NCURSESW_TERM_H 1
EOF
@@ -10952,7 +12720,7 @@
;;
esac
-echo "$as_me:10955: checking for ncurses version" >&5
+echo "$as_me:12723: checking for ncurses version" >&5
echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
if test "${cf_cv_ncurses_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10978,10 +12746,10 @@
#endif
EOF
cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
- { (eval echo "$as_me:10981: \"$cf_try\"") >&5
+ { (eval echo "$as_me:12749: \"$cf_try\"") >&5
(eval $cf_try) 2>&5
ac_status=$?
- echo "$as_me:10984: \$? = $ac_status" >&5
+ echo "$as_me:12752: \$? = $ac_status" >&5
(exit $ac_status); }
if test -f conftest.out ; then
cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -10991,7 +12759,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-#line 10994 "configure"
+#line 12762 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -11016,15 +12784,15 @@
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11019: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12787: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11022: \$? = $ac_status" >&5
+ echo "$as_me:12790: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:11024: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12792: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11027: \$? = $ac_status" >&5
+ echo "$as_me:12795: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -11038,16 +12806,17 @@
rm -f $cf_tempfile
fi
-echo "$as_me:11041: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:12809: result: $cf_cv_ncurses_version" >&5
echo "${ECHO_T}$cf_cv_ncurses_version" >&6
-test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
+test "$cf_cv_ncurses_version" = no ||
+cat >>confdefs.h <<\EOF
#define NCURSES 1
EOF
-echo "$as_me:11047: checking if we have identified curses libraries" >&5
+echo "$as_me:12816: checking if we have identified curses libraries" >&5
echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 11050 "configure"
+#line 12819 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -11059,16 +12828,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11062: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12831: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11065: \$? = $ac_status" >&5
+ echo "$as_me:12834: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11068: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12837: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11071: \$? = $ac_status" >&5
+ echo "$as_me:12840: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -11077,13 +12846,13 @@
cf_result=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:11080: result: $cf_result" >&5
+echo "$as_me:12849: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test "$cf_result" = no ; then
case $host_os in #(vi
freebsd*) #(vi
- echo "$as_me:11086: checking for tgoto in -lmytinfo" >&5
+ echo "$as_me:12855: checking for tgoto in -lmytinfo" >&5
echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11091,7 +12860,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lmytinfo $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 11094 "configure"
+#line 12863 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -11110,16 +12879,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11113: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12882: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11116: \$? = $ac_status" >&5
+ echo "$as_me:12885: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11119: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12888: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11122: \$? = $ac_status" >&5
+ echo "$as_me:12891: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_mytinfo_tgoto=yes
else
@@ -11130,7 +12899,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:11133: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:12902: result: $ac_cv_lib_mytinfo_tgoto" >&5
echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
if test $ac_cv_lib_mytinfo_tgoto = yes; then
LIBS="-lmytinfo $LIBS"
@@ -11144,7 +12913,7 @@
# term.h) for cur_colr
if test "x$cf_cv_screen" = "xcurses_colr"
then
- echo "$as_me:11147: checking for initscr in -lcur_colr" >&5
+ echo "$as_me:12916: checking for initscr in -lcur_colr" >&5
echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11152,7 +12921,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcur_colr $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 11155 "configure"
+#line 12924 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -11171,16 +12940,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11174: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12943: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11177: \$? = $ac_status" >&5
+ echo "$as_me:12946: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11180: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12949: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11183: \$? = $ac_status" >&5
+ echo "$as_me:12952: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_cur_colr_initscr=yes
else
@@ -11191,7 +12960,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:11194: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:12963: result: $ac_cv_lib_cur_colr_initscr" >&5
echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
if test $ac_cv_lib_cur_colr_initscr = yes; then
@@ -11200,7 +12969,7 @@
else
- echo "$as_me:11203: checking for initscr in -lHcurses" >&5
+ echo "$as_me:12972: checking for initscr in -lHcurses" >&5
echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11208,7 +12977,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lHcurses $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 11211 "configure"
+#line 12980 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -11227,16 +12996,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11230: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12999: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11233: \$? = $ac_status" >&5
+ echo "$as_me:13002: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11236: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13005: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11239: \$? = $ac_status" >&5
+ echo "$as_me:13008: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_Hcurses_initscr=yes
else
@@ -11247,7 +13016,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:11250: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:13019: result: $ac_cv_lib_Hcurses_initscr" >&5
echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
if test $ac_cv_lib_Hcurses_initscr = yes; then
@@ -11261,7 +13030,7 @@
fi
fi
- ;;
+ ;;
linux*)
case `arch 2>/dev/null` in
x86_64)
@@ -11287,7 +13056,7 @@
if test "$cf_have_libdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6
-echo "${as_me:-configure}:11290: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13059: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -11316,7 +13085,7 @@
if test "$cf_have_libdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6
-echo "${as_me:-configure}:11319: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13088: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -11347,7 +13116,7 @@
if test "$cf_have_libdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6
-echo "${as_me:-configure}:11350: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13119: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -11357,7 +13126,7 @@
;;
esac
- ;;
+ ;;
sunos3*|sunos4*)
if test "x$cf_cv_screen" = "xcurses_5lib"
then
@@ -11382,7 +13151,7 @@
if test "$cf_have_libdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6
-echo "${as_me:-configure}:11385: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13154: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -11398,26 +13167,26 @@
esac
if test ".$ac_cv_func_initscr" != .yes ; then
- cf_save_LIBS="$LIBS"
- cf_term_lib=""
- cf_curs_lib=""
+ cf_save_LIBS="$LIBS"
- if test ".${cf_cv_ncurses_version:-no}" != .no
- then
- cf_check_list="ncurses curses cursesX"
- else
- cf_check_list="cursesX curses ncurses"
- fi
+ if test ".${cf_cv_ncurses_version:-no}" != .no
+ then
+ cf_check_list="ncurses curses cursesX"
+ else
+ cf_check_list="cursesX curses ncurses"
+ fi
- # Check for library containing tgoto. Do this before curses library
- # because it may be needed to link the test-case for initscr.
- echo "$as_me:11414: checking for tgoto" >&5
+ # Check for library containing tgoto. Do this before curses library
+ # because it may be needed to link the test-case for initscr.
+ if test "x$cf_term_lib" = x
+ then
+ echo "$as_me:13183: checking for tgoto" >&5
echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
if test "${ac_cv_func_tgoto+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11420 "configure"
+#line 13189 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char tgoto (); below. */
@@ -11440,7 +13209,7 @@
#if defined (__stub_tgoto) || defined (__stub___tgoto)
choke me
#else
-f = tgoto;
+f = tgoto; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
#endif
;
@@ -11448,16 +13217,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11451: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13220: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11454: \$? = $ac_status" >&5
+ echo "$as_me:13223: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11457: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13226: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11460: \$? = $ac_status" >&5
+ echo "$as_me:13229: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_tgoto=yes
else
@@ -11467,16 +13236,16 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:11470: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:13239: result: $ac_cv_func_tgoto" >&5
echo "${ECHO_T}$ac_cv_func_tgoto" >&6
if test $ac_cv_func_tgoto = yes; then
cf_term_lib=predefined
else
- for cf_term_lib in $cf_check_list otermcap termcap termlib unknown
- do
- as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:11479: checking for tgoto in -l$cf_term_lib" >&5
+ for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
+ do
+ as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
+echo "$as_me:13248: checking for tgoto in -l$cf_term_lib" >&5
echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
if eval "test \"\${$as_ac_Lib+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11484,7 +13253,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-l$cf_term_lib $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 11487 "configure"
+#line 13256 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -11503,16 +13272,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11506: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13275: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11509: \$? = $ac_status" >&5
+ echo "$as_me:13278: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11512: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13281: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11515: \$? = $ac_status" >&5
+ echo "$as_me:13284: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Lib=yes"
else
@@ -11523,22 +13292,26 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:11526: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:13295: result: `eval echo '${'$as_ac_Lib'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
break
fi
- done
+ done
fi
- # Check for library containing initscr
- test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS"
- for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
- do
- as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
-echo "$as_me:11541: checking for initscr in -l$cf_curs_lib" >&5
+ fi
+
+ # Check for library containing initscr
+ test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS"
+ if test "x$cf_curs_lib" = x
+ then
+ for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
+ do
+ as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
+echo "$as_me:13314: checking for initscr in -l$cf_curs_lib" >&5
echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6
if eval "test \"\${$as_ac_Lib+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11546,7 +13319,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-l$cf_curs_lib $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 11549 "configure"
+#line 13322 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -11565,16 +13338,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11568: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13341: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11571: \$? = $ac_status" >&5
+ echo "$as_me:13344: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11574: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13347: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11577: \$? = $ac_status" >&5
+ echo "$as_me:13350: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Lib=yes"
else
@@ -11585,23 +13358,24 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:11588: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:13361: result: `eval echo '${'$as_ac_Lib'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
break
fi
- done
- test $cf_curs_lib = unknown && { { echo "$as_me:11595: error: no curses library found" >&5
+ done
+ fi
+ test $cf_curs_lib = unknown && { { echo "$as_me:13369: error: no curses library found" >&5
echo "$as_me: error: no curses library found" >&2;}
{ (exit 1); exit 1; }; }
- LIBS="-l$cf_curs_lib $cf_save_LIBS"
- if test "$cf_term_lib" = unknown ; then
- echo "$as_me:11601: checking if we can link with $cf_curs_lib library" >&5
+ LIBS="-l$cf_curs_lib $cf_save_LIBS"
+ if test "$cf_term_lib" = unknown ; then
+ echo "$as_me:13375: checking if we can link with $cf_curs_lib library" >&5
echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
-#line 11604 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 13378 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -11613,16 +13387,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11616: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13390: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11619: \$? = $ac_status" >&5
+ echo "$as_me:13393: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11622: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13396: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11625: \$? = $ac_status" >&5
+ echo "$as_me:13399: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -11631,18 +13405,18 @@
cf_result=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:11634: result: $cf_result" >&5
+ echo "$as_me:13408: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
- test $cf_result = no && { { echo "$as_me:11636: error: Cannot link curses library" >&5
+ test $cf_result = no && { { echo "$as_me:13410: error: Cannot link curses library" >&5
echo "$as_me: error: Cannot link curses library" >&2;}
{ (exit 1); exit 1; }; }
- elif test "$cf_curs_lib" = "$cf_term_lib" ; then
- :
- elif test "$cf_term_lib" != predefined ; then
- echo "$as_me:11642: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+ elif test "$cf_curs_lib" = "$cf_term_lib" ; then
+ :
+ elif test "$cf_term_lib" != predefined ; then
+ echo "$as_me:13416: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
-#line 11645 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 13419 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -11654,16 +13428,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11657: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13431: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11660: \$? = $ac_status" >&5
+ echo "$as_me:13434: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11663: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13437: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11666: \$? = $ac_status" >&5
+ echo "$as_me:13440: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=no
else
@@ -11670,9 +13444,9 @@
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-#line 11675 "configure"
+ LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 13449 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -11684,16 +13458,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11687: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13461: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11690: \$? = $ac_status" >&5
+ echo "$as_me:13464: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11693: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13467: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11696: \$? = $ac_status" >&5
+ echo "$as_me:13470: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -11705,9 +13479,9 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:11708: result: $cf_result" >&5
+ echo "$as_me:13482: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
- fi
+ fi
fi
fi
@@ -11715,7 +13489,7 @@
cf_all_widgets=yes
-echo "$as_me:11718: checking if you want extra dialogs" >&5
+echo "$as_me:13492: checking if you want extra dialogs" >&5
echo $ECHO_N "checking if you want extra dialogs... $ECHO_C" >&6
# Check whether --enable-extras or --disable-extras was given.
@@ -11725,7 +13499,7 @@
else
enableval=yes
fi;
-echo "$as_me:11728: result: $enableval" >&5
+echo "$as_me:13502: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
if test "$enableval" != no ; then
cf_all_widgets=yes
@@ -11733,7 +13507,7 @@
cf_all_widgets=no
fi
-echo "$as_me:11736: checking if you want config-file support" >&5
+echo "$as_me:13510: checking if you want config-file support" >&5
echo $ECHO_N "checking if you want config-file support... $ECHO_C" >&6
# Check whether --enable-rc-file or --disable-rc-file was given.
@@ -11743,11 +13517,12 @@
else
enableval=$cf_all_widgets
fi;
-echo "$as_me:11746: result: $enableval" >&5
+echo "$as_me:13520: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
if test "$enableval" != no ; then
EXTRAOBJS="$EXTRAOBJS rc\$o"
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_RC_FILE 1
EOF
@@ -11755,7 +13530,7 @@
:
fi
-echo "$as_me:11758: checking if you want Xdialog-style dialogs" >&5
+echo "$as_me:13533: checking if you want Xdialog-style dialogs" >&5
echo $ECHO_N "checking if you want Xdialog-style dialogs... $ECHO_C" >&6
# Check whether --enable-Xdialog or --disable-Xdialog was given.
@@ -11765,11 +13540,12 @@
else
enableval=$cf_all_widgets
fi;
-echo "$as_me:11768: result: $enableval" >&5
+echo "$as_me:13543: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
if test "$enableval" != no ; then
EXTRAOBJS="$EXTRAOBJS calendar\$o fselect\$o timebox\$o"
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_XDIALOG 1
EOF
@@ -11777,7 +13553,52 @@
:
fi
-echo "$as_me:11780: checking if you want the form dialog" >&5
+echo "$as_me:13556: checking if you want extra Xdialog-style dialogs (1.2)" >&5
+echo $ECHO_N "checking if you want extra Xdialog-style dialogs (1.2)... $ECHO_C" >&6
+
+# Check whether --enable-Xdialog2 or --disable-Xdialog2 was given.
+if test "${enable_Xdialog2+set}" = set; then
+ enableval="$enable_Xdialog2"
+
+else
+ enableval=$cf_all_widgets
+fi;
+echo "$as_me:13566: result: $enableval" >&5
+echo "${ECHO_T}$enableval" >&6
+if test "$enableval" != no ; then
+EXTRAOBJS="$EXTRAOBJS buildlist\$o rangebox\$o treeview\$o"
+
+cat >>confdefs.h <<\EOF
+#define HAVE_XDIALOG2 1
+EOF
+
+else
+ :
+fi
+
+echo "$as_me:13579: checking if you want compatibility with whiptail options" >&5
+echo $ECHO_N "checking if you want compatibility with whiptail options... $ECHO_C" >&6
+
+# Check whether --enable-whiptail or --disable-whiptail was given.
+if test "${enable_whiptail+set}" = set; then
+ enableval="$enable_whiptail"
+
+else
+ enableval=$cf_all_widgets
+fi;
+echo "$as_me:13589: result: $enableval" >&5
+echo "${ECHO_T}$enableval" >&6
+if test "$enableval" != no ; then
+
+cat >>confdefs.h <<\EOF
+#define HAVE_WHIPTAIL 1
+EOF
+
+else
+ :
+fi
+
+echo "$as_me:13601: checking if you want the form dialog" >&5
echo $ECHO_N "checking if you want the form dialog... $ECHO_C" >&6
# Check whether --enable-form or --disable-form was given.
@@ -11787,11 +13608,12 @@
else
enableval=$cf_all_widgets
fi;
-echo "$as_me:11790: result: $enableval" >&5
+echo "$as_me:13611: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
if test "$enableval" != no ; then
EXTRAOBJS="$EXTRAOBJS formbox\$o"
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_DLG_FORMBOX 1
EOF
@@ -11799,7 +13621,7 @@
:
fi
-echo "$as_me:11802: checking if you want the gauge dialog" >&5
+echo "$as_me:13624: checking if you want the gauge dialog" >&5
echo $ECHO_N "checking if you want the gauge dialog... $ECHO_C" >&6
# Check whether --enable-gauge or --disable-gauge was given.
@@ -11809,11 +13631,12 @@
else
enableval=$cf_all_widgets
fi;
-echo "$as_me:11812: result: $enableval" >&5
+echo "$as_me:13634: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
if test "$enableval" != no ; then
EXTRAOBJS="$EXTRAOBJS guage\$o pause\$o prgbox\$o progressbox\$o"
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_DLG_GAUGE 1
EOF
@@ -11821,7 +13644,7 @@
:
fi
-echo "$as_me:11824: checking if you want the tailbox dialog" >&5
+echo "$as_me:13647: checking if you want the tailbox dialog" >&5
echo $ECHO_N "checking if you want the tailbox dialog... $ECHO_C" >&6
# Check whether --enable-tailbox or --disable-tailbox was given.
@@ -11831,11 +13654,12 @@
else
enableval=$cf_all_widgets
fi;
-echo "$as_me:11834: result: $enableval" >&5
+echo "$as_me:13657: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
if test "$enableval" != no ; then
EXTRAOBJS="$EXTRAOBJS tailbox\$o"
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_DLG_TAILBOX 1
EOF
@@ -11843,7 +13667,7 @@
:
fi
-echo "$as_me:11846: checking if you want the mixedform dialog" >&5
+echo "$as_me:13670: checking if you want the mixedform dialog" >&5
echo $ECHO_N "checking if you want the mixedform dialog... $ECHO_C" >&6
# Check whether --enable-mixedform or --disable-mixedform was given.
@@ -11853,11 +13677,12 @@
else
enableval=$cf_all_widgets
fi;
-echo "$as_me:11856: result: $enableval" >&5
+echo "$as_me:13680: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
if test "$enableval" != no ; then
EXTRAOBJS="$EXTRAOBJS mixedform\$o"
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_DLG_MIXEDFORM 1
EOF
@@ -11865,7 +13690,7 @@
:
fi
-echo "$as_me:11868: checking if you want the mixedgauge dialog" >&5
+echo "$as_me:13693: checking if you want the mixedgauge dialog" >&5
echo $ECHO_N "checking if you want the mixedgauge dialog... $ECHO_C" >&6
# Check whether --enable-mixedgauge or --disable-mixedgauge was given.
@@ -11875,11 +13700,12 @@
else
enableval=$cf_all_widgets
fi;
-echo "$as_me:11878: result: $enableval" >&5
+echo "$as_me:13703: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
if test "$enableval" != no ; then
EXTRAOBJS="$EXTRAOBJS mixedgauge\$o"
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_MIXEDGAUGE 1
EOF
@@ -11887,7 +13713,7 @@
:
fi
-echo "$as_me:11890: checking if you want the wide-curses features" >&5
+echo "$as_me:13716: checking if you want the wide-curses features" >&5
echo $ECHO_N "checking if you want the wide-curses features... $ECHO_C" >&6
# Check whether --enable-widec or --disable-widec was given.
@@ -11897,9 +13723,10 @@
else
enableval=$cf_wide_curses
fi;
-echo "$as_me:11900: result: $enableval" >&5
+echo "$as_me:13726: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
if test "$enableval" != no ; then
+
cat >>confdefs.h <<\EOF
#define USE_WIDE_CURSES 1
EOF
@@ -11908,13 +13735,13 @@
:
fi
-echo "$as_me:11911: checking for ANSI C header files" >&5
+echo "$as_me:13738: 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
cat >conftest.$ac_ext <<_ACEOF
-#line 11917 "configure"
+#line 13744 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -11922,13 +13749,13 @@
#include <float.h>
_ACEOF
-if { (eval echo "$as_me:11925: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13752: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:11931: \$? = $ac_status" >&5
+ echo "$as_me:13758: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11950,7 +13777,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
-#line 11953 "configure"
+#line 13780 "configure"
#include "confdefs.h"
#include <string.h>
@@ -11968,7 +13795,7 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
-#line 11971 "configure"
+#line 13798 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -11989,7 +13816,7 @@
:
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11992 "configure"
+#line 13819 "configure"
#include "confdefs.h"
#include <ctype.h>
#if ((' ' & 0x0FF) == 0x020)
@@ -12015,15 +13842,15 @@
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12018: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13845: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12021: \$? = $ac_status" >&5
+ echo "$as_me:13848: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:12023: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13850: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12026: \$? = $ac_status" >&5
+ echo "$as_me:13853: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -12036,7 +13863,7 @@
fi
fi
fi
-echo "$as_me:12039: result: $ac_cv_header_stdc" >&5
+echo "$as_me:13866: result: $ac_cv_header_stdc" >&5
echo "${ECHO_T}$ac_cv_header_stdc" >&6
if test $ac_cv_header_stdc = yes; then
@@ -12046,13 +13873,13 @@
fi
-echo "$as_me:12049: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:13876: 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
cat >conftest.$ac_ext <<_ACEOF
-#line 12055 "configure"
+#line 13882 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -12068,16 +13895,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12071: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13898: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12074: \$? = $ac_status" >&5
+ echo "$as_me:13901: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12077: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13904: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12080: \$? = $ac_status" >&5
+ echo "$as_me:13907: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_header_time=yes
else
@@ -12087,7 +13914,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:12090: result: $ac_cv_header_time" >&5
+echo "$as_me:13917: result: $ac_cv_header_time" >&5
echo "${ECHO_T}$ac_cv_header_time" >&6
if test $ac_cv_header_time = yes; then
@@ -12100,13 +13927,13 @@
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:12103: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:13930: 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 $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12109 "configure"
+#line 13936 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -12121,16 +13948,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12124: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13951: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12127: \$? = $ac_status" >&5
+ echo "$as_me:13954: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12130: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13957: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12133: \$? = $ac_status" >&5
+ echo "$as_me:13960: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Header=yes"
else
@@ -12140,7 +13967,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:12143: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:13970: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -12153,7 +13980,7 @@
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
- echo "$as_me:12156: checking for opendir in -ldir" >&5
+ echo "$as_me:13983: checking for opendir in -ldir" >&5
echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
if test "${ac_cv_lib_dir_opendir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12161,7 +13988,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldir $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 12164 "configure"
+#line 13991 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -12180,16 +14007,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12183: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14010: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12186: \$? = $ac_status" >&5
+ echo "$as_me:14013: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12189: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14016: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12192: \$? = $ac_status" >&5
+ echo "$as_me:14019: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dir_opendir=yes
else
@@ -12200,7 +14027,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:12203: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:14030: result: $ac_cv_lib_dir_opendir" >&5
echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
if test $ac_cv_lib_dir_opendir = yes; then
LIBS="$LIBS -ldir"
@@ -12207,7 +14034,7 @@
fi
else
- echo "$as_me:12210: checking for opendir in -lx" >&5
+ echo "$as_me:14037: checking for opendir in -lx" >&5
echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
if test "${ac_cv_lib_x_opendir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12215,7 +14042,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lx $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 12218 "configure"
+#line 14045 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -12234,16 +14061,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12237: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14064: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12240: \$? = $ac_status" >&5
+ echo "$as_me:14067: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12243: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14070: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12246: \$? = $ac_status" >&5
+ echo "$as_me:14073: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_x_opendir=yes
else
@@ -12254,7 +14081,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:12257: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:14084: result: $ac_cv_lib_x_opendir" >&5
echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
if test $ac_cv_lib_x_opendir = yes; then
LIBS="$LIBS -lx"
@@ -12265,23 +14092,23 @@
for ac_header in search.h unctrl.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12268: checking for $ac_header" >&5
+echo "$as_me:14095: 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 $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12274 "configure"
+#line 14101 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:12278: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14105: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:12284: \$? = $ac_status" >&5
+ echo "$as_me:14111: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12300,7 +14127,7 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:12303: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:14130: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -12310,7 +14137,7 @@
fi
done
-echo "$as_me:12313: checking for term.h" >&5
+echo "$as_me:14140: checking for term.h" >&5
echo $ECHO_N "checking for term.h... $ECHO_C" >&6
if test "${cf_cv_term_header+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12331,7 +14158,7 @@
for cf_header in $cf_header_list
do
cat >conftest.$ac_ext <<_ACEOF
-#line 12334 "configure"
+#line 14161 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -12345,16 +14172,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12348: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14175: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12351: \$? = $ac_status" >&5
+ echo "$as_me:14178: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12354: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14181: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12357: \$? = $ac_status" >&5
+ echo "$as_me:14184: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_term_header=$cf_header
break
@@ -12373,7 +14200,7 @@
for cf_header in ncurses/term.h ncursesw/term.h
do
cat >conftest.$ac_ext <<_ACEOF
-#line 12376 "configure"
+#line 14203 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -12391,16 +14218,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12394: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14221: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12397: \$? = $ac_status" >&5
+ echo "$as_me:14224: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12400: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14227: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12403: \$? = $ac_status" >&5
+ echo "$as_me:14230: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_term_header=$cf_header
break
@@ -12415,24 +14242,27 @@
esac
fi
-echo "$as_me:12418: result: $cf_cv_term_header" >&5
+echo "$as_me:14245: result: $cf_cv_term_header" >&5
echo "${ECHO_T}$cf_cv_term_header" >&6
case $cf_cv_term_header in #(vi
term.h) #(vi
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_TERM_H 1
EOF
;;
ncurses/term.h) #(vi
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_NCURSES_TERM_H 1
EOF
;;
ncursesw/term.h)
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_NCURSESW_TERM_H 1
EOF
@@ -12439,13 +14269,13 @@
;;
esac
-echo "$as_me:12442: checking return type of signal handlers" >&5
+echo "$as_me:14272: 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
cat >conftest.$ac_ext <<_ACEOF
-#line 12448 "configure"
+#line 14278 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -12467,16 +14297,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12470: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14300: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12473: \$? = $ac_status" >&5
+ echo "$as_me:14303: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12476: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14306: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12479: \$? = $ac_status" >&5
+ echo "$as_me:14309: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_signal=void
else
@@ -12486,7 +14316,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:12489: result: $ac_cv_type_signal" >&5
+echo "$as_me:14319: result: $ac_cv_type_signal" >&5
echo "${ECHO_T}$ac_cv_type_signal" >&6
cat >>confdefs.h <<EOF
@@ -12511,13 +14341,13 @@
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12514: checking for $ac_func" >&5
+echo "$as_me:14344: 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 $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12520 "configure"
+#line 14350 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -12540,7 +14370,7 @@
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-f = $ac_func;
+f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
#endif
;
@@ -12548,16 +14378,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12551: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14381: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12554: \$? = $ac_status" >&5
+ echo "$as_me:14384: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12557: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14387: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12560: \$? = $ac_status" >&5
+ echo "$as_me:14390: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -12567,7 +14397,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12570: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:14400: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -12577,7 +14407,7 @@
fi
done
-echo "$as_me:12580: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:14410: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
if test "${cf_cv_need_xopen_extension+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12584,7 +14414,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12587 "configure"
+#line 14417 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -12606,16 +14436,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12609: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14439: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12612: \$? = $ac_status" >&5
+ echo "$as_me:14442: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12615: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14445: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12618: \$? = $ac_status" >&5
+ echo "$as_me:14448: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_need_xopen_extension=no
else
@@ -12622,7 +14452,7 @@
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 12625 "configure"
+#line 14455 "configure"
#include "confdefs.h"
#define _XOPEN_SOURCE_EXTENDED
@@ -12644,16 +14474,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12647: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14477: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12650: \$? = $ac_status" >&5
+ echo "$as_me:14480: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12653: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14483: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12656: \$? = $ac_status" >&5
+ echo "$as_me:14486: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_need_xopen_extension=yes
else
@@ -12665,11 +14495,11 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12668: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:14498: result: $cf_cv_need_xopen_extension" >&5
echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
-echo "$as_me:12672: checking for unctrl.h" >&5
+echo "$as_me:14502: checking for unctrl.h" >&5
echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
if test "${cf_cv_unctrl_header+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12690,7 +14520,7 @@
for cf_header in $cf_header_list
do
cat >conftest.$ac_ext <<_ACEOF
-#line 12693 "configure"
+#line 14523 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -12704,16 +14534,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12707: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14537: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12710: \$? = $ac_status" >&5
+ echo "$as_me:14540: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12713: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14543: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12716: \$? = $ac_status" >&5
+ echo "$as_me:14546: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_unctrl_header=$cf_header
break
@@ -12727,30 +14557,33 @@
case $cf_cv_unctrl_header in #(vi
no)
- { echo "$as_me:12730: WARNING: unctrl.h header not found" >&5
+ { echo "$as_me:14560: WARNING: unctrl.h header not found" >&5
echo "$as_me: WARNING: unctrl.h header not found" >&2;}
;;
esac
fi
-echo "$as_me:12736: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:14566: result: $cf_cv_unctrl_header" >&5
echo "${ECHO_T}$cf_cv_unctrl_header" >&6
case $cf_cv_unctrl_header in #(vi
unctrl.h) #(vi
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_UNCTRL_H 1
EOF
;;
ncurses/unctrl.h) #(vi
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_NCURSES_UNCTRL_H 1
EOF
;;
ncursesw/unctrl.h)
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_NCURSESW_UNCTRL_H 1
EOF
@@ -12773,16 +14606,18 @@
getparyx \
use_default_colors \
wchgat \
+wcursyncup \
wget_wch \
+wsyncup \
do
cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- echo "$as_me:12782: checking for ${cf_func}" >&5
+ echo "$as_me:14617: checking for ${cf_func}" >&5
echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
-echo "${as_me:-configure}:12785: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:14620: testing ${cf_func} ..." 1>&5
if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12791,7 +14626,7 @@
eval cf_result='$ac_cv_func_'$cf_func
if test ".$cf_result" != ".no"; then
cat >conftest.$ac_ext <<_ACEOF
-#line 12794 "configure"
+#line 14629 "configure"
#include "confdefs.h"
#ifdef HAVE_XCURSES
@@ -12823,16 +14658,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12826: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14661: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12829: \$? = $ac_status" >&5
+ echo "$as_me:14664: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12832: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14667: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12835: \$? = $ac_status" >&5
+ echo "$as_me:14670: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -12848,7 +14683,7 @@
# use the computed/retrieved cache-value:
eval 'cf_result=$cf_cv_func_'$cf_func
- echo "$as_me:12851: result: $cf_result" >&5
+ echo "$as_me:14686: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test $cf_result != no; then
cat >>confdefs.h <<EOF
@@ -12858,13 +14693,13 @@
fi
done
-echo "$as_me:12861: checking for start_color" >&5
+echo "$as_me:14696: checking for start_color" >&5
echo $ECHO_N "checking for start_color... $ECHO_C" >&6
if test "${ac_cv_func_start_color+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12867 "configure"
+#line 14702 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char start_color (); below. */
@@ -12887,7 +14722,7 @@
#if defined (__stub_start_color) || defined (__stub___start_color)
choke me
#else
-f = start_color;
+f = start_color; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
#endif
;
@@ -12895,16 +14730,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12898: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14733: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12901: \$? = $ac_status" >&5
+ echo "$as_me:14736: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12904: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14739: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12907: \$? = $ac_status" >&5
+ echo "$as_me:14742: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_start_color=yes
else
@@ -12914,16 +14749,17 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12917: result: $ac_cv_func_start_color" >&5
+echo "$as_me:14752: result: $ac_cv_func_start_color" >&5
echo "${ECHO_T}$ac_cv_func_start_color" >&6
if test $ac_cv_func_start_color = yes; then
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_COLOR 1
EOF
fi
-echo "$as_me:12926: checking for chtype typedef" >&5
+echo "$as_me:14762: checking for chtype typedef" >&5
echo $ECHO_N "checking for chtype typedef... $ECHO_C" >&6
if test "${cf_cv_chtype_decl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12930,7 +14766,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12933 "configure"
+#line 14769 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -12942,16 +14778,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12945: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14781: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12948: \$? = $ac_status" >&5
+ echo "$as_me:14784: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12951: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14787: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12954: \$? = $ac_status" >&5
+ echo "$as_me:14790: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_chtype_decl=yes
else
@@ -12961,14 +14797,15 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:12964: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:14800: result: $cf_cv_chtype_decl" >&5
echo "${ECHO_T}$cf_cv_chtype_decl" >&6
if test $cf_cv_chtype_decl = yes ; then
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_TYPE_CHTYPE 1
EOF
- echo "$as_me:12971: checking if chtype is scalar or struct" >&5
+ echo "$as_me:14808: checking if chtype is scalar or struct" >&5
echo $ECHO_N "checking if chtype is scalar or struct... $ECHO_C" >&6
if test "${cf_cv_chtype_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12975,7 +14812,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12978 "configure"
+#line 14815 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -12987,16 +14824,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12990: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14827: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12993: \$? = $ac_status" >&5
+ echo "$as_me:14830: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12996: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14833: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12999: \$? = $ac_status" >&5
+ echo "$as_me:14836: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_chtype_type=scalar
else
@@ -13006,10 +14843,11 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:13009: result: $cf_cv_chtype_type" >&5
+echo "$as_me:14846: result: $cf_cv_chtype_type" >&5
echo "${ECHO_T}$cf_cv_chtype_type" >&6
if test $cf_cv_chtype_type = scalar ; then
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define TYPE_CHTYPE_IS_SCALAR 1
EOF
@@ -13016,7 +14854,7 @@
fi
fi
-echo "$as_me:13019: checking for wide alternate character set array" >&5
+echo "$as_me:14857: checking for wide alternate character set array" >&5
echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
if test "${cf_cv_curses_wacs_map+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13026,7 +14864,7 @@
for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
do
cat >conftest.$ac_ext <<_ACEOF
-#line 13029 "configure"
+#line 14867 "configure"
#include "confdefs.h"
#ifndef _XOPEN_SOURCE_EXTENDED
@@ -13042,16 +14880,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13045: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14883: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13048: \$? = $ac_status" >&5
+ echo "$as_me:14886: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13051: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14889: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13054: \$? = $ac_status" >&5
+ echo "$as_me:14892: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_curses_wacs_map=$name
break
@@ -13062,14 +14900,15 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
done
fi
-echo "$as_me:13065: result: $cf_cv_curses_wacs_map" >&5
+echo "$as_me:14903: result: $cf_cv_curses_wacs_map" >&5
echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
-test "$cf_cv_curses_wacs_map" != unknown && cat >>confdefs.h <<EOF
+test "$cf_cv_curses_wacs_map" != unknown &&
+cat >>confdefs.h <<EOF
#define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
EOF
-echo "$as_me:13072: checking for wide alternate character constants" >&5
+echo "$as_me:14911: checking for wide alternate character constants" >&5
echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
if test "${cf_cv_curses_wacs_symbols+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13079,7 +14918,7 @@
if test "$cf_cv_curses_wacs_map" != unknown
then
cat >conftest.$ac_ext <<_ACEOF
-#line 13082 "configure"
+#line 14921 "configure"
#include "confdefs.h"
#ifndef _XOPEN_SOURCE_EXTENDED
@@ -13096,16 +14935,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13099: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14938: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13102: \$? = $ac_status" >&5
+ echo "$as_me:14941: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13105: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14944: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13108: \$? = $ac_status" >&5
+ echo "$as_me:14947: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_curses_wacs_symbols=yes
else
@@ -13115,7 +14954,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
-#line 13118 "configure"
+#line 14957 "configure"
#include "confdefs.h"
#ifndef _XOPEN_SOURCE_EXTENDED
@@ -13131,16 +14970,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13134: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14973: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13137: \$? = $ac_status" >&5
+ echo "$as_me:14976: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13140: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14979: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13143: \$? = $ac_status" >&5
+ echo "$as_me:14982: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_curses_wacs_symbols=yes
else
@@ -13151,10 +14990,11 @@
fi
fi
-echo "$as_me:13154: result: $cf_cv_curses_wacs_symbols" >&5
+echo "$as_me:14993: result: $cf_cv_curses_wacs_symbols" >&5
echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
-test "$cf_cv_curses_wacs_symbols" != no && cat >>confdefs.h <<\EOF
+test "$cf_cv_curses_wacs_symbols" != no &&
+cat >>confdefs.h <<\EOF
#define CURSES_WACS_SYMBOLS 1
EOF
@@ -13163,10 +15003,10 @@
cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- echo "$as_me:13166: checking for ${cf_func}" >&5
+ echo "$as_me:15006: checking for ${cf_func}" >&5
echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
-echo "${as_me:-configure}:13169: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:15009: testing ${cf_func} ..." 1>&5
if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13175,7 +15015,7 @@
eval cf_result='$ac_cv_func_'$cf_func
if test ".$cf_result" != ".no"; then
cat >conftest.$ac_ext <<_ACEOF
-#line 13178 "configure"
+#line 15018 "configure"
#include "confdefs.h"
#ifdef HAVE_XCURSES
@@ -13207,16 +15047,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13210: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15050: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13213: \$? = $ac_status" >&5
+ echo "$as_me:15053: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13216: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15056: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13219: \$? = $ac_status" >&5
+ echo "$as_me:15059: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -13232,7 +15072,7 @@
# use the computed/retrieved cache-value:
eval 'cf_result=$cf_cv_func_'$cf_func
- echo "$as_me:13235: result: $cf_result" >&5
+ echo "$as_me:15075: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test $cf_result != no; then
cat >>confdefs.h <<EOF
@@ -13244,10 +15084,10 @@
if test "x$cf_cv_func_wgetparent" != xyes
then
- echo "$as_me:13247: checking if WINDOW has _parent member" >&5
+ echo "$as_me:15087: checking if WINDOW has _parent member" >&5
echo $ECHO_N "checking if WINDOW has _parent member... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 13250 "configure"
+#line 15090 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -13259,16 +15099,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13262: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15102: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13265: \$? = $ac_status" >&5
+ echo "$as_me:15105: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13268: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15108: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13271: \$? = $ac_status" >&5
+ echo "$as_me:15111: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_window__parent=yes
else
@@ -13277,11 +15117,12 @@
cf_window__parent=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:13280: result: $cf_window__parent" >&5
+ echo "$as_me:15120: result: $cf_window__parent" >&5
echo "${ECHO_T}$cf_window__parent" >&6
if test "$cf_window__parent" = yes
then
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_WINDOW__PARENT 1
EOF
@@ -13291,23 +15132,23 @@
for ac_header in sys/wait.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13294: checking for $ac_header" >&5
+echo "$as_me:15135: 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 $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 13300 "configure"
+#line 15141 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:13304: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15145: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:13310: \$? = $ac_status" >&5
+ echo "$as_me:15151: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13326,7 +15167,7 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:13329: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:15170: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -13347,23 +15188,23 @@
for ac_header in wait.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13350: checking for $ac_header" >&5
+echo "$as_me:15191: 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 $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 13356 "configure"
+#line 15197 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:13360: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15201: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:13366: \$? = $ac_status" >&5
+ echo "$as_me:15207: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13382,7 +15223,7 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:13385: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:15226: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -13395,23 +15236,23 @@
for ac_header in waitstatus.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13398: checking for $ac_header" >&5
+echo "$as_me:15239: 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 $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 13404 "configure"
+#line 15245 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:13408: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15249: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:13414: \$? = $ac_status" >&5
+ echo "$as_me:15255: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13430,7 +15271,7 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:13433: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:15274: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -13452,7 +15293,7 @@
fi
fi
-echo "$as_me:13455: checking for union wait" >&5
+echo "$as_me:15296: checking for union wait" >&5
echo $ECHO_N "checking for union wait... $ECHO_C" >&6
if test "${cf_cv_type_unionwait+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13459,7 +15300,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-#line 13462 "configure"
+#line 15303 "configure"
#include "confdefs.h"
$cf_wait_headers
int
@@ -13475,16 +15316,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13478: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15319: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13481: \$? = $ac_status" >&5
+ echo "$as_me:15322: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13484: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15325: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13487: \$? = $ac_status" >&5
+ echo "$as_me:15328: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_type_unionwait=no
echo compiles ok w/o union wait 1>&5
@@ -13494,7 +15335,7 @@
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 13497 "configure"
+#line 15338 "configure"
#include "confdefs.h"
$cf_wait_headers
int
@@ -13514,16 +15355,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13517: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15358: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13520: \$? = $ac_status" >&5
+ echo "$as_me:15361: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13523: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15364: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13526: \$? = $ac_status" >&5
+ echo "$as_me:15367: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_type_unionwait=yes
echo compiles ok with union wait and possibly macros too 1>&5
@@ -13538,15 +15379,16 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:13541: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:15382: result: $cf_cv_type_unionwait" >&5
echo "${ECHO_T}$cf_cv_type_unionwait" >&6
-test $cf_cv_type_unionwait = yes && cat >>confdefs.h <<\EOF
+test $cf_cv_type_unionwait = yes &&
+cat >>confdefs.h <<\EOF
#define HAVE_TYPE_UNIONWAIT 1
EOF
if test $cf_cv_type_unionwait = yes; then
- echo "$as_me:13549: checking if union wait can be used as wait-arg" >&5
+ echo "$as_me:15391: checking if union wait can be used as wait-arg" >&5
echo $ECHO_N "checking if union wait can be used as wait-arg... $ECHO_C" >&6
if test "${cf_cv_arg_union_wait+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13553,7 +15395,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-#line 13556 "configure"
+#line 15398 "configure"
#include "confdefs.h"
$cf_wait_headers
int
@@ -13565,16 +15407,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13568: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15410: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13571: \$? = $ac_status" >&5
+ echo "$as_me:15413: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13574: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15416: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13577: \$? = $ac_status" >&5
+ echo "$as_me:15419: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_arg_union_wait=yes
else
@@ -13586,13 +15428,14 @@
fi
- echo "$as_me:13589: result: $cf_cv_arg_union_wait" >&5
+ echo "$as_me:15431: result: $cf_cv_arg_union_wait" >&5
echo "${ECHO_T}$cf_cv_arg_union_wait" >&6
- test $cf_cv_arg_union_wait = yes && cat >>confdefs.h <<\EOF
+ test $cf_cv_arg_union_wait = yes &&
+cat >>confdefs.h <<\EOF
#define WAIT_USES_UNION 1
EOF
- echo "$as_me:13595: checking if union wait can be used as waitpid-arg" >&5
+ echo "$as_me:15438: checking if union wait can be used as waitpid-arg" >&5
echo $ECHO_N "checking if union wait can be used as waitpid-arg... $ECHO_C" >&6
if test "${cf_cv_arg_union_waitpid+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13599,7 +15442,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-#line 13602 "configure"
+#line 15445 "configure"
#include "confdefs.h"
$cf_wait_headers
int
@@ -13611,16 +15454,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13614: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15457: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13617: \$? = $ac_status" >&5
+ echo "$as_me:15460: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13620: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15463: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13623: \$? = $ac_status" >&5
+ echo "$as_me:15466: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_arg_union_waitpid=yes
else
@@ -13632,15 +15475,16 @@
fi
- echo "$as_me:13635: result: $cf_cv_arg_union_waitpid" >&5
+ echo "$as_me:15478: result: $cf_cv_arg_union_waitpid" >&5
echo "${ECHO_T}$cf_cv_arg_union_waitpid" >&6
- test $cf_cv_arg_union_waitpid = yes && cat >>confdefs.h <<\EOF
+ test $cf_cv_arg_union_waitpid = yes &&
+cat >>confdefs.h <<\EOF
#define WAITPID_USES_UNION 1
EOF
fi
-echo "$as_me:13643: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:15487: checking if we must include wchar.h to declare mbstate_t" >&5
echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
if test "${cf_cv_mbstate_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13647,7 +15491,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-#line 13650 "configure"
+#line 15494 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -13664,16 +15508,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13667: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15511: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13670: \$? = $ac_status" >&5
+ echo "$as_me:15514: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13673: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15517: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13676: \$? = $ac_status" >&5
+ echo "$as_me:15520: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_mbstate_t=no
else
@@ -13680,7 +15524,7 @@
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 13683 "configure"
+#line 15527 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -13698,16 +15542,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13701: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15545: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13704: \$? = $ac_status" >&5
+ echo "$as_me:15548: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13707: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15551: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13710: \$? = $ac_status" >&5
+ echo "$as_me:15554: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_mbstate_t=yes
else
@@ -13719,11 +15563,12 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:13722: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:15566: result: $cf_cv_mbstate_t" >&5
echo "${ECHO_T}$cf_cv_mbstate_t" >&6
if test "$cf_cv_mbstate_t" = yes ; then
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define NEED_WCHAR_H 1
EOF
@@ -13730,7 +15575,8 @@
fi
if test "$cf_cv_mbstate_t" != unknown ; then
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_MBSTATE_T 1
EOF
@@ -13742,7 +15588,7 @@
EXTRA_OUTPUT="$EXTRA_OUTPUT headers-sh:$srcdir/headers-sh.in"
cat >conftest.$ac_ext <<_ACEOF
-#line 13745 "configure"
+#line 15591 "configure"
#include "confdefs.h"
#include <locale.h>
int
@@ -13754,18 +15600,19 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13757: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15603: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13760: \$? = $ac_status" >&5
+ echo "$as_me:15606: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13763: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15609: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13766: \$? = $ac_status" >&5
+ echo "$as_me:15612: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_SETLOCALE 1
EOF
@@ -13775,86 +15622,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LD_RPATH_OPT=
-echo "$as_me:13779: checking for an rpath option" >&5
-echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
-case $cf_cv_system_name in #(vi
-irix*) #(vi
- if test "$GCC" = yes; then
- LD_RPATH_OPT="-Wl,-rpath,"
- else
- LD_RPATH_OPT="-rpath "
- fi
- ;;
-linux*|gnu*|k*bsd*-gnu) #(vi
- LD_RPATH_OPT="-Wl,-rpath,"
- ;;
-openbsd[2-9].*|mirbsd*) #(vi
- LD_RPATH_OPT="-Wl,-rpath,"
- ;;
-dragonfly*|freebsd*) #(vi
- LD_RPATH_OPT="-rpath "
- ;;
-netbsd*) #(vi
- LD_RPATH_OPT="-Wl,-rpath,"
- ;;
-osf*|mls+*) #(vi
- LD_RPATH_OPT="-rpath "
- ;;
-solaris2*) #(vi
- LD_RPATH_OPT="-R"
- ;;
-*)
- ;;
-esac
-echo "$as_me:13810: result: $LD_RPATH_OPT" >&5
-echo "${ECHO_T}$LD_RPATH_OPT" >&6
-
-case "x$LD_RPATH_OPT" in #(vi
-x-R*)
- echo "$as_me:13815: checking if we need a space after rpath option" >&5
-echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
- cf_save_LIBS="$LIBS"
- LIBS="${LD_RPATH_OPT}$libdir $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-#line 13820 "configure"
-#include "confdefs.h"
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13832: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:13835: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13838: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:13841: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cf_rpath_space=no
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-cf_rpath_space=yes
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS="$cf_save_LIBS"
- echo "$as_me:13851: result: $cf_rpath_space" >&5
-echo "${ECHO_T}$cf_rpath_space" >&6
- test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
- ;;
-esac
-
-echo "$as_me:13857: checking if rpath-hack should be disabled" >&5
+echo "$as_me:15625: checking if rpath-hack should be disabled" >&5
echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
# Check whether --enable-rpath-hack or --disable-rpath-hack was given.
@@ -13871,14 +15639,14 @@
cf_disable_rpath_hack=no
fi;
-echo "$as_me:13874: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:15642: result: $cf_disable_rpath_hack" >&5
echo "${ECHO_T}$cf_disable_rpath_hack" >&6
if test "$cf_disable_rpath_hack" = no ; then
-echo "$as_me:13878: checking for updated LDFLAGS" >&5
+echo "$as_me:15646: checking for updated LDFLAGS" >&5
echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
if test -n "$LD_RPATH_OPT" ; then
- echo "$as_me:13881: result: maybe" >&5
+ echo "$as_me:15649: result: maybe" >&5
echo "${ECHO_T}maybe" >&6
for ac_prog in ldd
@@ -13885,7 +15653,7 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:13888: checking for $ac_word" >&5
+echo "$as_me:15656: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13900,7 +15668,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:13903: found $ac_dir/$ac_word" >&5
+echo "$as_me:15671: found $ac_dir/$ac_word" >&5
break
done
@@ -13908,10 +15676,10 @@
fi
cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
if test -n "$cf_ldd_prog"; then
- echo "$as_me:13911: result: $cf_ldd_prog" >&5
+ echo "$as_me:15679: result: $cf_ldd_prog" >&5
echo "${ECHO_T}$cf_ldd_prog" >&6
else
- echo "$as_me:13914: result: no" >&5
+ echo "$as_me:15682: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -13925,7 +15693,7 @@
cf_rpath_oops=
cat >conftest.$ac_ext <<_ACEOF
-#line 13928 "configure"
+#line 15696 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -13937,19 +15705,19 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13940: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15708: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13943: \$? = $ac_status" >&5
+ echo "$as_me:15711: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13946: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15714: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13949: \$? = $ac_status" >&5
+ echo "$as_me:15717: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u`
- cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort -u`
+ cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
+ cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
@@ -13974,7 +15742,7 @@
then
test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
-echo "${as_me:-configure}:13977: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:15745: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
break
@@ -13986,11 +15754,11 @@
test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
-echo "${as_me:-configure}:13989: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:15757: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6
-echo "${as_me:-configure}:13993: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:15761: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
cf_rpath_dst=
for cf_rpath_src in $LDFLAGS
@@ -14027,7 +15795,7 @@
then
test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
-echo "${as_me:-configure}:14030: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:15798: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
fi
@@ -14040,11 +15808,11 @@
test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6
-echo "${as_me:-configure}:14043: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:15811: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6
-echo "${as_me:-configure}:14047: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:15815: testing ...checking LIBS $LIBS ..." 1>&5
cf_rpath_dst=
for cf_rpath_src in $LIBS
@@ -14081,7 +15849,7 @@
then
test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
-echo "${as_me:-configure}:14084: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:15852: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
fi
@@ -14094,17 +15862,47 @@
test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6
-echo "${as_me:-configure}:14097: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:15865: testing ...checked LIBS $LIBS ..." 1>&5
test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
-echo "${as_me:-configure}:14101: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:15869: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+else
+ echo "$as_me:15872: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
fi
-ac_config_files="$ac_config_files dialog-config makefile $EXTRA_OUTPUT $SUB_MAKEFILE samples/install/makefile"
+cf_libname=\${LIB_BASENAME}
+cf_liblink=$cf_libname
+cf_libroot=$cf_libname
+
+if test "x$cf_cv_do_symlinks" = xyes
+then
+ case "x$cf_cv_shlib_version" in #(vi
+ xrel) #(vi
+ cf_liblink="\${LIB_ABI_NAME}"
+ cf_libname="\${LIB_REL_NAME}"
+ ;;
+ xabi)
+ cf_liblink="\${LIB_REL_NAME}"
+ cf_libname="\${LIB_ABI_NAME}"
+ ;;
+ esac
+fi
+LIB_TARGET=$cf_libname
+
+SET_SHLIB_VARS="# begin CF__DEFINE_SHLIB_VARS\\
+LIB_BASENAME = ${LIB_PREFIX}\${LIB_ROOTNAME}\${LIB_SUFFIX}\\
+LIB_REL_NAME = \${LIB_BASENAME}.\${REL_VERSION}\\
+LIB_ABI_NAME = \${LIB_BASENAME}.\${ABI_VERSION}\\
+LIB_TARGET = $LIB_TARGET\\
+RM_SHARED_OPTS = $RM_SHARED_OPTS\\
+# end CF__DEFINE_SHLIB_VARS"
+
+ac_config_files="$ac_config_files dialog-config makefile $EXTRA_OUTPUT $SUB_MAKEFILE"
ac_config_commands="$ac_config_commands default"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -14185,7 +15983,7 @@
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:14188: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:15986: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
@@ -14317,7 +16115,7 @@
cat >>$CONFIG_STATUS <<EOF
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.52.20101002,
+configured by $0, generated by GNU Autoconf 2.52.20121002,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -14361,7 +16159,7 @@
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
- { { echo "$as_me:14364: error: ambiguous option: $1
+ { { echo "$as_me:16162: 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;}
@@ -14380,7 +16178,7 @@
ac_need_defaults=false;;
# This is an error.
- -*) { { echo "$as_me:14383: error: unrecognized option: $1
+ -*) { { echo "$as_me:16181: 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;}
@@ -14399,7 +16197,7 @@
## Running config.status. ##
## ----------------------- ##
-This file was extended by $as_me 2.52.20101002, executed with
+This file was extended by $as_me 2.52.20121002, executed with
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
CONFIG_LINKS = $CONFIG_LINKS
@@ -14415,6 +16213,16 @@
# INIT-COMMANDS section.
#
+ABI_VERSION="$ABI_VERSION"
+REL_VERSION="$REL_VERSION"
+LIB_MODEL="$LIB_MODEL"
+LIB_PREFIX="$LIB_PREFIX"
+LIB_ROOTNAME="$LIB_ROOTNAME"
+DFT_DEP_SUFFIX="$DFT_DEP_SUFFIX"
+RM_SHARED_OPTS="$RM_SHARED_OPTS"
+cf_cv_do_symlinks="$cf_cv_do_symlinks"
+cf_cv_shlib_version="$cf_cv_shlib_version"
+
EOF
cat >>$CONFIG_STATUS <<\EOF
@@ -14426,11 +16234,10 @@
"makefile" ) CONFIG_FILES="$CONFIG_FILES makefile" ;;
"$EXTRA_OUTPUT" ) CONFIG_FILES="$CONFIG_FILES $EXTRA_OUTPUT" ;;
"$SUB_MAKEFILE" ) CONFIG_FILES="$CONFIG_FILES $SUB_MAKEFILE" ;;
- "samples/install/makefile" ) CONFIG_FILES="$CONFIG_FILES samples/install/makefile" ;;
"default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
"dlg_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS dlg_config.h:config.hin" ;;
- *) { { echo "$as_me:14433: error: invalid argument: $ac_config_target" >&5
+ *) { { echo "$as_me:16240: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
@@ -14489,6 +16296,7 @@
s, at bindir@,$bindir,;t t
s, at sbindir@,$sbindir,;t t
s, at libexecdir@,$libexecdir,;t t
+s, at datarootdir@,$datarootdir,;t t
s, at datadir@,$datadir,;t t
s, at sysconfdir@,$sysconfdir,;t t
s, at sharedstatedir@,$sharedstatedir,;t t
@@ -14520,6 +16328,7 @@
s, at ac_ct_CC@,$ac_ct_CC,;t t
s, at EXEEXT@,$EXEEXT,;t t
s, at OBJEXT@,$OBJEXT,;t t
+s, at EXTRA_CPPFLAGS@,$EXTRA_CPPFLAGS,;t t
s, at CPP@,$CPP,;t t
s, at SET_MAKE@,$SET_MAKE,;t t
s, at RANLIB@,$RANLIB,;t t
@@ -14527,6 +16336,7 @@
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 LN_S@,$LN_S,;t t
s, at LINT@,$LINT,;t t
s, at LINT_OPTS@,$LINT_OPTS,;t t
s, at AR@,$AR,;t t
@@ -14551,13 +16361,17 @@
s, at host_os@,$host_os,;t t
s, at PROG_EXT@,$PROG_EXT,;t t
s, at LIB_PREFIX@,$LIB_PREFIX,;t t
-s, at EXTRA_CPPFLAGS@,$EXTRA_CPPFLAGS,;t t
s, at EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t
+s, at PKG_CONFIG@,$PKG_CONFIG,;t t
+s, at ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
s, at VERSION@,$VERSION,;t t
s, at VERSION_MAJOR@,$VERSION_MAJOR,;t t
s, at VERSION_MINOR@,$VERSION_MINOR,;t t
s, at VERSION_PATCH@,$VERSION_PATCH,;t t
s, at PACKAGE@,$PACKAGE,;t t
+s, at CFG_ROOTNAME@,$CFG_ROOTNAME,;t t
+s, at HDR_ROOTNAME@,$HDR_ROOTNAME,;t t
+s, at LIB_ROOTNAME@,$LIB_ROOTNAME,;t t
s, at SUB_INC@,$SUB_INC,;t t
s, at CONFIG_H@,$CONFIG_H,;t t
s, at ALLOCA@,$ALLOCA,;t t
@@ -14588,8 +16402,11 @@
s, at GT_YES@,$GT_YES,;t t
s, at GT_NO@,$GT_NO,;t t
s, at LINK_PREFIX@,$LINK_PREFIX,;t t
+s, at ABI_VERSION@,$ABI_VERSION,;t t
+s, at REL_VERSION@,$REL_VERSION,;t t
s, at LIBTOOL_VERSION@,$LIBTOOL_VERSION,;t t
s, at LIBTOOL@,$LIBTOOL,;t t
+s, at ac_ct_LIBTOOL@,$ac_ct_LIBTOOL,;t t
s, at LT_UNDEF@,$LT_UNDEF,;t t
s, at LIBTOOL_CXX@,$LIBTOOL_CXX,;t t
s, at LIBTOOL_OPTS@,$LIBTOOL_OPTS,;t t
@@ -14602,13 +16419,34 @@
s, at LIB_LINK@,$LIB_LINK,;t t
s, at LIB_INSTALL@,$LIB_INSTALL,;t t
s, at LIB_UNINSTALL@,$LIB_UNINSTALL,;t t
+s, at CC_SHARED_OPTS@,$CC_SHARED_OPTS,;t t
+s, at LD_RPATH_OPT@,$LD_RPATH_OPT,;t t
+s, at LD_SHARED_OPTS@,$LD_SHARED_OPTS,;t t
+s, at MK_SHARED_LIB@,$MK_SHARED_LIB,;t t
+s, at RM_SHARED_OPTS@,$RM_SHARED_OPTS,;t t
+s, at LINK_PROGS@,$LINK_PROGS,;t t
+s, at LINK_TESTS@,$LINK_TESTS,;t t
+s, at EXTRA_LDFLAGS@,$EXTRA_LDFLAGS,;t t
+s, at LOCAL_LDFLAGS@,$LOCAL_LDFLAGS,;t t
+s, at LOCAL_LDFLAGS2@,$LOCAL_LDFLAGS2,;t t
+s, at INSTALL_LIB@,$INSTALL_LIB,;t t
+s, at RPATH_LIST@,$RPATH_LIST,;t t
+s, at DFT_LWR_MODEL@,$DFT_LWR_MODEL,;t t
+s, at DFT_LIB_SUFFIX@,$DFT_LIB_SUFFIX,;t t
+s, at DFT_DEP_SUFFIX@,$DFT_DEP_SUFFIX,;t t
+s, at LIB_MODEL@,$LIB_MODEL,;t t
s, at LIBTOOL_MAKE@,$LIBTOOL_MAKE,;t t
+s, at MAKE_NORMAL@,$MAKE_NORMAL,;t t
+s, at MAKE_SHARED@,$MAKE_SHARED,;t t
+s, at MAKE_STATIC@,$MAKE_STATIC,;t t
s, at NCURSES_CONFIG@,$NCURSES_CONFIG,;t t
+s, at ac_ct_NCURSES_CONFIG@,$ac_ct_NCURSES_CONFIG,;t t
s, at EXTRAOBJS@,$EXTRAOBJS,;t t
s, at PACKAGE_PREFIX@,$PACKAGE_PREFIX,;t t
s, at PACKAGE_CONFIG@,$PACKAGE_CONFIG,;t t
s, at cf_ldd_prog@,$cf_ldd_prog,;t t
-s, at EXTRA_LDFLAGS@,$EXTRA_LDFLAGS,;t t
+s, at SET_SHLIB_VARS@,$SET_SHLIB_VARS,;t t
+s, at LIB_TARGET@,$LIB_TARGET,;t t
CEOF
EOF
@@ -14723,7 +16561,7 @@
esac
if test x"$ac_file" != x-; then
- { echo "$as_me:14726: creating $ac_file" >&5
+ { echo "$as_me:16564: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
@@ -14741,7 +16579,7 @@
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:14744: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:16582: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -14754,7 +16592,7 @@
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:14757: error: cannot find input file: $f" >&5
+ { { echo "$as_me:16595: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -14761,6 +16599,38 @@
esac
done` || { (exit 1); exit 1; }
EOF
+cat >>$CONFIG_STATUS <<\EOF
+ ac_warn_datarootdir=no
+ if test x"$ac_file" != x-; then
+ for ac_item in $ac_file_inputs
+ do
+ ac_seen=`grep '@\(datadir\|mandir\|infodir\)@' $ac_item`
+ if test -n "$ac_seen"; then
+ ac_used=`grep '@datarootdir@' $ac_item`
+ if test -z "$ac_used"; then
+ { echo "$as_me:16611: WARNING: datarootdir was used implicitly but not set:
+$ac_seen" >&5
+echo "$as_me: WARNING: datarootdir was used implicitly but not set:
+$ac_seen" >&2;}
+ ac_warn_datarootdir=yes
+ fi
+ fi
+ ac_seen=`grep '${datarootdir}' $ac_item`
+ if test -n "$ac_seen"; then
+ { echo "$as_me:16620: WARNING: datarootdir was used explicitly but not set:
+$ac_seen" >&5
+echo "$as_me: WARNING: datarootdir was used explicitly but not set:
+$ac_seen" >&2;}
+ ac_warn_datarootdir=yes
+ fi
+ done
+ fi
+
+if test "x$ac_warn_datarootdir" = xyes; then
+ ac_sed_cmds="$ac_sed_cmds | sed -e 's, at datarootdir@,\${prefix}/share,g' -e 's,\${datarootdir},\${prefix}/share,g'"
+fi
+
+EOF
cat >>$CONFIG_STATUS <<EOF
sed "$ac_vpsub
$extrasub
@@ -14775,11 +16645,35 @@
" $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
+ cp $tmp/out $ac_file
+
+ for ac_name in prefix exec_prefix datarootdir
+ do
+ ac_seen=`fgrep -n '${'$ac_name'[:=].*}' $ac_file`
+ if test -n "$ac_seen"; then
+ ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file`
+ if test -z "$ac_init"; then
+ ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
+ { echo "$as_me:16657: WARNING: Variable $ac_name is used but was not set:
+$ac_seen" >&5
+echo "$as_me: WARNING: Variable $ac_name is used but was not set:
+$ac_seen" >&2;}
+ fi
+ fi
+ done
+ egrep -n '@[a-z_][a-z_0-9]+@' $ac_file >$tmp/out
+ egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
+ if test -s $tmp/out; then
+ ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
+ { echo "$as_me:16668: WARNING: Some variables may not be substituted:
+$ac_seen" >&5
+echo "$as_me: WARNING: Some variables may not be substituted:
+$ac_seen" >&2;}
+ fi
else
cat $tmp/out
- rm -f $tmp/out
fi
+ rm -f $tmp/out
done
EOF
@@ -14820,7 +16714,7 @@
* ) ac_file_in=$ac_file.in ;;
esac
- test x"$ac_file" != x- && { echo "$as_me:14823: creating $ac_file" >&5
+ test x"$ac_file" != x- && { echo "$as_me:16717: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
@@ -14831,7 +16725,7 @@
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:14834: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:16728: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -14844,7 +16738,7 @@
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:14847: error: cannot find input file: $f" >&5
+ { { echo "$as_me:16741: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -14902,7 +16796,7 @@
rm -f $tmp/in
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
- { echo "$as_me:14905: $ac_file is unchanged" >&5
+ { echo "$as_me:16799: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -14986,6 +16880,128 @@
;;
esac
done ;;
+ default )
+
+cf_libname=\${LIB_BASENAME}
+cf_liblink=$cf_libname
+cf_libroot=$cf_libname
+
+if test "x$cf_cv_do_symlinks" = xyes
+then
+ case "x$cf_cv_shlib_version" in #(vi
+ xrel) #(vi
+ cf_liblink="\${LIB_ABI_NAME}"
+ cf_libname="\${LIB_REL_NAME}"
+ ;;
+ xabi)
+ cf_liblink="\${LIB_REL_NAME}"
+ cf_libname="\${LIB_ABI_NAME}"
+ ;;
+ esac
+fi
+LIB_TARGET=$cf_libname
+
+case x$LIB_MODEL in
+xlibtool|xshared) #(vi
+ cf_libdeps="\${LIBS} \${LDFLAGS}"
+ ;;
+x*)
+ cf_libdeps=
+ ;;
+esac
+
+cat >>makefile <<CF_EOF
+
+# generated by CF__ADD_SHLIB_RULES
+# libmodel: $LIB_MODEL
+# symlinks: $cf_cv_do_symlinks
+# shlibver: $cf_cv_shlib_version
+
+CF_EOF
+
+cat >>makefile <<CF_EOF
+$cf_libname :: \\
+CF_EOF
+
+cat >>makefile <<CF_EOF
+ \${LIB_OBJECT}
+ @echo linking \$@
+ \$(LIBTOOL_CREATE) \${LIB_OBJECT} $cf_libdeps
+CF_EOF
+
+if test "x$cf_cv_do_symlinks" = xyes
+then
+cat >>makefile <<CF_EOF
+ \$(LN_S) $cf_libname $cf_liblink
+ \$(LN_S) $cf_liblink $cf_libroot
+CF_EOF
+fi
+
+cat >>makefile <<CF_EOF
+
+install \\
+install.libs :: \$(DESTDIR)\$(libdir)/$cf_libname
+
+\$(DESTDIR)\$(libdir)/$cf_libname :: \\
+ \$(DESTDIR)\$(libdir) \\
+ \${LIB_OBJECT}
+ @echo linking \$@
+ \$(LIBTOOL_CREATE) \${LIB_OBJECT} $cf_libdeps
+CF_EOF
+
+if test "x$cf_cv_do_symlinks" = xyes
+then
+cat >>makefile <<CF_EOF
+ cd \$(DESTDIR)\$(libdir) && (\$(LN_S) $cf_libname $cf_liblink; \$(LN_S) $cf_liblink $cf_libroot; )
+CF_EOF
+fi
+
+if test x$LIB_MODEL = xshared
+then
+cat >>makefile <<CF_EOF
+ - test -z "\$(DESTDIR)" && /sbin/ldconfig
+CF_EOF
+fi
+
+cat >>makefile <<CF_EOF
+
+uninstall \\
+uninstall.libs ::
+ @echo uninstalling \$(DESTDIR)\$(libdir)/$cf_libname
+CF_EOF
+
+if test "x$cf_cv_do_symlinks" = xyes
+then
+cat >>makefile <<CF_EOF
+ -rm -f \$(DESTDIR)\$(libdir)/$cf_libroot
+ -rm -f \$(DESTDIR)\$(libdir)/$cf_liblink
+CF_EOF
+fi
+
+cat >>makefile <<CF_EOF
+ -rm -f \$(DESTDIR)\$(libdir)/$cf_libname
+
+clean \\
+clean.libs ::
+CF_EOF
+
+if test "x$cf_cv_do_symlinks" = xyes
+then
+cat >>makefile <<CF_EOF
+ -rm -f $cf_libroot
+ -rm -f $cf_liblink
+CF_EOF
+fi
+
+cat >>makefile <<CF_EOF
+ -rm -f $cf_libname
+
+mostlyclean::
+ -rm -f \${LIB_OBJECT}
+# end generated by CF__ADD_SHLIB_RULES
+CF_EOF
+
+ ;;
esac
done
EOF
Property changes on: vendor/dialog/dist/configure
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/configure.in
===================================================================
--- vendor/dialog/dist/configure.in 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/configure.in 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,7 +1,7 @@
-dnl $Id: configure.in,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+dnl $Id: configure.in,v 1.79 2013/09/02 14:02:57 tom Exp $
dnl Process this file with autoconf to produce a configure script.
dnl ---------------------------------------------------------------------------
-dnl Copyright 1999-2010,2011 -- Thomas E. Dickey
+dnl Copyright 1999-2011,2012 -- Thomas E. Dickey
dnl
dnl Permission is hereby granted, free of charge, to any person obtaining a
dnl copy of this software and associated documentation files (the
@@ -27,7 +27,7 @@
dnl sale, use or other dealings in this Software without prior written
dnl authorization.
dnl ---------------------------------------------------------------------------
-AC_PREREQ(2.13.20020210)
+AC_PREREQ(2.52.20011201)
AC_INIT(dialog.h)
AC_CONFIG_HEADER(dlg_config.h:config.hin)
@@ -39,20 +39,17 @@
dnl
dnl Checks for programs.
dnl
-AC_PROG_CC
+CF_PROG_CC
AC_PROG_CPP
-AC_PROG_GCC_TRADITIONAL
AC_PROG_MAKE_SET
AC_PROG_RANLIB
AC_PROG_INSTALL
+CF_PROG_LN_S
CF_PROG_LINT
dnl needed for CF_WITH_LIBTOOL
AC_CHECK_TOOL(AR, ar, ar)
-AC_ISC_POSIX
-AC_C_CONST
-
CF_MAKEFLAGS
CF_MAKE_TAGS
CF_DISABLE_ECHO
@@ -63,23 +60,36 @@
CF_LARGEFILE
CF_WITH_WARNINGS
+CF_PKG_CONFIG
dnl
dnl Allow dialog program and library to be renamed.
+AC_MSG_CHECKING(for this package's name)
AC_ARG_WITH(package,
[ --with-package=XXX rename dialog to XXX, library to libXXX.a, etc],
[PACKAGE=$withval],
[PACKAGE=dialog])
+AC_MSG_RESULT($PACKAGE)
CF_VERSION_INFO(dialog,$PACKAGE)
+CFG_ROOTNAME=$PACKAGE
+HDR_ROOTNAME=$PACKAGE
+LIB_ROOTNAME=$PACKAGE
+
+AC_SUBST(CFG_ROOTNAME)
+AC_SUBST(HDR_ROOTNAME)
+AC_SUBST(LIB_ROOTNAME)
+
dnl
dnl If package is renamed, it is useful to have the dlg_XXX headers in a
dnl subdirectory (using the package name) so that multiple versions of the
dnl headers can coexist.
+AC_MSG_CHECKING(if we should install dlg_XXX headers to subdirectory)
AC_ARG_ENABLE(header-subdir,
[ --enable-header-subdir install dlg_XXX headers to subdirectory],
[SUB_INC=$enableval],
[SUB_INC=no])
+AC_MSG_RESULT($SUB_INC)
AC_SUBST(SUB_INC)
dnl
@@ -95,19 +105,15 @@
trace,
[ --disable-trace do not support --trace option],
[EXTRAOBJS="$EXTRAOBJS trace\$o"
- AC_DEFINE(HAVE_DLG_TRACE)],,yes)
+ AC_DEFINE(HAVE_DLG_TRACE,1,[Define to 1 to support --trace option])],,yes)
-LIBTOOL_MAKE="#"
-CF_WITH_LIBTOOL
-if test "$with_libtool" = "yes" ; then
- OBJEXT="lo"
- LIBTOOL_MAKE=
- CF_WITH_LIBTOOL_OPTS
-fi
-AC_SUBST(LIBTOOL_MAKE)
+CF_LD_RPATH_OPT
+CF_WITH_SHARED_OR_LIBTOOL(DIALOG,${VERSION_MAJOR}.${VERSION_MINOR},`echo "$VERSION" |sed -e 's/:/./g'`)
CF_WITH_CURSES_DIR
+CF_ENABLE_RPATH
+
use_ncurses=no
AC_ARG_WITH(ncurses,
[ --with-ncurses compile/link with ncurses library],
@@ -136,48 +142,59 @@
rc-file,
[ --disable-rc-file do not include config-file support],
[EXTRAOBJS="$EXTRAOBJS rc\$o"
- AC_DEFINE(HAVE_RC_FILE)],,$cf_all_widgets)
+ AC_DEFINE(HAVE_RC_FILE,1,[Define to 1 to include config-file support])],,$cf_all_widgets)
CF_ARG_MSG_ENABLE([if you want Xdialog-style dialogs],
Xdialog,
- [ --disable-Xdialog do not include Xdialog-style dialogs],
+ [ --disable-Xdialog do not include Xdialog-style dialogs (1.1)],
[EXTRAOBJS="$EXTRAOBJS calendar\$o fselect\$o timebox\$o"
- AC_DEFINE(HAVE_XDIALOG)],,$cf_all_widgets)
+ AC_DEFINE(HAVE_XDIALOG,1,[Define to 1 to include Xdialog-style dialogs])],,$cf_all_widgets)
+CF_ARG_MSG_ENABLE([if you want extra Xdialog-style dialogs (1.2)],
+ Xdialog2,
+ [ --disable-Xdialog2 do not include extra Xdialog-style dialogs (1.2)],
+ [EXTRAOBJS="$EXTRAOBJS buildlist\$o rangebox\$o treeview\$o"
+ AC_DEFINE(HAVE_XDIALOG2,1,[Define to 1 to include extra Xdialog-style dialogs])],,$cf_all_widgets)
+
+CF_ARG_MSG_ENABLE([if you want compatibility with whiptail options],
+ whiptail,
+ [ --disable-whiptail do not map extra whiptail options],
+ [AC_DEFINE(HAVE_WHIPTAIL,1,[Define to 1 to include extra whiptail options])],,$cf_all_widgets)
+
CF_ARG_MSG_ENABLE([if you want the form dialog],
form,
[ --disable-form do not include the form dialog],
[EXTRAOBJS="$EXTRAOBJS formbox\$o"
- AC_DEFINE(HAVE_DLG_FORMBOX)],,$cf_all_widgets)
+ AC_DEFINE(HAVE_DLG_FORMBOX,1,[Define to 1 to include the form dialog])],,$cf_all_widgets)
CF_ARG_MSG_ENABLE([if you want the gauge dialog],
gauge,
[ --disable-gauge do not include the gauge dialogs],
[EXTRAOBJS="$EXTRAOBJS guage\$o pause\$o prgbox\$o progressbox\$o"
- AC_DEFINE(HAVE_DLG_GAUGE)],,$cf_all_widgets)
+ AC_DEFINE(HAVE_DLG_GAUGE,1,[Define to 1 to include the gauge dialogs])],,$cf_all_widgets)
CF_ARG_MSG_ENABLE([if you want the tailbox dialog],
tailbox,
[ --disable-tailbox do not include the tailbox dialog],
[EXTRAOBJS="$EXTRAOBJS tailbox\$o"
- AC_DEFINE(HAVE_DLG_TAILBOX)],,$cf_all_widgets)
+ AC_DEFINE(HAVE_DLG_TAILBOX,1,[Define to 1 to include the tailbox dialog])],,$cf_all_widgets)
CF_ARG_MSG_ENABLE([if you want the mixedform dialog],
mixedform,
[ --disable-mixedform do not include the mixedform dialog],
[EXTRAOBJS="$EXTRAOBJS mixedform\$o"
- AC_DEFINE(HAVE_DLG_MIXEDFORM)],,$cf_all_widgets)
+ AC_DEFINE(HAVE_DLG_MIXEDFORM,1,[Define to 1 to include the mixedform dialog])],,$cf_all_widgets)
CF_ARG_MSG_ENABLE([if you want the mixedgauge dialog],
mixedgauge,
[ --disable-mixedgauge do not include the mixedgauge dialog],
[EXTRAOBJS="$EXTRAOBJS mixedgauge\$o"
- AC_DEFINE(HAVE_MIXEDGAUGE)],,$cf_all_widgets)
+ AC_DEFINE(HAVE_MIXEDGAUGE,1,[Define to 1 to include the mixedgauge dialog])],,$cf_all_widgets)
CF_ARG_MSG_ENABLE([if you want the wide-curses features],
widec,
[ --enable-widec enable wide-curses features],
- [AC_DEFINE(USE_WIDE_CURSES)],,$cf_wide_curses)
+ [AC_DEFINE(USE_WIDE_CURSES,1,[Define to 1 to enable wide-curses features])],,$cf_wide_curses)
AC_SUBST(EXTRAOBJS)
@@ -227,10 +244,12 @@
getparyx \
use_default_colors \
wchgat \
+wcursyncup \
wget_wch \
+wsyncup \
)
-AC_CHECK_FUNC(start_color,[AC_DEFINE(HAVE_COLOR)])
+AC_CHECK_FUNC(start_color,[AC_DEFINE(HAVE_COLOR,1,[Define to 1 if (n)curses has start_color function])])
CF_CURSES_CHTYPE
CF_CURSES_WACS_SYMBOLS
CF_CURSES_WGETPARENT
@@ -239,8 +258,22 @@
CF_HEADERS_SH(DLG,dlg_config.h)
-AC_TRY_LINK([#include <locale.h>],[setlocale(LC_ALL, "")],[AC_DEFINE(HAVE_SETLOCALE)])
+AC_TRY_LINK([#include <locale.h>],[setlocale(LC_ALL, "")],[AC_DEFINE(HAVE_SETLOCALE,1,[Define to 1 if locale feature can be enabled])])
CF_DISABLE_RPATH_HACK
-AC_OUTPUT(dialog-config makefile $EXTRA_OUTPUT $SUB_MAKEFILE samples/install/makefile,,,sort -u)
+CF__DEFINE_SHLIB_VARS
+
+AC_OUTPUT(
+ dialog-config
+ makefile
+ $EXTRA_OUTPUT
+ $SUB_MAKEFILE,[
+CF__ADD_SHLIB_RULES(
+ makefile,
+ $LIB_MODEL,
+ [\${LIB_OBJECT}],
+ [\${LIBS} \${LDFLAGS}])
+],[
+CF__INIT_SHLIB_RULES
+],[sort -u])
Modified: vendor/dialog/dist/dialog-config.in
===================================================================
--- vendor/dialog/dist/dialog-config.in 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/dialog-config.in 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,7 +1,7 @@
#!@SHELL@
-# $Id: dialog-config.in,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: dialog-config.in,v 1.6 2012/10/06 14:29:45 tom Exp $
##############################################################################
-# Copyright (c) 2007,2011 Thomas E. Dickey #
+# Copyright (c) 2007-2011,2012 Thomas E. Dickey #
# #
# Permission is hereby granted, free of charge, to any person obtaining a #
# copy of this software and associated documentation files (the "Software"), #
@@ -30,6 +30,7 @@
prefix="@prefix@"
exec_prefix="@exec_prefix@"
+datarootdir="@datarootdir@"
bindir="@bindir@"
libdir="@libdir@"
Modified: vendor/dialog/dist/dialog.1
===================================================================
--- vendor/dialog/dist/dialog.1 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/dialog.1 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,6 +1,6 @@
'\" t
-.\" $Id: dialog.1,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
-.\" Copyright 2005-2010,2011 Thomas E. Dickey
+.\" $Id: dialog.1,v 1.167 2013/09/02 17:38:36 tom Exp $
+.\" Copyright 2005-2012,2013 Thomas E. Dickey
.\"
.\" This program is free software; you can redistribute it and/or modify
.\" it under the terms of the GNU Lesser General Public License, version 2.1
@@ -36,10 +36,14 @@
.fi
.RE
..
+.\" Bulleted paragraph
+.de bP
+.IP \(bu 4
+..
.
-.TH \*D 1 "" "$Date: 2011-12-18 03:01:46 $"
+.TH \*D 1 "" "$Date: 2013/09/02 17:38:36 $"
.SH NAME
-\*p \- display dialog boxes from shell scripts
+dialog \- display dialog boxes from shell scripts
.SH SYNOPSIS
\fB\*p --clear\fP
.br
@@ -60,6 +64,7 @@
.LP
.nh
.na
+.BR buildlist ", "
.BR calendar ", "
.BR checklist ", "
.BR dselect ", "
@@ -81,10 +86,12 @@
.BR programbox ", "
.BR progressbox ", "
.BR radiolist ", "
+.BR rangebox ", "
.BR tailbox ", "
.BR tailboxbg ", "
.BR textbox ", "
-.BR timebox ", and "
+.BR timebox ", "
+.BR treeview ", and "
.BR yesno " (yes/no)."
.ad
.hy
@@ -91,12 +98,10 @@
.RE
.PP
You can put more than one dialog box into a script:
-.TP 5
--
+.bP
Use the "\fB--and-widget\fP" token to force \fB\*p\fP to proceed to the next
dialog unless you have pressed ESC to cancel, or
-.TP 5
--
+.bP
Simply add the tokens for the next dialog box, making a chain.
\*L stops chaining when the return code from a dialog is nonzero,
e.g., Cancel or No (see DIAGNOSTICS).
@@ -238,6 +243,7 @@
.IP "\fB--cr-wrap"
Interpret embedded newlines in the dialog text as a newline on the screen.
Otherwise, \fB\*p\fR will only wrap lines where needed to fit inside the text box.
+.IP
Even though you can control line breaks with this,
\fB\*L\fR will still wrap any lines that are too long for the width of the box.
Without cr-wrap, the layout of your text may be formatted to look nice
@@ -271,6 +277,25 @@
those options overrides this,
making the default button always "Yes" (internally the same as "OK").
.
+.IP "\fB--default-button \fIstring"
+Set the default (preselected) button in a widget.
+By preselecting a button,
+a script makes it possible for the user to simply press \fIEnter\fP
+to proceed through a dialog with minimum interaction.
+.IP
+The option's value is the name of the button:
+.IR ok ,
+.IR yes ,
+.IR cancel ,
+.IR no ,
+.IR help "\ or"
+.IR extra .
+.IP
+Normally the first button in each widget is the default.
+The first button shown is determined by the widget
+together with the "\fB--nook\fP" and "\fB--nocancel\fP options.
+If this option is not given, there is no default button assigned.
+.
.IP "\fB--default-item \fIstring"
Set the default item in a checklist, form or menu box.
Normally the first item in the box is the default.
@@ -293,11 +318,19 @@
.IP "\fB--help-button"
Show a help-button after "OK" and "Cancel" buttons,
i.e., in checklist, radiolist and menu boxes.
-If "\fB--item-help\fR" is also given, on exit
-the return status will be the same as for the "OK" button,
-and the item-help text will be written to \fB\*p\fP's output after the token "HELP".
-Otherwise, the return status will indicate that the Help button was pressed,
-and no message printed.
+.IP
+On exit, the return status will indicate that the Help button was pressed.
+\fB\*L\fP will also write a message to its output after the token "HELP":
+.RS
+.bP
+If "\fB--item-help\fR" is also given, the item-help text will be written.
+.bP
+Otherwise, the item's tag (the first field) will be written.
+.RE
+.IP
+.IP
+You can use the \fB--help-tags\fP option and/or set the DIALOG_ITEM_HELP
+environment variable to modify these messages and exit-status.
.
.IP "\fB--help-label \fIstring"
Override the label used for "Help" buttons.
@@ -309,6 +342,11 @@
This can be used to reconstruct the state of a checklist after processing
the help request.
.
+.IP "\fB--help-tags"
+Modify the messages written on exit for \fB--help-button\fP
+by making them always just the item's tag.
+This does not affect the exit status code.
+.
.IP "\fB--hfile \fIfilename"
Display the given file using a textbox when the user presses F1.
.
@@ -359,6 +397,12 @@
That causes them to be repainted in reverse order.
See the discussion of the "\fB--clear\fR" option for examples.
.
+.IP "\fB--last-key"
+At exit, report the last key which the user entered.
+This is the curses key code rather than a symbol or literal character.
+It can be used by scripts to distinguish between two keys which are
+bound to the same action.
+.
.IP "\fB--max-input \fIsize"
Limit input strings to the given size.
If not specified, the limit is 2048.
@@ -375,6 +419,16 @@
Note that \fB\*p\fR will still wrap text,
subject to the "\fB--cr-wrap\fR" and "\fB--trim\fR" options.
.
+.IP "\fB--no-items"
+Some widgets (checklist, inputmenu, radiolist, menu) display a list
+with two columns (a "tag" and "item", i.e., "description").
+This option tells \fB\*p\fP to read shorter rows,
+omitting the "item" part of the list.
+This is occasionally useful, e.g., if the tags provide enough information.
+.IP
+See also \fB--no-tags\fP.
+If both options are given, this one is ignored.
+.
.IP "\fB--no-kill"
Tells
\fB\*p\fP
@@ -403,10 +457,27 @@
Suppress the "OK" button in checklist, inputbox and menu box modes.
A script can still test if the user pressed the "Enter" key to accept the data.
.
-.
.IP "\fB--no-shadow"
Suppress shadows that would be drawn to the right and bottom of each dialog box.
.
+.IP "\fB--no-tags"
+Some widgets (checklist, inputmenu, radiolist, menu) display a list
+with two columns (a "tag" and "description").
+The tag is useful for scripting, but may not help the user.
+The \fB--no-tags\fP option (from Xdialog) may be used to suppress the
+column of tags from the display.
+Unlike the \fB--no-items\fP option,
+this does not affect the data which is read from the script.
+.IP
+Xdialog does not display the tag column for the analogous buildlist
+and treeview widgets; \fB\*p\fP does the same.
+.IP
+Normally \fB\*p\fP allows you to quickly move to entries on the displayed list,
+by matching a single character to the first character of the tag.
+When the \fB--no-tags\fP option is given, \fB\*p\fP matches against
+the first character of the description.
+In either case, the matchable character is highlighted.
+.
.IP "\fB--ok-label \fIstring"
Override the label used for "OK" buttons.
.
@@ -435,6 +506,11 @@
This may be used alone, without other options.
It does not cause \fBdialog\fP to exit by itself.
.
+.IP "\fB--quoted"
+Normally \fB\*p\fP quotes the strings returned by checklist's
+as well as the item-help text.
+Use this option to quote all string results.
+.
.IP "\fB--scrollbar"
For widgets holding a scrollable set of data,
draw a scrollbar on its right-margin.
@@ -458,8 +534,8 @@
Use single-quoting as needed (and no quotes if unneeded) for the
output of checklist's as well as the item-help text.
If this option is not set, \fB\*p\fP uses double quotes around each item.
-That requires occasional use of backslashes to make the output useful in
-shell scripts.
+In either case,
+\fB\*p\fP adds backslashes to make the output useful in shell scripts.
.
.IP "\fB--size-err"
Check the resulting size of a dialog box before trying to use it,
@@ -503,8 +579,11 @@
.IP "\fB--timeout \fIsecs"
Timeout (exit with error code)
if no user response within the given number of seconds.
-This is overridden if the background "\fB--tailboxbg\fP is used.
A timeout of zero seconds is ignored.
+.IP
+This option is ignored by the "\fB--pause\fP" widget.
+It is also overridden if the background "\fB--tailboxbg\fP" option is used
+to setup multiple concurrent widgets.
.
.IP "\fB--title \fItitle"
Specifies a
@@ -535,7 +614,7 @@
See also "\fB--print-version\fP".
.
.IP "\fB--visit-items"
-Modify the tab-traversal of checklist, radiobox, menubox and inputmenu
+Modify the tab-traversal of checklist, radiolist, menubox and inputmenu
to include the list of items as one of the states.
This is useful as a visual aid,
i.e., the cursor position helps some users.
@@ -563,6 +642,44 @@
Other parameters depend on the box type.
.
.
+.IP "\fB--buildlist \fItext height width \fR[ \fItag item status \fR] \fI..."
+A \fBbuildlist\fP dialog displays two lists, side-by-side.
+The list on the left shows unselected items.
+The list on the right shows selected items.
+As items are selected or unselected, they move between the lists.
+.IP
+Use a carriage return or the "OK" button to accept the current value
+in the selected-window and exit.
+The results are written using the order displayed in the selected-window.
+.IP
+The initial on/off state of each entry is specified by
+.IR status "."
+.IP
+The dialog behaves like a \fBmenu\fP, using the \fB--visit-items\fP
+to control whether the cursor is allowed to visit the lists directly.
+.RS
+.bP
+If \fB--visit-items\fP is not given,
+tab-traversal uses two states (OK/Cancel).
+.bP
+If \fB--visit-items\fP is given,
+tab-traversal uses four states (Left/Right/OK/Cancel).
+.RE
+.IP
+Whether or not \fB--visit--items\fP is given,
+it is possible to move the highlight between the two lists using
+the default "^" (left-column) and "$" (right-column) keys.
+.IP
+On exit, a list of the \fItag\fP
+strings of those entries that are turned on
+will be printed on \fB\*p\fP's output.
+.IP
+If the "\fB--separate-output\fP" option is not given,
+the strings will be quoted as needed to make it simple for scripts to separate them.
+By default, this uses double-quotes.
+See the "\fB--single-quoted\fP" option, which modifies the quoting behavior.
+.
+.
.IP "\fB--calendar \fItext height width day month year"
A \fBcalendar\fP box displays
month, day and year in separately adjustable windows.
@@ -596,8 +713,10 @@
On exit, a list of the \fItag\fP
strings of those entries that are turned on
will be printed on \fB\*p\fP's output.
+.IP
If the "\fB--separate-output\fP" option is not given,
-the strings will be quoted to make it simple for scripts to separate them.
+the strings will be quoted as needed to make it simple for scripts to separate them.
+By default, this uses double-quotes.
See the "\fB--single-quoted\fP" option, which modifies the quoting behavior.
.
.
@@ -649,16 +768,13 @@
while the latter defines the permissible length of the data entered in the
field.
.RS
-.TP 3
--
+.bP
If \fIflen\fR is zero, the corresponding field cannot be altered.
and the contents of the field determine the displayed-length.
-.TP 3
--
+.bP
If \fIflen\fR is negative, the corresponding field cannot be altered,
and the negated value of \fIflen\fR is used as the displayed-length.
-.TP 3
--
+.bP
If \fIilen\fR is zero, it is set to \fIflen\fR.
.RE
.IP
@@ -946,7 +1062,7 @@
that you can indicate which entry is currently selected, by setting its
.IR status " to " on "."
.IP
-On exit, the name of the selected item is written to \fB\*p\fP's output.
+On exit, the tag of the selected item is written to \fB\*p\fP's output.
.
.
.IP "\fB--tailbox \fIfile height width"
@@ -959,6 +1075,36 @@
but an ESC exit status may be returned.
.
.
+.nf
+.IP "\fB--rangebox \fItext height width list-height min-value max-value default-value"
+.fi
+Allow the user to select from a range of values, e.g., using a slider.
+The dialog shows the current value as a bar (like the gauge dialog).
+Tabs or arrow keys move the cursor between the buttons and the value.
+When the cursor is on the value,
+you can edit it by:
+.RS
+.TP 5
+left/right cursor movement to select a digit to modify
+.TP 5
++/-
+characters to increment/decrement the digit by one
+.TP 5
+0 through 9
+to set the digit to the given value
+.RE
+.IP
+Some keys are also recognized in all cursor positions:
+.RS
+.TP 5
+home/end
+set the value to its maximum or minimum
+.TP 5
+pageup/pagedown
+increment the value so that the slider moves by one column
+.RE
+.
+.
.IP "\fB--tailboxbg \fIfile height width"
Display text from a file in a dialog box as a background task,
as in a "tail -f &" command.
@@ -1024,6 +1170,19 @@
The format can be overridden using the \fB--time-format\fP option.
.
.
+.IP "\fB--treeview \fItext height width list-height \fR[ \fItag item status depth \fR] \fI..."
+Display data organized as a tree.
+Each group of data contains a tag,
+the text to display for the item,
+its status ("on" or "off")
+and the depth of the item in the tree.
+.IP
+Only one item can be selected (like the \fBradiolist\fP).
+The tag is not displayed.
+.IP
+On exit, the tag of the selected item is written to \fB\*p\fP's output.
+.
+.
.IP "\fB--yesno \fItext height width"
A \fByes/no\fP dialog box of
size \fIheight\fP rows by \fIwidth\fP columns will be displayed.
@@ -1265,9 +1424,7 @@
that can override them are:
.TP 5
0
-if
-.BR \*p " is exited by pressing the " Yes " or " OK
-button (DIALOG_OK).
+if the \fBYES\fP or \fBOK\fP button is pressed (DIALOG_OK).
.TP 5
1
if the
@@ -1277,7 +1434,9 @@
2
if the
.BR Help
-button is pressed (DIALOG_HELP).
+button is pressed (DIALOG_HELP),
+.br
+except as noted below about DIALOG_ITEM_HELP.
.TP 5
3
if the
@@ -1287,13 +1446,21 @@
4
if the
.BR Help
-button is pressed (DIALOG_HELP),
-or the \fB--item-help\fP option is set
-when the \fBHelp\fP button is pressed (DIALOG_ITEM_HELP),
+button is pressed,
+.br
+and the \fB--item-help\fP option is set
+.br
+and the DIALOG_ITEM_HELP environment variable is set to 4.
+.IP
+While any of the exit-codes can be overridden using environment variables,
+this special case was introduced in 2004 to simplify compatibility.
+\fB\*L\fP uses DIALOG_ITEM_HELP(4) internally,
+but unless the environment variable is also set,
+it changes that to DIALOG_HELP(2) on exit.
.TP 5
-1
if errors occur inside \fB\*p\fP (DIALOG_ERROR)
-or \fB\*p\fP is exited by pressing the \fIESC\fP key (DIALOG_ESC).
+or \fB\*p\fP exits because the \fIESC\fP key (DIALOG_ESC) was pressed.
.
.\" ************************************************************************
.SH PORTABILITY
@@ -1300,14 +1467,12 @@
\fB\*L\fP works with X/Open curses.
However, some implementations have deficiencies:
.RS 3
-.TP 3
--
+.bP
HPUX curses (and perhaps others) do not open the terminal properly for
the \fInewterm\fP function.
This interferes with \fB\*p\fP's \fB--input-fd\fP option,
by preventing cursor-keys and similar escape sequences from being recognized.
-.TP 3
--
+.bP
NetBSD 5.1 curses has incomplete support for wide-characters.
\fB\*p\fP will build, but not all examples display properly.
.RE
@@ -1360,10 +1525,25 @@
.RE
.PP
\fBXdialog\fP's manpage has a section discussing its compatibility with \fB\*p\fP.
+There are some differences not shown in the manpage.
+For example, the html documentation states
+.RS
+.PP
+Note: former Xdialog releases used the "\n" (line feed) as a
+results separator for the checklist widget; this has been
+changed to "/" in Xdialog v1.5.0 so to make it compatible with
+(c)dialog. In your old scripts using the Xdialog checklist, you
+will then have to add the --separate-output option before the
+--checklist one.
+.RE
+.PP
+\fB\*L\fP has not used a different separator;
+the difference was likely due to confusion regarding some script.
.SS WHIPTAIL
Then there is \fBwhiptail\fP.
-For practical purposes, it is maintained by Debian.
-Its documentation claims
+For practical purposes, it is maintained by Debian
+(very little work is done by its upstream developers).
+Its documentation (README.whiptail) claims
.RS
.sp
.nf
@@ -1386,18 +1566,24 @@
Disregard the first paragraph.
.PP
The second paragraph is misleading, since \fBwhiptail\fP
-also does not work for common options of \*p, such as the gauge box.
-\fBwhiptail\fP is less compatible with \fB\*p\fP than the decade-old
-original dialog 0.4 program.
+also does not work for common options of \fB\*p\fP,
+such as the gauge box.
+\fBwhiptail\fP is less compatible with \fB\*p\fP than the
+original mid-1990s dialog 0.4 program.
.PP
\fBwhiptail\fP's manpage borrows features from \fB\*p\fP, e.g.,
-\fB--default-item\fP (2000),
-\fB--output-fd\fP (2002),
-but oddly cites only \fB\*p\fP versions up to 0.4 (1996) as a source.
+but oddly cites only \fB\*p\fP versions up to 0.4 (1994) as a source.
That is, its manpage refers to features which
were borrowed from more recent versions of \fB\*p\fP, e.g.,
-the \fB--gauge\fP and \fB--password\fP boxes,
-as well as options such as \fB--separate-output\fP (2008).
+.bP
+\fB--gauge\fP (from 0.5)
+.bP
+\fB--passwordbox\fP (from Debian changes in 1999),
+.bP
+\fB--default-item\fP (from \fB\*p\fP 2000/02/22),
+.bP
+\fB--output-fd\fP (from \fB\*p\fP 2002/08/14).
+.PP
Somewhat humorously, one may note that the \fBpopt\fP feature
(undocumented in its manpage)
of using a "--" as an escape was documented in \fB\*p\fP's manpage about
@@ -1415,12 +1601,38 @@
_ _
l l.
\fIOption\fR \fITreatment\fR
+\fB--cancel-button\fP mapped to \fB--cancel-label\fP
\fB--fb\fP ignored
\fB--fullbutton\fP ignored
+\fB--no-button\fP mapped to \fB--no-label\fP
\fB--nocancel\fP mapped to \fB--no-cancel\fP
-\fB--noitem\fP ignored
+\fB--noitem\fP mapped to \fB--no-items\fP
+\fB--notags\fP mapped to \fB--no-tags\fP
+\fB--ok-button\fP mapped to \fB--ok-label\fP
+\fB--scrolltext\fP mapped to \fB--scrollbar\fP
+\fB--topleft\fP mapped to \fB--begin 0 0\fP
+\fB--yes-button\fP mapped to \fB--yes-label\fP
.TE
.RE
+.LP
+There are visual differences which are not addressed by command-line options:
+.bP
+\fB\*p\fP centers lists within the window.
+\fBwhiptail\fP typically puts lists against the left margin.
+.bP
+\fBwhiptail\fP uses angle brackets ("<" and ">") for marking buttons.
+\fB\*p\fP uses square brackets.
+.bP
+\fBwhiptail\fP marks the limits of subtitles with vertical bars.
+\fB\*p\fP does not mark the limits.
+.bP
+\fBwhiptail\fP attempts to mark the top/bottom cells of a scrollbar
+with up/down arrows.
+When it cannot do this,
+it fills those cells with the background color
+of the scrollbar and confusing the user.
+\fB\*p\fP uses the entire scrollbar space,
+thereby getting better resolution.
.\" ************************************************************************
.SH BUGS
Perhaps.
@@ -1439,13 +1651,11 @@
This is a rewrite (except as needed to provide compatibility)
of the earlier version of \fB\*p 0.9a\fP,
which lists as authors:
-.RS
-.LP
+.bP
Savio Lam - version 0.3, "dialog"
-.LP
+.bP
Stuart Herbert - patch for version 0.4
-.LP
+.bP
Marc Ewing - the gauge widget.
-.LP
+.bP
Pasquale De Marco "Pako" - version 0.9a, "cdialog"
-.RE
Modified: vendor/dialog/dist/dialog.3
===================================================================
--- vendor/dialog/dist/dialog.3 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/dialog.3 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,6 @@
-.\" $Id: dialog.3,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
-.\" Copyright 2005-2010,2011 Thomas E. Dickey
+'\" t
+.\" $Id: dialog.3,v 1.93 2013/09/22 23:58:11 tom Exp $
+.\" Copyright 2005-2012,2013 Thomas E. Dickey
.\"
.\" This program is free software; you can redistribute it and/or modify
.\" it under the terms of the GNU Lesser General Public License, version 2.1
@@ -38,9 +39,9 @@
.de bP
.IP \(bu 4
..
-.TH \*D 3 "" "$Date: 2011-12-18 03:01:46 $"
+.TH \*D 3 "" "$Date: 2013/09/22 23:58:11 $"
.SH NAME
-\*l \- widgets and utilities for the \*p program
+dialog \- widgets and utilities for the \*p program
.SH SYNOPSIS
.B cc [ flag ... ] file ... -l\*l [ library ... ]
.br
@@ -126,6 +127,11 @@
It represents width / height.
The default is 9, which means 9 characters wide to every 1 line high.
.\" ---------------------------------------------------------------------------
+.IP \fIDIALOG_STATE.finish_string
+When set to true, this allows calls to \fBdlg_finish_string\fP to discard the
+corresponding data which is created to speed up layout computations for the
+given string parameter. The \fBgauge\fP widget uses this feature.
+.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_STATE.getc_callbacks
This is setup in \fIui_getc.c\fP to record windows which must be polled
for input, e.g,. to handle the background tailbox widget.
@@ -295,6 +301,9 @@
Restore normal settings with "\\Zn".
.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_VARS.column_separator
+This corresponds to the command-line option "\fB--column-separator\fP".
+\fB\*L\fP splits data for radio/checkboxes and menus on the
+occurrences of the given string, and aligns the split data into columns.
.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_VARS.cr_wrap
This corresponds to the command-line option "\fB--cr-wrap\fP".
@@ -312,11 +321,16 @@
If the host provides \fBstrftime\fP, and the value is nonnull,
the calendar widget uses this to format its output.
.\" ---------------------------------------------------------------------------
+.IP \fIDIALOG_VARS.default_button
+This is set by the command-line option "\fB--default-button\fP.
+It is used by \fBdlg_default_button\fP.
+.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_VARS.default_item
This corresponds to the command-line option "\fB--default-item\fP \fIstring\fP".
The given string is used as
the default item in a checklist, form or menu box.
Normally the first item in the box is the default.
+.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_VARS.defaultno
This corresponds to the command-line option "\fB--defaultno\fP".
If true,
@@ -387,6 +401,14 @@
This can be used to reconstruct the state of a checklist after processing
the help request.
.\" ---------------------------------------------------------------------------
+.IP \fIDIALOG_VARS.help_tags
+This corresponds to the command-line option "\fB--help-tags\fP".
+If true,
+\fBdlg_add_help_formitem\fP and
+\fBdlg_add_help_listitem\fP use the item's tag value consistently
+rather than using the tag's help-text value
+when \fIDIALOG_VARS.item_help\fP is set.
+.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_VARS.input_length
This is nonzero if \fIDIALOG_VARS.input_result\fP is allocated,
versus being a pointer to the user's local variables.
@@ -424,7 +446,7 @@
.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_VARS.in_helpfile
This variable is used to prevent \fBdialog_helpfile\fP from showing
-anything, e.g., if F1 were pressed within a help-file display.
+anything, e.g., if F1 were pressed within a help-file display.
.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_VARS.item_help
This corresponds to the command-line option "\fB--item-help\fP".
@@ -448,11 +470,21 @@
widgets are run in the same process.
Note that curses will clear the screen when starting a new process.
.\" ---------------------------------------------------------------------------
+.IP \fIDIALOG_VARS.last_key
+This corresponds to the command-line option "\fB--last-key\fP".
+.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_VARS.max_input
This corresponds to the command-line option "\fB--max-input\fP \fIsize\fP".
Limit input strings to the given size.
If not specified, the limit is 2048.
.\" ---------------------------------------------------------------------------
+.IP \fIDIALOG_VARS.no_items
+This corresponds to the command-line option "\fB--no-items\fP".
+Some widgets (checklist, inputmenu, radiolist, menu) display a list
+with two columns (a "tag" and "item", i.e., "description").
+This tells \fB\*p\fP to read shorter rows from data,
+omitting the "list".
+.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_VARS.no_label
This corresponds to the command-line option "\fB--no-label\fP \fIstring\fP".
The given string overrides the label used for "No" buttons.
@@ -467,6 +499,63 @@
If false, \fBdlg_trim_string\fP converts literal "\\n" substrings
in a message into newlines.
.\" ---------------------------------------------------------------------------
+.IP \fIDIALOG_VARS.no_tags
+This corresponds to the command-line option "\fB--no-tags\fP".
+Some widgets (checklist, inputmenu, radiolist, menu) display a list
+with two columns (a "tag" and "item", also known as "description").
+The tag is useful for scripting, but may not help the user.
+The \fB--no-tags\fP option (from Xdialog) may be used to suppress the
+column of tags from the display.
+.IP
+Normally \fB\*p\fP allows you to quickly move to entries on the displayed list,
+by matching a single character to the first character of the tag.
+When the \fB--no-tags\fP option is given, \fB\*p\fP matches against
+the first character of the description.
+In either case, the matchable character is highlighted.
+.IP
+Here is a table showing how the no_tags and no_items values interact:
+.TS
+tab(/);
+l l l l l
+_ _ _ _ _
+l l l c c.
+Widget/Fields Shown/Fields Read/.no_items/.no_tags
+buildlist/item/tag,item/0/0*
+buildlist/item/tag,item/0/1
+buildlist/tag/tag/1/0*
+buildlist/tag/tag/1/1
+checklist/tag,item/tag,item/0/0
+checklist/item/tag,item/0/1
+checklist/tag/tag/1/0
+checklist/tag/tag/1/1
+inputmenu/tag,item/tag,item/0/0
+inputmenu/item/tag,item/0/1
+inputmenu/tag/tag/1/0
+inputmenu/tag/tag/1/1
+menu/tag,item/tag,item/0/0
+menu/item/tag,item/0/1
+menu/tag/tag/1/0
+menu/tag/tag/1/1
+radiolist/tag,item/tag,item/0/0
+radiolist/item/tag,item/0/1
+radiolist/tag/tag/1/0
+radiolist/tag/tag/1/1
+treeview/item/tag,item/0/0*
+treeview/item/tag,item/0/1
+treeview/tag/tag/1/0*
+treeview/tag/tag/1/1
+_
+.TE
+.RS
+.TP 2
+*
+Xdialog does not display the tag column for the analogous buildlist
+and treeview widgets.
+\fB\*L\fP does the same on the command-line.
+However the library interface defaults to displaying the tag column.
+Your application can enable or disable the tag column as needed for each widget.
+.RE
+.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_VARS.nocancel
This corresponds to the command-line option "\fB--no-cancel\fP".
If true,
@@ -482,6 +571,8 @@
option.
.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_VARS.nook
+This corresponds to the command-line option "\fB--nook\fP.
+\fB\*L\fP will suppress the "ok" (or "yes") button from the widget.
.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_VARS.ok_label
This corresponds to the command-line option "\fB--ok-label\fP \fIstring\fP".
@@ -493,6 +584,7 @@
each widget prints its size to \fB\*p\fP's output when it is invoked.
.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_VARS.quoted
+This corresponds to the command-line option "\fB--quoted\fP.
.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_VARS.separate_output
This corresponds to the command-line option "\fB--separate-output\fP".
@@ -506,8 +598,9 @@
Use single-quoting as needed (and no quotes if unneeded) for the
output of checklist's as well as the item-help text.
If this option is not set, \fB\*p\fP uses double quotes around each item.
-That requires occasional use of backslashes to make the output useful in
+The latter requires occasional use of backslashes to make the output useful in
shell scripts.
+.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_VARS.size_err
This corresponds to the command-line option "\fB--size-err\fP".
If true,
@@ -548,7 +641,8 @@
.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_VARS.visit_items
This corresponds to the command-line option "\fB--visit-items\fP".
-Modify the tab-traversal of checklist, radiobox, menubox and inputmenu
+Modify the tab-traversal of the list-oriented widgets
+(buildlist, checklist, radiobox, menubox, inputmenu, and treeview)
to include the list of items as one of the states.
This is useful as a visual aid,
i.e., the cursor position helps some users.
@@ -577,6 +671,49 @@
Other parameters depend on the box type.
.
.\" ************************************************************************
+.IP \fBdialog_buildlist
+implements the "\fB--buildlist\fP" option.
+.RS
+.TP 5
+.B const char * \fItitle
+is the title on the top of the widget.
+.TP 5
+.B const char * \fIcprompt
+is the prompt text shown within the widget.
+.TP 5
+.B int \fIheight
+is the desired height of the box.
+If zero, the height is adjusted to use the available screen size.
+.TP 5
+.B int \fIwidth
+is the desired width of the box.
+If zero, the height is adjusted to use the available screen size.
+.TP 5
+.B int \fIlist_height
+is the minimum height to reserve for displaying the list.
+If zero, it is computed based on the given \fIheight\fP and \fIwidth\fP.
+.TP 5
+.B int \fIitem_no
+is the number of rows in \fIitems\fP.
+.TP 5
+.B char ** \fIitems
+is an array of strings which is viewed either as a list of rows
+.RS
+\fItag item status \fR
+.RE
+.IP
+or
+.RS
+\fItag item status help\fR
+.RE
+.IP
+depending on whether \fBdialog_vars.item_help\fP is set.
+.TP 5
+.B int \fIorder_mode
+is reserved for future enhancements
+.RE
+.
+.\" ************************************************************************
.IP \fBdialog_calendar
implements the "\fB--calendar\fP" option.
.RS
@@ -752,9 +889,10 @@
.\" ************************************************************************
.IP \fBdialog_gauge
implements the "\fB--gauge\fP" option.
-Alternatively, a simpler or customized gauge widget can be
+Alternatively, a simpler or customized gauge widget can be
setup using
\fBdlg_allocate_gauge\fP,
+\fBdlg_reallocate_gauge\fP,
\fBdlg_update_gauge\fP and
\fBdlg_free_gauge\fP.
.RS
@@ -1056,6 +1194,35 @@
If zero, the height is based on the screen size.
.RE
.\" ************************************************************************
+.IP \fBdialog_rangebox
+implements the "\fB--rangebox\fP" option.
+.RS
+.TP 5
+.B const char * \fItitle
+is the title on the top of the widget.
+.TP 5
+.B const char * \fIcprompt
+is the prompt text shown within the widget.
+If empty or null, no prompt is shown.
+.TP 5
+.B int \fIheight
+is the desired height of the widget.
+If zero, the height is based on the screen size.
+.TP 5
+.B int \fIwidth
+is the desired width of the widget.
+If zero, the height is based on the screen size.
+.TP 5
+.B int \fImin_value
+is the minimum value to allow.
+.TP 5
+.B int \fImax_value
+is the maximum value to allow.
+.TP 5
+.B int \fIdefault_value
+is the default value, if no change is made.
+.RE
+.\" ************************************************************************
.IP \fBdialog_tailbox
implements the "\fB--tailbox\fP" or "\fB--tailboxbg\fP" option
depending on whether \fIbg_task\fP is set.
@@ -1136,6 +1303,42 @@
Returns DLG_EXIT_ERROR if the value specified is greater than or equal to 60.
.RE
.\" ************************************************************************
+.IP \fBdialog_treeview
+implements the "\fB--treeview\fP" option.
+.RS
+.TP 5
+.B const char * \fItitle
+is the title on the top of the widget.
+.TP 5
+.B const char * \fIcprompt
+is the prompt text shown within the widget.
+.TP 5
+.B int \fIheight
+is the desired height of the box.
+If zero, the height is based on the screen size.
+.TP 5
+.B int \fIwidth
+is the desired width of the box.
+If zero, the height is based on the screen size.
+.TP 5
+.B int \fIlist_height
+is the minimum height to reserve for displaying the list.
+If zero, it is computed based on the given \fIheight\fP and \fIwidth\fP.
+.TP 5
+.B int \fIitem_no
+is the number of rows in \fIitems\fP.
+.TP 5
+.B char ** \fIitems
+is the list of items, contain tag, name, and optionally help strings
+(if \fBdialog_vars.item_help\fP is set).
+The initial selection state for each item is also in this list.
+.TP 5
+.B int \fIflag
+.IP flag
+is either \fIFLAG_CHECK\fP, for checklists (multiple selections),
+or \fIFLAG_RADIO\fP for radiolists (a single selection).
+.RE
+.\" ************************************************************************
.IP \fBdialog_yesno
implements the "\fB--yesno\fP" option.
.RS
@@ -1197,8 +1400,68 @@
.RE
.\" ---------------------------------------------------------------------------
.TP 5
+.B dlg_add_help_formitem
+This is a utility function used enforce consistent behavior for
+the \fIDIALOG_VARS.help_tags\fP and \fIDIALOG_VARS.item_help\fP variables.
+.RS
+.TP 5
+.B int *\fIresult\fP
+this is updated to DLG_EXIT_ITEM_HELP if \fIDIALOG_VARS.item_help\fP is set.
+.TP 5
+.B char **\fItag\fP
+the tag- or help-text is stored here.
+.TP 5
+.B DIALOG_FORMITEM *\fIitem\fP
+contains the list item to use for tag- or help-text.
+.RE
+.\" ---------------------------------------------------------------------------
+.TP 5
+.B dlg_add_help_listitem
+This is a utility function used enforce consistent behavior for
+the \fIDIALOG_VARS.help_tags\fP and \fIDIALOG_VARS.item_help\fP variables.
+.RS
+.TP 5
+.B int *\fIresult\fP
+this is updated to DLG_EXIT_ITEM_HELP if \fIDIALOG_VARS.item_help\fP is set.
+.TP 5
+.B char **\fItag\fP
+the tag- or help-text is stored here.
+.TP 5
+.B DIALOG_LISTITEM *\fIitem\fP
+contains the list item to use for tag- or help-text.
+.RE
+.\" ---------------------------------------------------------------------------
+.TP 5
+.B dlg_add_last_key
+Report the last key entered by the user.
+This implements the \fB\-\-last\-key\fP command-line option,
+using \fBdialog_vars.last_key\fP.
+.RS
+.TP 5
+.B int \fImode
+controls the way the last key report is separated from other results:
+.RS
+.TP 5
+-2
+(no separator)
+.TP 5
+-1
+(separator after the key name)
+.TP 5
+0
+(separator is optionally before the key name)
+.TP 5
+1
+(same as -1)
+.RE
+.RE
+.\" ---------------------------------------------------------------------------
+.TP 5
.B dlg_add_quoted
Add a quoted string to the result buffer (see \fBdlg_add_result\fP).
+If no quotes are necessary, none are used.
+If \fBdialog_vars.single_quoted\fR is set, single-quotes are used.
+Otherwise, double-quotes are used.
.RS
.TP 5
.B char * \fIstring
@@ -1207,7 +1470,7 @@
.\" ---------------------------------------------------------------------------
.TP 5
.B dlg_add_result
-Add a quoted string to the result buffer \fBdialog_vars.input_result\fP.
+Add a string to the result buffer \fBdialog_vars.input_result\fP.
.RS
.TP 5
.B char * \fIstring
@@ -1218,7 +1481,7 @@
.B dlg_add_separator
Add an output-separator to the result buffer \fBdialog_vars.input_result\fP.
If \fBdialog_vars.output_separator\fP is set, use that.
-Otherwise, if \fBdialog_vars.separate_output\fP is set, use newline.
+Otherwise, if \fBdialog_vars.separate_output\fP is set, use newline.
If neither is set, use a space.
.\" ---------------------------------------------------------------------------
.TP 5
@@ -1372,17 +1635,13 @@
.B dlg_boxchar
returns its \fBchtype\fP parameter transformed as follows:
.RS
-.TP 3
-.B -
+.bP
if neither \fBdialog_vars.ascii_lines\fP nor \fBdialog_vars.no_lines\fP is set.
-.TP 3
-.B -
+.bP
if \fBdialog_vars.ascii_lines\fP is set, returns the corresponding "+" or "-", etc. for the line-drawing characters used in \fB\*p\fP.
-.TP 3
-.B -
+.bP
otherwise, if \fBdialog_vars.no_lines\fP is set, returns a space for the line-drawing characters.
-.TP 3
-.B -
+.bP
if the parameter is not a line-drawing or other special character such as ACS_DARROW, it returns the parameter unchanged.
.RE
.\" ---------------------------------------------------------------------------
@@ -1411,6 +1670,56 @@
.RE
.\" ---------------------------------------------------------------------------
.TP 5
+.B dlg_buildlist
+This is an alternate interface to the \fBbuildlist\fP widget
+which allows the application to read the list item states back
+directly without putting them in the output buffer.
+.RS
+.TP 5
+.B const char * \fItitle
+is the title string to display at the top of the widget.
+.TP 5
+.B const char * \fIcprompt
+is the prompt text shown within the widget.
+.TP 5
+.B int \fIheight
+is the desired height of the box.
+If zero, the height is adjusted to use the available screen size.
+.TP 5
+.B int \fIwidth
+is the desired width of the box.
+If zero, the height is adjusted to use the available screen size.
+.TP 5
+.B int \fIlist_height
+is the minimum height to reserve for displaying the list.
+If zero, it is computed based on the given \fIheight\fP and \fIwidth\fP.
+.TP 5
+.B int \fIitem_no
+is the number of rows in \fIitems\fP.
+.TP 5
+.B DIALOG_LISTITEM * \fIitems
+is the list of items, contain tag, name, and optionally help strings
+(if \fBdialog_vars.item_help\fP is set).
+The initial selection state for each item is also in this list.
+.TP 5
+.B const char * \fIstates
+This is a list of characters to display for the given states.
+Normally a buildlist provides true (1) and false (0) values,
+which the widget displays as "*" and space, respectively.
+An application may set this parameter to an arbitrary null-terminated string.
+The widget determines the number of states from the length of this string,
+and will cycle through the corresponding display characters as the user
+presses the space-bar.
+.TP 5
+.B int \fIorder_mode
+is reserved for future enhancements
+.TP 5
+.B int * \fIcurrent_item
+The widget sets the referenced location to the index of the current display
+item (cursor) when it returns.
+.RE
+.\" ---------------------------------------------------------------------------
+.TP 5
.B dlg_button_count
Count the buttons in the list.
.RS
@@ -1483,6 +1792,16 @@
If the label is empty, return -1.
If no uppercase character is found, return 0.
Otherwise return the uppercase character.
+.IP
+Normally
+.B dlg_draw_buttons
+and
+.B dlg_char_to_button
+use the first uppercase character.
+However, they keep track of all of the labels and
+if the first has already been used in another label,
+they will continue looking for another uppercase character.
+This function does not have enough information to make that check.
.RS
.TP 5
.B const char * \fIlabel
@@ -1491,8 +1810,8 @@
.\" ---------------------------------------------------------------------------
.TP 5
.B dlg_calc_list_width
-Calculate the minimum width for the list, assuming none of the items
-are truncated.
+Calculate the minimum width for the list,
+assuming none of the items are truncated.
.RS
.TP 5
.B int \fIitem_no
@@ -1503,6 +1822,9 @@
e.g., for checklists or radiobox lists.
The function returns the sum of the widest columns
needed for of each of these fields.
+.IP
+If \fBdialog_vars.no_items\fP is set,
+the \fItext\fP fields in the list are ignored.
.RE
.\" ---------------------------------------------------------------------------
.TP 5
@@ -1741,6 +2063,13 @@
.RE
.\" ---------------------------------------------------------------------------
.TP 5
+.B dlg_default_button
+If \fBdialog_vars.default_button\fP is positive,
+return the button-index for that button code,
+using \fBdlg_ok_buttoncode\fP to test indices starting with zero.
+Otherwise (or if no match was found for the button code), return zero.
+.\" ---------------------------------------------------------------------------
+.TP 5
.B dlg_default_formitem
If \fBdialog_vars.default_item\fP is not null,
find that name by matching the \fIname\fP field in the list of form \fIitems\fP.
@@ -2235,6 +2564,18 @@
.RE
.\" ---------------------------------------------------------------------------
.TP 5
+.B dlg_finish_string
+If \fIDIALOG_STATE.finish_string\fP is true,
+this function discards data used to speed up layout computations.
+.RS
+.TP 5
+.B const char * \fIstring
+is the address of the string whose data should be discarded.
+The address rather than contents is used as the unique identifier because
+some of the caching is used for editable input-fields.
+.RE
+.\" ---------------------------------------------------------------------------
+.TP 5
.B dlg_flush_getc
Cancel the local data saved by \fBdlg_last_getc\fP.
.\" ---------------------------------------------------------------------------
@@ -2657,6 +2998,21 @@
.RE
.\" ---------------------------------------------------------------------------
.TP 5
+.B dlg_mouse_setcode
+Sets a value used internally by \fBdlg_mouse_mkregion\fP
+which is added to the \fIcode\fP parameter.
+By providing different values,
+e.g., multiples of \fBKEY_MAX\fP,
+it is possible to support multiple "big" regions in a widget.
+The \fIbuildlist\fP widget uses this feature to recognize mouse-clicks
+in the left/right panes.
+.RS
+.TP 5
+.B int \fIcode
+is the value to add to \fBdlg_mouse_mkregion\fP's \fIcode\fP parameter.
+.RE
+.\" ---------------------------------------------------------------------------
+.TP 5
.B dlg_mouse_wgetch
is a wrapper for \fBdlg_getc\fP which additionally maps mouse-clicks
(if the curses library supports those) into extended function-keys
@@ -2812,6 +3168,35 @@
.RE
.\" ---------------------------------------------------------------------------
.TP 5
+.B dlg_print_listitem
+This is a helper function used for the various "list" widgets,
+e.g., checklist, menu, buildlist, treeview.
+Each list-widget has "tag" and "description" values for each item
+which can be displayed.
+If \fBdialog_vars.no_tags\fP is true,
+the "tag" value is not shown.
+The first character of the first value shown (tag or description)
+is highlighted to indicate that the widget will match it for quick navigation.
+.RS
+.TP 5
+.B WINDOW *\fIwin
+the window in which to display the text
+.TP 5
+.B const char *\fItext
+the value to display
+.TP 5
+.B int \fIclimit
+the number of columns available for printing the text
+.TP 5
+.B bool \fIfirst
+true if this is the first call (for "tag" and "description"),
+and the first character of the value should be highlighted.
+.TP 5
+.B int \fIselected
+nonzero if the text should be displayed using the "selected" colors
+.RE
+.\" ---------------------------------------------------------------------------
+.TP 5
.B dlg_print_scrolled
This is a wrapper for \fBdlg_print_autowrap\fP which allows the user
to scroll too-long prompt text up/down.
@@ -2975,6 +3360,38 @@
The background title is shown at the top of the screen.
.\" ---------------------------------------------------------------------------
.TP 5
+.B dlg_reallocate_gauge
+Allocates or reallocates a gauge widget (see \fBdlg_allocate_gauge\fP).
+Use \fBdlg_update_gauge\fP to display the result.
+.RS
+.TP 5
+.B void ** \fIobjptr
+If the pointer referenced by this parameter is null, the function creates
+a new gauge widget using \fBdlg_allocate_gauge\fP.
+Otherwise, it updates the title and cprompt values, reusing the window
+from the previous call on this function.
+As a side-effect, the function stores the updated object-pointer via
+the \fIobjptr\fP parameter.
+.TP 5
+.B const char * \fItitle
+is the title string to display at the top of the widget.
+.TP 5
+.B const char * \fIcprompt
+is the prompt text shown within the widget.
+.TP 5
+.B int \fIheight
+is the desired height of the box.
+If zero, the height is adjusted to use the available screen size.
+.TP 5
+.B int \fIwidth
+is the desired width of the box.
+If zero, the height is adjusted to use the available screen size.
+.TP 5
+.B int \fIpercent
+is the percentage to show in the progress bar.
+.RE
+.\" ---------------------------------------------------------------------------
+.TP 5
.B dlg_register_buttons
The widget developer should call this function after \fBdlg_register_window\fP,
for the list of button labels associated with the widget.
@@ -3048,7 +3465,7 @@
is the variable from which to restore.
.RE
.IP
-The
+The
\fIDIALOG_VARS.input_length\fP and
\fIDIALOG_VARS.input_result\fP members are treated specially,
since these are used by a widget to pass data to the caller.
@@ -3075,7 +3492,7 @@
.\" ---------------------------------------------------------------------------
.TP 5
.B dlg_save_vars
-Save \fB\*p\fP's variables into the given variable (see \fBdialog_restore_vars\fP).
+Save \fB\*p\fP's variables into the given variable (see \fBdlg_restore_vars\fP).
.RS
.TP 5
.B DIALOG_VARS * \fIsave
@@ -3097,7 +3514,7 @@
.\" ---------------------------------------------------------------------------
.TP 5
.B dlg_set_result
-Setup a fixed-buffer for the result in \fBdialog_vars.input_result\fP
+Setup a fixed-buffer for the result in \fBdialog_vars.input_result\fP
.RS
.TP 5
.B const char * \fIstring
@@ -3209,7 +3626,7 @@
.\" ---------------------------------------------------------------------------
.TP 5
.B dlg_trace_chr
-If \fBdialog_state.trace\fP is set,
+If \fBdialog_state.trace\fP is set,
translate the parameters into a printable representation,
log it on a "chr" line.
.RS
@@ -3246,10 +3663,66 @@
.\" ---------------------------------------------------------------------------
.TP 5
.B dlg_trace_win
-If \fBdialog_state.trace\fP is set,
+If \fBdialog_state.trace\fP is set,
log a printable picture of the given window.
.\" ---------------------------------------------------------------------------
.TP 5
+.B dlg_treeview
+This is an alternate interface to 'treeview' which allows the application
+to read the list item states back directly without putting them in the
+output buffer.
+.RS
+.TP 5
+.B const char * \fItitle
+is the title on the top of the widget.
+.TP 5
+.B const char * \fIcprompt
+is the prompt text shown within the widget.
+.TP 5
+.B int \fIheight
+is the desired height of the box.
+If zero, the height is based on the screen size.
+.TP 5
+.B int \fIwidth
+is the desired width of the box.
+If zero, the height is based on the screen size.
+.TP 5
+.B int \fIlist_height
+is the minimum height to reserve for displaying the list.
+If zero, it is computed based on the given \fIheight\fP and \fIwidth\fP.
+.TP 5
+.B int \fIitem_no
+is the number of rows in \fIitems\fP.
+.TP 5
+.B DIALOG_LISTITEM * \fIitems
+is the list of items, contain tag, name, and optionally help strings
+(if \fBdialog_vars.item_help\fP is set).
+The initial selection state for each item is also in this list.
+.TP 5
+.B const char * \fIstates
+This is a list of characters to display for the given states.
+Normally a buildlist provides true (1) and false (0) values,
+which the widget displays as "*" and space, respectively.
+An application may set this parameter to an arbitrary null-terminated string.
+The widget determines the number of states from the length of this string,
+and will cycle through the corresponding display characters as the user
+presses the space-bar.
+.TP 5
+.B int * \fIdepths
+This is a list of depths of each item in the tree.
+It is a separate parameter from \fIitems\fP to allow reuse of
+the existing functions.
+.TP 5
+.B int \fIflag
+is either \fIFLAG_CHECK\fP, for checklists (multiple selections),
+or \fIFLAG_RADIO\fP for radiolists (a single selection).
+.TP 5
+.B int * \fIcurrent_item
+The widget sets the referenced location to the index of the current display
+item (cursor) when it returns.
+.RE
+.\" ---------------------------------------------------------------------------
+.TP 5
.B dlg_trim_string
The \fBdialog\fP program uses this in each widget to adjust the
message string,
Modified: vendor/dialog/dist/dialog.c
===================================================================
--- vendor/dialog/dist/dialog.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/dialog.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: dialog.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: dialog.c,v 1.231 2013/09/02 17:20:09 tom Exp $
*
* cdialog - Display simple dialog boxes from shell scripts
*
- * Copyright 2000-2010,2011 Thomas E. Dickey
+ * Copyright 2000-2012,2013 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -48,7 +48,6 @@
,o_beep
,o_beep_after
,o_begin
- ,o_calendar
,o_cancel_label
,o_checklist
,o_clear
@@ -57,17 +56,14 @@
,o_cr_wrap
,o_create_rc
,o_date_format
+ ,o_default_button
,o_default_item
,o_defaultno
- ,o_dselect
- ,o_editbox
,o_exit_label
,o_extra_button
,o_extra_label
,o_fixed_font
,o_form
- ,o_fselect
- ,o_fullbutton
,o_gauge
,o_help
,o_help_button
@@ -75,6 +71,7 @@
,o_help_label
,o_help_line
,o_help_status
+ ,o_help_tags
,o_icon
,o_ignore
,o_infobox
@@ -86,6 +83,7 @@
,o_keep_colors
,o_keep_tite
,o_keep_window
+ ,o_last_key
,o_max_input
,o_menu
,o_mixedform
@@ -101,7 +99,6 @@
,o_no_nl_expand
,o_no_shadow
,o_nocancel
- ,o_noitem
,o_nook
,o_ok_label
,o_output_fd
@@ -135,7 +132,6 @@
,o_tailboxbg
,o_textbox
,o_time_format
- ,o_timebox
,o_timeout
,o_title
,o_trim
@@ -145,6 +141,26 @@
,o_wmclass
,o_yes_label
,o_yesno
+#ifdef HAVE_WHIPTAIL
+ ,o_fullbutton
+ ,o_topleft
+#endif
+#ifdef HAVE_XDIALOG
+ ,o_calendar
+ ,o_dselect
+ ,o_editbox
+ ,o_fselect
+ ,o_timebox
+#endif
+#ifdef HAVE_XDIALOG2
+ ,o_buildlist
+ ,o_rangebox
+ ,o_treeview
+#endif
+#if defined(HAVE_XDIALOG2) || defined(HAVE_WHIPTAIL)
+ ,o_no_items
+ ,o_no_tags
+#endif
#ifdef HAVE_DLG_TRACE
,o_trace
#endif
@@ -189,10 +205,9 @@
{ "aspect", o_aspect, 1, "<ratio>" },
{ "auto-placement", o_auto_placement, 1, NULL },
{ "backtitle", o_backtitle, 1, "<backtitle>" },
- { "beep", o_beep, 1, NULL },
- { "beep-after", o_beep_after, 1, NULL },
+ { "beep", o_beep, 1, "" },
+ { "beep-after", o_beep_after, 1, "" },
{ "begin", o_begin, 1, "<y> <x>" },
- { "calendar", o_calendar, 2, "<text> <height> <width> <day> <month> <year>" },
{ "cancel-label", o_cancel_label, 1, "<str>" },
{ "checklist", o_checklist, 2, "<text> <height> <width> <list height> <tag1> <item1> <status1>..." },
{ "clear", o_clear, 1, "" },
@@ -201,18 +216,14 @@
{ "cr-wrap", o_cr_wrap, 1, "" },
{ "create-rc", o_create_rc, 1, NULL },
{ "date-format", o_date_format, 1, "<str>" },
+ { "default-button", o_default_button, 1, "<str>" },
{ "default-item", o_default_item, 1, "<str>" },
{ "defaultno", o_defaultno, 1, "" },
- { "dselect", o_dselect, 2, "<directory> <height> <width>" },
- { "editbox", o_editbox, 2, "<file> <height> <width>" },
{ "exit-label", o_exit_label, 1, "<str>" },
{ "extra-button", o_extra_button, 1, "" },
{ "extra-label", o_extra_label, 1, "<str>" },
- { "fb", o_fullbutton, 1, NULL },
{ "fixed-font", o_fixed_font, 1, NULL },
{ "form", o_form, 2, "<text> <height> <width> <form height> <label1> <l_y1> <l_x1> <item1> <i_y1> <i_x1> <flen1> <ilen1>..." },
- { "fselect", o_fselect, 2, "<filepath> <height> <width>" },
- { "fullbutton", o_fullbutton, 1, NULL },
{ "gauge", o_gauge, 2, "<text> <height> <width> [<percent>]" },
{ "guage", o_gauge, 2, NULL },
{ "help", o_help, 4, "" },
@@ -219,6 +230,7 @@
{ "help-button", o_help_button, 1, "" },
{ "help-label", o_help_label, 1, "<str>" },
{ "help-status", o_help_status, 1, "" },
+ { "help-tags", o_help_tags, 1, "" },
{ "hfile", o_help_file, 1, "<str>" },
{ "hline", o_help_line, 1, "<str>" },
{ "icon", o_icon, 1, NULL },
@@ -232,6 +244,7 @@
{ "keep-colors", o_keep_colors, 1, NULL },
{ "keep-tite", o_keep_tite, 1, "" },
{ "keep-window", o_keep_window, 1, "" },
+ { "last-key", o_last_key, 1, "" },
{ "max-input", o_max_input, 1, "<n>" },
{ "menu", o_menu, 2, "<text> <height> <width> <menu height> <tag1> <item1>..." },
{ "mixedform", o_mixedform, 2, "<text> <height> <width> <form height> <label1> <l_y1> <l_x1> <item1> <i_y1> <i_x1> <flen1> <ilen1> <itype>..." },
@@ -240,7 +253,7 @@
{ "no-cancel", o_nocancel, 1, "" },
{ "no-close", o_no_close, 1, NULL },
{ "no-collapse", o_no_collapse, 1, "" },
- { "no-cr-wrap", o_no_cr_wrap, 1, NULL },
+ { "no-cr-wrap", o_no_cr_wrap, 1, "" },
{ "no-kill", o_no_kill, 1, "" },
{ "no-label", o_no_label, 1, "<str>" },
{ "no-lines", o_no_lines, 1, "" },
@@ -249,7 +262,6 @@
{ "no-ok", o_nook, 1, "" },
{ "no-shadow", o_no_shadow, 1, "" },
{ "nocancel", o_nocancel, 1, NULL }, /* see --no-cancel */
- { "noitem", o_noitem, 1, NULL },
{ "nook", o_nook, 1, "" }, /* See no-ok */
{ "ok-label", o_ok_label, 1, "<str>" },
{ "output-fd", o_output_fd, 1, "<fd>" },
@@ -283,7 +295,6 @@
{ "tailboxbg", o_tailboxbg, 2, "<file> <height> <width>" },
{ "textbox", o_textbox, 2, "<file> <height> <width>" },
{ "time-format", o_time_format, 1, "<str>" },
- { "timebox", o_timebox, 2, "<text> <height> <width> <hour> <minute> <second>" },
{ "timeout", o_timeout, 1, "<secs>" },
{ "title", o_title, 1, "<title>" },
{ "trim", o_trim, 1, "" },
@@ -293,6 +304,34 @@
{ "wmclass", o_wmclass, 1, NULL },
{ "yes-label", o_yes_label, 1, "<str>" },
{ "yesno", o_yesno, 2, "<text> <height> <width>" },
+#ifdef HAVE_WHIPTAIL
+ { "cancel-button", o_cancel_label, 1, NULL },
+ { "fb", o_fullbutton, 1, NULL },
+ { "fullbutton", o_fullbutton, 1, NULL },
+ { "no-button", o_no_label, 1, NULL },
+ { "ok-button", o_ok_label, 1, NULL },
+ { "scrolltext", o_scrollbar, 1, NULL },
+ { "topleft", o_topleft, 1, NULL },
+ { "yes-button", o_yes_label, 1, NULL },
+#endif
+#ifdef HAVE_XDIALOG
+ { "calendar", o_calendar, 2, "<text> <height> <width> <day> <month> <year>" },
+ { "dselect", o_dselect, 2, "<directory> <height> <width>" },
+ { "editbox", o_editbox, 2, "<file> <height> <width>" },
+ { "fselect", o_fselect, 2, "<filepath> <height> <width>" },
+ { "timebox", o_timebox, 2, "<text> <height> <width> <hour> <minute> <second>" },
+#endif
+#ifdef HAVE_XDIALOG2
+ { "buildlist", o_buildlist, 2, "<text> <height> <width> <tag1> <item1> <status1>..." },
+ { "no-items", o_no_items, 1, "" },
+ { "no-tags", o_no_tags, 1, "" },
+ { "rangebox", o_rangebox, 2, "<text> <height> <width> <min-value> <max-value> <default-value>" },
+ { "treeview", o_treeview, 2, "<text> <height> <width> <list-height> <tag1> <item1> <status1> <depth1>..." },
+#endif
+#if defined(HAVE_XDIALOG2) || defined(HAVE_WHIPTAIL)
+ { "noitem", o_no_items, 1, NULL },
+ { "notags", o_no_tags, 1, NULL },
+#endif
#ifdef HAVE_DLG_TRACE
{ "trace", o_trace, 1, "<file>" },
#endif
@@ -431,6 +470,12 @@
dialog_argv = (*argvp);
}
+#define OptionChars "\
+0123456789\
+-\
+abcdefghijklmnopqrstuvwxyz\
+"
+
/*
* Check if the given string from main's argv is an option.
*/
@@ -449,7 +494,11 @@
}
}
} else if (!strncmp(arg, "--", (size_t) 2) && isalpha(UCH(arg[2]))) {
- result = TRUE;
+ if (strlen(arg) == strspn(arg, OptionChars)) {
+ result = TRUE;
+ } else {
+ dlg_exiterr("Invalid option \"%s\"", arg);
+ }
}
}
return result;
@@ -459,6 +508,7 @@
lookupOption(const char *name, int pass)
{
unsigned n;
+ eOptions result = o_unknown;
if (isOption(name)) {
name += 2;
@@ -465,11 +515,12 @@
for (n = 0; n < sizeof(options) / sizeof(options[0]); n++) {
if ((pass & options[n].pass) != 0
&& !strcmp(name, options[n].name)) {
- return options[n].code;
+ result = options[n].code;
+ break;
}
}
}
- return o_unknown;
+ return result;
}
static void
@@ -523,13 +574,17 @@
static int
numeric_arg(char **av, int n)
{
- char *last = 0;
- int result = (int) strtol(av[n], &last, 10);
- char msg[80];
+ int result = 0;
- if (last == 0 || *last != 0) {
- sprintf(msg, "Expected a number for token %d of %.20s", n, av[0]);
- Usage(msg);
+ if (n < dlg_count_argv(av)) {
+ char msg[80];
+ char *last = 0;
+ result = (int) strtol(av[n], &last, 10);
+
+ if (last == 0 || *last != 0) {
+ sprintf(msg, "Expected a number for token %d of %.20s", n, av[0]);
+ Usage(msg);
+ }
}
return result;
}
@@ -685,9 +740,7 @@
{
int tags = howmany_tags(av + 5, CHECKBOX_TAGS);
int code;
- bool save_quoted = dialog_vars.quoted;
- dialog_vars.quoted = !dialog_vars.separate_output;
*offset_add = 5 + tags * CHECKBOX_TAGS;
code = dialog_checklist(t,
av[1],
@@ -695,7 +748,6 @@
numeric_arg(av, 3),
numeric_arg(av, 4),
tags, av + 5, FLAG_CHECK);
- dialog_vars.quoted = save_quoted;
return code;
}
@@ -792,6 +844,75 @@
}
#endif /* HAVE_XDIALOG */
+/* dialog 1.2 widgets */
+#ifdef HAVE_XDIALOG2
+
+#define DisableNoTags() \
+ bool save_no_tags = dialog_vars.no_tags; \
+ bool save_no_items = dialog_vars.no_items; \
+ dialog_vars.no_tags = TRUE; \
+ dialog_vars.no_items = FALSE
+
+#define RestoreNoTags() \
+ dialog_vars.no_tags = save_no_tags; \
+ dialog_vars.no_items = save_no_items
+
+static int
+call_buildlist(CALLARGS)
+{
+ int tags = howmany_tags(av + 5, CHECKBOX_TAGS);
+ int result;
+
+ DisableNoTags();
+
+ *offset_add = 5 + tags * CHECKBOX_TAGS;
+ result = dialog_buildlist(t,
+ av[1],
+ numeric_arg(av, 2),
+ numeric_arg(av, 3),
+ numeric_arg(av, 4),
+ tags, av + 5,
+ TRUE);
+ RestoreNoTags();
+ return result;
+}
+
+static int
+call_rangebox(CALLARGS)
+{
+ int min_value;
+
+ *offset_add = arg_rest(av);
+ min_value = numeric_arg(av, 4);
+ return dialog_rangebox(t,
+ av[1],
+ numeric_arg(av, 2),
+ numeric_arg(av, 3),
+ min_value,
+ numeric_arg(av, 5),
+ (*offset_add > 6) ? numeric_arg(av, 6) : min_value);
+}
+
+static int
+call_treeview(CALLARGS)
+{
+ int tags = howmany_tags(av + 5, TREEVIEW_TAGS);
+ int result;
+
+ DisableNoTags();
+
+ *offset_add = arg_rest(av);
+ result = dialog_treeview(t,
+ av[1],
+ numeric_arg(av, 2),
+ numeric_arg(av, 3),
+ numeric_arg(av, 4),
+ tags, av + 5, FLAG_RADIO);
+ RestoreNoTags();
+ return result;
+}
+#endif /* HAVE_XDIALOG */
+
#ifdef HAVE_DLG_FORMBOX
static int
call_form(CALLARGS)
@@ -1006,11 +1127,14 @@
{o_tailboxbg, 4, 4, call_tailboxbg},
#endif
#ifdef HAVE_XDIALOG
+ {o_buildlist, 4, 0, call_buildlist},
{o_calendar, 4, 7, call_calendar},
{o_dselect, 4, 5, call_dselect},
{o_editbox, 4, 4, call_editbox},
{o_fselect, 4, 5, call_fselect},
+ {o_rangebox, 5, 7, call_rangebox},
{o_timebox, 4, 7, call_timebox},
+ {o_treeview, 4, 0, call_treeview},
#endif
};
/* *INDENT-ON* */
@@ -1052,6 +1176,43 @@
return result;
}
+/* Return exit-code for a named button */
+static int
+button_code(const char *name)
+{
+ /* *INDENT-OFF* */
+ static struct {
+ const char *name;
+ int code;
+ } table[] = {
+ { "ok", DLG_EXIT_OK },
+ { "yes", DLG_EXIT_OK },
+ { "cancel", DLG_EXIT_CANCEL },
+ { "no", DLG_EXIT_CANCEL },
+ { "help", DLG_EXIT_HELP },
+ { "extra", DLG_EXIT_EXTRA },
+ };
+ /* *INDENT-ON* */
+
+ int code = DLG_EXIT_ERROR;
+ size_t i;
+
+ for (i = 0; i < (sizeof(table) / sizeof(table[0])); i++) {
+ if (!dlg_strcmp(name, table[i].name)) {
+ code = table[i].code;
+ break;
+ }
+ }
+
+ if (code == DLG_EXIT_ERROR) {
+ char temp[80];
+ sprintf(temp, "Button name \"%.20s\" unknown", name);
+ Usage(temp);
+ }
+
+ return code;
+}
+
/*
* Print parts of a message
*/
@@ -1115,7 +1276,7 @@
static const char *const tbl_1[] =
{
"cdialog (ComeOn Dialog!) version %s",
- "Copyright 2000-2008,2011 Thomas E. Dickey",
+ "Copyright 2000-2012,2013 Thomas E. Dickey",
"This is free software; see the source for copying conditions. There is NO",
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.",
"",
@@ -1191,13 +1352,20 @@
{
int j;
- dlg_trace(NULL);
- dlg_trace(optionString(argv, offset));
+ if (dialog_state.trace_output == 0) {
+ dlg_trace(optionString(argv, offset));
+ } else {
+ dlg_trace_msg("# ignore extra --trace option\n");
+ *offset += 1;
+ }
+
+ dlg_trace_msg("# Parameters:\n");
for (j = 0; argv[j] != 0; ++j) {
- dlg_trace_msg("argv[%d] = %s\n", j, argv[j]);
+ dlg_trace_msg("# argv[%d] = %s\n", j, argv[j]);
}
}
#endif
+
/*
* "Common" options apply to all widgets more/less. Most of the common options
* set values in dialog_vars, a few set dialog_state and a couple write to the
@@ -1208,7 +1376,10 @@
{
bool done = FALSE;
+ dlg_trace_msg("# process_common_options, offset %d\n", offset);
+
while (offset < argc && !done) { /* Common options */
+ dlg_trace_msg("#\targv[%d] = %s\n", offset, argv[offset]);
switch (lookupOption(argv[offset], 1)) {
case o_title:
dialog_vars.title = optionString(argv, &offset);
@@ -1266,7 +1437,12 @@
break;
case o_defaultno:
dialog_vars.defaultno = TRUE;
+ dialog_vars.default_button = DLG_EXIT_CANCEL;
break;
+ case o_default_button:
+ dialog_vars.default_button = button_code(optionString(argv, &offset));
+ dialog_vars.defaultno = dialog_vars.default_button == DLG_EXIT_CANCEL;
+ break;
case o_default_item:
dialog_vars.default_item = optionString(argv, &offset);
break;
@@ -1288,6 +1464,9 @@
case o_help_status:
dialog_vars.help_status = TRUE;
break;
+ case o_help_tags:
+ dialog_vars.help_tags = TRUE;
+ break;
case o_extra_button:
dialog_vars.extra_button = TRUE;
break;
@@ -1297,6 +1476,9 @@
case o_keep_window:
dialog_vars.keep_window = TRUE;
break;
+ case o_last_key:
+ dialog_vars.last_key = TRUE;
+ break;
case o_no_shadow:
dialog_state.use_shadow = FALSE;
break;
@@ -1350,6 +1532,7 @@
break;
case o_visit_items:
dialog_state.visit_items = TRUE;
+ dialog_state.visit_cols = 1;
break;
case o_aspect:
dialog_state.aspect_ratio = optionValue(argv, &offset);
@@ -1404,10 +1587,16 @@
dialog_state.no_mouse = TRUE;
mouse_close();
break;
- case o_noitem:
+#ifdef HAVE_WHIPTAIL
+ case o_topleft:
+ dialog_vars.begin_set = TRUE;
+ dialog_vars.begin_y = 0;
+ dialog_vars.begin_x = 0;
+ break;
case o_fullbutton:
/* ignore */
break;
+#endif
/* options of Xdialog which we ignore */
case o_icon:
case o_wmclass:
@@ -1435,6 +1624,14 @@
process_trace_option(argv, &offset);
break;
#endif
+#if defined(HAVE_XDIALOG2) || defined(HAVE_WHIPTAIL)
+ case o_no_items:
+ dialog_vars.no_items = TRUE;
+ break;
+ case o_no_tags:
+ dialog_vars.no_tags = TRUE;
+ break;
+#endif
}
if (!done)
offset++;
@@ -1453,6 +1650,8 @@
static char **special_argv = 0;
static int special_argc = 0;
+ dlg_trace_msg("# init_result\n");
+
/* clear everything we do not save for the next widget */
memset(&dialog_vars, 0, sizeof(dialog_vars));
@@ -1459,6 +1658,8 @@
dialog_vars.input_result = buffer;
dialog_vars.input_result[0] = '\0';
+ dialog_vars.default_button = -1;
+
/*
* The first time this is called, check for common options given by an
* environment variable.
@@ -1579,7 +1780,7 @@
++offset;
continue;
}
- dlg_trace_msg("...discarding %d parameters starting with argv[%d] (%s)\n",
+ dlg_trace_msg("# discarding %d parameters starting with argv[%d] (%s)\n",
1 + offset - base, base,
argv[base]);
for (j = base; j < argc; ++j) {
@@ -1709,7 +1910,13 @@
break;
default:
if (argv[j] != 0) {
- dlg_trim_string(argv[j]);
+ char *argv_j = strdup(argv[j]);
+ if (argv_j != 0) {
+ dlg_trim_string(argv_j);
+ argv[j] = argv_j;
+ } else {
+ argv[j] = strdup("?");
+ }
}
break;
}
@@ -1718,7 +1925,7 @@
retval = show_result((*(modePtr->jumper)) (dialog_vars.title,
argv + offset,
&offset_add));
- dlg_trace_msg("...widget returns %d\n", retval);
+ dlg_trace_msg("# widget returns %d\n", retval);
offset += offset_add;
if (dialog_vars.input_result != my_buffer) {
Modified: vendor/dialog/dist/dialog.h
===================================================================
--- vendor/dialog/dist/dialog.h 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/dialog.h 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: dialog.h,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: dialog.h,v 1.267 2013/09/22 19:06:36 tom Exp $
*
* dialog.h -- common declarations for all dialog modules
*
- * Copyright 2000-2010,2011 Thomas E. Dickey
+ * Copyright 2000-2012,2013 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -59,12 +59,10 @@
#include <ncurses.h>
#else
#include <curses.h>
-#endif
-
-/* most curses.h headers include this, some do not */
#if defined(HAVE_UNCTRL_H)
-#include <unctrl.h>
+#include <unctrl.h> /* most curses.h headers include this, some do not */
#endif
+#endif
/* Solaris xpg4 renames these */
#ifndef KEY_MAX
@@ -242,6 +240,16 @@
#define wgetparent(win) ((win) ? (win)->_parent : 0)
#endif
+#if !defined(HAVE_WSYNCUP)
+#undef wsyncup
+#define wsyncup(win) /* nothing */
+#endif
+
+#if !defined(HAVE_WCURSYNCUP)
+#undef wcursyncup
+#define wcursyncup(win) /* nothing */
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -322,6 +330,7 @@
#define mouse_mkregion(y,x,h,w,n) dlg_mouse_mkregion(y,x,h,w,n)
#define mouse_region(y,x) dlg_mouse_region(y,x)
#define mouse_setbase(x,y) dlg_mouse_setbase(x,y)
+#define mouse_setcode(c) dlg_mouse_setcode(c)
#define mouse_wgetch(w,c) dlg_mouse_wgetch(w,c)
#define new_window(h,w,y,x) dlg_new_window(h,w,y,x)
#define parse_rc() dlg_parse_rc()
@@ -435,6 +444,9 @@
#endif
/* 1.1-20110106 */
bool no_mouse; /* option "--no-mouse" */
+ int visit_cols; /* option "--visit-items" */
+ /* 1.2-20130922 */
+ bool finish_string; /* caching optimization for gauge */
} DIALOG_STATE;
extern DIALOG_STATE dialog_state;
@@ -505,14 +517,35 @@
char *help_file; /* option "--hfile" */
bool in_helpfile; /* flag to prevent recursion in --hfile */
bool no_nl_expand; /* option "--no-nl-expand" */
+ /* 1.1-20120701 */
+ int default_button; /* option "--default-button" (exit code) */
+ /* 1.1-20121218 */
+ bool no_tags; /* option "--no-tags" */
+ bool no_items; /* option "--no-items" */
+ /* 1.2-20130315 */
+ bool last_key; /* option "--last-key" */
+ /* 1.2-20130902 */
+ bool help_tags; /* option "--help-tags" */
} DIALOG_VARS;
#define USE_ITEM_HELP(s) (dialog_vars.item_help && (s) != 0)
-#define CHECKBOX_TAGS (dialog_vars.item_help ? 4 : 3)
-#define MENUBOX_TAGS (dialog_vars.item_help ? 3 : 2)
-#define FORMBOX_TAGS (dialog_vars.item_help ? 9 : 8)
-#define MIXEDFORM_TAGS (FORMBOX_TAGS + 1)
+
+/*
+ * Some settings change the number of data items per row which dialog reads
+ * from a script.
+ */
+#define DLG__NO_ITEMS (dialog_vars.no_items ? 0 : 1)
+#define DLG__ITEM_HELP (dialog_vars.item_help ? 1 : 0)
+
+/*
+ * These are the total number of data items per row used for each widget type.
+ */
+#define CHECKBOX_TAGS (2 + DLG__ITEM_HELP + DLG__NO_ITEMS)
+#define MENUBOX_TAGS (1 + DLG__ITEM_HELP + DLG__NO_ITEMS)
+#define FORMBOX_TAGS (8 + DLG__ITEM_HELP)
+#define MIXEDFORM_TAGS (1 + FORMBOX_TAGS)
#define MIXEDGAUGE_TAGS 2
+#define TREEVIEW_TAGS (3 + DLG__ITEM_HELP + DLG__NO_ITEMS)
extern DIALOG_VARS dialog_vars;
@@ -552,6 +585,7 @@
extern const char *dialog_version(void);
/* widgets, each in separate files */
+extern int dialog_buildlist(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*list_height*/, int /*item_no*/, char ** /*items*/, int /*order_mode*/);
extern int dialog_calendar(const char * /*title*/, const char * /*subtitle*/, int /*height*/, int /*width*/, int /*day*/, int /*month*/, int /*year*/);
extern int dialog_checklist(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*list_height*/, int /*item_no*/, char ** /*items*/, int /*flag*/);
extern int dialog_dselect(const char * /*title*/, const char * /*path*/, int /*height*/, int /*width*/);
@@ -568,9 +602,11 @@
extern int dialog_pause(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*seconds*/);
extern int dialog_prgbox(const char * /*title*/, const char * /*cprompt*/, const char * /*command*/, int /*height*/, int /*width*/, int /*pauseopt*/);
extern int dialog_progressbox(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/);
+extern int dialog_rangebox(const char * /*title*/, const char * /*file*/, int /*height*/, int /*width*/, int /*min_value*/, int /*max_value*/, int /*default_value*/);
extern int dialog_tailbox(const char * /*title*/, const char * /*file*/, int /*height*/, int /*width*/, int /*bg_task*/);
extern int dialog_textbox(const char * /*title*/, const char * /*file*/, int /*height*/, int /*width*/);
extern int dialog_timebox(const char * /*title*/, const char * /*subtitle*/, int /*height*/, int /*width*/, int /*hour*/, int /*minute*/, int /*second*/);
+extern int dialog_treeview(const char * /*title*/, const char * /*subtitle*/, int /*height*/, int /*width*/, int /*list_height*/, int /*item_no*/, char ** /*items*/, int /*flag*/);
extern int dialog_yesno(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/);
/* some widgets have alternate entrypoints, to allow list manipulation */
@@ -617,6 +653,9 @@
extern void dlg_draw_helpline(WINDOW * /*dialog*/, bool /*decorations*/);
extern void dlg_draw_scrollbar(WINDOW * /*dialog*/, long /* first_data */, long /* this_data */, long /* next_data */, long /* total_data */, int /* left */, int /* right */, int /*top*/, int /*bottom*/, chtype /*attr*/, chtype /*borderattr*/);
+/* buildlist.c */
+extern int dlg_buildlist(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*list_height*/, int /*item_no*/, DIALOG_LISTITEM * /*items*/, const char * /*states*/, int /*order_mode*/, int * /*current_item*/);
+
/* buttons.c */
extern const char ** dlg_exit_label(void);
extern const char ** dlg_ok_label(void);
@@ -652,6 +691,7 @@
/* guage.c */
extern void * dlg_allocate_gauge(const char * /* title */, const char * /* cprompt */, int /* height */, int /* width */, int /* percent */);
+extern void * dlg_reallocate_gauge(void * /* objptr */, const char * /* title */, const char * /* cprompt */, int /* height */, int /* width */, int /* percent */);
extern void dlg_free_gauge(void * /* objptr */);
extern void dlg_update_gauge(void * /* objptr */, int /* percent */);
@@ -664,6 +704,7 @@
extern int dlg_edit_offset(char * /*string*/, int /*offset*/, int /*x_last*/);
extern int dlg_find_index(const int * /*list*/, int /*limit*/, int /*to_find*/);
extern int dlg_limit_columns(const char * /*string*/, int /*limit*/, int /*offset*/);
+extern void dlg_finish_string(const char * /* string */);
extern void dlg_show_string(WINDOW * /*win*/, const char * /*string*/, int /*offset*/, chtype /*attr*/, int /*y_base*/, int /*x_base*/, int /*x_last*/, bool /*hidden*/, bool /*force*/);
/* menubox.c */
@@ -676,10 +717,14 @@
extern void dlg_create_rc(const char * /*filename*/);
#endif
+/* treeview.c */
+extern int dlg_treeview(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*list_height*/, int /*item_no*/, DIALOG_LISTITEM * /*items*/, const char * /*states*/, int * /*depths*/, int /*flag*/, int * /*current_item*/);
+
/* ui_getc.c */
extern int dlg_getc(WINDOW * /*win*/, int * /*fkey*/);
extern int dlg_getc_callbacks(int /*ch*/, int /*fkey*/, int * /*result*/);
extern int dlg_last_getc(void);
+extern void dlg_add_last_key(int /*mode*/);
extern void dlg_add_callback(DIALOG_CALLBACK * /*p*/);
extern void dlg_add_callback_ref(DIALOG_CALLBACK ** /*p*/, DIALOG_FREEBACK /* cleanup */);
extern void dlg_flush_getc(void);
@@ -707,8 +752,11 @@
extern int dlg_default_item(char ** /*items*/, int /*llen*/);
extern int dlg_default_listitem(DIALOG_LISTITEM * /*items*/);
extern int dlg_defaultno_button(void);
+extern int dlg_default_button(void);
extern int dlg_max_input(int /*max_len*/);
extern int dlg_print_scrolled(WINDOW * /* win */, const char * /* prompt */, int /* offset */, int /* height */, int /* width */, int /* pauseopt */);
+extern void dlg_add_help_formitem(int * /* result */, char ** /* tag */, DIALOG_FORMITEM * /* item */);
+extern void dlg_add_help_listitem(int * /* result */, char ** /* tag */, DIALOG_LISTITEM * /* item */);
extern void dlg_add_quoted(char * /*string*/);
extern void dlg_add_result(const char * /*string*/);
extern void dlg_add_separator(void);
@@ -731,6 +779,7 @@
extern void dlg_exit(int /*code*/) GCC_NORETURN;
extern void dlg_item_help(const char * /*txt*/);
extern void dlg_print_autowrap(WINDOW * /*win*/, const char * /*prompt*/, int /*height*/, int /*width*/);
+extern void dlg_print_listitem(WINDOW * /*win*/, const char * /*text*/, int /*climit*/, bool /*first*/, int /*selected*/);
extern void dlg_print_size(int /*height*/, int /*width*/);
extern void dlg_print_text(WINDOW * /*win*/, const char * /*txt*/, int /*len*/, chtype * /*attr*/);
extern void dlg_put_backtitle(void);
@@ -798,6 +847,7 @@
extern void dlg_mouse_free_regions (void);
extern void dlg_mouse_mkbigregion (int /*y*/, int /*x*/, int /*height*/, int /*width*/, int /*code*/, int /*step_x*/, int /*step_y*/, int /*mode*/);
extern void dlg_mouse_setbase (int /*x*/, int /*y*/);
+extern void dlg_mouse_setcode (int /*code*/);
#define USE_MOUSE 1
@@ -809,6 +859,7 @@
#define dlg_mouse_mkregion(y, x, height, width, code) /*nothing*/
#define dlg_mouse_mkbigregion(y, x, height, width, code, step_x, step_y, mode) /*nothing*/
#define dlg_mouse_setbase(x, y) /*nothing*/
+#define dlg_mouse_setcode(c) /*nothing*/
#define USE_MOUSE 0
Modified: vendor/dialog/dist/dialog.pl
===================================================================
--- vendor/dialog/dist/dialog.pl 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/dialog.pl 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
# Functions that handle calling dialog(1) -*-perl-*-
-# $Id: dialog.pl,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: dialog.pl,v 1.4 2001/10/13 00:40:22 tom Exp $
# Return values are 1 for success and 0 for failure (or cancel)
# Resultant text (if any) is in dialog_result
Modified: vendor/dialog/dist/dlg_colors.h
===================================================================
--- vendor/dialog/dist/dlg_colors.h 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/dlg_colors.h 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
/*
- * $Id: dlg_colors.h,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: dlg_colors.h,v 1.17 2011/10/14 21:19:59 tom Exp $
*
* colors.h -- color attribute definitions
*
Modified: vendor/dialog/dist/dlg_keys.c
===================================================================
--- vendor/dialog/dist/dlg_keys.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/dlg_keys.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
/*
- * $Id: dlg_keys.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: dlg_keys.c,v 1.34 2011/10/14 00:41:08 tom Exp $
*
* dlg_keys.c -- runtime binding support for dialog
*
Modified: vendor/dialog/dist/dlg_keys.h
===================================================================
--- vendor/dialog/dist/dlg_keys.h 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/dlg_keys.h 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: dlg_keys.h,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: dlg_keys.h,v 1.32 2012/12/21 21:54:30 tom Exp $
*
* dlg_keys.h -- runtime binding support for dialog
*
- * Copyright 2005-2010,2011 Thomas E. Dickey
+ * Copyright 2005-2011,2012 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -32,7 +32,7 @@
#define dlg_toupper(ch) towupper((wint_t)ch)
#define dlg_isupper(ch) iswupper((wint_t)ch)
#else
-#define dlg_toupper(ch) toupper(ch)
+#define dlg_toupper(ch) (((ch) > 0 && (ch) <= 255) ? toupper(ch) : (ch))
#define dlg_isupper(ch) (isalpha(ch) && isupper(ch))
#endif
@@ -124,24 +124,36 @@
DLG_KEYS_DATA( DLGK_GRID_LEFT, KEY_LEFT ), \
DLG_KEYS_DATA( DLGK_GRID_RIGHT, KEY_RIGHT )
+#define SCROLL_FKEY_BINDINGS \
+ DLG_KEYS_DATA( DLGK_GRID_DOWN, KEY_DOWN ), \
+ DLG_KEYS_DATA( DLGK_GRID_UP, KEY_UP ), \
+ DLG_KEYS_DATA( DLGK_PAGE_FIRST, KEY_HOME ), \
+ DLG_KEYS_DATA( DLGK_PAGE_LAST, KEY_END ), \
+ DLG_KEYS_DATA( DLGK_PAGE_NEXT, KEY_NPAGE ), \
+ DLG_KEYS_DATA( DLGK_PAGE_PREV, KEY_PPAGE )
+
#define SCROLLKEY_BINDINGS \
+ SCROLL_FKEY_BINDINGS, \
DLG_KEYS_DATA( DLGK_GRID_DOWN, 'J' ), \
DLG_KEYS_DATA( DLGK_GRID_DOWN, 'j' ), \
- DLG_KEYS_DATA( DLGK_GRID_DOWN, KEY_DOWN ), \
DLG_KEYS_DATA( DLGK_GRID_UP, 'K' ), \
DLG_KEYS_DATA( DLGK_GRID_UP, 'k' ), \
- DLG_KEYS_DATA( DLGK_GRID_UP, KEY_UP ), \
DLG_KEYS_DATA( DLGK_PAGE_FIRST, 'g' ), \
- DLG_KEYS_DATA( DLGK_PAGE_FIRST, KEY_HOME ), \
DLG_KEYS_DATA( DLGK_PAGE_LAST, 'G' ), \
- DLG_KEYS_DATA( DLGK_PAGE_LAST, KEY_END ), \
DLG_KEYS_DATA( DLGK_PAGE_NEXT, 'F' ), \
DLG_KEYS_DATA( DLGK_PAGE_NEXT, 'f' ), \
- DLG_KEYS_DATA( DLGK_PAGE_NEXT, KEY_NPAGE ), \
DLG_KEYS_DATA( DLGK_PAGE_PREV, 'B' ), \
- DLG_KEYS_DATA( DLGK_PAGE_PREV, 'b' ), \
- DLG_KEYS_DATA( DLGK_PAGE_PREV, KEY_PPAGE )
+ DLG_KEYS_DATA( DLGK_PAGE_PREV, 'b' )
+#define TRAVERSE_BINDINGS \
+ DLG_KEYS_DATA( DLGK_ENTER, ' ' ), \
+ DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_DOWN ), \
+ DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_RIGHT ), \
+ DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ), \
+ DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_UP ), \
+ DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ), \
+ DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_LEFT )
+
extern int dlg_lookup_key(WINDOW * /*win*/, int /*curses_key*/, int * /*dialog_key*/);
extern int dlg_result_key(int /*dialog_key*/, int /*fkey*/, int * /*resultp*/);
extern void dlg_register_buttons(WINDOW * /*win*/, const char * /*name*/, const char ** /*buttons*/);
Modified: vendor/dialog/dist/editbox.c
===================================================================
--- vendor/dialog/dist/editbox.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/editbox.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: editbox.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: editbox.c,v 1.62 2013/03/17 15:03:41 tom Exp $
*
* editbox.c -- implements the edit box
*
- * Copyright 2007-2010,2011 Thomas E. Dickey
+ * Copyright 2007-2012,2013 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -368,7 +368,7 @@
retry:
#endif
show_buttons = TRUE;
- state = dialog_vars.defaultno ? dlg_defaultno_button() : sTEXT;
+ state = dialog_vars.default_button >= 0 ? dlg_default_button() : sTEXT;
fkey = 0;
dlg_button_layout(buttons, &mincols);
@@ -710,6 +710,7 @@
dlg_add_result((*list)[n]);
dlg_add_separator();
}
+ dlg_add_last_key(-1);
}
free(buffer);
dlg_restore_vars(&save_vars);
Modified: vendor/dialog/dist/formbox.c
===================================================================
--- vendor/dialog/dist/formbox.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/formbox.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: formbox.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: formbox.c,v 1.87 2013/09/02 17:02:05 tom Exp $
*
* formbox.c -- implements the form (i.e, some pairs label/editbox)
*
- * Copyright 2003-2010,2011 Thomas E. Dickey
+ * Copyright 2003-2012,2013 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -287,6 +287,7 @@
static bool
scroll_next(WINDOW *win, DIALOG_FORMITEM item[], int stepsize, int *choice, int *scrollamt)
{
+ bool result = TRUE;
int old_choice = *choice;
int old_scroll = *scrollamt;
int old_row = MIN(item[old_choice].text_y, item[old_choice].name_y);
@@ -298,34 +299,40 @@
target = old_scroll;
else
target = old_scroll + stepsize;
- if (target < 0)
- target = 0;
+ if (target < 0) {
+ result = FALSE;
+ }
} else {
- int limit = form_limit(item);
- if (target > limit)
- target = limit;
+ if (target > form_limit(item)) {
+ result = FALSE;
+ }
}
- for (n = 0; item[n].name != 0; ++n) {
- if (item[n].text_flen > 0) {
- int new_row = MIN(item[n].text_y, item[n].name_y);
- if (abs(new_row - target) < abs(old_row - target)) {
- old_row = new_row;
- *choice = n;
+ if (result) {
+ for (n = 0; item[n].name != 0; ++n) {
+ if (item[n].text_flen > 0) {
+ int new_row = MIN(item[n].text_y, item[n].name_y);
+ if (abs(new_row - target) < abs(old_row - target)) {
+ old_row = new_row;
+ *choice = n;
+ }
}
}
- }
- if (old_choice != *choice)
- print_item(win, item + old_choice, *scrollamt, FALSE);
+ if (old_choice != *choice)
+ print_item(win, item + old_choice, *scrollamt, FALSE);
- *scrollamt = *choice;
- if (*scrollamt != old_scroll) {
- scrollok(win, TRUE);
- wscrl(win, *scrollamt - old_scroll);
- scrollok(win, FALSE);
+ *scrollamt = *choice;
+ if (*scrollamt != old_scroll) {
+ scrollok(win, TRUE);
+ wscrl(win, *scrollamt - old_scroll);
+ scrollok(win, FALSE);
+ }
+ result = (old_choice != *choice) || (old_scroll != *scrollamt);
}
- return (old_choice != *choice) || (old_scroll != *scrollamt);
+ if (!result)
+ beep();
+ return result;
}
/*
@@ -447,7 +454,7 @@
DLG_KEYS_DATA( DLGK_PAGE_NEXT, KEY_NPAGE ), \
DLG_KEYS_DATA( DLGK_PAGE_PREV, KEY_PPAGE )
/*
- * Display a form for fulfill a number of fields
+ * Display a form for entering a number of fields
*/
int
dlg_form(const char *title,
@@ -484,7 +491,7 @@
int first = TRUE;
int first_trace = TRUE;
int chr_offset = 0;
- int state = dialog_vars.defaultno ? dlg_defaultno_button() : sTEXT;
+ int state = dialog_vars.default_button >= 0 ? dlg_default_button() : sTEXT;
int x, y, cur_x, cur_y, box_x, box_y;
int code;
int key = 0;
@@ -626,6 +633,8 @@
current->text_x,
current->text_len,
is_hidden(current), first);
+ wsyncup(form);
+ wcursyncup(form);
field_changed = FALSE;
}
@@ -906,6 +915,7 @@
DIALOG_FORMITEM *listitems;
DIALOG_VARS save_vars;
bool show_status = FALSE;
+ char *help_result;
dlg_save_vars(&save_vars);
dialog_vars.separate_output = TRUE;
@@ -945,14 +955,9 @@
show_status = TRUE;
break;
case DLG_EXIT_HELP:
- dlg_add_result("HELP ");
+ dlg_add_help_formitem(&result, &help_result, &listitems[choice]);
show_status = dialog_vars.help_status;
- if (USE_ITEM_HELP(listitems[choice].help)) {
- dlg_add_string(listitems[choice].help);
- result = DLG_EXIT_ITEM_HELP;
- } else {
- dlg_add_string(listitems[choice].name);
- }
+ dlg_add_string(help_result);
if (show_status)
dlg_add_separator();
break;
@@ -964,6 +969,7 @@
dlg_add_separator();
}
}
+ dlg_add_last_key(-1);
}
dlg_free_formitems(listitems);
Modified: vendor/dialog/dist/fselect.c
===================================================================
--- vendor/dialog/dist/fselect.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/fselect.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: fselect.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: fselect.c,v 1.93 2012/12/30 20:52:25 tom Exp $
*
* fselect.c -- implements the file-selector box
*
- * Copyright 2000-2010,2011 Thomas E. Dickey
+ * Copyright 2000-2011,2012 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -367,7 +367,7 @@
matches[data_len++] = f_list->data[i];
}
}
- matches = dlg_realloc(char *, data_len, matches);
+ matches = dlg_realloc(char *, data_len + 1, matches);
match_list->data = matches;
match_list->length = (int) data_len;
}
@@ -457,13 +457,18 @@
}
if (rescan) {
+ size_t have = strlen(input);
- strcpy(current, input);
+ if (have > MAX_LEN)
+ have = MAX_LEN;
+ memcpy(current, input, have);
+ current[have] = '\0';
/* refill the lists */
free_list(d_list, TRUE);
free_list(f_list, TRUE);
- strcpy(path, current);
+ memcpy(path, current, have);
+ path[have] = '\0';
if ((leaf = strrchr(path, '/')) != 0) {
*++leaf = 0;
} else {
@@ -483,14 +488,18 @@
}
(void) closedir(dp);
/* sort the lists */
- qsort(d_list->data,
- (size_t) d_list->length,
- sizeof(d_list->data[0]),
- compar);
- qsort(f_list->data,
- (size_t) f_list->length,
- sizeof(f_list->data[0]),
- compar);
+ if (d_list->data != 0 && d_list->length > 1) {
+ qsort(d_list->data,
+ (size_t) d_list->length,
+ sizeof(d_list->data[0]),
+ compar);
+ }
+ if (f_list->data != 0 && f_list->length > 1) {
+ qsort(f_list->data,
+ (size_t) f_list->length,
+ sizeof(f_list->data[0]),
+ compar);
+ }
}
(void) show_both_lists(input, d_list, f_list, FALSE);
@@ -573,7 +582,7 @@
int fkey = FALSE;
int code;
int result = DLG_EXIT_UNKNOWN;
- int state = dialog_vars.defaultno ? dlg_defaultno_button() : sTEXT;
+ int state = dialog_vars.default_button >= 0 ? dlg_default_button() : sTEXT;
int button;
int first = (state == sTEXT);
int first_trace = TRUE;
@@ -586,7 +595,7 @@
const char **buttons = dlg_ok_labels();
const char *d_label = _("Directories");
const char *f_label = _("Files");
- char *partial;
+ char *partial = 0;
int min_wide = MIN_WIDE;
int min_items = height ? 0 : 4;
LIST d_list, f_list;
@@ -631,8 +640,10 @@
tbox_x = (width - tbox_width) / 2;
w_text = derwin(dialog, tbox_height, tbox_width, tbox_y, tbox_x);
- if (w_text == 0)
- return DLG_EXIT_ERROR;
+ if (w_text == 0) {
+ result = DLG_EXIT_ERROR;
+ goto finish;
+ }
(void) keypad(w_text, TRUE);
dlg_draw_box(dialog, tbox_y - MARGIN, tbox_x - MARGIN,
@@ -656,8 +667,10 @@
dbox_x = tbox_x;
w_work = derwin(dialog, dbox_height, dbox_width, dbox_y, dbox_x);
- if (w_work == 0)
- return DLG_EXIT_ERROR;
+ if (w_work == 0) {
+ result = DLG_EXIT_ERROR;
+ goto finish;
+ }
(void) keypad(w_work, TRUE);
(void) mvwaddstr(dialog, dbox_y - (MARGIN + 1), dbox_x - MARGIN, d_label);
@@ -675,8 +688,10 @@
fbox_x = tbox_x + dbox_width + (2 * MARGIN);
w_work = derwin(dialog, fbox_height, fbox_width, fbox_y, fbox_x);
- if (w_work == 0)
- return DLG_EXIT_ERROR;
+ if (w_work == 0) {
+ result = DLG_EXIT_ERROR;
+ goto finish;
+ }
(void) keypad(w_work, TRUE);
(void) mvwaddstr(dialog, fbox_y - (MARGIN + 1), fbox_x - MARGIN, f_label);
@@ -791,7 +806,10 @@
continue;
case DLGK_SELECT:
completed = 0;
- partial = 0;
+ if (partial != 0) {
+ free(partial);
+ partial = 0;
+ }
if (state == sFILES && !dselect) {
completed = data_of(&f_list);
} else if (state == sDIRS) {
@@ -808,8 +826,10 @@
offset = (int) strlen(input);
dlg_show_string(w_text, input, offset, inputbox_attr,
0, 0, tbox_width, 0, first);
- if (partial != NULL)
+ if (partial != NULL) {
free(partial);
+ partial = 0;
+ }
continue;
} else { /* if (state < sTEXT) */
(void) beep();
@@ -882,6 +902,10 @@
dlg_mouse_free_regions();
free_list(&d_list, FALSE);
free_list(&f_list, FALSE);
+
+ finish:
+ if (partial != 0)
+ free(partial);
return result;
}
Modified: vendor/dialog/dist/guage.c
===================================================================
--- vendor/dialog/dist/guage.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/guage.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: guage.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: guage.c,v 1.68 2013/09/22 19:10:22 tom Exp $
*
* guage.c -- implements the gauge dialog
*
- * Copyright 2000-2010,2011 Thomas E. Dickey
+ * Copyright 2000-2012,2013 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -39,7 +39,7 @@
DIALOG_CALLBACK obj; /* has to be first in struct */
struct _my_obj *next;
WINDOW *text;
- const char *title;
+ char *title;
char *prompt;
char prompt_buf[MY_LEN];
int percent;
@@ -94,6 +94,7 @@
result = 0;
} else if (fgets(buffer, MY_LEN, fp) != 0) {
DLG_TRACE(("read_data:%s", buffer));
+ buffer[MY_LEN] = '\0';
dlg_trim_string(buffer);
result = 1;
} else {
@@ -182,7 +183,7 @@
MY_OBJ *obj = (MY_OBJ *) cb;
bool result;
int status;
- char buf[MY_LEN];
+ char buf[MY_LEN + 1];
if (dialog_state.pipe_input == 0) {
status = -1;
@@ -272,61 +273,97 @@
dlg_update_gauge(void *objptr, int percent)
{
MY_OBJ *obj = (MY_OBJ *) objptr;
+ bool save_finish_string = dialog_state.finish_string;
+ dialog_state.finish_string = TRUE;
curs_set(0);
obj->percent = percent;
repaint_text(obj);
+ dialog_state.finish_string = save_finish_string;
}
/*
- * Allocates a new object and fills it as per the arguments
+ * (Re)Allocates an object and fills it as per the arguments
*/
void *
-dlg_allocate_gauge(const char *title,
- const char *cprompt,
- int height,
- int width,
- int percent)
+dlg_reallocate_gauge(void *objptr,
+ const char *title,
+ const char *cprompt,
+ int height,
+ int width,
+ int percent)
{
- int x, y;
char *prompt = dlg_strclone(cprompt);
- WINDOW *dialog;
- MY_OBJ *obj = 0;
+ MY_OBJ *obj = objptr;
+ bool save_finish_string = dialog_state.finish_string;
+ dialog_state.finish_string = TRUE;
dlg_tab_correct_str(prompt);
- dlg_auto_size(title, prompt, &height, &width, MIN_HIGH, MIN_WIDE);
- dlg_print_size(height, width);
- dlg_ctl_size(height, width);
+ if (objptr == 0) {
+ /* create a new object */
+ obj = dlg_calloc(MY_OBJ, 1);
+ assert_ptr(obj, "dialog_gauge");
- /* center dialog box on screen */
- x = dlg_box_x_ordinate(width);
- y = dlg_box_y_ordinate(height);
+ dlg_auto_size(title, prompt, &height, &width, MIN_HIGH, MIN_WIDE);
+ dlg_print_size(height, width);
+ dlg_ctl_size(height, width);
- dialog = dlg_new_window(height, width, y, x);
+ } else {
+ /* reuse an existing object */
+ obj = objptr;
+ height = obj->height;
+ width = obj->width;
+ }
- obj = dlg_calloc(MY_OBJ, 1);
- assert_ptr(obj, "dialog_gauge");
+ if (obj->obj.win == 0) {
+ /* center dialog box on screen */
+ int x = dlg_box_x_ordinate(width);
+ int y = dlg_box_y_ordinate(height);
+ WINDOW *dialog = dlg_new_window(height, width, y, x);
+ obj->obj.win = dialog;
+ }
obj->obj.input = dialog_state.pipe_input;
- obj->obj.win = dialog;
obj->obj.keep_win = TRUE;
obj->obj.bg_task = TRUE;
obj->obj.handle_getc = handle_my_getc;
obj->obj.handle_input = handle_input;
- obj->title = title;
+ if (obj->title == 0 || strcmp(obj->title, title)) {
+ dlg_finish_string(obj->title);
+ free(obj->title);
+ obj->title = dlg_strclone(title);
+ }
+
+ dlg_finish_string(obj->prompt);
+ free(obj->prompt);
+
obj->prompt = prompt;
obj->percent = percent;
obj->height = height;
obj->width = width;
- obj->next = all_objects;
- all_objects = obj;
+ /* if this was a new object, link it into the list */
+ if (objptr == 0) {
+ obj->next = all_objects;
+ all_objects = obj;
+ }
+ dialog_state.finish_string = save_finish_string;
return (void *) obj;
}
+void *
+dlg_allocate_gauge(const char *title,
+ const char *cprompt,
+ int height,
+ int width,
+ int percent)
+{
+ return dlg_reallocate_gauge(NULL, title, cprompt, height, width, percent);
+}
+
void
dlg_free_gauge(void *objptr)
{
Modified: vendor/dialog/dist/headers-sh.in
===================================================================
--- vendor/dialog/dist/headers-sh.in 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/headers-sh.in 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: headers-sh.in,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: headers-sh.in,v 1.11 2011/10/18 23:49:13 tom Exp $
##############################################################################
# Copyright (c) 2004-2007,2011 Thomas E. Dickey #
# #
Property changes on: vendor/dialog/dist/headers-sh.in
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/help.c
===================================================================
--- vendor/dialog/dist/help.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/help.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: help.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: help.c,v 1.3 2012/12/04 02:01:10 tom Exp $
*
* help.c -- implements the help dialog
*
- * Copyright 2011 Thomas E. Dickey
+ * Copyright 2011,2012 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -33,11 +33,22 @@
int width)
{
int result = DLG_EXIT_ERROR;
+ DIALOG_VARS save;
if (!dialog_vars.in_helpfile && file != 0 && *file != '\0') {
+ dlg_save_vars(&save);
+
+ dialog_vars.no_label = NULL;
+ dialog_vars.ok_label = NULL;
+ dialog_vars.help_button = FALSE;
+ dialog_vars.extra_button = FALSE;
+ dialog_vars.nook = FALSE;
+
dialog_vars.in_helpfile = TRUE;
+
result = dialog_textbox(title, file, height, width);
- dialog_vars.in_helpfile = FALSE;
+
+ dlg_restore_vars(&save);
}
return (result);
}
Modified: vendor/dialog/dist/inputbox.c
===================================================================
--- vendor/dialog/dist/inputbox.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/inputbox.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: inputbox.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: inputbox.c,v 1.76 2012/12/03 11:46:50 tom Exp $
*
* inputbox.c -- implements the input box
*
- * Copyright 2000-2010,2011 Thomas E. Dickey
+ * Copyright 2000-2011,2012 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -73,6 +73,7 @@
int result = DLG_EXIT_UNKNOWN;
int state;
int first;
+ int edited;
char *input;
WINDOW *dialog;
WINDOW *editor;
@@ -85,12 +86,13 @@
/* Set up the initial value */
input = dlg_set_result(init);
+ edited = FALSE;
#ifdef KEY_RESIZE
retry:
#endif
show_buttons = TRUE;
- state = dialog_vars.defaultno ? dlg_defaultno_button() : sTEXT;
+ state = dialog_vars.default_button >= 0 ? dlg_default_button() : sTEXT;
first = (state == sTEXT);
key = fkey = 0;
@@ -138,7 +140,12 @@
editor = dlg_sub_window(dialog, 1, box_width, yorg + box_y, xorg + box_x);
dlg_register_window(editor, "inputbox2", binding2);
- dlg_trace_win(dialog);
+ if (*input != '\0') {
+ dlg_show_string(editor, input, chr_offset, inputbox_attr,
+ 0, 0, box_width, password, first);
+ wsyncup(editor);
+ wcursyncup(editor);
+ }
while (result == DLG_EXIT_UNKNOWN) {
int edit = 0;
@@ -153,6 +160,13 @@
}
if (!first) {
+ if (*input != '\0' && !edited) {
+ dlg_show_string(editor, input, chr_offset, inputbox_attr,
+ 0, 0, box_width, password, first);
+ wmove(editor, 0, chr_offset);
+ wsyncup(editor);
+ wcursyncup(editor);
+ }
key = dlg_mouse_wgetch((state == sTEXT) ? editor : dialog, &fkey);
if (dlg_result_key(key, fkey, &result))
break;
@@ -173,9 +187,12 @@
edit = dlg_edit_string(input, &chr_offset, key, fkey, first);
if (edit) {
- dlg_show_string(dialog, input, chr_offset, inputbox_attr,
- box_y, box_x, box_width, password, first);
+ dlg_show_string(editor, input, chr_offset, inputbox_attr,
+ 0, 0, box_width, password, first);
+ wsyncup(editor);
+ wcursyncup(editor);
first = FALSE;
+ edited = TRUE;
continue;
} else if (first) {
first = FALSE;
Modified: vendor/dialog/dist/inputstr.c
===================================================================
--- vendor/dialog/dist/inputstr.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/inputstr.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: inputstr.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: inputstr.c,v 1.83 2013/09/23 23:19:26 tom Exp $
*
* inputstr.c -- functions for input/display of a string
*
- * Copyright 2000-2010,2011 Thomas E. Dickey
+ * Copyright 2000-2012,2013 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -51,7 +51,7 @@
typedef struct _cache {
struct _cache *next;
#if USE_CACHING
- struct _cache *cache_at; /* unique: associate caches by CACHE */
+ int cache_num; /* tells what type of data is in list[] */
const char *string_at; /* unique: associate caches by char* */
#endif
size_t s_len; /* strlen(string) - we add 1 for EOS */
@@ -65,6 +65,14 @@
static CACHE *cache_list;
+typedef enum {
+ cInxCols
+ ,cCntWideBytes
+ ,cCntWideChars
+ ,cInxWideChars
+ ,cMAX
+} CACHE_USED;
+
#ifdef HAVE_TSEARCH
static void *sorted_cache;
#endif
@@ -89,13 +97,35 @@
#endif
#ifdef HAVE_TSEARCH
+
+#if 0
+static void
+show_tsearch(const void *nodep, const VISIT which, const int depth)
+{
+ const CACHE *p = *(CACHE * const *) nodep;
+ (void) depth;
+ if (which == postorder || which == leaf) {
+ dlg_trace_msg("\tcache %p %p:%s\n", p, p->string, p->string);
+ }
+}
+
+static void
+trace_cache(const char *fn, int ln)
+{
+ dlg_trace_msg("trace_cache %s@%d\n", fn, ln);
+ twalk(sorted_cache, show_tsearch);
+}
+
+#else
+#define trace_cache(fn, ln) /* nothing */
+#endif
+
static int
compare_cache(const void *a, const void *b)
{
const CACHE *p = (const CACHE *) a;
const CACHE *q = (const CACHE *) b;
- int result = 0;
- result = (int) (p->cache_at - q->cache_at);
+ int result = (p->cache_num - q->cache_num);
if (result == 0)
result = (int) (p->string_at - q->string_at);
return result;
@@ -103,7 +133,7 @@
#endif
static CACHE *
-find_cache(CACHE * cache, const char *string)
+find_cache(int cache_num, const char *string)
{
CACHE *p;
@@ -112,7 +142,7 @@
CACHE find;
memset(&find, 0, sizeof(find));
- find.cache_at = cache;
+ find.cache_num = cache_num;
find.string_at = string;
if ((pp = tfind(&find, &sorted_cache, compare_cache)) != 0) {
@@ -122,8 +152,7 @@
}
#else
for (p = cache_list; p != 0; p = p->next) {
- if (p->cache_at == cache
- && p->string_at == string) {
+ if (p->string_at == string) {
break;
}
}
@@ -131,8 +160,8 @@
return p;
}
-static void
-make_cache(CACHE * cache, const char *string)
+static CACHE *
+make_cache(int cache_num, const char *string)
{
CACHE *p;
@@ -141,43 +170,30 @@
p->next = cache_list;
cache_list = p;
- p->cache_at = cache;
+ p->cache_num = cache_num;
p->string_at = string;
- *cache = *p;
#ifdef HAVE_TSEARCH
(void) tsearch(p, &sorted_cache, compare_cache);
#endif
+ return p;
}
-static void
-load_cache(CACHE * cache, const char *string)
+static CACHE *
+load_cache(int cache_num, const char *string)
{
CACHE *p;
- if ((p = find_cache(cache, string)) != 0) {
- *cache = *p;
- } else {
- make_cache(cache, string);
+ if ((p = find_cache(cache_num, string)) == 0) {
+ p = make_cache(cache_num, string);
}
+ return p;
}
-
-static void
-save_cache(CACHE * cache, const char *string)
-{
- CACHE *p;
-
- if ((p = find_cache(cache, string)) != 0) {
- CACHE *q = p->next;
- *p = *cache;
- p->next = q;
- }
-}
#else
+static CACHE my_cache;
#define SAME_CACHE(c,s,l) (c->string != 0)
-#define load_cache(cache, string) /* nothing */
-#define save_cache(cache, string) /* nothing */
-#endif /* USE_WIDE_CURSES */
+#define load_cache(cache, string) &my_cache
+#endif /* USE_CACHING */
/*
* If the given string has not changed, we do not need to update the index.
@@ -188,32 +204,34 @@
{
unsigned need;
size_t s_len = strlen(string);
+ bool result = TRUE;
- if (cache->s_len != 0
- && cache->s_len >= s_len
- && cache->list != 0
- && SAME_CACHE(cache, string, (size_t) s_len)) {
- return TRUE;
- }
+ if (cache->s_len == 0
+ || cache->s_len < s_len
+ || cache->list == 0
+ || !SAME_CACHE(cache, string, (size_t) s_len)) {
- need = (i_len + 1);
- if (cache->list == 0) {
- cache->list = dlg_malloc(int, need);
- } else if (cache->i_len < i_len) {
- cache->list = dlg_realloc(int, need, cache->list);
- }
- cache->i_len = i_len;
+ need = (i_len + 1);
+ if (cache->list == 0) {
+ cache->list = dlg_malloc(int, need);
+ } else if (cache->i_len < i_len) {
+ cache->list = dlg_realloc(int, need, cache->list);
+ }
+ assert_ptr(cache->list, "load_cache");
+ cache->i_len = i_len;
- if (cache->s_len >= s_len && cache->string != 0) {
- strcpy(cache->string, string);
- } else {
- if (cache->string != 0)
- free(cache->string);
- cache->string = dlg_strclone(string);
+ if (cache->s_len >= s_len && cache->string != 0) {
+ strcpy(cache->string, string);
+ } else {
+ if (cache->string != 0)
+ free(cache->string);
+ cache->string = dlg_strclone(string);
+ }
+ cache->s_len = s_len;
+
+ result = FALSE;
}
- cache->s_len = s_len;
-
- return FALSE;
+ return result;
}
#ifdef USE_WIDE_CURSES
@@ -225,23 +243,24 @@
same_cache1(CACHE * cache, const char *string, size_t i_len)
{
size_t s_len = strlen(string);
+ bool result = TRUE;
- if (cache->s_len == s_len
- && SAME_CACHE(cache, string, (size_t) s_len)) {
- return TRUE;
- }
+ if (cache->s_len != s_len
+ || !SAME_CACHE(cache, string, (size_t) s_len)) {
- if (cache->s_len >= s_len && cache->string != 0) {
- strcpy(cache->string, string);
- } else {
- if (cache->string != 0)
- free(cache->string);
- cache->string = dlg_strclone(string);
+ if (cache->s_len >= s_len && cache->string != 0) {
+ strcpy(cache->string, string);
+ } else {
+ if (cache->string != 0)
+ free(cache->string);
+ cache->string = dlg_strclone(string);
+ }
+ cache->s_len = s_len;
+ cache->i_len = i_len;
+
+ result = FALSE;
}
- cache->s_len = s_len;
- cache->i_len = i_len;
-
- return FALSE;
+ return result;
}
#endif /* USE_CACHING */
@@ -256,29 +275,26 @@
int result;
if (have_locale()) {
- static CACHE cache;
-
- load_cache(&cache, string);
- if (!same_cache1(&cache, string, len)) {
+ CACHE *cache = load_cache(cCntWideBytes, string);
+ if (!same_cache1(cache, string, len)) {
while (len != 0) {
size_t code = 0;
- const char *src = cache.string;
+ const char *src = cache->string;
mbstate_t state;
- char save = cache.string[len];
+ char save = cache->string[len];
- cache.string[len] = '\0';
+ cache->string[len] = '\0';
memset(&state, 0, sizeof(state));
code = mbsrtowcs((wchar_t *) 0, &src, len, &state);
- cache.string[len] = save;
+ cache->string[len] = save;
if ((int) code >= 0) {
break;
}
--len;
}
- cache.i_len = len;
- save_cache(&cache, string);
+ cache->i_len = len;
}
- result = (int) cache.i_len;
+ result = (int) cache->i_len;
} else {
result = (int) len;
}
@@ -293,30 +309,32 @@
dlg_count_wchars(const char *string)
{
int result;
+#ifdef USE_WIDE_CURSES
-#ifdef USE_WIDE_CURSES
if (have_locale()) {
- static CACHE cache;
size_t len = strlen(string);
+ CACHE *cache = load_cache(cCntWideChars, string);
- load_cache(&cache, string);
- if (!same_cache1(&cache, string, len)) {
- const char *src = cache.string;
+ if (!same_cache1(cache, string, len)) {
+ const char *src = cache->string;
mbstate_t state;
- int part = dlg_count_wcbytes(cache.string, len);
- char save = cache.string[part];
+ int part = dlg_count_wcbytes(cache->string, len);
+ char save = cache->string[part];
size_t code;
wchar_t *temp = dlg_calloc(wchar_t, len + 1);
- cache.string[part] = '\0';
- memset(&state, 0, sizeof(state));
- code = mbsrtowcs(temp, &src, (size_t) part, &state);
- cache.i_len = ((int) code >= 0) ? wcslen(temp) : 0;
- cache.string[part] = save;
- free(temp);
- save_cache(&cache, string);
+ if (temp != 0) {
+ cache->string[part] = '\0';
+ memset(&state, 0, sizeof(state));
+ code = mbsrtowcs(temp, &src, (size_t) part, &state);
+ cache->i_len = ((int) code >= 0) ? wcslen(temp) : 0;
+ cache->string[part] = save;
+ free(temp);
+ } else {
+ cache->i_len = 0;
+ }
}
- result = (int) cache.i_len;
+ result = (int) cache->i_len;
} else
#endif /* USE_WIDE_CURSES */
{
@@ -332,15 +350,14 @@
const int *
dlg_index_wchars(const char *string)
{
- static CACHE cache;
unsigned len = (unsigned) dlg_count_wchars(string);
unsigned inx;
+ CACHE *cache = load_cache(cInxWideChars, string);
- load_cache(&cache, string);
- if (!same_cache2(&cache, string, len)) {
+ if (!same_cache2(cache, string, len)) {
const char *current = string;
- cache.list[0] = 0;
+ cache->list[0] = 0;
for (inx = 1; inx <= len; ++inx) {
#ifdef USE_WIDE_CURSES
if (have_locale()) {
@@ -351,17 +368,16 @@
if (width <= 0)
width = 1; /* FIXME: what if we have a control-char? */
current += width;
- cache.list[inx] = cache.list[inx - 1] + width;
+ cache->list[inx] = cache->list[inx - 1] + width;
} else
#endif /* USE_WIDE_CURSES */
{
(void) current;
- cache.list[inx] = (int) inx;
+ cache->list[inx] = (int) inx;
}
}
- save_cache(&cache, string);
}
- return cache.list;
+ return cache->list;
}
/*
@@ -375,8 +391,9 @@
for (result = 0; result <= limit; ++result) {
if (to_find == list[result]
|| result == limit
- || to_find < list[result + 1])
+ || ((result < limit) && (to_find < list[result + 1]))) {
break;
+ }
}
return result;
}
@@ -387,13 +404,12 @@
const int *
dlg_index_columns(const char *string)
{
- static CACHE cache;
unsigned len = (unsigned) dlg_count_wchars(string);
unsigned inx;
+ CACHE *cache = load_cache(cInxCols, string);
- load_cache(&cache, string);
- if (!same_cache2(&cache, string, len)) {
- cache.list[0] = 0;
+ if (!same_cache2(cache, string, len)) {
+ cache->list[0] = 0;
#ifdef USE_WIDE_CURSES
if (have_locale()) {
size_t num_bytes = strlen(string);
@@ -406,7 +422,7 @@
int result;
if (string[inx_wchars[inx]] == TAB) {
- result = ((cache.list[inx] | 7) + 1) - cache.list[inx];
+ result = ((cache->list[inx] | 7) + 1) - cache->list[inx];
} else {
memset(&state, 0, sizeof(state));
memset(temp, 0, sizeof(temp));
@@ -427,9 +443,9 @@
result = printable ? (int) wcslen(printable) : 1;
}
}
- cache.list[inx + 1] = result;
+ cache->list[inx + 1] = result;
if (inx != 0)
- cache.list[inx + 1] += cache.list[inx];
+ cache->list[inx + 1] += cache->list[inx];
}
} else
#endif /* USE_WIDE_CURSES */
@@ -438,24 +454,23 @@
chtype ch = UCH(string[inx]);
if (ch == TAB)
- cache.list[inx + 1] =
- ((cache.list[inx] | 7) + 1) - cache.list[inx];
+ cache->list[inx + 1] =
+ ((cache->list[inx] | 7) + 1) - cache->list[inx];
else if (isprint(ch))
- cache.list[inx + 1] = 1;
+ cache->list[inx + 1] = 1;
else {
const char *printable;
printable = unctrl(ch);
- cache.list[inx + 1] = (printable
- ? (int) strlen(printable)
- : 1);
+ cache->list[inx + 1] = (printable
+ ? (int) strlen(printable)
+ : 1);
}
if (inx != 0)
- cache.list[inx + 1] += cache.list[inx];
+ cache->list[inx + 1] += cache->list[inx];
}
}
- save_cache(&cache, string);
}
- return cache.list;
+ return cache->list;
}
/*
@@ -473,6 +488,7 @@
} else {
result = (int) strlen(string);
}
+ dlg_finish_string(string);
return result;
}
@@ -529,7 +545,7 @@
edit = force;
break;
case DLGK_GRID_LEFT:
- if (*chr_offset)
+ if (*chr_offset && offset > 0)
*chr_offset = indx[offset - 1];
break;
case DLGK_GRID_RIGHT:
@@ -727,22 +743,59 @@
}
}
+/*
+ * Discard cached data for the given string.
+ */
+void
+dlg_finish_string(const char *string)
+{
+#if USE_CACHING
+ if ((string != 0) && dialog_state.finish_string) {
+ CACHE *p = cache_list;
+ CACHE *q = 0;
+ CACHE *r;
+
+ while (p != 0) {
+ if (p->string_at == string) {
+#ifdef HAVE_TSEARCH
+ if (tdelete(p, &sorted_cache, compare_cache) == 0) {
+ continue;
+ }
+ trace_cache(__FILE__, __LINE__);
+#endif
+ if (p->string != 0)
+ free(p->string);
+ if (p->list != 0)
+ free(p->list);
+ if (p == cache_list) {
+ cache_list = p->next;
+ r = cache_list;
+ } else {
+ q->next = p->next;
+ r = q;
+ }
+ free(p);
+ p = r;
+ } else {
+ q = p;
+ p = p->next;
+ }
+ }
+ }
+#else
+ (void) string;
+#endif
+}
+
#ifdef NO_LEAKS
void
_dlg_inputstr_leaks(void)
{
#if USE_CACHING
+ dialog_state.finish_string = TRUE;
+ trace_cache(__FILE__, __LINE__);
while (cache_list != 0) {
- CACHE *next = cache_list->next;
-#ifdef HAVE_TSEARCH
- tdelete(cache_list, &sorted_cache, compare_cache);
-#endif
- if (cache_list->string != 0)
- free(cache_list->string);
- if (cache_list->list != 0)
- free(cache_list->list);
- free(cache_list);
- cache_list = next;
+ dlg_finish_string(cache_list->string_at);
}
#endif /* USE_CACHING */
}
Index: vendor/dialog/dist/install-sh
===================================================================
--- vendor/dialog/dist/install-sh 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/install-sh 2018-06-15 16:21:14 UTC (rev 10958)
Property changes on: vendor/dialog/dist/install-sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/makefile.in
===================================================================
--- vendor/dialog/dist/makefile.in 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/makefile.in 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,7 +1,7 @@
-# $Id: makefile.in,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: makefile.in,v 1.87 2013/09/02 19:51:58 tom Exp $
# template makefile for DIALOG
##############################################################################
-# Copyright (c) 1999-2010,2011 Thomas E. Dickey #
+# Copyright (c) 1999-2012,2013 Thomas E. Dickey #
# #
# Permission is hereby granted, free of charge, to any person obtaining a #
# copy of this software and associated documentation files (the "Software"), #
@@ -35,15 +35,30 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
top_builddir = .
x = @EXEEXT@
o = . at OBJEXT@
-a = @LIB_SUFFIX@
DESTDIR =
+THIS = dialog
+
+CFG_ROOTNAME = @CFG_ROOTNAME@
+HDR_ROOTNAME = @HDR_ROOTNAME@
+LIB_ROOTNAME = @LIB_ROOTNAME@
+LIB_SUFFIX = @LIB_SUFFIX@
+
+VERSION_MAJOR = @VERSION_MAJOR@
+VERSION_MINOR = @VERSION_MINOR@
+VERSION = $(VERSION_MAJOR).$(VERSION_MINOR)
+REL_VERSION = @REL_VERSION@
+ABI_VERSION = @ABI_VERSION@
+LIB_ROOTNAME = @LIB_ROOTNAME@
+ at SET_SHLIB_VARS@
+
bindir = @bindir@
includedir = @includedir@
libdir = @libdir@
@@ -71,6 +86,7 @@
RANLIB = @LIB_PREP@
RM = rm -f
+LN_S = @LN_S@
LINT = @LINT@
LINT_OPTS = @LINT_OPTS@
@@ -85,6 +101,7 @@
LIBTOOL_LINK = @LIB_LINK@
LIBTOOL_INSTALL = @LIB_INSTALL@
LIBTOOL_UNINSTALL = @LIB_UNINSTALL@
+LIBTOOL_VERSION = @LIBTOOL_VERSION@
INSTALL = @INSTALL@
INSTALL_PROGRAM = $(LIBTOOL_INSTALL) @INSTALL_PROGRAM@
@@ -97,12 +114,12 @@
# renamed at install time, starting with the package name.
PACKAGE = @PACKAGE@
ACTUAL_PROG = `echo $(PACKAGE) |sed @program_transform_name@`
-LIB_CONFIG = @PACKAGE at -config
+LIB_CONFIG = $(CFG_ROOTNAME)-config
# The library name $(LIB) is set at configure/make time, since it is used as a
# makefile target. Ditto for $(PROG).
-LIB = @LIB_PREFIX@@PACKAGE@$a
-PROG = dialog$x
+LIB = @LIB_TARGET@
+PROG = @PACKAGE@$x
#
# Standard .c to .o compile line.
#
@@ -115,7 +132,7 @@
@ECHO_CC@$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c $<
.1.html :
- GROFF_NO_SGR=stupid $(SHELL) -c "tbl $< | groff -Thtml -man" >$@
+ GROFF_NO_SGR=stupid $(SHELL) -c "tbl $< | groff -P -o0 -I$*_ -Thtml -man" >$@
.1.ps :
$(SHELL) -c "tbl $< | groff -man" >$@
@@ -176,11 +193,7 @@
dialog$o \
$(OBJECTS) : $(srcdir)/dialog.h $(srcdir)/dlg_keys.h dlg_config.h VERSION
-$(LIB) : $(LIB_OBJECT)
- $(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT)
- $(RANLIB) $@
-
-dialog$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@
+$(PROG)$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@
$(LINK) -o $@ dialog$o -L. -l at PACKAGE@ $(LDFLAGS) $(LIBS)
clean \
Modified: vendor/dialog/dist/menubox.c
===================================================================
--- vendor/dialog/dist/menubox.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/menubox.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: menubox.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: menubox.c,v 1.148 2013/09/02 17:15:13 tom Exp $
*
* menubox.c -- implements the menu box
*
- * Copyright 2000-2010,2011 Thomas E. Dickey
+ * Copyright 2000-2012,2013 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public Licens, version 2.1e
@@ -27,8 +27,6 @@
#include <dialog.h>
#include <dlg_keys.h>
-static int menu_width, tag_x, item_x;
-
typedef enum {
Unselected = 0,
Selected,
@@ -35,81 +33,36 @@
Editing
} Mode;
+typedef struct {
+ /* the outer-window */
+ WINDOW *dialog;
+ int box_y;
+ int box_x;
+ int tag_x;
+ int item_x;
+ int menu_height;
+ int menu_width;
+ /* the inner-window */
+ WINDOW *menu;
+ DIALOG_LISTITEM *items;
+ int item_no;
+} ALL_DATA;
+
#define MIN_HIGH (1 + (5 * MARGIN))
#define INPUT_ROWS 3 /* rows per inputmenu entry */
-#define LLEN(n) ((n) * MENUBOX_TAGS)
-#define ItemName(i) items[LLEN(i)]
-#define ItemText(i) items[LLEN(i) + 1]
-#define ItemHelp(i) items[LLEN(i) + 2]
-
#define RowHeight(i) (is_inputmenu ? ((i) * INPUT_ROWS) : ((i) * 1))
#define ItemToRow(i) (is_inputmenu ? ((i) * INPUT_ROWS + 1) : (i))
#define RowToItem(i) (is_inputmenu ? ((i) / INPUT_ROWS + 0) : (i))
-static void
-print_arrows(WINDOW *win,
- int box_x,
- int box_y,
- int scrollamt,
- int max_choice,
- int item_no,
- int menu_height)
-{
- dlg_draw_scrollbar(win,
- scrollamt,
- scrollamt,
- scrollamt + max_choice,
- item_no,
- box_x,
- box_x + menu_width,
- box_y,
- box_y + menu_height + 1,
- menubox_border2_attr,
- menubox_border_attr);
-}
-
/*
- * Print the tag of a menu-item
- */
-static void
-print_tag(WINDOW *win,
- DIALOG_LISTITEM * item,
- int choice,
- Mode selected,
- bool is_inputmenu)
-{
- int my_x = item_x;
- int my_y = ItemToRow(choice);
- int tag_width = (my_x - tag_x - GUTTER);
- const int *indx;
- int limit;
- int prefix;
-
- indx = dlg_index_wchars(item->name);
- prefix = (indx[1] - indx[0]);
-
- /* highlight first char of the tag to be special */
- (void) wmove(win, my_y, tag_x);
- wattrset(win, selected ? tag_key_selected_attr : tag_key_attr);
- if (strlen(item->name) != 0)
- (void) waddnstr(win, item->name, prefix);
- /* print rest of the string */
- wattrset(win, selected ? tag_selected_attr : tag_attr);
- if ((int) strlen(item->name) > prefix) {
- limit = dlg_limit_columns(item->name, tag_width, 1);
- if (limit > 0)
- (void) waddnstr(win, item->name + indx[1], indx[limit] - indx[1]);
- }
-}
-
-/*
* Print menu item
*/
static void
-print_item(WINDOW *win,
- DIALOG_LISTITEM * items,
+print_item(ALL_DATA * data,
+ WINDOW *win,
+ DIALOG_LISTITEM * item,
int choice,
Mode selected,
bool is_inputmenu)
@@ -116,25 +69,26 @@
{
chtype save = dlg_get_attrs(win);
int n;
- int my_width = menu_width;
- int my_x = item_x;
+ int climit = (data->item_x - data->tag_x - GUTTER);
+ int my_width = data->menu_width;
+ int my_x = data->item_x;
int my_y = ItemToRow(choice);
- chtype attr = A_NORMAL;
- chtype textchar;
+ bool both = (!dialog_vars.no_tags && !dialog_vars.no_items);
+ bool first = TRUE;
chtype bordchar;
+ const char *show = (dialog_vars.no_items
+ ? item->name
+ : item->text);
switch (selected) {
default:
case Unselected:
- textchar = item_attr;
bordchar = item_attr;
break;
case Selected:
- textchar = item_selected_attr;
bordchar = item_selected_attr;
break;
case Editing:
- textchar = inputbox_attr;
bordchar = dialog_attr;
break;
}
@@ -141,24 +95,29 @@
/* Clear 'residue' of last item and mark current current item */
if (is_inputmenu) {
- wattrset(win, (selected != Unselected) ? item_selected_attr : item_attr);
+ (void) wattrset(win, (selected != Unselected) ? item_selected_attr : item_attr);
for (n = my_y - 1; n < my_y + INPUT_ROWS - 1; n++) {
wmove(win, n, 0);
wprintw(win, "%*s", my_width, " ");
}
} else {
- wattrset(win, menubox_attr);
+ (void) wattrset(win, menubox_attr);
wmove(win, my_y, 0);
wprintw(win, "%*s", my_width, " ");
}
- print_tag(win, items, choice, selected, is_inputmenu);
+ /* highlight first char of the tag to be special */
+ if (both) {
+ (void) wmove(win, my_y, data->tag_x);
+ dlg_print_listitem(win, item->name, climit, first, selected);
+ first = FALSE;
+ }
/* Draw the input field box (only for inputmenu) */
(void) wmove(win, my_y, my_x);
if (is_inputmenu) {
my_width -= 1;
- dlg_draw_box(win, my_y - 1, my_x, INPUT_ROWS, my_width - my_x - tag_x,
+ dlg_draw_box(win, my_y - 1, my_x, INPUT_ROWS, my_width - my_x - data->tag_x,
bordchar,
bordchar);
my_width -= 1;
@@ -167,13 +126,12 @@
/* print actual item */
wmove(win, my_y, my_x);
- wattrset(win, textchar);
- dlg_print_text(win, items->text, my_width - my_x, &attr);
+ dlg_print_listitem(win, show, my_width - my_x, first, selected);
if (selected) {
- dlg_item_help(items->help);
+ dlg_item_help(item->help);
}
- wattrset(win, save);
+ (void) wattrset(win, save);
}
/*
@@ -180,12 +138,12 @@
* Allow the user to edit the text of a menu entry.
*/
static int
-input_menu_edit(WINDOW *win,
+input_menu_edit(ALL_DATA * data,
DIALOG_LISTITEM * items,
int choice,
char **resultp)
{
- chtype save = dlg_get_attrs(win);
+ chtype save = dlg_get_attrs(data->menu);
char *result;
int offset = 0;
int key = 0, fkey = 0;
@@ -203,15 +161,17 @@
result[0] = '\0';
strcpy(result, items->text);
- print_item(win, items, choice, Editing, TRUE);
+ print_item(data, data->menu, items, choice, Editing, TRUE);
/* taken out of inputbox.c - but somewhat modified */
for (;;) {
if (!first)
- key = dlg_mouse_wgetch(win, &fkey);
+ key = dlg_mouse_wgetch(data->menu, &fkey);
if (dlg_edit_string(result, &offset, key, fkey, first)) {
- dlg_show_string(win, result, offset, inputbox_attr,
- y, item_x + 1, menu_width - item_x - 3,
+ dlg_show_string(data->menu, result, offset, inputbox_attr,
+ y,
+ data->item_x + 1,
+ data->menu_width - data->item_x - 3,
FALSE, first);
first = FALSE;
} else if (key == ESC || key == TAB) {
@@ -221,8 +181,8 @@
break;
}
}
- print_item(win, items, choice, Selected, TRUE);
- wattrset(win, save);
+ print_item(data, data->menu, items, choice, Selected, TRUE);
+ (void) wattrset(data->menu, save);
*resultp = result;
return code;
@@ -231,6 +191,8 @@
static int
handle_button(int code, DIALOG_LISTITEM * items, int choice)
{
+ char *help_result;
+
switch (code) {
case DLG_EXIT_OK: /* FALLTHRU */
case DLG_EXIT_EXTRA:
@@ -237,13 +199,8 @@
dlg_add_string(items[choice].name);
break;
case DLG_EXIT_HELP:
- dlg_add_result("HELP ");
- if (USE_ITEM_HELP(items[choice].help)) {
- dlg_add_string(items[choice].help);
- code = DLG_EXIT_ITEM_HELP;
- } else {
- dlg_add_string(items[choice].name);
- }
+ dlg_add_help_listitem(&code, &help_result, &items[choice]);
+ dlg_add_string(help_result);
break;
}
return code;
@@ -270,6 +227,63 @@
return DLG_EXIT_ERROR;
}
+static void
+print_menu(ALL_DATA * data, int choice, int scrollamt, int max_choice, bool is_inputmenu)
+{
+ int i;
+
+ for (i = 0; i < max_choice; i++) {
+ print_item(data,
+ data->menu,
+ &data->items[i + scrollamt],
+ i,
+ (i == choice) ? Selected : Unselected,
+ is_inputmenu);
+ }
+
+ /* Clean bottom lines */
+ if (is_inputmenu) {
+ int spare_lines, x_count;
+ spare_lines = data->menu_height % INPUT_ROWS;
+ (void) wattrset(data->menu, menubox_attr);
+ for (; spare_lines; spare_lines--) {
+ wmove(data->menu, data->menu_height - spare_lines, 0);
+ for (x_count = 0; x_count < data->menu_width;
+ x_count++) {
+ waddch(data->menu, ' ');
+ }
+ }
+ }
+
+ (void) wnoutrefresh(data->menu);
+
+ dlg_draw_scrollbar(data->dialog,
+ scrollamt,
+ scrollamt,
+ scrollamt + max_choice,
+ data->item_no,
+ data->box_x,
+ data->box_x + data->menu_width,
+ data->box_y,
+ data->box_y + data->menu_height + 1,
+ menubox_border2_attr,
+ menubox_border_attr);
+}
+
+static bool
+check_hotkey(DIALOG_LISTITEM * items, int choice)
+{
+ bool result = FALSE;
+
+ if (dlg_match_char(dlg_last_getc(),
+ (dialog_vars.no_tags
+ ? items[choice].text
+ : items[choice].name))) {
+ result = TRUE;
+ }
+ return result;
+}
+
/*
* This is an alternate interface to 'menu' which allows the application
* to read the list item states back directly without putting them in the
@@ -320,15 +334,16 @@
int old_height = height;
int old_width = width;
#endif
- int i, j, x, y, cur_x, cur_y, box_x, box_y;
+ ALL_DATA all;
+ int i, j, x, y, cur_x, cur_y;
int key = 0, fkey;
- int button = dialog_state.visit_items ? -1 : dlg_defaultno_button();
+ int button = dialog_state.visit_items ? -1 : dlg_default_button();
int choice = dlg_default_listitem(items);
int result = DLG_EXIT_UNKNOWN;
int scrollamt = 0;
- int max_choice, min_width;
+ int max_choice;
int found;
- int use_height, use_width, name_width, text_width;
+ int use_width, name_width, text_width, list_width;
WINDOW *dialog, *menu;
char *prompt = dlg_strclone(cprompt);
const char **buttons = dlg_ok_labels();
@@ -335,6 +350,9 @@
bool is_inputmenu = ((rename_menutext != 0)
&& (rename_menutext != dlg_dummy_menutext));
+ all.items = items;
+ all.item_no = item_no;
+
dlg_does_output();
dlg_tab_correct_str(prompt);
@@ -342,14 +360,17 @@
retry:
#endif
- use_height = menu_height;
- if (use_height == 0) {
- min_width = dlg_calc_list_width(item_no, items) + 10;
+ all.menu_height = menu_height;
+ use_width = dlg_calc_list_width(item_no, items) + 10;
+ use_width = MAX(26, use_width);
+ if (all.menu_height == 0) {
/* calculate height without items (4) */
- dlg_auto_size(title, prompt, &height, &width, MIN_HIGH, MAX(26, min_width));
- dlg_calc_listh(&height, &use_height, item_no);
+ dlg_auto_size(title, prompt, &height, &width, MIN_HIGH, use_width);
+ dlg_calc_listh(&height, &all.menu_height, item_no);
} else {
- dlg_auto_size(title, prompt, &height, &width, MIN_HIGH + use_height, 26);
+ dlg_auto_size(title, prompt,
+ &height, &width,
+ MIN_HIGH + all.menu_height, use_width);
}
dlg_button_layout(buttons, &width);
dlg_print_size(height, width);
@@ -359,6 +380,8 @@
y = dlg_box_y_ordinate(height);
dialog = dlg_new_window(height, width, y, x);
+ all.dialog = dialog;
+
dlg_register_window(dialog, "menubox", binding);
dlg_register_buttons(dialog, "menubox", buttons);
@@ -368,38 +391,42 @@
dlg_draw_bottom_box2(dialog, border_attr, border2_attr, dialog_attr);
dlg_draw_title(dialog, title);
- wattrset(dialog, dialog_attr);
+ (void) wattrset(dialog, dialog_attr);
dlg_print_autowrap(dialog, prompt, height, width);
- menu_width = width - 6;
+ all.menu_width = width - 6;
getyx(dialog, cur_y, cur_x);
- box_y = cur_y + 1;
- box_x = (width - menu_width) / 2 - 1;
+ all.box_y = cur_y + 1;
+ all.box_x = (width - all.menu_width) / 2 - 1;
/*
* After displaying the prompt, we know how much space we really have.
* Limit the list to avoid overwriting the ok-button.
*/
- if (use_height + MIN_HIGH > height - cur_y)
- use_height = height - MIN_HIGH - cur_y;
- if (use_height <= 0)
- use_height = 1;
+ if (all.menu_height + MIN_HIGH > height - cur_y)
+ all.menu_height = height - MIN_HIGH - cur_y;
+ if (all.menu_height <= 0)
+ all.menu_height = 1;
/* Find out maximal number of displayable items at once. */
- max_choice = MIN(use_height,
+ max_choice = MIN(all.menu_height,
RowHeight(item_no));
if (is_inputmenu)
max_choice /= INPUT_ROWS;
/* create new window for the menu */
- menu = dlg_sub_window(dialog, use_height, menu_width,
- y + box_y + 1,
- x + box_x + 1);
+ menu = dlg_sub_window(dialog, all.menu_height, all.menu_width,
+ y + all.box_y + 1,
+ x + all.box_x + 1);
+ all.menu = menu;
+
dlg_register_window(menu, "menu", binding2);
dlg_register_buttons(menu, "menu", buttons);
/* draw a box around the menu items */
- dlg_draw_box(dialog, box_y, box_x, use_height + 2, menu_width + 2,
+ dlg_draw_box(dialog,
+ all.box_y, all.box_x,
+ all.menu_height + 2, all.menu_width + 2,
menubox_border_attr, menubox_border2_attr);
name_width = 0;
@@ -419,22 +446,37 @@
*
* FIXME: the gutter width and name/list ratio should be configurable.
*/
- use_width = (menu_width - GUTTER);
- if (text_width + name_width > use_width) {
- int need = (int) (0.30 * use_width);
- if (name_width > need) {
- int want = (int) (use_width
- * ((double) name_width)
- / (text_width + name_width));
- name_width = (want > need) ? want : need;
+ use_width = (all.menu_width - GUTTER);
+ if (dialog_vars.no_tags) {
+ list_width = MIN(use_width, text_width);
+ } else if (dialog_vars.no_items) {
+ list_width = MIN(use_width, name_width);
+ } else {
+ if (text_width >= 0
+ && name_width >= 0
+ && use_width > 0
+ && text_width + name_width > use_width) {
+ int need = (int) (0.30 * use_width);
+ if (name_width > need) {
+ int want = (int) (use_width
+ * ((double) name_width)
+ / (text_width + name_width));
+ name_width = (want > need) ? want : need;
+ }
+ text_width = use_width - name_width;
}
- text_width = use_width - name_width;
+ list_width = (text_width + name_width);
}
- tag_x = (is_inputmenu
- ? 0
- : (use_width - text_width - name_width) / 2);
- item_x = name_width + tag_x + GUTTER;
+ all.tag_x = (is_inputmenu
+ ? 0
+ : (use_width - list_width) / 2);
+ all.item_x = ((dialog_vars.no_tags
+ ? 0
+ : (dialog_vars.no_items
+ ? 0
+ : (GUTTER + name_width)))
+ + all.tag_x);
if (choice - scrollamt >= max_choice) {
scrollamt = choice - (max_choice - 1);
@@ -441,28 +483,21 @@
choice = max_choice - 1;
}
- /* Print the menu */
- for (i = 0; i < max_choice; i++) {
- print_item(menu,
- &items[i + scrollamt],
- i,
- (i == choice) ? Selected : Unselected,
- is_inputmenu);
- }
- (void) wnoutrefresh(menu);
+ print_menu(&all, choice, scrollamt, max_choice, is_inputmenu);
/* register the new window, along with its borders */
- dlg_mouse_mkbigregion(box_y + 1, box_x, use_height + 2, menu_width + 2,
+ dlg_mouse_mkbigregion(all.box_y + 1, all.box_x,
+ all.menu_height + 2, all.menu_width + 2,
KEY_MAX, 1, 1, 1 /* by lines */ );
- print_arrows(dialog, box_x, box_y, scrollamt, max_choice, item_no, use_height);
-
dlg_draw_buttons(dialog, height - 2, 0, buttons, button, FALSE, width);
dlg_trace_win(dialog);
while (result == DLG_EXIT_UNKNOWN) {
if (button < 0) /* --visit-items */
- wmove(dialog, box_y + ItemToRow(choice) + 1, box_x + tag_x + 1);
+ wmove(dialog,
+ all.box_y + ItemToRow(choice) + 1,
+ all.box_x + all.tag_x + 1);
key = dlg_mouse_wgetch(dialog, &fkey);
if (dlg_result_key(key, fkey, &result))
@@ -499,7 +534,7 @@
*/
if (button < 0 || !dialog_state.visit_items) {
for (j = scrollamt + choice + 1; j < item_no; j++) {
- if (dlg_match_char(dlg_last_getc(), items[j].name)) {
+ if (check_hotkey(items, j)) {
found = TRUE;
i = j - scrollamt;
break;
@@ -507,7 +542,7 @@
}
if (!found) {
for (j = 0; j <= scrollamt + choice; j++) {
- if (dlg_match_char(dlg_last_getc(), items[j].name)) {
+ if (check_hotkey(items, j)) {
found = TRUE;
i = j - scrollamt;
break;
@@ -577,95 +612,17 @@
if (i != choice) {
getyx(dialog, cur_y, cur_x);
if (i < 0 || i >= max_choice) {
-#if defined(NCURSES_VERSION_MAJOR) && NCURSES_VERSION_MAJOR < 5
- /*
- * Using wscrl to assist ncurses scrolling is not needed
- * in version 5.x
- */
- if (i == -1) {
- if (use_height > 1) {
- /* De-highlight current first item */
- print_item(menu,
- &items[scrollamt],
- 0, Unselected, is_inputmenu);
- scrollok(menu, TRUE);
- wscrl(menu, -RowHeight(1));
- scrollok(menu, FALSE);
- }
- scrollamt--;
- print_item(menu,
- &items[scrollamt],
- 0, Selected, is_inputmenu);
- } else if (i == max_choice) {
- if (use_height > 1) {
- /* De-highlight current last item before scrolling up */
- print_item(menu,
- &items[scrollamt + max_choice - 1],
- max_choice - 1,
- Unselected,
- is_inputmenu);
- scrollok(menu, TRUE);
- wscrl(menu, RowHeight(1));
- scrollok(menu, FALSE);
- }
- scrollamt++;
- print_item(menu,
- &items[scrollamt + max_choice - 1],
- max_choice - 1, TRUE,
- is_inputmenu);
- } else
-#endif
- {
- if (i < 0) {
- scrollamt += i;
- choice = 0;
- } else {
- choice = max_choice - 1;
- scrollamt += (i - max_choice + 1);
- }
- for (i = 0; i < max_choice; i++) {
- print_item(menu,
- &items[scrollamt + i],
- i,
- (i == choice) ? Selected : Unselected,
- is_inputmenu);
- }
+ if (i < 0) {
+ scrollamt += i;
+ choice = 0;
+ } else {
+ choice = max_choice - 1;
+ scrollamt += (i - max_choice + 1);
}
- /* Clean bottom lines */
- if (is_inputmenu) {
- int spare_lines, x_count;
- spare_lines = use_height % INPUT_ROWS;
- wattrset(menu, menubox_attr);
- for (; spare_lines; spare_lines--) {
- wmove(menu, use_height - spare_lines, 0);
- for (x_count = 0; x_count < menu_width;
- x_count++) {
- waddch(menu, ' ');
- }
- }
- }
- (void) wnoutrefresh(menu);
- print_arrows(dialog,
- box_x, box_y,
- scrollamt, max_choice, item_no, use_height);
+ print_menu(&all, choice, scrollamt, max_choice, is_inputmenu);
} else {
- /* De-highlight current item */
- print_item(menu,
- &items[scrollamt + choice],
- choice,
- Unselected,
- is_inputmenu);
- /* Highlight new item */
choice = i;
- print_item(menu,
- &items[scrollamt + choice],
- choice,
- Selected,
- is_inputmenu);
- (void) wnoutrefresh(menu);
- print_arrows(dialog,
- box_x, box_y,
- scrollamt, max_choice, item_no, use_height);
+ print_menu(&all, choice, scrollamt, max_choice, is_inputmenu);
(void) wmove(dialog, cur_y, cur_x);
wrefresh(dialog);
}
@@ -686,7 +643,10 @@
FALSE, width);
break;
case DLGK_ENTER:
- result = dlg_enter_buttoncode(button);
+ if (is_inputmenu)
+ result = dlg_ok_buttoncode(button);
+ else
+ result = dlg_enter_buttoncode(button);
/*
* If dlg_menu() is called from dialog_menu(), we want to
@@ -713,7 +673,7 @@
if (is_inputmenu && result == DLG_EXIT_EXTRA) {
char *tmp;
- if (input_menu_edit(menu,
+ if (input_menu_edit(&all,
&items[scrollamt + choice],
choice,
&tmp)) {
@@ -725,7 +685,8 @@
}
} else {
result = DLG_EXIT_UNKNOWN;
- print_item(menu,
+ print_item(&all,
+ menu,
&items[scrollamt + choice],
choice,
Selected,
@@ -782,17 +743,19 @@
{
int result;
int choice;
- int i;
+ int i, j;
DIALOG_LISTITEM *listitems;
listitems = dlg_calloc(DIALOG_LISTITEM, (size_t) item_no + 1);
assert_ptr(listitems, "dialog_menu");
- for (i = 0; i < item_no; ++i) {
- listitems[i].name = ItemName(i);
- listitems[i].text = ItemText(i);
+ for (i = j = 0; i < item_no; ++i) {
+ listitems[i].name = items[j++];
+ listitems[i].text = (dialog_vars.no_items
+ ? dlg_strempty()
+ : items[j++]);
listitems[i].help = ((dialog_vars.item_help)
- ? ItemHelp(i)
+ ? items[j++]
: dlg_strempty());
}
dlg_align_columns(&listitems[0].text, sizeof(DIALOG_LISTITEM), item_no);
Modified: vendor/dialog/dist/mixedform.c
===================================================================
--- vendor/dialog/dist/mixedform.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/mixedform.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: mixedform.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: mixedform.c,v 1.12 2013/09/02 17:02:05 tom Exp $
*
* mixedform.c -- implements the mixed form (i.e, typed pairs label/editbox)
*
- * Copyright 2007-2010,2011 Thomas E. Dickey
+ * Copyright 2007-2011,2013 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -54,6 +54,7 @@
DIALOG_FORMITEM *listitems;
DIALOG_VARS save_vars;
bool show_status = FALSE;
+ char *help_result;
dlg_save_vars(&save_vars);
dialog_vars.separate_output = TRUE;
@@ -93,14 +94,9 @@
show_status = TRUE;
break;
case DLG_EXIT_HELP:
- dlg_add_result("HELP ");
+ dlg_add_help_formitem(&result, &help_result, &listitems[choice]);
show_status = dialog_vars.help_status;
- if (USE_ITEM_HELP(listitems[choice].help)) {
- dlg_add_string(listitems[choice].help);
- result = DLG_EXIT_ITEM_HELP;
- } else {
- dlg_add_string(listitems[choice].name);
- }
+ dlg_add_string(help_result);
if (show_status)
dlg_add_separator();
break;
@@ -112,6 +108,7 @@
dlg_add_separator();
}
}
+ dlg_add_last_key(-1);
}
dlg_free_formitems(listitems);
Modified: vendor/dialog/dist/mixedgauge.c
===================================================================
--- vendor/dialog/dist/mixedgauge.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/mixedgauge.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: mixedgauge.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: mixedgauge.c,v 1.30 2012/11/18 16:30:20 tom Exp $
*
* mixedgauge.c -- implements the mixedgauge dialog
*
- * Copyright 2007-2010,2011 Thomas E. Dickey
+ * Copyright 2007-2011,2012 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -121,11 +121,8 @@
const char *status = "";
char *freeMe = 0;
- if (win) {
- bm -= (2 * MARGIN);
- }
- if (win != 0)
- getyx(win, last_y, last_x);
+ bm -= (2 * MARGIN);
+ getyx(win, last_y, last_x);
for (item = 0; item < dlg->item_no; ++item) {
chtype attr = A_NORMAL;
Modified: vendor/dialog/dist/mouse.c
===================================================================
--- vendor/dialog/dist/mouse.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/mouse.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: mouse.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: mouse.c,v 1.20 2012/12/21 10:00:30 tom Exp $
*
* mouse.c -- mouse support for dialog
*
- * Copyright 2002-2006,2007 Thomas E. Dickey
+ * Copyright 2002-2007,2012 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -26,7 +26,7 @@
#if USE_MOUSE
-static int basex, basey;
+static int basex, basey, basecode;
static mseRegion *regionList = NULL;
@@ -52,6 +52,12 @@
}
void
+dlg_mouse_setcode(int code)
+{
+ basecode = code;
+}
+
+void
dlg_mouse_mkbigregion(int y, int x,
int height, int width,
int code,
@@ -79,7 +85,7 @@
{
mseRegion *butPtr;
- if ((butPtr = find_region_by_code(code)) == 0) {
+ if ((butPtr = find_region_by_code(basecode + code)) == 0) {
butPtr = dlg_malloc(mseRegion, 1);
assert_ptr(butPtr, "dlg_mouse_mkregion");
butPtr->next = regionList;
@@ -93,7 +99,7 @@
butPtr->Y = basey + y + height;
butPtr->x = basex + x;
butPtr->X = basex + x + width;
- butPtr->code = code;
+ butPtr->code = basecode + code;
}
return butPtr;
}
@@ -105,12 +111,15 @@
mseRegion *butPtr;
for (butPtr = regionList; butPtr; butPtr = butPtr->next) {
- if (small ^ (butPtr->code >= 0))
+ if (small ^ (butPtr->code >= 0)) {
continue;
- if (y < butPtr->y || y >= butPtr->Y)
+ }
+ if (y < butPtr->y || y >= butPtr->Y) {
continue;
- if (x < butPtr->x || x >= butPtr->X)
+ }
+ if (x < butPtr->x || x >= butPtr->X) {
continue;
+ }
break; /* found */
}
return butPtr;
Modified: vendor/dialog/dist/mousewget.c
===================================================================
--- vendor/dialog/dist/mousewget.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/mousewget.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: mousewget.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: mousewget.c,v 1.22 2012/11/30 10:23:49 tom Exp $
*
* mousewget.c -- mouse/wgetch support for dialog
*
- * Copyright 2000-2006,2008 Thomas E. Dickey
+ * Copyright 2000-2008,2012 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -37,7 +37,7 @@
#if USE_MOUSE
mouse_err = FALSE;
- if (fkey && (key == KEY_MOUSE)) {
+ if (key == KEY_MOUSE) {
MEVENT event;
mseRegion *p;
Modified: vendor/dialog/dist/msgbox.c
===================================================================
--- vendor/dialog/dist/msgbox.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/msgbox.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: msgbox.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: msgbox.c,v 1.75 2012/12/01 01:48:08 tom Exp $
*
* msgbox.c -- implements the message box and info box
*
- * Copyright 2000-2010,2011 Thomas E. Dickey
+ * Copyright 2000-2011,2012 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -39,20 +39,14 @@
static DLG_KEYS_BINDING binding[] = {
HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
- DLG_KEYS_DATA( DLGK_ENTER, ' ' ),
+ TRAVERSE_BINDINGS,
SCROLLKEY_BINDINGS,
- DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_DOWN ),
- DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_RIGHT ),
- DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ),
- DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_UP ),
- DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ),
- DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_LEFT ),
END_KEYS_BINDING
};
/* *INDENT-ON* */
int x, y, last = 0, page;
- int button = 0;
+ int button;
int key = 0, fkey;
int result = DLG_EXIT_UNKNOWN;
WINDOW *dialog = 0;
@@ -62,10 +56,18 @@
int check;
bool show = TRUE;
int min_width = (pauseopt == 1 ? 12 : 0);
+ int save_nocancel = dialog_vars.nocancel;
+#ifdef KEY_RESIZE
+ int req_high;
+ int req_wide;
+#endif
+ dialog_vars.nocancel = TRUE;
+ button = dlg_default_button();
+
#ifdef KEY_RESIZE
- int req_high = height;
- int req_wide = width;
+ req_high = height;
+ req_wide = width;
restart:
#endif
@@ -98,7 +100,7 @@
dlg_draw_box2(dialog, 0, 0, height, width, dialog_attr, border_attr, border2_attr);
dlg_draw_title(dialog, title);
- wattrset(dialog, dialog_attr);
+ (void) wattrset(dialog, dialog_attr);
if (pauseopt) {
dlg_draw_bottom_box2(dialog, border_attr, border2_attr, dialog_attr);
@@ -118,7 +120,7 @@
break;
if (!fkey && (check = dlg_char_to_button(key, buttons)) >= 0) {
- result = check ? DLG_EXIT_HELP : DLG_EXIT_OK;
+ result = dlg_ok_buttoncode(check);
break;
}
@@ -151,22 +153,21 @@
FALSE, width);
break;
case DLGK_ENTER:
- result = button ? DLG_EXIT_HELP : DLG_EXIT_OK;
+ result = dlg_ok_buttoncode(button);
break;
- case DLGK_MOUSE(0):
- result = DLG_EXIT_OK;
- break;
- case DLGK_MOUSE(1):
- result = DLG_EXIT_HELP;
- break;
default:
- if (dlg_check_scrolled(key,
- last,
- page,
- &show,
- &offset) == 0)
- break;
- beep();
+ if (is_DLGK_MOUSE(key)) {
+ result = dlg_ok_buttoncode(key - M_EVENT);
+ if (result < 0)
+ result = DLG_EXIT_OK;
+ } else if (dlg_check_scrolled(key,
+ last,
+ page,
+ &show,
+ &offset) == 0) {
+ } else {
+ beep();
+ }
break;
}
} else {
@@ -184,5 +185,8 @@
dlg_del_window(dialog);
dlg_mouse_free_regions();
free(prompt);
+
+ dialog_vars.nocancel = save_nocancel;
+
return result;
}
Modified: vendor/dialog/dist/package/debian/changelog
===================================================================
--- vendor/dialog/dist/package/debian/changelog 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/package/debian/changelog 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,3 +1,54 @@
+cdialog (20130923) unstable; urgency=low
+
+ * improved memory-caching for gauge widget
+
+ -- Thomas E. Dickey <dickey at invisible-island.net> Sat, 21 Sep 2013 09:18:26 -0400
+
+cdialog (20130902) unstable; urgency=low
+
+ * maintenance updates
+
+ -- Thomas E. Dickey <dickey at invisible-island.net> Sun, 01 Sep 2013 19:08:31 -0400
+
+cdialog (20130523) unstable; urgency=low
+
+ * minor fixes
+
+ -- Thomas E. Dickey <dickey at invisible-island.net> Thu, 23 May 2013 19:25:01 -0400
+
+cdialog (20130315) unstable; urgency=low
+
+ * minor fixes
+
+ -- Thomas E. Dickey <dickey at invisible-island.net> Fri, 15 Mar 2013 04:41:20 -0400
+
+cdialog (20121230) unstable; urgency=low
+
+ * new widgets
+ * coverity fixes
+ * configure-script updates
+
+ -- Thomas E. Dickey <dickey at invisible-island.net> Sat, 06 Oct 2012 09:19:29 -0400
+
+cdialog (20120706) unstable; urgency=high
+
+ * fix regression in msgbox (ArchLinux #30574)
+
+ -- Thomas E. Dickey <dickey at invisible-island.net> Fri, 06 Jul 2012 12:52:46 -0400
+
+cdialog (20120703) unstable; urgency=low
+
+ * minor fixes
+ * add --default-button
+
+ -- Thomas E. Dickey <dickey at invisible-island.net> Sat, 30 Jun 2012 10:41:05 -0400
+
+cdialog (20120215) unstable; urgency=low
+
+ * minor fixes
+
+ -- Thomas E. Dickey <dickey at invisible-island.net> Wed, 15 Feb 2012 19:40:32 -0500
+
cdialog (20111020) unstable; urgency=high
* fix regression in menubox.c logic for inputmenu vs menu.
Modified: vendor/dialog/dist/package/debian/copyright
===================================================================
--- vendor/dialog/dist/package/debian/copyright 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/package/debian/copyright 2018-06-15 16:21:14 UTC (rev 10958)
@@ -4,7 +4,7 @@
-------------------------------------------------------------------------------
Files: *.c *.h
- Copyright 2000-2008,2010 Thomas E. Dickey
+ Copyright 2000-2012,2013 Thomas E. Dickey
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License, version 2.1
@@ -27,7 +27,7 @@
Files: aclocal.m4
Licence: other-BSD
-Copyright: 1999-2009,2010 by Thomas E. Dickey
+Copyright: 1999-2010,2013 by Thomas E. Dickey
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
@@ -88,7 +88,7 @@
shared with many OS's install programs.
Files: debian/*
-Copyright: 2010 Thomas E. Dickey
+Copyright: 2010-2012,2013 Thomas E. Dickey
Licence: other-BSD
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
Index: vendor/dialog/dist/package/debian/rules
===================================================================
--- vendor/dialog/dist/package/debian/rules 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/package/debian/rules 2018-06-15 16:21:14 UTC (rev 10958)
Property changes on: vendor/dialog/dist/package/debian/rules
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/package/dialog.spec
===================================================================
--- vendor/dialog/dist/package/dialog.spec 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/package/dialog.spec 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
Summary: dialog - display dialog boxes from shell scripts
%define AppProgram dialog
-%define AppVersion 1.1
-%define AppRelease 20111020
+%define AppVersion 1.2
+%define AppRelease 20130923
%define ActualProg c%{AppProgram}
-# $XTermId: dialog.spec,v 1.33 2011/10/20 20:06:28 tom Exp $
+# $XTermId: dialog.spec,v 1.54 2013/09/23 23:08:24 tom Exp $
Name: %{ActualProg}
Version: %{AppVersion}
Release: %{AppRelease}
@@ -28,6 +28,8 @@
This package installs as "cdialog" to avoid conflict with other packages.
%prep
+%define debug_package %{nil}
+
%setup -q -n %{AppProgram}-%{AppVersion}-%{AppRelease}
%build
Added: vendor/dialog/dist/package/freebsd/Makefile
===================================================================
--- vendor/dialog/dist/package/freebsd/Makefile (rev 0)
+++ vendor/dialog/dist/package/freebsd/Makefile 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,48 @@
+# New ports collection makefile for: ncdialog
+# Date created: 2003-01-11
+# Whom: AlanE <alane at freebsd.org>
+#
+# $Carpetsmoker: ports/cdialog/Makefile,v 1.4 2007/04/22 11:30:53 carpetsmoker Exp $
+# $FreeBSD: stable/10/contrib/dialog/package/freebsd/Makefile 255852 2013-09-24 14:52:43Z dteske $
+#
+
+PORTNAME= cdialog
+PORTVERSION= 1.2.20130923
+PORTEPOCH= 1
+CATEGORIES= devel
+MASTER_SITES= ftp://invisible-island.net/${PORTNAME:S|^c||}/
+DISTNAME= ${PORTNAME:S|^c||}-${PORTVERSION:R}-${PORTVERSION:E}
+EXTRACT_SUFX= .tgz
+
+MAINTAINER= sylvio at FreeBSD.org
+COMMENT= An enhanced version of 'dialog' to work with ncurses
+
+LICENSE= LGPL21
+
+USE_AUTOTOOLS= libtool
+GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
+CONFIGURE_ARGS= --enable-widec \
+ --includedir=${PREFIX}/include/${PORTNAME} \
+ --with-libtool \
+ --with-ncursesw \
+ --with-package=${PORTNAME}
+MAKEFILE= makefile
+
+MAN1= cdialog.1
+MAN3= cdialog.3
+MANCOMPRESSED= no
+
+INSTALL_TARGET= install-strip install-man install-lib
+
+.if !defined(NOPORTEXAMPLES)
+post-patch:
+ @${FIND} ${WRKSRC}/samples/ -type f -exec ${REINPLACE_CMD} -i "" "s|dialog|cdialog|g" {} \;
+
+post-install:
+ @${MKDIR} ${EXAMPLESDIR}
+ cd ${WRKSRC}/samples && ${FIND} . | \
+ ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
+.endif
+
+.include <bsd.port.mk>
Added: vendor/dialog/dist/package/freebsd/distinfo
===================================================================
--- vendor/dialog/dist/package/freebsd/distinfo (rev 0)
+++ vendor/dialog/dist/package/freebsd/distinfo 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,2 @@
+SHA256 (dialog-1.1-20120215.tgz) = 883c58498663d939b18f3aea56976b64268b736d1579ac850512e5d5a4a2eafc
+SIZE (dialog-1.1-20120215.tgz) = 441234
Added: vendor/dialog/dist/package/freebsd/pkg-descr
===================================================================
--- vendor/dialog/dist/package/freebsd/pkg-descr (rev 0)
+++ vendor/dialog/dist/package/freebsd/pkg-descr 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,9 @@
+This is an enhanced version of the 'dialog' command. Quoting Thomas Dickey,
+the ncurses developer, "DIALOG was written by Savio Lam <lam836 at cs.cuhk.hk>
+and modified by several people.
+
+"Initially, I made fixes and reviewed the code to ensure that problems
+reported were not related to ncurses. After that, I resumed development,
+adding new widget types. See the changelog for details."
+
+WWW: http://invisible-island.net/dialog/
Added: vendor/dialog/dist/package/freebsd/pkg-plist
===================================================================
--- vendor/dialog/dist/package/freebsd/pkg-plist (rev 0)
+++ vendor/dialog/dist/package/freebsd/pkg-plist 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,203 @@
+bin/cdialog
+bin/cdialog-config
+include/cdialog/dialog.h
+include/cdialog/dlg_colors.h
+include/cdialog/dlg_config.h
+include/cdialog/dlg_keys.h
+lib/libcdialog.a
+lib/libcdialog.la
+lib/libcdialog.so
+lib/libcdialog.so.10
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar-stdout
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar2-stdout
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar3-stdout
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist-8bit
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist-utf8
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist10
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist11
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist5
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist6
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist7
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist8
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist9
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist9.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/admin.funcs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/common.funcs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.funcs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.ifman1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.ifman2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.ifmcfg2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.ifmcfg4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.ifmcfg5
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.ifpoll1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.ifpoll2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.ifreq1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.ifreq2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.rcnews
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.sendifm1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.sendifm2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.trnrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.wheel
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/ifpatch
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copismall
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debian.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialog.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/editbox
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/editbox-utf8
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/editbox2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/editbox3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/editbox4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/form1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/form1-both
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/form1-extra
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/form1-help
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/form1-utf8
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/form2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/form3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/form4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/form5
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/form6
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fselect
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fselect-stdout
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fselect0
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fselect1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fselect1-stdout
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fselect2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fselect2-stdout
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gauge
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gauge0
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gauge0-input-fd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gauge2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/infobox
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/infobox1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/infobox2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/infobox3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/infobox4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/infobox5
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/infobox6
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox-both
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox-extra
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox-help
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox5
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox6-8bit
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox6-utf8
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox7
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputmenu
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputmenu-stdout
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputmenu1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputmenu2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputmenu3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputmenu4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/install/FDISK.TEST
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/install/makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/install/makefile.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/install/setup.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/install/setup.help
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/killall
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/listing
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox-8bit
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox-utf8
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox10
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox5
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox6
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox7
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox8
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox9
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mixedform
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mixedform2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mixedgauge
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox-help
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox-utf8
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox4-8bit
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox4-eucjp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox4-utf8
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox5
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox6
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox6a
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/password
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/password1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/password2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/passwordform1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/passwordform1-utf8
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pause
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pause-both
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pause-extra
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pause-help
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/prgbox
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/prgbox2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/programbox
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/programbox2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/progress
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/progress2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/radiolist
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/radiolist1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/radiolist10
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/radiolist2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/radiolist3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/radiolist4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/report-button
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/report-edit
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/report-string
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/report-tempfile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/report-yesno
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rotated-data
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/setup-edit
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/setup-tempfile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/setup-utf8
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/setup-vars
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shortlist
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/slackware.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sourcemage.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/suse.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tailbox
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tailboxbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tailboxbg1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tailboxbg2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testdata-8bit
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/textbox
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/textbox-both
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/textbox-help
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/textbox.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/textbox2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/textbox3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timebox
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timebox-stdout
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timebox2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timebox2-stdout
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wheel
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/whiptail.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yesno
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yesno-both
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yesno-extra
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yesno-help
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yesno-utf8
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yesno2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yesno3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yesno4
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/install
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/copifuncs
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+ at dirrm include/cdialog
Modified: vendor/dialog/dist/pause.c
===================================================================
--- vendor/dialog/dist/pause.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/pause.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: pause.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: pause.c,v 1.36 2012/07/03 00:01:59 tom Exp $
*
* pause.c -- implements the pause dialog
*
- * Copyright 2004-2010,2011 Thomas E. Dickey
+ * Copyright 2004-2011,2012 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -55,13 +55,7 @@
static DLG_KEYS_BINDING binding[] = {
HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
- DLG_KEYS_DATA( DLGK_ENTER, ' ' ),
- DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_DOWN ),
- DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_RIGHT ),
- DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ),
- DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_UP ),
- DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ),
- DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_LEFT ),
+ TRAVERSE_BINDINGS,
END_KEYS_BINDING
};
/* *INDENT-ON* */
@@ -72,7 +66,7 @@
#endif
int i, x, y, step;
- int button = 0;
+ int button = dlg_default_button();
int seconds_orig;
WINDOW *dialog;
const char **buttons = dlg_ok_labels();
@@ -83,11 +77,13 @@
int button_high = (have_buttons ? BTN_HIGH : MARGIN);
int gauge_y;
char *prompt = dlg_strclone(cprompt);
+ int save_timeout = dialog_vars.timeout_secs;
curs_set(0);
dlg_tab_correct_str(prompt);
+ dialog_vars.timeout_secs = 0;
seconds_orig = (seconds > 0) ? seconds : 1;
#ifdef KEY_RESIZE
@@ -226,24 +222,25 @@
case DLGK_ENTER:
result = dlg_enter_buttoncode(button);
break;
- case DLGK_MOUSE(0):
- result = DLG_EXIT_OK;
- break;
- case DLGK_MOUSE(1):
- result = DLG_EXIT_CANCEL;
- break;
case ERR:
break;
default:
+ if (is_DLGK_MOUSE(key)) {
+ result = dlg_ok_buttoncode(key - M_EVENT);
+ if (result < 0)
+ result = DLG_EXIT_OK;
+ }
break;
}
}
} while ((result == DLG_EXIT_UNKNOWN) && (seconds-- > 0));
- nodelay(dialog, FALSE);
curs_set(1);
dlg_mouse_free_regions();
dlg_del_window(dialog);
free(prompt);
+
+ dialog_vars.timeout_secs = save_timeout;
+
return ((result == DLG_EXIT_UNKNOWN) ? DLG_EXIT_OK : result);
}
Added: vendor/dialog/dist/po/an.po
===================================================================
--- vendor/dialog/dist/po/an.po (rev 0)
+++ vendor/dialog/dist/po/an.po 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,111 @@
+# Dialog
+# Copyright 2003-2007,2008 # Thomas Dickey
+# This file is distributed under the same license as the dialog package.
+# Daniel Martinez <entaltoaragon at gmail.com>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: dialog 1.1.20080819\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"PO-Revision-Date: 2013-02-19 17:50+0100\n"
+"Last-Translator: Daniel Martinez <entaltoaragon at gmail.com>\n"
+"Language-Team: Aragonese <softaragones at googlegroups.com>\n"
+"Language: an\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: buttons.c:385
+msgid "Yes"
+msgstr "Sí"
+
+#: buttons.c:393
+msgid "No"
+msgstr "No"
+
+#: buttons.c:401
+msgid "OK"
+msgstr "Acceptar"
+
+#: buttons.c:409
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: buttons.c:417
+msgid "EXIT"
+msgstr "Salir"
+
+#: buttons.c:425
+msgid "Extra"
+msgstr "Extra"
+
+#: buttons.c:433
+msgid "Help"
+msgstr "Aduya"
+
+#. Headline "Month"
+#: calendar.c:273
+msgid "Month"
+msgstr "Mes"
+
+#. Headline "Year"
+#: calendar.c:293
+msgid "Year"
+msgstr "Anyo"
+
+#: dialog.c:741
+msgid "Rename"
+msgstr "Renombrar"
+
+#: fselect.c:550
+msgid "Directories"
+msgstr "Directorios"
+
+#: fselect.c:551
+msgid "Files"
+msgstr "Fichers"
+
+#: mixedgauge.c:58
+msgid "Succeeded"
+msgstr "Finalizau con exito"
+
+#: mixedgauge.c:61
+msgid "Failed"
+msgstr "Falló"
+
+#: mixedgauge.c:64
+msgid "Passed"
+msgstr "Pasau"
+
+#: mixedgauge.c:67
+msgid "Completed"
+msgstr "Completau"
+
+#: mixedgauge.c:70
+msgid "Checked"
+msgstr "Comprebau"
+
+#: mixedgauge.c:73
+msgid "Done"
+msgstr "Feito"
+
+#: mixedgauge.c:76
+msgid "Skipped"
+msgstr "Blincau"
+
+#: mixedgauge.c:79
+msgid "In Progress"
+msgstr "En progreso"
+
+#: mixedgauge.c:85
+msgid "N/A"
+msgstr "N/A"
+
+#: mixedgauge.c:193
+msgid "Overall Progress"
+msgstr "Progreso total"
+
+#: textbox.c:489
+msgid "Search"
+msgstr "Buscar"
Modified: vendor/dialog/dist/po/cs.po
===================================================================
--- vendor/dialog/dist/po/cs.po 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/po/cs.po 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,15 +1,23 @@
-# From: Martin Povolny <martin at solnet.cz>
+# Czech translations for dialog package.
+# Copyright (C) 2011 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the dialog package.
+#
+# Martin Povolny <martin at solnet.cz>
+# Marek Černocký <marek at manet.cz>, 2011.
+#
msgid ""
msgstr ""
-"Project-Id-Version: dialog 0.9a-20010527\n"
+"Project-Id-Version: dialog 1.1.20080819\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-06-18 18:26-0400\n"
-"PO-Revision-Date: 2004-12-19 20:14-0500\n"
-"Last-Translator: Martin Povolny <martin at solnet.cz>\n"
-"Language-Team:\n"
+"PO-Revision-Date: 2011-11-25 13:18+0100\n"
+"Last-Translator: Marek Černocký <marek at manet.cz>\n"
+"Language-Team: Czech <translation-team-cs at lists.sourceforge.net>\n"
+"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#: buttons.c:385
msgid "Yes"
@@ -21,7 +29,7 @@
#: buttons.c:401
msgid "OK"
-msgstr "OK"
+msgstr "Budiž"
#: buttons.c:409
msgid "Cancel"
@@ -33,11 +41,11 @@
#: buttons.c:425
msgid "Extra"
-msgstr ""
+msgstr "Další"
#: buttons.c:433
msgid "Help"
-msgstr ""
+msgstr "Nápověda"
#. Headline "Month"
#: calendar.c:273
@@ -51,11 +59,11 @@
#: dialog.c:741
msgid "Rename"
-msgstr ""
+msgstr "Přejmenovat"
#: fselect.c:550
msgid "Directories"
-msgstr "Adresáře"
+msgstr "Složky"
#: fselect.c:551
msgid "Files"
@@ -63,46 +71,44 @@
#: mixedgauge.c:58
msgid "Succeeded"
-msgstr ""
+msgstr "Úspěšné"
#: mixedgauge.c:61
-#, fuzzy
msgid "Failed"
-msgstr "Soubory"
+msgstr "Selhalo"
#: mixedgauge.c:64
msgid "Passed"
-msgstr ""
+msgstr "Pozastaveno"
#: mixedgauge.c:67
msgid "Completed"
-msgstr ""
+msgstr "Dokončeno"
#: mixedgauge.c:70
msgid "Checked"
-msgstr ""
+msgstr "Zkontrolováno"
#: mixedgauge.c:73
msgid "Done"
-msgstr ""
+msgstr "Hotovo"
#: mixedgauge.c:76
msgid "Skipped"
-msgstr ""
+msgstr "Přeskočeno"
#: mixedgauge.c:79
msgid "In Progress"
-msgstr ""
+msgstr "Probíhá"
#: mixedgauge.c:85
msgid "N/A"
-msgstr ""
+msgstr "Není známo"
#: mixedgauge.c:193
msgid "Overall Progress"
-msgstr ""
+msgstr "Celkový průběh"
#: textbox.c:489
-#, fuzzy
msgid "Search"
-msgstr "Search"
+msgstr "Hledat"
Modified: vendor/dialog/dist/po/el.po
===================================================================
--- vendor/dialog/dist/po/el.po 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/po/el.po 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,14 +1,20 @@
+# Greek translation for dialog.
+# This file is distributed under the same license as the dialog package.
+# Copyright (C) 2008 Free Software Foundation, Inc.
+# Savvas Radevic <vicedar at gmail.com>, 2012.
+#
msgid ""
msgstr ""
-"Project-Id-Version: Dialog\n"
+"Project-Id-Version: dialog 1.1.20080819\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-06-18 18:26-0400\n"
-"PO-Revision-Date: 2002-06-05 10:00GMT+2\n"
-"Last-Translator: kromJx <kromJx at crosswinds.net>\n"
-"Language-Team: <i18ngr at hellug.gr>\n"
+"PO-Revision-Date: 2012-03-18 00:54+0100\n"
+"Last-Translator: Savvas Radevic <vicedar at gmail.com>\n"
+"Language-Team: Greek <team at lists.gnome.gr>\n"
+"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
#: buttons.c:385
msgid "Yes"
@@ -20,7 +26,7 @@
#: buttons.c:401
msgid "OK"
-msgstr "OK"
+msgstr "Εντάξει"
#: buttons.c:409
msgid "Cancel"
@@ -32,7 +38,7 @@
#: buttons.c:425
msgid "Extra"
-msgstr ""
+msgstr "Πρόσθετα"
#: buttons.c:433
msgid "Help"
@@ -50,7 +56,7 @@
#: dialog.c:741
msgid "Rename"
-msgstr ""
+msgstr "Μετονομασία"
#: fselect.c:550
msgid "Directories"
@@ -62,46 +68,44 @@
#: mixedgauge.c:58
msgid "Succeeded"
-msgstr ""
+msgstr "Επιτυχία"
#: mixedgauge.c:61
-#, fuzzy
msgid "Failed"
-msgstr "Αρχεία"
+msgstr "Αποτυχία"
#: mixedgauge.c:64
msgid "Passed"
-msgstr ""
+msgstr "Πέρασε"
#: mixedgauge.c:67
msgid "Completed"
-msgstr ""
+msgstr "Ολοκλήρωση"
#: mixedgauge.c:70
msgid "Checked"
-msgstr ""
+msgstr "Έλεγχος"
#: mixedgauge.c:73
msgid "Done"
-msgstr ""
+msgstr "Τέλος"
#: mixedgauge.c:76
msgid "Skipped"
-msgstr ""
+msgstr "Παράλειψη"
#: mixedgauge.c:79
msgid "In Progress"
-msgstr ""
+msgstr "Σε εξέλιξη"
#: mixedgauge.c:85
msgid "N/A"
-msgstr ""
+msgstr "Μη Διαθέσιμο"
#: mixedgauge.c:193
msgid "Overall Progress"
-msgstr ""
+msgstr "Συνολική πρόοδος"
#: textbox.c:489
-#, fuzzy
msgid "Search"
-msgstr "Search"
+msgstr "Αναζήτηση"
Added: vendor/dialog/dist/po/fa.po
===================================================================
--- vendor/dialog/dist/po/fa.po (rev 0)
+++ vendor/dialog/dist/po/fa.po 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,113 @@
+# Dialog
+# Copyright 2003-2007,2008 # Thomas Dickey
+# This file is distributed under the same license as the dialog package.
+#
+# Seyed Ali Akbar Najafian <s.ali.najafian at chmail.ir>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: dialog 1.1.20080819\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"PO-Revision-Date: 2013-08-03 17:04+0330\n"
+"Last-Translator: سیدعلیاکبر نجفیان <s.ali.najafian at chmail.ir>\n"
+"Language-Team: Persian <translation-team-fa at lists.sourceforge.net>\n"
+"Language: persian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
+
+#: buttons.c:385
+#, fuzzy
+msgid "Yes"
+msgstr "بله"
+
+#: buttons.c:393
+msgid "No"
+msgstr "خیر"
+
+#: buttons.c:401
+msgid "OK"
+msgstr "باشه"
+
+#: buttons.c:409
+msgid "Cancel"
+msgstr "لغو"
+
+#: buttons.c:417
+msgid "EXIT"
+msgstr "خروج"
+
+#: buttons.c:425
+msgid "Extra"
+msgstr "اضافس"
+
+#: buttons.c:433
+msgid "Help"
+msgstr "راهنما"
+
+#. Headline "Month"
+#: calendar.c:273
+msgid "Month"
+msgstr "ماه"
+
+#. Headline "Year"
+#: calendar.c:293
+msgid "Year"
+msgstr "سال"
+
+#: dialog.c:741
+msgid "Rename"
+msgstr "تغییر نام"
+
+#: fselect.c:550
+msgid "Directories"
+msgstr "مسیرها"
+
+#: fselect.c:551
+msgid "Files"
+msgstr "پروندهها"
+
+#: mixedgauge.c:58
+msgid "Succeeded"
+msgstr "موفقیت آمیز"
+
+#: mixedgauge.c:61
+msgid "Failed"
+msgstr "شکست خورد"
+
+#: mixedgauge.c:64
+msgid "Passed"
+msgstr "متوقف شد"
+
+#: mixedgauge.c:67
+msgid "Completed"
+msgstr "کامل شد"
+
+#: mixedgauge.c:70
+msgid "Checked"
+msgstr "بررسی شد"
+
+#: mixedgauge.c:73
+msgid "Done"
+msgstr "انجام شد"
+
+#: mixedgauge.c:76
+msgid "Skipped"
+msgstr "رها شد"
+
+#: mixedgauge.c:79
+msgid "In Progress"
+msgstr "در حال پیشرفت"
+
+#: mixedgauge.c:85
+msgid "N/A"
+msgstr "N/A"
+
+#: mixedgauge.c:193
+msgid "Overall Progress"
+msgstr "پیشرفت جاری"
+
+#: textbox.c:489
+msgid "Search"
+msgstr "جستجو"
Modified: vendor/dialog/dist/po/gl.po
===================================================================
--- vendor/dialog/dist/po/gl.po 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/po/gl.po 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,68 +1,76 @@
+# Galician translation of dialog
# This file is distributed under the same license as the dialog package.
-# Mensaxes en galego para dialog.
-# Copyright 2003-2006,2007 Thomas Dickey
+# Copyright 2003-2006, 2007 Thomas Dickey
+# Copyright 2012 Leandro Regueiro
+#
# Diego Pérez Montes <kabute at gulo.org>, 2008
+# Leandro Regueiro <leandro.regueiro at gmail.com>, 2012.
#
+# Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas
+# colaborar connosco, podes atopar máis información en <http://www.trasno.net>
+#
msgid ""
msgstr ""
-"Project-Id-Version: dialog 1.1.20070704\n"
+"Project-Id-Version: dialog 1.1.20080819\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-16 17:57-0500\n"
-"PO-Revision-Date: 2008-05-13 23:57+0100\n"
-"Last-Translator: Diego Pérez Montes <kabute at gulo.org>\n"
+"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"PO-Revision-Date: 2012-11-10 13:53+0200\n"
+"Last-Translator: Leandro Regueiro <leandro.regueiro at gmail.com>\n"
"Language-Team: Galician <proxecto at trasno.net>\n"
"Language: gl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.0\n"
-#: buttons.c:387
+#: buttons.c:385
msgid "Yes"
-msgstr "Sí"
+msgstr "Si"
-#: buttons.c:395
+#: buttons.c:393
msgid "No"
msgstr "Non"
-#: buttons.c:403
+#: buttons.c:401
msgid "OK"
msgstr "Aceptar"
-#: buttons.c:411
+#: buttons.c:409
msgid "Cancel"
msgstr "Cancelar"
-#: buttons.c:419
+#: buttons.c:417
msgid "EXIT"
msgstr "SAÍR"
-#: buttons.c:427
+#: buttons.c:425
msgid "Extra"
-msgstr "Suplementario"
+msgstr "Extra"
-#: buttons.c:435
+#: buttons.c:433
msgid "Help"
msgstr "Axuda"
#. Headline "Month"
-#: calendar.c:298
+#: calendar.c:273
msgid "Month"
msgstr "Mes"
#. Headline "Year"
-#: calendar.c:318
+#: calendar.c:293
msgid "Year"
msgstr "Ano"
-#: dialog.c:756
+#: dialog.c:741
msgid "Rename"
msgstr "Renomear"
-#: fselect.c:571
+#: fselect.c:550
msgid "Directories"
msgstr "Directorios"
-#: fselect.c:572
+#: fselect.c:551
msgid "Files"
msgstr "Ficheiros"
@@ -96,16 +104,16 @@
#: mixedgauge.c:79
msgid "In Progress"
-msgstr "En Progreso"
+msgstr "En progreso"
#: mixedgauge.c:85
msgid "N/A"
-msgstr "Non Dispoñible"
+msgstr "Non dispoñíbel"
#: mixedgauge.c:193
msgid "Overall Progress"
-msgstr "Progreso Total"
+msgstr "Progreso total"
-#: textbox.c:468
+#: textbox.c:489
msgid "Search"
-msgstr "Procurar"
+msgstr "Buscar"
Modified: vendor/dialog/dist/po/hr.po
===================================================================
--- vendor/dialog/dist/po/hr.po 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/po/hr.po 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,110 +1,112 @@
-# Croatian translation of Dialog.
+# Dialog
+# Copyright 2003-2007,2008 # Thomas Dickey
# This file is distributed under the same license as the dialog package.
-# Copyright (C) 2005 Thomas Dickey.
+# Tomislav Krznar <tomislav.krznar at gmail.com>, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: Dialog 1.0-20050116\n"
+"Project-Id-Version: dialog 1.1.20080819\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-16 17:57-0500\n"
-"PO-Revision-Date: 2004-07-25 14:52+0200\n"
-"Last-Translator: Krunoslav Gernhard <kruno at linux.hr>\n"
+"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"PO-Revision-Date: 2012-03-31 00:10+0200\n"
+"Last-Translator: Tomislav Krznar <tomislav.krznar at gmail.com>\n"
"Language-Team: Croatian <lokalizacija at linux.hr>\n"
"Language: hr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-#: buttons.c:387
+#: buttons.c:385
msgid "Yes"
msgstr "Da"
-#: buttons.c:395
+#: buttons.c:393
msgid "No"
msgstr "Ne"
-#: buttons.c:403
+#: buttons.c:401
msgid "OK"
msgstr "U redu"
-#: buttons.c:411
+#: buttons.c:409
msgid "Cancel"
msgstr "Otkaži"
-#: buttons.c:419
+#: buttons.c:417
msgid "EXIT"
-msgstr ""
+msgstr "IZLAZ"
-#: buttons.c:427
+#: buttons.c:425
msgid "Extra"
-msgstr ""
+msgstr "Dodatno"
-#: buttons.c:435
+#: buttons.c:433
msgid "Help"
-msgstr ""
+msgstr "Pomoć"
#. Headline "Month"
-#: calendar.c:298
+#: calendar.c:273
msgid "Month"
-msgstr ""
+msgstr "Mjesec"
#. Headline "Year"
-#: calendar.c:318
+#: calendar.c:293
msgid "Year"
-msgstr ""
+msgstr "Godina"
-#: dialog.c:756
+#: dialog.c:741
msgid "Rename"
-msgstr ""
+msgstr "Preimenuj"
-#: fselect.c:571
+#: fselect.c:550
msgid "Directories"
-msgstr ""
+msgstr "Direktoriji"
-#: fselect.c:572
+#: fselect.c:551
msgid "Files"
-msgstr ""
+msgstr "Datoteke"
#: mixedgauge.c:58
msgid "Succeeded"
-msgstr ""
+msgstr "Uspjeh"
#: mixedgauge.c:61
msgid "Failed"
-msgstr ""
+msgstr "Neuspjeh"
#: mixedgauge.c:64
msgid "Passed"
-msgstr ""
+msgstr "Prošlo"
#: mixedgauge.c:67
msgid "Completed"
-msgstr ""
+msgstr "Dovršeno"
#: mixedgauge.c:70
msgid "Checked"
-msgstr ""
+msgstr "Provjereno"
#: mixedgauge.c:73
msgid "Done"
-msgstr ""
+msgstr "Gotovo"
#: mixedgauge.c:76
msgid "Skipped"
-msgstr ""
+msgstr "Preskočeno"
#: mixedgauge.c:79
msgid "In Progress"
-msgstr ""
+msgstr "U tijeku"
#: mixedgauge.c:85
msgid "N/A"
-msgstr ""
+msgstr "Nedostupno"
#: mixedgauge.c:193
msgid "Overall Progress"
-msgstr ""
+msgstr "Ukupni napredak"
-#: textbox.c:468
+#: textbox.c:489
msgid "Search"
-msgstr ""
+msgstr "Pretraga"
Added: vendor/dialog/dist/po/ia.po
===================================================================
--- vendor/dialog/dist/po/ia.po (rev 0)
+++ vendor/dialog/dist/po/ia.po 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,111 @@
+# Interlingua translation of Dialog
+# Copyright (C) 2012 Free Software Foundation, Inc.
+# This file is distributed under the same license as the dialog package.
+# Nik Kalach <nik.kalach at inbox.ru>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: dialog 1.1.20080819\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"PO-Revision-Date: 2012-12-04 00:56+0400\n"
+"Last-Translator: Nik Kalach <nik.kalach at inbox.ru>\n"
+"Language-Team: Interlingua <translation-team-ia at lists.sourceforge.net>\n"
+"Language: ia\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: buttons.c:385
+msgid "Yes"
+msgstr "Si"
+
+#: buttons.c:393
+msgid "No"
+msgstr "No"
+
+#: buttons.c:401
+msgid "OK"
+msgstr "OK"
+
+#: buttons.c:409
+msgid "Cancel"
+msgstr "Annullar"
+
+#: buttons.c:417
+msgid "EXIT"
+msgstr "SORTIR"
+
+#: buttons.c:425
+msgid "Extra"
+msgstr "Extra"
+
+#: buttons.c:433
+msgid "Help"
+msgstr "Adjuta"
+
+#. Headline "Month"
+#: calendar.c:273
+msgid "Month"
+msgstr "Mense"
+
+#. Headline "Year"
+#: calendar.c:293
+msgid "Year"
+msgstr "Anno"
+
+#: dialog.c:741
+msgid "Rename"
+msgstr "Renominar"
+
+#: fselect.c:550
+msgid "Directories"
+msgstr "Directorios"
+
+#: fselect.c:551
+msgid "Files"
+msgstr "Files"
+
+#: mixedgauge.c:58
+msgid "Succeeded"
+msgstr "Succedite"
+
+#: mixedgauge.c:61
+msgid "Failed"
+msgstr "Fallite"
+
+#: mixedgauge.c:64
+msgid "Passed"
+msgstr "Passate"
+
+#: mixedgauge.c:67
+msgid "Completed"
+msgstr "Completate"
+
+#: mixedgauge.c:70
+msgid "Checked"
+msgstr "Controlate"
+
+#: mixedgauge.c:73
+msgid "Done"
+msgstr "Facite"
+
+#: mixedgauge.c:76
+msgid "Skipped"
+msgstr "Saltate"
+
+#: mixedgauge.c:79
+msgid "In Progress"
+msgstr "In curso"
+
+#: mixedgauge.c:85
+msgid "N/A"
+msgstr "N/A"
+
+#: mixedgauge.c:193
+msgid "Overall Progress"
+msgstr "Progresso general"
+
+#: textbox.c:489
+msgid "Search"
+msgstr "Cerca"
Modified: vendor/dialog/dist/po/lt.po
===================================================================
--- vendor/dialog/dist/po/lt.po 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/po/lt.po 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,79 +1,79 @@
-# translation of dialog-1.1.20070704 to Lithuanian
+# translation of dialog to Lithuanian
# This file is distributed under the same license as the dialog package.
-#
# Gintautas Miliauskas <gintas at akl.lt>, 2008.
+# Rimas Kudelis <rq at akl.lt>, 2013.
msgid ""
msgstr ""
-"Project-Id-Version: dialog-1.1.20070704\n"
+"Project-Id-Version: dialog-1.1.20080819\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-16 17:57-0500\n"
-"PO-Revision-Date: 2008-05-14 02:51+0300\n"
-"Last-Translator: Gintautas Miliauskas <gintas at akl.lt>\n"
+"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"PO-Revision-Date: 2013-06-28 18:38+0300\n"
+"Last-Translator: Rimas Kudelis <rq at akl.lt>\n"
"Language-Team: Lithuanian <komp_lt at konferencijos.lt>\n"
"Language: lt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1\n"
-#: buttons.c:387
+#: buttons.c:385
msgid "Yes"
msgstr "Taip"
-#: buttons.c:395
+#: buttons.c:393
msgid "No"
msgstr "Ne"
-#: buttons.c:403
+#: buttons.c:401
msgid "OK"
-msgstr "OK"
+msgstr "Gerai"
-#: buttons.c:411
+#: buttons.c:409
msgid "Cancel"
-msgstr "Atmesti"
+msgstr "Atsisakyti"
-#: buttons.c:419
+#: buttons.c:417
msgid "EXIT"
msgstr "IŠEITI"
-#: buttons.c:427
+#: buttons.c:425
msgid "Extra"
-msgstr "Papildoma"
+msgstr "Kita"
-#: buttons.c:435
+#: buttons.c:433
msgid "Help"
msgstr "Žinynas"
#. Headline "Month"
-#: calendar.c:298
+#: calendar.c:273
msgid "Month"
msgstr "Mėnuo"
#. Headline "Year"
-#: calendar.c:318
+#: calendar.c:293
msgid "Year"
msgstr "Metai"
-#: dialog.c:756
+#: dialog.c:741
msgid "Rename"
msgstr "Pervadinti"
-#: fselect.c:571
+#: fselect.c:550
msgid "Directories"
msgstr "Aplankai"
-#: fselect.c:572
+#: fselect.c:551
msgid "Files"
msgstr "Failai"
#: mixedgauge.c:58
msgid "Succeeded"
-msgstr "Sėkminga"
+msgstr "Pavyko"
#: mixedgauge.c:61
msgid "Failed"
-msgstr "Nesėkminga"
+msgstr "Nepavyko"
#: mixedgauge.c:64
msgid "Passed"
@@ -81,7 +81,7 @@
#: mixedgauge.c:67
msgid "Completed"
-msgstr "Baigta"
+msgstr "Užbaigta"
#: mixedgauge.c:70
msgid "Checked"
@@ -89,11 +89,11 @@
#: mixedgauge.c:73
msgid "Done"
-msgstr "Baigta"
+msgstr "Atlikta"
#: mixedgauge.c:76
msgid "Skipped"
-msgstr "Peršokta"
+msgstr "Praleista"
#: mixedgauge.c:79
msgid "In Progress"
@@ -101,12 +101,12 @@
#: mixedgauge.c:85
msgid "N/A"
-msgstr "N/d"
+msgstr "Nepasiekiama"
#: mixedgauge.c:193
msgid "Overall Progress"
msgstr "Bendras progresas"
-#: textbox.c:468
+#: textbox.c:489
msgid "Search"
msgstr "Ieškoti"
Modified: vendor/dialog/dist/po/sr.po
===================================================================
--- vendor/dialog/dist/po/sr.po 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/po/sr.po 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,18 +1,21 @@
-# Serbian translation of `dialog'.
+# Serbian translation of dialog.
# Copyright (C) 2005 Free Software Foundation, Inc.
-# This file is distributed under the same license as the `dialog' package.
+# This file is distributed under the same license as the dialog package.
# Aleksandar Jelenak <jelenak at verizon.net>, 2005.
+# Мирослав Николић <miroslavnikolic at rocketmail.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: dialog 1.0-rel20041222\n"
+"Project-Id-Version: dialog-1.1.20080819\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-06-18 18:26-0400\n"
-"PO-Revision-Date: 2005-08-21 12:53-0400\n"
-"Last-Translator: Aleksandar Jelenak <jelenak at verizon.net>\n"
+"PO-Revision-Date: 2011-12-24 21:29+0200\n"
+"Last-Translator: Мирослав Николић <miroslavnikolic at rocketmail.com>\n"
"Language-Team: Serbian <gnu at prevod.org>\n"
+"Language: sr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: buttons.c:385
msgid "Yes"
@@ -66,44 +69,43 @@
#: mixedgauge.c:58
msgid "Succeeded"
-msgstr ""
+msgstr "Успешно"
#: mixedgauge.c:61
-#, fuzzy
msgid "Failed"
-msgstr "Датотеке"
+msgstr "Неуспешно"
#: mixedgauge.c:64
msgid "Passed"
-msgstr ""
+msgstr "Прошло"
#: mixedgauge.c:67
msgid "Completed"
-msgstr ""
+msgstr "Завршено"
#: mixedgauge.c:70
msgid "Checked"
-msgstr ""
+msgstr "Проверено"
#: mixedgauge.c:73
msgid "Done"
-msgstr ""
+msgstr "Урађено"
#: mixedgauge.c:76
msgid "Skipped"
-msgstr ""
+msgstr "Прескочено"
#: mixedgauge.c:79
msgid "In Progress"
-msgstr ""
+msgstr "У току"
#: mixedgauge.c:85
msgid "N/A"
-msgstr ""
+msgstr "Н/Д"
#: mixedgauge.c:193
msgid "Overall Progress"
-msgstr ""
+msgstr "Укупно напредовање"
#: textbox.c:489
msgid "Search"
Modified: vendor/dialog/dist/po/zh_TW.po
===================================================================
--- vendor/dialog/dist/po/zh_TW.po 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/po/zh_TW.po 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,15 +1,15 @@
# Traditional Chinese Messages for dialog.
# Copyright (C) 2005 Free Software Foundation, Inc.
# This file is distributed under the same license as the dialog package.
-# Wei-Lun Chao <chaoweilun at gmail.com>, 2005, 2007.
+# Wei-Lun Chao <bluebat at member.fsf.org>, 2005, 2007, 2013.
#
msgid ""
msgstr ""
-"Project-Id-Version: dialog 1.1.20070704\n"
+"Project-Id-Version: dialog 1.1.20080819\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-16 17:57-0500\n"
-"PO-Revision-Date: 2007-12-19 23:39+0800\n"
-"Last-Translator: Wei-Lun Chao <chaoweilun at gmail.com>\n"
+"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"PO-Revision-Date: 2013-02-12 23:39+0800\n"
+"Last-Translator: Wei-Lun Chao <bluebat at member.fsf.org>\n"
"Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
"Language: zh_TW\n"
"MIME-Version: 1.0\n"
@@ -17,53 +17,53 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: buttons.c:387
+#: buttons.c:385
msgid "Yes"
msgstr "是"
-#: buttons.c:395
+#: buttons.c:393
msgid "No"
msgstr "否"
-#: buttons.c:403
+#: buttons.c:401
msgid "OK"
msgstr "確定"
-#: buttons.c:411
+#: buttons.c:409
msgid "Cancel"
msgstr "取消"
-#: buttons.c:419
+#: buttons.c:417
msgid "EXIT"
msgstr "離開"
-#: buttons.c:427
+#: buttons.c:425
msgid "Extra"
msgstr "其他"
-#: buttons.c:435
+#: buttons.c:433
msgid "Help"
msgstr "求助"
#. Headline "Month"
-#: calendar.c:298
+#: calendar.c:273
msgid "Month"
msgstr "月"
#. Headline "Year"
-#: calendar.c:318
+#: calendar.c:293
msgid "Year"
msgstr "年"
-#: dialog.c:756
+#: dialog.c:741
msgid "Rename"
msgstr "更名"
-#: fselect.c:571
+#: fselect.c:550
msgid "Directories"
msgstr "目錄"
-#: fselect.c:572
+#: fselect.c:551
msgid "Files"
msgstr "檔案"
@@ -107,6 +107,6 @@
msgid "Overall Progress"
msgstr "整體進度"
-#: textbox.c:468
+#: textbox.c:489
msgid "Search"
msgstr "搜尋"
Modified: vendor/dialog/dist/prgbox.c
===================================================================
--- vendor/dialog/dist/prgbox.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/prgbox.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: prgbox.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: prgbox.c,v 1.9 2012/12/02 23:40:30 tom Exp $
*
* prgbox.c -- implements the prg box
*
- * Copyright 2011 Thomas E. Dickey
+ * Copyright 2011,2012 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -23,6 +23,12 @@
#include <dialog.h>
+static void
+reapchild(int sig)
+{
+ (void) sig;
+}
+
/*
* Open a pipe which ties stderr and stdout together.
*/
@@ -96,6 +102,7 @@
{
int code;
FILE *fp;
+ void (*oldreaper) (int) = signal(SIGCHLD, reapchild);
fp = dlg_popen(command, "r");
if (fp == NULL)
@@ -104,6 +111,7 @@
code = dlg_progressbox(title, cprompt, height, width, pauseopt, fp);
pclose(fp);
+ signal(SIGCHLD, oldreaper);
return code;
}
Modified: vendor/dialog/dist/progressbox.c
===================================================================
--- vendor/dialog/dist/progressbox.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/progressbox.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,10 +1,10 @@
/*
- * $Id: progressbox.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: progressbox.c,v 1.23 2012/12/21 10:00:05 tom Exp $
*
* progressbox.c -- implements the progress box
*
* Copyright 2005 Valery Reznic
- * Copyright 2006-2011 Thomas E. Dickey
+ * Copyright 2006-2012 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
@@ -46,7 +46,7 @@
int col = 0;
int j, tmpint, ch;
- while (1) {
+ for (;;) {
if ((ch = getc(fp)) == EOF) {
obj->is_eof = 1;
if (col) {
@@ -59,20 +59,23 @@
break;
if (ch == '\r')
break;
+ if (col >= MAX_LEN)
+ continue;
if ((ch == TAB) && (dialog_vars.tab_correct)) {
tmpint = dialog_state.tab_len
- (col % dialog_state.tab_len);
for (j = 0; j < tmpint; j++) {
- if (col < MAX_LEN)
+ if (col < MAX_LEN) {
obj->line[col] = ' ';
- ++col;
+ ++col;
+ } else {
+ break;
+ }
}
} else {
obj->line[col] = (char) ch;
++col;
}
- if (col >= MAX_LEN)
- break;
}
obj->line[col] = '\0';
@@ -112,54 +115,79 @@
static DLG_KEYS_BINDING binding[] = {
HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
- DLG_KEYS_DATA( DLGK_ENTER, ' ' ),
+ TRAVERSE_BINDINGS,
END_KEYS_BINDING
};
/* *INDENT-ON* */
- int button = 0;
+ int button;
int key = 0, fkey;
int result = DLG_EXIT_UNKNOWN;
const char **buttons = dlg_ok_label();
int check;
+ int save_nocancel = dialog_vars.nocancel;
+ bool redraw = TRUE;
+ dialog_vars.nocancel = TRUE;
+ button = dlg_default_button();
+
dlg_register_window(dialog, "progressbox", binding);
dlg_register_buttons(dialog, "progressbox", buttons);
dlg_draw_bottom_box2(dialog, border_attr, border2_attr, dialog_attr);
mouse_mkbutton(height - 2, width / 2 - 4, 6, '\n');
- dlg_draw_buttons(dialog, height - 2, 0, buttons, button, FALSE, width);
while (result == DLG_EXIT_UNKNOWN) {
+ if (redraw) {
+ redraw = FALSE;
+ if (button < 0)
+ button = 0;
+ dlg_draw_buttons(dialog,
+ height - 2, 0,
+ buttons, button,
+ FALSE, width);
+ }
+
key = dlg_mouse_wgetch(dialog, &fkey);
if (dlg_result_key(key, fkey, &result))
break;
if (!fkey && (check = dlg_char_to_button(key, buttons)) >= 0) {
- result = check ? DLG_EXIT_HELP : DLG_EXIT_OK;
+ result = dlg_ok_buttoncode(check);
break;
}
if (fkey) {
switch (key) {
- case DLGK_ENTER:
- result = button ? DLG_EXIT_HELP : DLG_EXIT_OK;
+ case DLGK_FIELD_NEXT:
+ button = dlg_next_button(buttons, button);
+ redraw = TRUE;
break;
- case DLGK_MOUSE(0):
- result = DLG_EXIT_OK;
+ case DLGK_FIELD_PREV:
+ button = dlg_prev_button(buttons, button);
+ redraw = TRUE;
break;
- case DLGK_MOUSE(1):
- result = DLG_EXIT_HELP;
+ case DLGK_ENTER:
+ result = dlg_ok_buttoncode(button);
break;
default:
- beep();
+ if (is_DLGK_MOUSE(key)) {
+ result = dlg_ok_buttoncode(key - M_EVENT);
+ if (result < 0)
+ result = DLG_EXIT_OK;
+ } else {
+ beep();
+ }
break;
}
+
} else {
beep();
}
}
dlg_unregister_window(dialog);
+
+ dialog_vars.nocancel = save_nocancel;
return result;
}
Added: vendor/dialog/dist/rangebox.c
===================================================================
--- vendor/dialog/dist/rangebox.c (rev 0)
+++ vendor/dialog/dist/rangebox.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,419 @@
+/*
+ * $Id: rangebox.c,v 1.17 2013/03/17 16:02:00 tom Exp $
+ *
+ * rangebox.c -- implements the rangebox dialog
+ *
+ * Copyright 2012,2013 Thomas E. Dickey
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License, version 2.1
+ * as published by the Free Software Foundation.
+ *
+ * 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to
+ * Free Software Foundation, Inc.
+ * 51 Franklin St., Fifth Floor
+ * Boston, MA 02110, USA.
+ */
+
+#include <dialog.h>
+#include <dlg_keys.h>
+
+#define ONE_HIGH 1
+
+#define MIN_HIGH (ONE_HIGH + 1 + (4 * MARGIN))
+#define MIN_WIDE (10 + 2 + (2 * MARGIN))
+
+struct _box;
+
+typedef struct _box {
+ WINDOW *parent;
+ WINDOW *window;
+ int x;
+ int y;
+ int width;
+ int height;
+ int period;
+ int value;
+} BOX;
+
+typedef struct {
+ /* window in which the value and slider are drawn */
+ WINDOW *window;
+ int min_value;
+ int max_value;
+ /* position and width of the numeric field */
+ int value_x;
+ int value_len;
+ int value_col;
+ /* position and width of the slider field */
+ int slide_x;
+ int slide_y;
+ int slide_len;
+ /* current value drawn */
+ int current;
+ /* value to add to make slider move by one cell */
+ int slide_inc;
+} VALUE;
+
+static int
+digits_of(int value)
+{
+ char temp[80];
+ sprintf(temp, "%d", value);
+ return (int) strlen(temp);
+}
+
+static int
+digit_of(VALUE * data)
+{
+ int col = data->value_col;
+ int result = 1;
+
+ while (++col < data->value_len) {
+ result *= 10;
+ }
+ return result;
+}
+
+static bool
+set_digit(VALUE * data, int chr)
+{
+ bool result = FALSE;
+ char buffer[80];
+ long check;
+ char *next = 0;
+
+ sprintf(buffer, "%*d", data->value_len, data->current);
+ buffer[data->value_col] = (char) chr;
+ check = strtol(buffer, &next, 10);
+ if (next == 0 || *next == '\0') {
+ if ((check <= (long) data->max_value) &&
+ (check >= (long) data->min_value)) {
+ result = TRUE;
+ data->current = (int) check;
+ }
+ }
+
+ return result;
+}
+
+/*
+ * This is similar to the gauge code, but differs in the way the number
+ * is displayed, etc.
+ */
+static void
+draw_value(VALUE * data, int value)
+{
+ if (value != data->current) {
+ WINDOW *win = data->window;
+ int y, x;
+ int n;
+ int ranges = (data->max_value + 1 - data->min_value);
+ int offset = (value - data->min_value);
+ int scaled;
+
+ getyx(win, y, x);
+
+ if (ranges > data->slide_len) {
+ scaled = (offset + data->slide_inc) / data->slide_inc;
+ } else if (ranges < data->slide_len) {
+ scaled = (offset + 1) * data->slide_inc;
+ } else {
+ scaled = offset;
+ }
+
+ (void) wattrset(win, gauge_attr);
+ wmove(win, data->slide_y, data->slide_x);
+ for (n = 0; n < data->slide_len; ++n) {
+ (void) waddch(win, ' ');
+ }
+ wmove(win, data->slide_y, data->value_x);
+ wprintw(win, "%*d", data->value_len, value);
+ if ((gauge_attr & A_REVERSE) != 0) {
+ wattroff(win, A_REVERSE);
+ } else {
+ (void) wattrset(win, A_REVERSE);
+ }
+ wmove(win, data->slide_y, data->slide_x);
+ for (n = 0; n < scaled; ++n) {
+ chtype ch2 = winch(win);
+ if (gauge_attr & A_REVERSE) {
+ ch2 &= ~A_REVERSE;
+ }
+ (void) waddch(win, ch2);
+ }
+ (void) wattrset(win, dialog_attr);
+
+ wmove(win, y, x);
+ data->current = value;
+
+ dlg_trace_msg("drew %d offset %d scaled %d limit %d inc %d\n",
+ value,
+ offset,
+ scaled,
+ data->slide_len,
+ data->slide_inc);
+
+ dlg_trace_win(win);
+ }
+}
+
+/*
+ * Allow the user to select from a range of values, e.g., using a slider.
+ */
+int
+dialog_rangebox(const char *title,
+ const char *cprompt,
+ int height,
+ int width,
+ int min_value,
+ int max_value,
+ int default_value)
+{
+ /* *INDENT-OFF* */
+ static DLG_KEYS_BINDING binding[] = {
+ DLG_KEYS_DATA( DLGK_DELETE_RIGHT,KEY_DC ),
+ HELPKEY_BINDINGS,
+ ENTERKEY_BINDINGS,
+ DLG_KEYS_DATA( DLGK_ENTER, ' ' ),
+ DLG_KEYS_DATA( DLGK_FIELD_NEXT, CHR_NEXT ),
+ DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_RIGHT ),
+ DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ),
+ DLG_KEYS_DATA( DLGK_FIELD_PREV, CHR_BACKSPACE ),
+ DLG_KEYS_DATA( DLGK_FIELD_PREV, CHR_PREVIOUS ),
+ DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ),
+ DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_LEFT ),
+ DLG_KEYS_DATA( DLGK_ITEM_FIRST, KEY_HOME),
+ DLG_KEYS_DATA( DLGK_ITEM_LAST, KEY_END),
+ DLG_KEYS_DATA( DLGK_ITEM_LAST, KEY_LL ),
+ DLG_KEYS_DATA( DLGK_ITEM_NEXT, '+'),
+ DLG_KEYS_DATA( DLGK_ITEM_NEXT, KEY_DOWN),
+ DLG_KEYS_DATA( DLGK_ITEM_PREV, '-' ),
+ DLG_KEYS_DATA( DLGK_ITEM_PREV, KEY_UP ),
+ DLG_KEYS_DATA( DLGK_PAGE_NEXT, KEY_NEXT),
+ DLG_KEYS_DATA( DLGK_PAGE_NEXT, KEY_NPAGE),
+ DLG_KEYS_DATA( DLGK_PAGE_PREV, KEY_PPAGE ),
+ DLG_KEYS_DATA( DLGK_PAGE_PREV, KEY_PREVIOUS ),
+ END_KEYS_BINDING
+ };
+ /* *INDENT-ON* */
+
+#ifdef KEY_RESIZE
+ int old_height = height;
+ int old_width = width;
+#endif
+ VALUE data;
+ int key = 0, key2, fkey;
+ int button;
+ int result = DLG_EXIT_UNKNOWN;
+ WINDOW *dialog;
+ int state = dlg_default_button();
+ const char **buttons = dlg_ok_labels();
+ char *prompt = dlg_strclone(cprompt);
+ char buffer[MAX_LEN];
+ int cur_value = default_value;
+ int usable;
+ int ranges;
+ int yorg, xorg;
+
+ if (max_value < min_value)
+ max_value = min_value;
+ if (cur_value > max_value)
+ cur_value = max_value;
+ if (cur_value < min_value)
+ cur_value = min_value;
+
+ dlg_does_output();
+
+#ifdef KEY_RESIZE
+ retry:
+#endif
+
+ dlg_auto_size(title, prompt, &height, &width, 0, 0);
+ height += MIN_HIGH;
+ if (width < MIN_WIDE)
+ width = MIN_WIDE;
+ dlg_button_layout(buttons, &width);
+ dlg_print_size(height, width);
+ dlg_ctl_size(height, width);
+
+ dialog = dlg_new_window(height, width,
+ yorg = dlg_box_y_ordinate(height),
+ xorg = dlg_box_x_ordinate(width));
+
+ data.window = dialog;
+
+ data.min_value = min_value;
+ data.max_value = max_value;
+
+ usable = (width - 2 - 4 * MARGIN);
+ ranges = max_value - min_value + 1;
+
+ /*
+ * Center the number after allowing for its maximum number of digits.
+ */
+ data.value_len = digits_of(max_value);
+ if (digits_of(min_value) > data.value_len)
+ data.value_len = digits_of(min_value);
+ data.value_x = (usable - data.value_len) / 2 + MARGIN;
+ data.value_col = data.value_len - 1;
+
+ /*
+ * The slider is scaled, to try to use the width of the dialog.
+ */
+ if (ranges > usable) {
+ data.slide_inc = (ranges + usable - 1) / usable;
+ data.slide_len = 1 + ranges / data.slide_inc;
+ } else if (ranges < usable) {
+ data.slide_inc = usable / ranges;
+ data.slide_len = ranges * data.slide_inc;
+ } else {
+ data.slide_inc = 1;
+ data.slide_len = usable;
+ }
+ data.slide_x = (usable - data.slide_len) / 2 + MARGIN + 2;
+ data.slide_y = height - 5;
+
+ data.current = cur_value - 1;
+
+ dlg_register_window(dialog, "rangebox", binding);
+ dlg_register_buttons(dialog, "rangebox", buttons);
+
+ dlg_draw_box2(dialog, 0, 0, height, width, dialog_attr, border_attr, border2_attr);
+ dlg_mouse_setbase(xorg, yorg);
+ dlg_mouse_mkregion(data.slide_y - 1, data.slide_x - 1, 3, usable + 2, 'i');
+ dlg_draw_box2(dialog,
+ height - 6, data.slide_x - MARGIN,
+ 2 + MARGIN, data.slide_len + 2 * MARGIN,
+ dialog_attr,
+ border_attr,
+ border2_attr);
+ dlg_draw_bottom_box2(dialog, border_attr, border2_attr, dialog_attr);
+ dlg_draw_title(dialog, title);
+ dlg_draw_helpline(dialog, FALSE);
+
+ (void) wattrset(dialog, dialog_attr);
+ dlg_print_autowrap(dialog, prompt, height, width);
+
+ dlg_trace_win(dialog);
+ while (result == DLG_EXIT_UNKNOWN) {
+ draw_value(&data, cur_value);
+ button = (state < 0) ? 0 : state;
+ dlg_draw_buttons(dialog, height - 2, 0, buttons, button, FALSE, width);
+ if (state < 0) {
+ data.value_col = data.value_len + state;
+ wmove(dialog, data.slide_y, data.value_x + data.value_col);
+ }
+
+ key = dlg_mouse_wgetch(dialog, &fkey);
+ if (dlg_result_key(key, fkey, &result))
+ break;
+
+ if ((key2 = dlg_char_to_button(key, buttons)) >= 0) {
+ result = key2;
+ } else {
+ /* handle function-keys */
+ if (fkey) {
+ switch (key) {
+ case DLGK_ENTER:
+ result = dlg_ok_buttoncode(button);
+ break;
+ case DLGK_FIELD_PREV:
+ if (state < 0 && state > -data.value_len) {
+ --state;
+ } else {
+ state = dlg_prev_ok_buttonindex(state, -data.value_len);
+ }
+ break;
+ case DLGK_FIELD_NEXT:
+ if (state < 0) {
+ ++state;
+ } else {
+ state = dlg_next_ok_buttonindex(state, -data.value_len);
+ }
+ break;
+ case DLGK_ITEM_FIRST:
+ cur_value = min_value;
+ break;
+ case DLGK_ITEM_LAST:
+ cur_value = max_value;
+ break;
+ case DLGK_ITEM_PREV:
+ if (state < 0) {
+ cur_value -= digit_of(&data);
+ } else {
+ cur_value -= 1;
+ }
+ if (cur_value < min_value)
+ cur_value = min_value;
+ break;
+ case DLGK_ITEM_NEXT:
+ if (state < 0) {
+ cur_value += digit_of(&data);
+ } else {
+ cur_value += 1;
+ }
+ if (cur_value > max_value)
+ cur_value = max_value;
+ break;
+ case DLGK_PAGE_PREV:
+ cur_value -= data.slide_inc;
+ if (cur_value < min_value)
+ cur_value = min_value;
+ break;
+ case DLGK_PAGE_NEXT:
+ cur_value += data.slide_inc;
+ if (cur_value > max_value)
+ cur_value = max_value;
+ break;
+#ifdef KEY_RESIZE
+ case KEY_RESIZE:
+ /* reset data */
+ height = old_height;
+ width = old_width;
+ /* repaint */
+ dlg_clear();
+ dlg_del_window(dialog);
+ refresh();
+ dlg_mouse_free_regions();
+ goto retry;
+#endif
+ case DLGK_MOUSE('i'):
+ state = -data.value_len;
+ break;
+ default:
+ if (is_DLGK_MOUSE(key)) {
+ result = dlg_ok_buttoncode(key - M_EVENT);
+ if (result < 0)
+ result = DLG_EXIT_OK;
+ }
+ break;
+ }
+ } else if (isdigit(key) && state < 0) {
+ if (set_digit(&data, key)) {
+ cur_value = data.current;
+ data.current--;
+ }
+ } else {
+ beep();
+ }
+ }
+ }
+
+ sprintf(buffer, "%d", cur_value);
+ dlg_add_result(buffer);
+ dlg_add_separator();
+ dlg_add_last_key(-1);
+
+ dlg_del_window(dialog);
+ dlg_mouse_free_regions();
+ free(prompt);
+
+ return result;
+}
Modified: vendor/dialog/dist/rc.c
===================================================================
--- vendor/dialog/dist/rc.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/rc.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: rc.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: rc.c,v 1.51 2012/11/30 21:32:39 tom Exp $
*
* rc.c -- routines for processing the configuration file
*
- * Copyright 2000-2010,2011 Thomas E. Dickey
+ * Copyright 2000-2011,2012 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -214,6 +214,7 @@
int i = 0, get_fg = 1;
unsigned j;
char tempstr[MAX_LEN + 1], *part;
+ size_t have;
if (str[0] != '(' || lastch(str) != ')') {
if ((i = find_color(str)) >= 0) {
@@ -226,8 +227,14 @@
}
/* remove the parenthesis */
- strcpy(tempstr, str + 1);
- lastch(tempstr) = '\0';
+ have = strlen(str);
+ if (have > MAX_LEN) {
+ have = MAX_LEN - 1;
+ } else {
+ have -= 2;
+ }
+ memcpy(tempstr, str + 1, have);
+ tempstr[have] = '\0';
/* get foreground and background */
Modified: vendor/dialog/dist/rename.sh
===================================================================
--- vendor/dialog/dist/rename.sh 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/rename.sh 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,7 +1,7 @@
#! /bin/sh
-# $Id: rename.sh,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: rename.sh,v 1.4 2012/12/19 10:17:36 tom Exp $
##############################################################################
-# Copyright (c) 2011 Thomas E. Dickey #
+# Copyright (c) 2011,2012 Thomas E. Dickey #
# #
# Permission is hereby granted, free of charge, to any person obtaining a #
# copy of this software and associated documentation files (the "Software"), #
@@ -54,6 +54,7 @@
-e "s,^\.ds l dialog\>,.ds l $PACKAGE," \
-e "s,^\.ds L Dialog\>,.ds L $ONE_CAPS," \
-e "s,^\.ds D DIALOG\>,.ds D $ALL_CAPS," \
+ -e 's,^dialog \\- ,'"$PACKAGE"' \\- ,' \
<$SOURCE >source.tmp
"$@" source.tmp $TARGET
rm -f source.tmp
Property changes on: vendor/dialog/dist/rename.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/README
===================================================================
--- vendor/dialog/dist/samples/README 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/README 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,4 +1,4 @@
--- $Id: README,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+-- $Id: README,v 1.4 2012/12/02 18:52:52 tom Exp $
You can set the environment-variable DIALOG to whatever program you
want to check. Default is "dialog".
@@ -5,36 +5,3 @@
Use "export DIALOG=/usr/bin/dialog" for sh or "setenv DIALOG ../dialog" for csh
to test the /usr/bin/dialog program.
-
--- Here is the original README for the samples directory.
-
-There is no documentation at the moment for cdialog 0.9a, but here are a
-small installer (copismall) for 'points' fido-like, that uses cdialog 0.9a.
-It can demonstrate some of the new features... run "copismall" paying
-attention because after asking for some things, it then installs and/or
-configures programs like as Inn, Ifmail, Smail to make the 'point'.
-It's in Italian language only at moment, but the code is bash......
-If you want look at other much professional products FREE realized with
-cdialog and that use much of the other new characteristics, look for one of
-the ComeOn Point Suites v1.1+. Makers are a sub-group of the ComeOn Linux
-Development Team... ComeOn Linux! follows GNU philosophy.
-
-Mail demarco_p at abramo.it to have the actual location of these Suites and
-of other free ComeOn Linux! software, or if you want more info about
-ComeOn Linux!
-
-To run the "ComeOn Point Installer! v0.9a.small", type:
-$ copismall
-
-Other external samples could be:
-
-copa - ComeOn Point Administrator! v0.8
-copm - ComeOn Point Maintainer! v0.2
-copi - ComeOn Point Installer! v0.9 (system-wide version of copi)
-coepi - ComeOn Expert Point Installer! v1.3 (Professional)
-
-cops - ComeOn Point Suite! v1.1
-copsp - ComeOn Point Suite Professional! v1.1
-
-coui - ComeOn UUCP Installer! v0.1 (makes dialup networks in a moment)
-
Added: vendor/dialog/dist/samples/buildlist
===================================================================
--- vendor/dialog/dist/samples/buildlist (rev 0)
+++ vendor/dialog/dist/samples/buildlist 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,20 @@
+#!/bin/sh
+# $Id: buildlist,v 1.2 2012/12/04 11:45:21 tom Exp $
+
+. ./setup-vars
+
+. ./setup-tempfile
+
+$DIALOG --title "BUILDLIST DEMO" --backtitle "A user-built list" \
+ --separator "|" \
+ --buildlist "hello, this is a --buildlist..." 0 0 0 \
+ "1" "Item number 1" "on" \
+ "2" "Item number 2" "off" \
+ "3" "Item number 3" "on" \
+ "4" "Item number 4" "on" \
+ "5" "Item number 5" "off" \
+ "6" "Item number 6" "on" 2> $tempfile
+
+retval=$?
+
+. ./report-tempfile
Added: vendor/dialog/dist/samples/buildlist2
===================================================================
--- vendor/dialog/dist/samples/buildlist2 (rev 0)
+++ vendor/dialog/dist/samples/buildlist2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,42 @@
+#!/bin/sh
+# $Id: buildlist2,v 1.6 2012/12/23 22:28:12 tom Exp $
+
+. ./setup-vars
+
+. ./setup-edit
+
+count=0
+ls -1 | while true
+do
+ read filename
+ test -z "$filename" && break
+ case $filename in
+ *.*)
+ state=off
+ ;;
+ *-*)
+ state=on
+ ;;
+ *)
+ continue
+ ;;
+ esac
+ case "x$DIALOGOPTS" in
+ *--no-items*|*--noitem*)
+ echo $filename $state >>$input
+ ;;
+ *)
+ echo $count $filename $state >>$input
+ ;;
+ esac
+ count=`expr $count + 1`
+done
+
+$DIALOG --title "BUILDLIST DEMO" --backtitle "A user-built list" \
+ --visit-items --scrollbar --separator "|" \
+ --buildlist "hello, this is a --buildlist..." 0 0 10 `cat $input` 2> $output
+
+retval=$?
+
+tempfile=$output
+. ./report-tempfile
Modified: vendor/dialog/dist/samples/calendar
===================================================================
--- vendor/dialog/dist/samples/calendar 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/calendar 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: calendar,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: calendar,v 1.9 2010/01/13 10:20:33 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/calendar
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/calendar-stdout
===================================================================
--- vendor/dialog/dist/samples/calendar-stdout 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/calendar-stdout 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: calendar-stdout,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: calendar-stdout,v 1.6 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/calendar-stdout
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/calendar2
===================================================================
--- vendor/dialog/dist/samples/calendar2 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/calendar2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: calendar2,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: calendar2,v 1.8 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/calendar2
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/calendar2-stdout
===================================================================
--- vendor/dialog/dist/samples/calendar2-stdout 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/calendar2-stdout 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: calendar2-stdout,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: calendar2-stdout,v 1.6 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/calendar2-stdout
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/calendar3
===================================================================
--- vendor/dialog/dist/samples/calendar3 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/calendar3 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: calendar3,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: calendar3,v 1.9 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/calendar3
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/calendar3-stdout
===================================================================
--- vendor/dialog/dist/samples/calendar3-stdout 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/calendar3-stdout 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: calendar3-stdout,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: calendar3-stdout,v 1.6 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/calendar3-stdout
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/checklist
===================================================================
--- vendor/dialog/dist/samples/checklist 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/checklist 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: checklist,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: checklist,v 1.14 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/checklist
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/checklist-8bit
===================================================================
--- vendor/dialog/dist/samples/checklist-8bit 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/checklist-8bit 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: checklist-8bit,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: checklist-8bit,v 1.8 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/checklist-8bit
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/checklist-utf8
===================================================================
--- vendor/dialog/dist/samples/checklist-utf8 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/checklist-utf8 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: checklist-utf8,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: checklist-utf8,v 1.12 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/checklist-utf8
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/checklist1
===================================================================
--- vendor/dialog/dist/samples/checklist1 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/checklist1 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: checklist1,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: checklist1,v 1.10 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/checklist1
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/checklist10
===================================================================
--- vendor/dialog/dist/samples/checklist10 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/checklist10 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: checklist10,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: checklist10,v 1.9 2010/01/13 10:20:03 tom Exp $
# zero-width column
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/checklist10
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/checklist11
===================================================================
--- vendor/dialog/dist/samples/checklist11 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/checklist11 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: checklist11,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: checklist11,v 1.1 2010/01/17 23:04:01 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/checklist11
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Added: vendor/dialog/dist/samples/checklist12
===================================================================
--- vendor/dialog/dist/samples/checklist12 (rev 0)
+++ vendor/dialog/dist/samples/checklist12 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,44 @@
+#! /bin/sh
+# $Id: checklist12,v 1.3 2012/12/23 22:27:51 tom Exp $
+
+. ./setup-vars
+
+. ./setup-edit
+
+case "x$DIALOGOPTS" in
+*--no-items*|*--noitem*)
+ CUT="cut -d: -f1,3"
+ ;;
+*)
+ CUT="cat"
+ ;;
+esac
+
+$CUT >$input <<-EOF
+ Apple:It's an apple.:off
+ Dog:No, that's not my dog.:ON
+ Orange:Yeah, that's juicy.:off
+ Chicken:Normally not a pet.:off
+ Cat:No, never put a dog and a cat together!:oN
+ Fish:Cats like fish.:On
+ Lemon:You know how it tastes.:on
+EOF
+cat $input | sed -e 's/^/"/' -e 's/:/" "/g' -e 's/$/"/' >$output
+cat $output >$input
+
+$DIALOG --backtitle "No Such Organization" \
+ --title "CHECKLIST BOX" "$@" \
+ --checklist "Hi, this is a checklist box. You can use this to \n\
+present a list of choices which can be turned on or \n\
+off. If there are more items than can fit on the \n\
+screen, the list will be scrolled. You can use the \n\
+UP/DOWN arrow keys, the first letter of the choice as a \n\
+hot key, or the number keys 1-9 to choose an option. \n\
+Press SPACE to toggle an option on/off. \n\n\
+ Which of the following are fruits?" 20 61 5 \
+ --file $input 2> $output
+
+retval=$?
+
+tempfile=$output
+. ./report-tempfile
Modified: vendor/dialog/dist/samples/checklist2
===================================================================
--- vendor/dialog/dist/samples/checklist2 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/checklist2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: checklist2,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: checklist2,v 1.11 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/checklist2
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/checklist3
===================================================================
--- vendor/dialog/dist/samples/checklist3 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/checklist3 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: checklist3,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: checklist3,v 1.11 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/checklist3
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/checklist4
===================================================================
--- vendor/dialog/dist/samples/checklist4 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/checklist4 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: checklist4,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: checklist4,v 1.12 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/checklist4
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/checklist5
===================================================================
--- vendor/dialog/dist/samples/checklist5 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/checklist5 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: checklist5,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: checklist5,v 1.11 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/checklist5
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/checklist6
===================================================================
--- vendor/dialog/dist/samples/checklist6 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/checklist6 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: checklist6,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: checklist6,v 1.11 2010/01/13 10:20:03 tom Exp $
# example showing the --colors option
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/checklist6
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/checklist7
===================================================================
--- vendor/dialog/dist/samples/checklist7 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/checklist7 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: checklist7,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: checklist7,v 1.11 2010/01/13 10:20:03 tom Exp $
# "checklist6" with --separate-output
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/checklist7
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/checklist8
===================================================================
--- vendor/dialog/dist/samples/checklist8 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/checklist8 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: checklist8,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: checklist8,v 1.10 2010/01/13 10:20:03 tom Exp $
# "checklist7" without --item-help
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/checklist8
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/checklist9
===================================================================
--- vendor/dialog/dist/samples/checklist9 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/checklist9 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: checklist9,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: checklist9,v 1.8 2010/01/13 10:20:03 tom Exp $
# "checklist8" using --file
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/checklist9
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/debian.rc
===================================================================
--- vendor/dialog/dist/samples/debian.rc 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/debian.rc 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,4 +1,4 @@
-# $Id: debian.rc,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: debian.rc,v 1.7 2011/10/15 01:00:09 tom Exp $
# vile:confmode
# Run-time configuration file for dialog, matches Debian color scheme.
# (these are the default values for dialog)
Added: vendor/dialog/dist/samples/dft-cancel
===================================================================
--- vendor/dialog/dist/samples/dft-cancel (rev 0)
+++ vendor/dialog/dist/samples/dft-cancel 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,3 @@
+#!/bin/sh
+# $Id: dft-cancel,v 1.2 2012/07/03 09:44:02 tom Exp $
+DIALOGOPTS="$DIALOGOPTS --extra-button --help-button --default-button cancel" "$@"
Added: vendor/dialog/dist/samples/dft-extra
===================================================================
--- vendor/dialog/dist/samples/dft-extra (rev 0)
+++ vendor/dialog/dist/samples/dft-extra 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,3 @@
+#!/bin/sh
+# $Id: dft-extra,v 1.2 2012/07/03 09:44:02 tom Exp $
+DIALOGOPTS="$DIALOGOPTS --extra-button --help-button --default-button extra" "$@"
Added: vendor/dialog/dist/samples/dft-help
===================================================================
--- vendor/dialog/dist/samples/dft-help (rev 0)
+++ vendor/dialog/dist/samples/dft-help 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,3 @@
+#!/bin/sh
+# $Id: dft-help,v 1.2 2012/07/03 09:44:02 tom Exp $
+DIALOGOPTS="$DIALOGOPTS --extra-button --help-button --default-button help" "$@"
Added: vendor/dialog/dist/samples/dft-no
===================================================================
--- vendor/dialog/dist/samples/dft-no (rev 0)
+++ vendor/dialog/dist/samples/dft-no 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,3 @@
+#!/bin/sh
+# $Id: dft-no,v 1.2 2012/07/03 09:44:02 tom Exp $
+DIALOGOPTS="$DIALOGOPTS --extra-button --help-button --defaultno" "$@"
Modified: vendor/dialog/dist/samples/dialog.py
===================================================================
--- vendor/dialog/dist/samples/dialog.py 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/dialog.py 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,4 +1,5 @@
-# $Id: dialog.py,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+#!/usr/bin/python
+# $Id: dialog.py,v 1.4 2012/06/29 09:33:18 tom Exp $
# Module: dialog.py
# Copyright (c) 2000 Robb Shecter <robb at acm.org>
# All rights reserved.
Modified: vendor/dialog/dist/samples/editbox
===================================================================
--- vendor/dialog/dist/samples/editbox 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/editbox 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: editbox,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: editbox,v 1.13 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/editbox
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/editbox-utf8
===================================================================
--- vendor/dialog/dist/samples/editbox-utf8 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/editbox-utf8 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: editbox-utf8,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: editbox-utf8,v 1.9 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/editbox-utf8
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/editbox2
===================================================================
--- vendor/dialog/dist/samples/editbox2 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/editbox2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: editbox2,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: editbox2,v 1.7 2010/01/13 10:20:03 tom Exp $
# example with extra- and help-buttons
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/editbox2
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/editbox3
===================================================================
--- vendor/dialog/dist/samples/editbox3 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/editbox3 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: editbox3,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: editbox3,v 1.7 2010/01/13 10:20:03 tom Exp $
# example with extra- and help-buttons
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/editbox3
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/editbox4
===================================================================
--- vendor/dialog/dist/samples/editbox4 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/editbox4 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: editbox4,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: editbox4,v 1.1 2010/01/17 22:29:50 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/editbox4
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/form1
===================================================================
--- vendor/dialog/dist/samples/form1 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/form1 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: form1,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: form1,v 1.15 2011/10/04 23:36:53 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/form1
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/form1-both
===================================================================
--- vendor/dialog/dist/samples/form1-both 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/form1-both 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: form1-both,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: form1-both,v 1.5 2010/01/13 10:47:35 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/form1-both
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/form1-extra
===================================================================
--- vendor/dialog/dist/samples/form1-extra 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/form1-extra 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: form1-extra,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: form1-extra,v 1.5 2010/01/13 10:47:35 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/form1-extra
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/form1-help
===================================================================
--- vendor/dialog/dist/samples/form1-help 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/form1-help 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: form1-help,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: form1-help,v 1.5 2010/01/13 10:47:35 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/form1-help
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/form1-utf8
===================================================================
--- vendor/dialog/dist/samples/form1-utf8 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/form1-utf8 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: form1-utf8,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: form1-utf8,v 1.7 2010/01/13 10:47:35 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/form1-utf8
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/form2
===================================================================
--- vendor/dialog/dist/samples/form2 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/form2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: form2,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: form2,v 1.9 2010/01/13 10:53:11 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/form2
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/form3
===================================================================
--- vendor/dialog/dist/samples/form3 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/form3 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: form3,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: form3,v 1.6 2010/01/13 10:49:52 tom Exp $
# form1 with --help-button
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/form3
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/form4
===================================================================
--- vendor/dialog/dist/samples/form4 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/form4 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: form4,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: form4,v 1.6 2010/01/13 10:49:52 tom Exp $
# form3 with --item-help
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/form4
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/form5
===================================================================
--- vendor/dialog/dist/samples/form5 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/form5 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: form5,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: form5,v 1.6 2010/01/13 10:49:52 tom Exp $
# form4 with --help-status
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/form5
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/form6
===================================================================
--- vendor/dialog/dist/samples/form6 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/form6 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: form6,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: form6,v 1.5 2010/01/13 10:49:52 tom Exp $
# form4 with --help-status
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/form6
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/fselect
===================================================================
--- vendor/dialog/dist/samples/fselect 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/fselect 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: fselect,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: fselect,v 1.11 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/fselect
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/fselect-stdout
===================================================================
--- vendor/dialog/dist/samples/fselect-stdout 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/fselect-stdout 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: fselect-stdout,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: fselect-stdout,v 1.6 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/fselect-stdout
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/fselect0
===================================================================
--- vendor/dialog/dist/samples/fselect0 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/fselect0 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: fselect0,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: fselect0,v 1.1 2011/10/14 08:32:48 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/fselect0
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/fselect1
===================================================================
--- vendor/dialog/dist/samples/fselect1 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/fselect1 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: fselect1,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: fselect1,v 1.9 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/fselect1
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/fselect1-stdout
===================================================================
--- vendor/dialog/dist/samples/fselect1-stdout 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/fselect1-stdout 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: fselect1-stdout,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: fselect1-stdout,v 1.6 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/fselect1-stdout
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/fselect2
===================================================================
--- vendor/dialog/dist/samples/fselect2 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/fselect2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: fselect2,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: fselect2,v 1.8 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/fselect2
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/fselect2-stdout
===================================================================
--- vendor/dialog/dist/samples/fselect2-stdout 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/fselect2-stdout 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: fselect2-stdout,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: fselect2-stdout,v 1.6 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/fselect2-stdout
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/gauge
===================================================================
--- vendor/dialog/dist/samples/gauge 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/gauge 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: gauge,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: gauge,v 1.7 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/gauge
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/gauge0
===================================================================
--- vendor/dialog/dist/samples/gauge0 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/gauge0 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: gauge0,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: gauge0,v 1.7 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/gauge0
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/gauge0-input-fd
===================================================================
--- vendor/dialog/dist/samples/gauge0-input-fd 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/gauge0-input-fd 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: gauge0-input-fd,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: gauge0-input-fd,v 1.5 2010/01/13 10:20:03 tom Exp $
# modified "gauge0" script to use "--input-fd" option.
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/gauge0-input-fd
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/gauge2
===================================================================
--- vendor/dialog/dist/samples/gauge2 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/gauge2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: gauge2,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: gauge2,v 1.8 2010/01/13 10:26:52 tom Exp $
# The original dialog program assumed the first line after the first "XXX"
# was a percentage value (compare with "gauge" script).
Property changes on: vendor/dialog/dist/samples/gauge2
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/infobox
===================================================================
--- vendor/dialog/dist/samples/infobox 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/infobox 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: infobox,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: infobox,v 1.8 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/infobox
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/infobox1
===================================================================
--- vendor/dialog/dist/samples/infobox1 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/infobox1 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: infobox1,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: infobox1,v 1.4 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/infobox1
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/infobox2
===================================================================
--- vendor/dialog/dist/samples/infobox2 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/infobox2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: infobox2,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: infobox2,v 1.5 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/infobox2
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/infobox3
===================================================================
--- vendor/dialog/dist/samples/infobox3 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/infobox3 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: infobox3,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: infobox3,v 1.5 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/infobox3
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/infobox4
===================================================================
--- vendor/dialog/dist/samples/infobox4 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/infobox4 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: infobox4,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: infobox4,v 1.5 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/infobox4
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/infobox5
===================================================================
--- vendor/dialog/dist/samples/infobox5 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/infobox5 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: infobox5,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: infobox5,v 1.7 2011/01/18 09:19:09 tom Exp $
# get rid of all flickering by constructing a script unroll the loop, leaving
# us in curses-mode until we're done counting.
Property changes on: vendor/dialog/dist/samples/infobox5
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/infobox6
===================================================================
--- vendor/dialog/dist/samples/infobox6 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/infobox6 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: infobox6,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: infobox6,v 1.7 2011/01/18 09:20:59 tom Exp $
# get rid of all flickering by constructing a script unroll the loop, leaving
# us in curses-mode until we're done counting.
#
Property changes on: vendor/dialog/dist/samples/infobox6
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/inputbox
===================================================================
--- vendor/dialog/dist/samples/inputbox 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/inputbox 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: inputbox,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: inputbox,v 1.11 2010/01/13 10:06:01 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/inputbox
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/inputbox-both
===================================================================
--- vendor/dialog/dist/samples/inputbox-both 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/inputbox-both 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: inputbox-both,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: inputbox-both,v 1.6 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/inputbox-both
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/inputbox-extra
===================================================================
--- vendor/dialog/dist/samples/inputbox-extra 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/inputbox-extra 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: inputbox-extra,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: inputbox-extra,v 1.6 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/inputbox-extra
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/inputbox-help
===================================================================
--- vendor/dialog/dist/samples/inputbox-help 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/inputbox-help 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: inputbox-help,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: inputbox-help,v 1.6 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/inputbox-help
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/inputbox1
===================================================================
--- vendor/dialog/dist/samples/inputbox1 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/inputbox1 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: inputbox1,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: inputbox1,v 1.13 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/inputbox1
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/inputbox2
===================================================================
--- vendor/dialog/dist/samples/inputbox2 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/inputbox2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: inputbox2,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: inputbox2,v 1.9 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/inputbox2
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/inputbox3
===================================================================
--- vendor/dialog/dist/samples/inputbox3 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/inputbox3 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: inputbox3,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: inputbox3,v 1.7 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/inputbox3
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/inputbox4
===================================================================
--- vendor/dialog/dist/samples/inputbox4 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/inputbox4 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: inputbox4,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: inputbox4,v 1.7 2010/01/13 10:28:12 tom Exp $
# An example which does not use temporary files, as suggested by Cary Evans:
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/inputbox4
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/inputbox5
===================================================================
--- vendor/dialog/dist/samples/inputbox5 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/inputbox5 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: inputbox5,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: inputbox5,v 1.7 2010/01/13 10:20:03 tom Exp $
# use --output-fd to write to a different output than stderr
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/inputbox5
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/inputbox6-8bit
===================================================================
--- vendor/dialog/dist/samples/inputbox6-8bit 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/inputbox6-8bit 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: inputbox6-8bit,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: inputbox6-8bit,v 1.6 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/inputbox6-8bit
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/inputbox6-utf8
===================================================================
--- vendor/dialog/dist/samples/inputbox6-utf8 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/inputbox6-utf8 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: inputbox6-utf8,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: inputbox6-utf8,v 1.9 2013/09/24 00:06:02 tom Exp $
. ./setup-vars
@@ -7,10 +7,11 @@
. ./setup-utf8
+TITLE="あいうえお"
+
$DIALOG \
---title `printf "\xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a"` "$@" \
---inputbox `printf "\xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a"` \
-10 20 "Ｄ.Ｏ.Ｇ" 2>$tempfile
+--title "$TITLE" "$@" \
+--inputbox "$TITLE" 10 20 "Ｄ.Ｏ.Ｇ" 2>$tempfile
retval=$?
Property changes on: vendor/dialog/dist/samples/inputbox6-utf8
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/inputbox7
===================================================================
--- vendor/dialog/dist/samples/inputbox7 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/inputbox7 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: inputbox7,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: inputbox7,v 1.7 2010/01/13 10:20:03 tom Exp $
# An example which produces two widget outputs.
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/inputbox7
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/inputmenu
===================================================================
--- vendor/dialog/dist/samples/inputmenu 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/inputmenu 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,17 +1,20 @@
-#! /bin/bash
-# $Id: inputmenu,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+#! /bin/sh
+# $Id: inputmenu,v 1.15 2012/07/06 18:11:21 tom Exp $
# 2002 - written by Tobias Rittweiler <tobrit at freebits.de>
. ./setup-vars
-user="$USER" ; uid="$UID" ;
-gid="$GROUPS" ; home="$HOME" ;
+user="$USER"
+uid=`id|sed -e 's/^uid=//' -e 's/(.*//'`
+gid=`id|sed -e 's/^.*gid=//' -e 's/(.*//'`
+home="$HOME"
while [ ${returncode:-99} -ne 1 -a ${returncode:-99} -ne 250 ]; do
- exec 3>&1
- value=$("$DIALOG" --clear --ok-label "Create" \
- --backtitle "An Example for the use of --inputmenu:" "$@" \
- --inputmenu "Originally I designed --inputmenu for a \
+ exec 3>&1
+ value=`$DIALOG \
+ --clear --ok-label "Create" \
+ --backtitle "An Example for the use of --inputmenu:" "$@" \
+ --inputmenu "Originally I designed --inputmenu for a \
configuration purpose. Here is a possible piece of a configuration program. \
" 20 50 10 \
"Username:" "$user" \
@@ -18,43 +21,45 @@
"UID:" "$uid" \
"GID:" "$gid" \
"HOME:" "$home" \
-2>&1 1>&3 )
- returncode=$?
- exec 3>&-
- case $returncode in
- $DIALOG_CANCEL)
- "$DIALOG" --clear --backtitle "An Example for the use of --inputmenu:" \
- --yesno "Really quit?" 10 30
- case $? in
- $DIALOG_OK) break;;
- $DIALOG_CANCEL) returncode=99;;
- esac
- ;;
- $DIALOG_OK)
- "$DIALOG" --clear --backtitle "An Example for the use of --inputmenu:" \
+2>&1 1>&3 `
+ returncode=$?
+ exec 3>&-
+ case $returncode in
+ $DIALOG_CANCEL)
+ "$DIALOG" \
+ --clear --backtitle "An Example for the use of --inputmenu:" \
+ --yesno "Really quit?" 10 30
+ case $? in
+ $DIALOG_OK) break;;
+ $DIALOG_CANCEL) returncode=99;;
+ esac
+ ;;
+ $DIALOG_OK)
+ "$DIALOG" \
+ --clear --backtitle "An Example for the use of --inputmenu:" \
--msgbox "useradd \n\
-d $home \n\
-u $uid \n\
-g $gid \n\
$user" 10 40
- ;;
- $DIALOG_EXTRA)
- value="${value:8:${#value}}"
- tag="${value%:*}"
- item="${value#*: }"
+ ;;
+ $DIALOG_EXTRA)
+ value=`echo "$value" | sed -e 's/^RENAMED //'`
+ tag=`echo "$value" | sed -e 's/:.*//'`
+ item=`echo "$value" | sed -e 's/^[^:]*:[ ][ ]*//'`
- case "$tag" in
- Username) user="$item";;
- UID) uid="$item";;
- GID) gid="$item";;
- HOME) home="$item";;
- esac
- ;;
+ case "$tag" in
+ Username) user="$item" ;;
+ UID) uid="$item" ;;
+ GID) gid="$item" ;;
+ HOME) home="$item" ;;
+ esac
+ ;;
- $DIALOG_ESC)
- echo "ESC pressed."
- break
- ;;
+ $DIALOG_ESC)
+ echo "ESC pressed."
+ break
+ ;;
- esac
+ esac
done
Property changes on: vendor/dialog/dist/samples/inputmenu
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/inputmenu-stdout
===================================================================
--- vendor/dialog/dist/samples/inputmenu-stdout 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/inputmenu-stdout 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,53 +1,63 @@
-#! /bin/bash
-# $Id: inputmenu-stdout,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+#! /bin/sh
+# $Id: inputmenu-stdout,v 1.13 2012/07/06 18:11:12 tom Exp $
# 2002 - written by Tobias Rittweiler <tobrit at freebits.de>
. ./setup-vars
-user="$USER" ; uid="$UID" ;
-gid="$GROUPS" ; home="$HOME" ;
+user="$USER"
+uid=`id|sed -e 's/^uid=//' -e 's/(.*//'`
+gid=`id|sed -e 's/^.*gid=//' -e 's/(.*//'`
+home="$HOME"
while [ ${returncode:-99} -ne 1 -a ${returncode:-99} -ne 250 ]; do
- value="$("$DIALOG" --stdout --clear --ok-label "Create" \
- --backtitle "An Example for the use of --inputmenu:" "$@" \
- --inputmenu "Originally I designed --inputmenu for a \
-configuration purpose. Here is a possible piece of a configuration program.
-" 20 50 10 "Username:" "$user" "UID:" "$uid" "GID:" "$gid" "HOME:" "$home")"
- returncode=$?
- case $returncode in
- $DIALOG_CANCEL)
- "$DIALOG" --clear --backtitle "An Example for the use of --inputmenu:" \
- --yesno "Really quit?" 10 30
- case $? in
- $DIALOG_OK) break;;
- $DIALOG_CANCEL) returncode=99;;
- esac
- ;;
- $DIALOG_OK)
- "$DIALOG" --clear --backtitle "An Example for the use of --inputmenu:" \
+ value=`$DIALOG \
+ --stdout --clear --ok-label "Create" \
+ --backtitle "An Example for the use of --inputmenu:" "$@" \
+ --inputmenu "Originally I designed --inputmenu for a \
+configuration purpose. Here is a possible piece of a configuration program. \
+" 20 50 10 \
+"Username:" "$user" \
+"UID:" "$uid" \
+"GID:" "$gid" \
+"HOME:" "$home" \
+`
+ returncode=$?
+ case $returncode in
+ $DIALOG_CANCEL)
+ "$DIALOG" \
+ --clear --backtitle "An Example for the use of --inputmenu:" \
+ --yesno "Really quit?" 10 30
+ case $? in
+ $DIALOG_OK) break;;
+ $DIALOG_CANCEL) returncode=99;;
+ esac
+ ;;
+ $DIALOG_OK)
+ "$DIALOG" \
+ --clear --backtitle "An Example for the use of --inputmenu:" \
--msgbox "useradd \n\
-d $home \n\
-u $uid \n\
-g $gid \n\
$user" 10 40
- ;;
- $DIALOG_EXTRA)
- value="${value:8:${#value}}"
- tag="${value%:*}"
- item="${value#*: }"
+ ;;
+ $DIALOG_EXTRA)
+ value=`echo "$value" | sed -e 's/^RENAMED //'`
+ tag=`echo "$value" | sed -e 's/:.*//'`
+ item=`echo "$value" | sed -e 's/^[^:]*:[ ][ ]*//'`
- case "$tag" in
- Username) user="$item";;
- UID) uid="$item";;
- GID) gid="$item";;
- HOME) home="$item";;
- esac
- ;;
+ case "$tag" in
+ Username) user="$item" ;;
+ UID) uid="$item" ;;
+ GID) gid="$item" ;;
+ HOME) home="$item" ;;
+ esac
+ ;;
- $DIALOG_ESC)
- echo "ESC pressed."
- break
- ;;
+ $DIALOG_ESC)
+ echo "ESC pressed."
+ break
+ ;;
- esac
+ esac
done
Property changes on: vendor/dialog/dist/samples/inputmenu-stdout
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/inputmenu1
===================================================================
--- vendor/dialog/dist/samples/inputmenu1 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/inputmenu1 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: inputmenu1,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: inputmenu1,v 1.9 2012/07/01 00:59:54 tom Exp $
#
# "inputmenu" rewritten into Bourne shell.
@@ -58,7 +58,7 @@
;;
$DIALOG_EXTRA)
tag=`echo "$value" |sed -e 's/^RENAMED //' -e 's/:.*//'`
- item=`echo "$value" |sed -e 's/^.*:[ ]*//' -e 's/[ ]*$//'`
+ item=`echo "$value" |sed -e 's/^[^:]*:[ ]*//' -e 's/[ ]*$//'`
case "$tag" in
Username)
Property changes on: vendor/dialog/dist/samples/inputmenu1
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/inputmenu2
===================================================================
--- vendor/dialog/dist/samples/inputmenu2 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/inputmenu2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: inputmenu2,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: inputmenu2,v 1.9 2012/07/01 01:00:34 tom Exp $
#
# "inputmenu1" with defaultitem, help-button.
@@ -66,7 +66,7 @@
;;
$DIALOG_EXTRA)
tag=`echo "$value" |sed -e 's/^RENAMED //' -e 's/:.*/:/'`
- item=`echo "$value" |sed -e 's/^.*:[ ]*//' -e 's/[ ]*$//'`
+ item=`echo "$value" |sed -e 's/^[^:]*:[ ]*//' -e 's/[ ]*$//'`
case "$tag" in
Username:)
Property changes on: vendor/dialog/dist/samples/inputmenu2
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/inputmenu3
===================================================================
--- vendor/dialog/dist/samples/inputmenu3 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/inputmenu3 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: inputmenu3,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: inputmenu3,v 1.11 2012/07/01 01:00:34 tom Exp $
#
# "inputmenu1" with defaultitem, help-button and item-help.
@@ -75,7 +75,7 @@
;;
$DIALOG_EXTRA)
tag=`echo "$value" |sed -e 's/^RENAMED //' -e 's/:.*/:/'`
- item=`echo "$value" |sed -e 's/^.*:[ ]*//' -e 's/[ ]*$//'`
+ item=`echo "$value" |sed -e 's/^[^:]*:[ ]*//' -e 's/[ ]*$//'`
case "$tag" in
Username:)
Property changes on: vendor/dialog/dist/samples/inputmenu3
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/inputmenu4
===================================================================
--- vendor/dialog/dist/samples/inputmenu4 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/inputmenu4 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: inputmenu4,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: inputmenu4,v 1.9 2012/07/01 01:00:34 tom Exp $
#
# "inputmenu1" with a different label for the extra-button
@@ -59,7 +59,7 @@
;;
$DIALOG_EXTRA)
tag=`echo "$value" |sed -e 's/^RENAMED //' -e 's/:.*//'`
- item=`echo "$value" |sed -e 's/^.*:[ ]*//' -e 's/[ ]*$//'`
+ item=`echo "$value" |sed -e 's/^[^:]*:[ ]*//' -e 's/[ ]*$//'`
case "$tag" in
Username)
Property changes on: vendor/dialog/dist/samples/inputmenu4
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: vendor/dialog/dist/samples/install/FDISK.TEST
===================================================================
--- vendor/dialog/dist/samples/install/FDISK.TEST 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/install/FDISK.TEST 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,28 +0,0 @@
-
-Disk /dev/hda: 14 heads, 62 sectors, 1018 cylinders
-Units = cylinders of 868 * 512 bytes
-
- Device Boot Begin Start End Blocks Id System
-/dev/hda1 1 1 3 1271 a OS/2 Boot Manager
-/dev/hda2 4 4 287 123256 6 DOS 16-bit >=32M
-/dev/hda3 * 288 288 649 157108 83 Linux native
-/dev/hda4 650 650 1018 160146 83 Linux native
-
-Disk /dev/sda: 64 heads, 32 sectors, 511 cylinders
-Units = cylinders of 2048 * 512 bytes
-
- Device Boot Begin Start End Blocks Id System
-/dev/sda1 1 1 21 21488 82 Linux swap
-/dev/sda2 22 22 511 501760 83 Linux native
-
-Disk /dev/sdb: 64 heads, 32 sectors, 4106 cylinders
-Units = cylinders of 2048 * 512 bytes
-
- Device Boot Begin Start End Blocks Id System
-/dev/sdb1 1 1 201 205808 83 Linux native
-/dev/sdb2 202 202 402 205824 83 Linux native
-/dev/sdb3 403 403 603 205824 83 Linux native
-/dev/sdb4 604 604 4106 3587072 5 Extended
-/dev/sdb5 604 604 1803 1228784 83 Linux native
-/dev/sdb6 1024 1804 3003 1228784 83 Linux native
-/dev/sdb7 2048 3004 4106 1129456 83 Linux native
Modified: vendor/dialog/dist/samples/killall
===================================================================
--- vendor/dialog/dist/samples/killall 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/killall 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,13 +1,16 @@
#! /bin/sh
-# $Id: killall,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: killall,v 1.3 2012/06/29 09:39:19 tom Exp $
# Linux has a program that does this correctly.
+
+. ./setup-vars
+
for prog in $*
do
pid=`ps -a |fgrep $prog |fgrep -v fgrep|sed -e 's/^[ ]*//' -e 's/ .*//' `
if test -n "$pid" ; then
echo killing pid=$pid, $prog
- kill -1 $pid || \
- kill -15 $pid || \
- kill -9 $pid
+ kill -$SIG_HUP $pid || \
+ kill -$SIG_TERM $pid || \
+ kill -$SIG_KILL $pid
fi
done
Property changes on: vendor/dialog/dist/samples/killall
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/listing
===================================================================
--- vendor/dialog/dist/samples/listing 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/listing 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: listing,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: listing,v 1.2 2007/05/28 12:40:36 tom Exp $
while true
do
ls -lrt
Property changes on: vendor/dialog/dist/samples/listing
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/menubox
===================================================================
--- vendor/dialog/dist/samples/menubox 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/menubox 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: menubox,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: menubox,v 1.11 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/menubox
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/menubox-8bit
===================================================================
--- vendor/dialog/dist/samples/menubox-8bit 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/menubox-8bit 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: menubox-8bit,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: menubox-8bit,v 1.6 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/menubox-8bit
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/menubox-utf8
===================================================================
--- vendor/dialog/dist/samples/menubox-utf8 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/menubox-utf8 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: menubox-utf8,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: menubox-utf8,v 1.10 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/menubox-utf8
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/menubox1
===================================================================
--- vendor/dialog/dist/samples/menubox1 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/menubox1 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: menubox1,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: menubox1,v 1.7 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/menubox1
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/menubox10
===================================================================
--- vendor/dialog/dist/samples/menubox10 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/menubox10 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: menubox10,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: menubox10,v 1.5 2010/01/13 10:34:12 tom Exp $
# zero-width column
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/menubox10
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Added: vendor/dialog/dist/samples/menubox12
===================================================================
--- vendor/dialog/dist/samples/menubox12 (rev 0)
+++ vendor/dialog/dist/samples/menubox12 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,43 @@
+#!/bin/sh
+# $Id: menubox12,v 1.3 2012/12/23 22:28:26 tom Exp $
+
+. ./setup-vars
+
+. ./setup-edit
+
+case "x$DIALOGOPTS" in
+*--no-items*|*--noitem*)
+ CUT="cut -d: -f1,3"
+ ;;
+*)
+ CUT="cat"
+ ;;
+esac
+
+$CUT >$input <<-EOF
+ Linux:The Great Unix Clone for 386/486
+ NetBSD:Another free Unix Clone for 386/486
+ OS/2:IBM OS/2
+ WIN NT:Microsoft Windows NT
+ PCDOS:IBM PC DOS
+ MSDOS:Microsoft DOS
+EOF
+cat $input | sed -e 's/^/"/' -e 's/:/" "/g' -e 's/$/"/' >$output
+cat $output >$input
+
+$DIALOG --clear --title "MENU BOX" "$@" \
+ --menu "Hi, this is a menu box. You can use this to \n\
+present a list of choices for the user to \n\
+choose. If there are more items than can fit \n\
+on the screen, the menu will be scrolled. \n\
+You can use the UP/DOWN arrow keys, the first \n\
+letter of the choice as a hot key, or the \n\
+number keys 1-9 to choose an option.\n\
+Try it now!\n\n\
+ Choose the OS you like:" 20 51 4 \
+ --file $input 2> $output
+
+retval=$?
+
+tempfile=$output
+. ./report-tempfile
Modified: vendor/dialog/dist/samples/menubox2
===================================================================
--- vendor/dialog/dist/samples/menubox2 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/menubox2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: menubox2,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: menubox2,v 1.7 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/menubox2
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/menubox3
===================================================================
--- vendor/dialog/dist/samples/menubox3 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/menubox3 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: menubox3,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: menubox3,v 1.8 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/menubox3
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/menubox4
===================================================================
--- vendor/dialog/dist/samples/menubox4 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/menubox4 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: menubox4,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: menubox4,v 1.8 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/menubox4
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/menubox5
===================================================================
--- vendor/dialog/dist/samples/menubox5 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/menubox5 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: menubox5,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: menubox5,v 1.9 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/menubox5
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/menubox6
===================================================================
--- vendor/dialog/dist/samples/menubox6 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/menubox6 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: menubox6,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: menubox6,v 1.8 2010/01/13 10:20:03 tom Exp $
# example showing the --colors option
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/menubox6
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/menubox7
===================================================================
--- vendor/dialog/dist/samples/menubox7 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/menubox7 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: menubox7,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: menubox7,v 1.9 2010/01/13 10:20:03 tom Exp $
# example with --extra-button
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/menubox7
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/menubox8
===================================================================
--- vendor/dialog/dist/samples/menubox8 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/menubox8 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: menubox8,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: menubox8,v 1.7 2010/01/13 10:34:32 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/menubox8
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/menubox9
===================================================================
--- vendor/dialog/dist/samples/menubox9 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/menubox9 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: menubox9,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: menubox9,v 1.6 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/menubox9
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/mixedform
===================================================================
--- vendor/dialog/dist/samples/mixedform 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/mixedform 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: mixedform,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: mixedform,v 1.6 2010/01/13 10:47:35 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/mixedform
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/mixedform2
===================================================================
--- vendor/dialog/dist/samples/mixedform2 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/mixedform2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: mixedform2,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: mixedform2,v 1.5 2010/01/13 10:47:35 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/mixedform2
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/mixedgauge
===================================================================
--- vendor/dialog/dist/samples/mixedgauge 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/mixedgauge 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: mixedgauge,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: mixedgauge,v 1.7 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/mixedgauge
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/msgbox
===================================================================
--- vendor/dialog/dist/samples/msgbox 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/msgbox 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: msgbox,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: msgbox,v 1.7 2010/01/13 10:35:13 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/msgbox
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/msgbox-help
===================================================================
--- vendor/dialog/dist/samples/msgbox-help 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/msgbox-help 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: msgbox-help,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: msgbox-help,v 1.6 2010/01/13 10:53:11 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/msgbox-help
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/msgbox-utf8
===================================================================
(Binary files differ)
Index: vendor/dialog/dist/samples/msgbox-utf8
===================================================================
--- vendor/dialog/dist/samples/msgbox-utf8 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/msgbox-utf8 2018-06-15 16:21:14 UTC (rev 10958)
Property changes on: vendor/dialog/dist/samples/msgbox-utf8
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: vendor/dialog/dist/samples/msgbox1
===================================================================
--- vendor/dialog/dist/samples/msgbox1 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/msgbox1 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: msgbox1,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: msgbox1,v 1.9 2010/01/13 10:26:52 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/msgbox1
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/msgbox2
===================================================================
--- vendor/dialog/dist/samples/msgbox2 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/msgbox2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: msgbox2,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: msgbox2,v 1.7 2010/01/13 10:26:52 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/msgbox2
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/msgbox3
===================================================================
--- vendor/dialog/dist/samples/msgbox3 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/msgbox3 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: msgbox3,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: msgbox3,v 1.7 2010/01/13 10:26:52 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/msgbox3
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/msgbox4-8bit
===================================================================
--- vendor/dialog/dist/samples/msgbox4-8bit 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/msgbox4-8bit 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: msgbox4-8bit,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: msgbox4-8bit,v 1.4 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/msgbox4-8bit
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/msgbox4-eucjp
===================================================================
--- vendor/dialog/dist/samples/msgbox4-eucjp 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/msgbox4-eucjp 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: msgbox4-eucjp,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: msgbox4-eucjp,v 1.5 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/msgbox4-eucjp
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/msgbox4-utf8
===================================================================
--- vendor/dialog/dist/samples/msgbox4-utf8 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/msgbox4-utf8 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: msgbox4-utf8,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: msgbox4-utf8,v 1.10 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/msgbox4-utf8
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/msgbox5
===================================================================
--- vendor/dialog/dist/samples/msgbox5 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/msgbox5 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: msgbox5,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: msgbox5,v 1.5 2010/01/13 10:26:52 tom Exp $
# this differs from msgbox3 by making a window small enough to force scrolling.
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/msgbox5
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/msgbox6
===================================================================
--- vendor/dialog/dist/samples/msgbox6 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/msgbox6 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: msgbox6,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: msgbox6,v 1.5 2010/01/13 10:26:52 tom Exp $
# this differs from msgbox3 by making a window small enough to force scrolling.
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/msgbox6
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/msgbox6a
===================================================================
--- vendor/dialog/dist/samples/msgbox6a 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/msgbox6a 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: msgbox6a,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: msgbox6a,v 1.5 2010/01/13 10:26:52 tom Exp $
# this differs from msgbox3 by making a window small enough to force scrolling.
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/msgbox6a
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/password
===================================================================
--- vendor/dialog/dist/samples/password 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/password 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: password,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: password,v 1.7 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/password
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/password1
===================================================================
--- vendor/dialog/dist/samples/password1 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/password1 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: password1,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: password1,v 1.6 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/password1
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/password2
===================================================================
--- vendor/dialog/dist/samples/password2 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/password2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: password2,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: password2,v 1.6 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/password2
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/passwordform1
===================================================================
--- vendor/dialog/dist/samples/passwordform1 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/passwordform1 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: passwordform1,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: passwordform1,v 1.5 2010/01/13 10:47:35 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/passwordform1
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/passwordform1-utf8
===================================================================
--- vendor/dialog/dist/samples/passwordform1-utf8 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/passwordform1-utf8 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: passwordform1-utf8,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: passwordform1-utf8,v 1.7 2010/01/13 10:47:35 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/passwordform1-utf8
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/pause
===================================================================
--- vendor/dialog/dist/samples/pause 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/pause 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: pause,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: pause,v 1.5 2010/01/14 00:27:23 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/pause
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/pause-both
===================================================================
--- vendor/dialog/dist/samples/pause-both 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/pause-both 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: pause-both,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: pause-both,v 1.1 2011/01/18 09:49:24 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/pause-both
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/pause-extra
===================================================================
--- vendor/dialog/dist/samples/pause-extra 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/pause-extra 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: pause-extra,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: pause-extra,v 1.1 2011/01/18 09:49:07 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/pause-extra
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/pause-help
===================================================================
--- vendor/dialog/dist/samples/pause-help 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/pause-help 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: pause-help,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: pause-help,v 1.5 2010/01/13 10:36:00 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/pause-help
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/prgbox
===================================================================
--- vendor/dialog/dist/samples/prgbox 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/prgbox 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,6 +1,9 @@
#!/bin/sh
-# $Id: prgbox,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: prgbox,v 1.2 2012/07/02 09:46:24 tom Exp $
. ./setup-vars
$DIALOG --title "PRGBOX" "$@" --prgbox "./shortlist" 20 70
+
+retval=$?
+. ./report-button
Property changes on: vendor/dialog/dist/samples/prgbox
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/prgbox2
===================================================================
--- vendor/dialog/dist/samples/prgbox2 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/prgbox2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,6 +1,9 @@
#!/bin/sh
-# $Id: prgbox2,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: prgbox2,v 1.2 2012/07/02 09:46:24 tom Exp $
. ./setup-vars
$DIALOG --title "PRGBOX" "$@" --prgbox "./shortlist 3" 20 70
+
+retval=$?
+. ./report-button
Property changes on: vendor/dialog/dist/samples/prgbox2
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/programbox
===================================================================
--- vendor/dialog/dist/samples/programbox 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/programbox 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: programbox,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: programbox,v 1.1 2011/03/02 01:17:28 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/programbox
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/programbox2
===================================================================
--- vendor/dialog/dist/samples/programbox2 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/programbox2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: programbox2,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: programbox2,v 1.1 2011/03/02 01:25:31 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/programbox2
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/progress
===================================================================
--- vendor/dialog/dist/samples/progress 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/progress 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: progress,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: progress,v 1.5 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/progress
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/progress2
===================================================================
--- vendor/dialog/dist/samples/progress2 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/progress2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: progress2,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: progress2,v 1.5 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/progress2
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/radiolist
===================================================================
--- vendor/dialog/dist/samples/radiolist 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/radiolist 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: radiolist,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: radiolist,v 1.13 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/radiolist
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/radiolist1
===================================================================
--- vendor/dialog/dist/samples/radiolist1 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/radiolist1 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: radiolist1,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: radiolist1,v 1.1 2010/01/17 23:05:14 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/radiolist1
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/radiolist10
===================================================================
--- vendor/dialog/dist/samples/radiolist10 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/radiolist10 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: radiolist10,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: radiolist10,v 1.6 2010/01/13 10:20:03 tom Exp $
# zero-width column
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/radiolist10
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/radiolist2
===================================================================
--- vendor/dialog/dist/samples/radiolist2 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/radiolist2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: radiolist2,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: radiolist2,v 1.8 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/radiolist2
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/radiolist3
===================================================================
--- vendor/dialog/dist/samples/radiolist3 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/radiolist3 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: radiolist3,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: radiolist3,v 1.9 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/radiolist3
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/radiolist4
===================================================================
--- vendor/dialog/dist/samples/radiolist4 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/radiolist4 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: radiolist4,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: radiolist4,v 1.9 2010/01/13 10:20:03 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/radiolist4
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Added: vendor/dialog/dist/samples/rangebox
===================================================================
--- vendor/dialog/dist/samples/rangebox (rev 0)
+++ vendor/dialog/dist/samples/rangebox 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,11 @@
+#!/bin/sh
+# $Id: rangebox,v 1.3 2012/12/05 10:07:54 tom Exp $
+
+. ./setup-vars
+
+exec 3>&1
+RESULT=`$DIALOG --title "RANGE BOX" --rangebox "Please set the volume..." 0 60 0 123 5 2>&1 1>&3`
+retval=$?
+exec 3>&-
+
+. ./report-string
Added: vendor/dialog/dist/samples/rangebox2
===================================================================
--- vendor/dialog/dist/samples/rangebox2 (rev 0)
+++ vendor/dialog/dist/samples/rangebox2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,11 @@
+#!/bin/sh
+# $Id: rangebox2,v 1.1 2012/12/05 10:28:58 tom Exp $
+
+. ./setup-vars
+
+exec 3>&1
+RESULT=`$DIALOG --title "RANGE BOX" --rangebox "Please set the volume..." 0 60 0 6 5 2>&1 1>&3`
+retval=$?
+exec 3>&-
+
+. ./report-string
Added: vendor/dialog/dist/samples/rangebox3
===================================================================
--- vendor/dialog/dist/samples/rangebox3 (rev 0)
+++ vendor/dialog/dist/samples/rangebox3 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,11 @@
+#!/bin/sh
+# $Id: rangebox3,v 1.1 2012/12/05 10:19:42 tom Exp $
+
+. ./setup-vars
+
+exec 3>&1
+RESULT=`$DIALOG --title "RANGE BOX" --rangebox "Please set the volume..." 0 60 -48 55 5 2>&1 1>&3`
+retval=$?
+exec 3>&-
+
+. ./report-string
Added: vendor/dialog/dist/samples/rangebox4
===================================================================
--- vendor/dialog/dist/samples/rangebox4 (rev 0)
+++ vendor/dialog/dist/samples/rangebox4 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,11 @@
+#!/bin/sh
+# $Id: rangebox4,v 1.1 2012/12/05 11:54:04 tom Exp $
+
+. ./setup-vars
+
+exec 3>&1
+RESULT=`$DIALOG --title "RANGE BOX" --rangebox "Please set the volume..." 0 60 10 100 5 2>&1 1>&3`
+retval=$?
+exec 3>&-
+
+. ./report-string
Modified: vendor/dialog/dist/samples/report-button
===================================================================
--- vendor/dialog/dist/samples/report-button 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/report-button 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,4 +1,5 @@
-# $Id: report-button,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+#!/bin/sh
+# $Id: report-button,v 1.3 2012/06/29 09:29:36 tom Exp $
# Report button-only, no $RESULT
# vile:shmode
Modified: vendor/dialog/dist/samples/report-edit
===================================================================
--- vendor/dialog/dist/samples/report-edit 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/report-edit 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,4 +1,5 @@
-# $Id: report-edit,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+#!/bin/sh
+# $Id: report-edit,v 1.4 2012/06/29 09:29:41 tom Exp $
# Report results from editing.
# vile:shmode
Modified: vendor/dialog/dist/samples/report-string
===================================================================
--- vendor/dialog/dist/samples/report-string 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/report-string 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,4 +1,5 @@
-# $Id: report-string,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+#!/bin/sh
+# $Id: report-string,v 1.3 2012/06/29 09:32:17 tom Exp $
# Report result passed in a string $RESULT
# vile:shmode
Modified: vendor/dialog/dist/samples/report-tempfile
===================================================================
--- vendor/dialog/dist/samples/report-tempfile 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/report-tempfile 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,4 +1,5 @@
-# $Id: report-tempfile,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+#!/bin/sh
+# $Id: report-tempfile,v 1.5 2013/09/02 18:03:13 tom Exp $
# Report results in a temporary-file.
# vile:shmode
@@ -8,11 +9,11 @@
$DIALOG_CANCEL)
echo "Cancel pressed.";;
$DIALOG_HELP)
- echo "Help pressed.";;
+ echo "Help pressed: `cat $tempfile`";;
$DIALOG_EXTRA)
echo "Extra button pressed.";;
$DIALOG_ITEM_HELP)
- echo "Item-help button pressed.";;
+ echo "Item-help button pressed: `cat $tempfile`";;
$DIALOG_ESC)
if test -s $tempfile ; then
cat $tempfile
Modified: vendor/dialog/dist/samples/report-yesno
===================================================================
--- vendor/dialog/dist/samples/report-yesno 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/report-yesno 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,4 +1,5 @@
-# $Id: report-yesno,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+#!/bin/sh
+# $Id: report-yesno,v 1.2 2012/06/29 09:32:12 tom Exp $
# Report button-only, no $RESULT
# vile:shmode
Modified: vendor/dialog/dist/samples/rotated-data
===================================================================
--- vendor/dialog/dist/samples/rotated-data 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/rotated-data 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: rotated-data,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: rotated-data,v 1.1 2004/12/19 16:43:47 tom Exp $
# Rotate the second parameter's data by the given shift count.
if test $# != 0
then
Property changes on: vendor/dialog/dist/samples/rotated-data
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/setup-edit
===================================================================
--- vendor/dialog/dist/samples/setup-edit 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/setup-edit 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,6 +1,7 @@
-# $Id: setup-edit,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+#!/bin/sh
+# $Id: setup-edit,v 1.2 2012/06/29 09:31:49 tom Exp $
# vile:shmode
input=`tempfile 2>/dev/null` || input=/tmp/input$$
output=`tempfile 2>/dev/null` || output=/tmp/test$$
-trap "rm -f $input $output" 0 1 2 5 15
+trap "rm -f $input $output" $SIG_NONE $SIG_HUP $SIG_INT $SIG_TRAP $SIG_TERM
Modified: vendor/dialog/dist/samples/setup-tempfile
===================================================================
--- vendor/dialog/dist/samples/setup-tempfile 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/setup-tempfile 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,6 @@
-# $Id: setup-tempfile,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+#!/bin/sh
+# $Id: setup-tempfile,v 1.3 2012/07/06 17:51:56 tom Exp $
# vile:shmode
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+tempfile=`(tempfile) 2>/dev/null` || tempfile=/tmp/test$$
+trap "rm -f $tempfile" 0 $SIG_NONE $SIG_HUP $SIG_INT $SIG_TRAP $SIG_TERM
Modified: vendor/dialog/dist/samples/setup-utf8
===================================================================
--- vendor/dialog/dist/samples/setup-utf8 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/setup-utf8 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,4 +1,5 @@
-# $Id: setup-utf8,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+#!/bin/sh
+# $Id: setup-utf8,v 1.2 2012/06/29 09:50:32 tom Exp $
# vile:shmode
case none"$LANG$LC_ALL$LC_CTYPE" in
Modified: vendor/dialog/dist/samples/setup-vars
===================================================================
--- vendor/dialog/dist/samples/setup-vars 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/setup-vars 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,4 +1,5 @@
-# $Id: setup-vars,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+#!/bin/sh
+# $Id: setup-vars,v 1.3 2012/06/29 09:52:26 tom Exp $
# vile:shmode
# These symbols are defined to use in the sample shell scripts to make them
@@ -13,3 +14,10 @@
: ${DIALOG_EXTRA=3}
: ${DIALOG_ITEM_HELP=4}
: ${DIALOG_ESC=255}
+
+: ${SIG_NONE=0}
+: ${SIG_HUP=1}
+: ${SIG_INT=2}
+: ${SIG_QUIT=3}
+: ${SIG_KILL=9}
+: ${SIG_TERM=15}
Modified: vendor/dialog/dist/samples/shortlist
===================================================================
--- vendor/dialog/dist/samples/shortlist 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/shortlist 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: shortlist,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: shortlist,v 1.2 2011/03/02 00:11:50 tom Exp $
# make a short listing, which writes to both stdout and stderr.
if test $# != 0
Property changes on: vendor/dialog/dist/samples/shortlist
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/slackware.rc
===================================================================
--- vendor/dialog/dist/samples/slackware.rc 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/slackware.rc 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,4 +1,4 @@
-# $Id: slackware.rc,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: slackware.rc,v 1.10 2012/12/01 00:36:55 tom Exp $
# vile:confmode
# Run-time configuration file for dialog, matches Slackware color scheme.
#
@@ -130,7 +130,7 @@
gauge_color = (BLUE,WHITE,ON)
# Dialog box border2 color
-border2_color = (BLACK,WHITE,OFF)
+border2_color = dialog_color
# Input box border2 color
inputbox_border2_color = border2_color
Modified: vendor/dialog/dist/samples/sourcemage.rc
===================================================================
--- vendor/dialog/dist/samples/sourcemage.rc 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/sourcemage.rc 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,4 +1,4 @@
-# $Id: sourcemage.rc,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: sourcemage.rc,v 1.6 2011/10/15 01:00:41 tom Exp $
# vile:confmode
# Run-time configuration file for dialog, matches SourceMage color scheme.
#
Modified: vendor/dialog/dist/samples/suse.rc
===================================================================
--- vendor/dialog/dist/samples/suse.rc 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/suse.rc 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,4 +1,4 @@
-# $Id: suse.rc,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: suse.rc,v 1.5 2011/10/15 01:01:00 tom Exp $
# vile:confmode
# Run-time configuration file for dialog, matches SuSE color scheme.
#
Modified: vendor/dialog/dist/samples/tailbox
===================================================================
--- vendor/dialog/dist/samples/tailbox 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/tailbox 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: tailbox,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: tailbox,v 1.7 2010/01/13 10:36:18 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/tailbox
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/tailboxbg
===================================================================
--- vendor/dialog/dist/samples/tailboxbg 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/tailboxbg 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: tailboxbg,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: tailboxbg,v 1.10 2012/06/29 09:48:28 tom Exp $
. ./setup-vars
@@ -16,7 +16,7 @@
sleep 10
# now kill it
-kill -3 `cat $tempfile` 2>&1 >/dev/null 2>/dev/null
+kill -$SIG_QUIT `cat $tempfile` 2>&1 >/dev/null 2>/dev/null
# ...and the process that is making the listing
./killall listing
Property changes on: vendor/dialog/dist/samples/tailboxbg
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/tailboxbg1
===================================================================
--- vendor/dialog/dist/samples/tailboxbg1 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/tailboxbg1 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: tailboxbg1,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: tailboxbg1,v 1.10 2012/06/29 09:51:46 tom Exp $
. ./setup-vars
@@ -24,7 +24,7 @@
sleep 10
# now kill it
-kill -3 $pid 2>&1 >/dev/null 2>/dev/null
+kill -$SIG_QUIT $pid 2>&1 >/dev/null 2>/dev/null
echo "killed [$pid]"
fi
Property changes on: vendor/dialog/dist/samples/tailboxbg1
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/tailboxbg2
===================================================================
--- vendor/dialog/dist/samples/tailboxbg2 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/tailboxbg2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: tailboxbg2,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: tailboxbg2,v 1.10 2012/06/29 09:51:11 tom Exp $
. ./setup-vars
@@ -25,7 +25,7 @@
sleep 10
# now kill it
-kill -3 $pid 2>&1 >/dev/null 2>/dev/null
+kill -$SIG_QUIT $pid 2>&1 >/dev/null 2>/dev/null
echo "killed [$pid]"
fi
Property changes on: vendor/dialog/dist/samples/tailboxbg2
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/testdata-8bit
===================================================================
--- vendor/dialog/dist/samples/testdata-8bit 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/testdata-8bit 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: testdata-8bit,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: testdata-8bit,v 1.2 2011/10/16 23:26:32 tom Exp $
# Select one of the "SAMPLE=" lines, to test handling of characters which
# are nonprinting in a POSIX locale:
Modified: vendor/dialog/dist/samples/textbox
===================================================================
--- vendor/dialog/dist/samples/textbox 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/textbox 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: textbox,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: textbox,v 1.12 2010/01/13 10:36:35 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/textbox
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/textbox-both
===================================================================
--- vendor/dialog/dist/samples/textbox-both 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/textbox-both 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: textbox-both,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: textbox-both,v 1.1 2011/01/18 09:59:47 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/textbox-both
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/textbox-help
===================================================================
--- vendor/dialog/dist/samples/textbox-help 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/textbox-help 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: textbox-help,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: textbox-help,v 1.1 2011/01/18 09:59:20 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/textbox-help
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/textbox2
===================================================================
--- vendor/dialog/dist/samples/textbox2 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/textbox2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: textbox2,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: textbox2,v 1.8 2010/01/13 10:36:49 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/textbox2
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/textbox3
===================================================================
--- vendor/dialog/dist/samples/textbox3 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/textbox3 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: textbox3,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: textbox3,v 1.6 2010/01/13 10:37:01 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/textbox3
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/timebox
===================================================================
--- vendor/dialog/dist/samples/timebox 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/timebox 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: timebox,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: timebox,v 1.9 2010/01/13 10:23:10 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/timebox
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/timebox-stdout
===================================================================
--- vendor/dialog/dist/samples/timebox-stdout 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/timebox-stdout 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: timebox-stdout,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: timebox-stdout,v 1.5 2010/01/13 10:37:19 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/timebox-stdout
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/timebox2
===================================================================
--- vendor/dialog/dist/samples/timebox2 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/timebox2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: timebox2,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: timebox2,v 1.7 2010/01/13 10:37:35 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/timebox2
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/timebox2-stdout
===================================================================
--- vendor/dialog/dist/samples/timebox2-stdout 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/timebox2-stdout 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: timebox2-stdout,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: timebox2-stdout,v 1.5 2010/01/13 10:37:55 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/timebox2-stdout
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Added: vendor/dialog/dist/samples/treeview
===================================================================
--- vendor/dialog/dist/samples/treeview (rev 0)
+++ vendor/dialog/dist/samples/treeview 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,22 @@
+#!/bin/sh
+# $Id: treeview,v 1.2 2012/12/04 10:53:09 tom Exp $
+
+. ./setup-vars
+
+. ./setup-tempfile
+
+$DIALOG --title "TREE VIEW DIALOG" \
+ --treeview "TreeView demo" 0 0 0 \
+ tag1 one off 0 \
+ tag2 two off 1 \
+ tag3 three on 2 \
+ tag4 four off 1 \
+ tag5 five off 2 \
+ tag6 six off 3 \
+ tag7 seven off 3 \
+ tag8 eight off 4 \
+ tag9 nine off 1 2> $tempfile
+
+retval=$?
+
+. ./report-tempfile
Added: vendor/dialog/dist/samples/treeview2
===================================================================
--- vendor/dialog/dist/samples/treeview2 (rev 0)
+++ vendor/dialog/dist/samples/treeview2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,52 @@
+#!/bin/sh
+# $Id: treeview2,v 1.3 2012/12/23 22:28:00 tom Exp $
+
+. ./setup-vars
+
+. ./setup-edit
+
+case "x$DIALOGOPTS" in
+*--no-items*|*--noitem*)
+ CUT="cut -d: -f1,3,4"
+ ;;
+*)
+ CUT="cat"
+ ;;
+esac
+
+$CUT >$input <<-EOF
+ tag1:one:off:0
+ tag2:two:off:1
+ tag3:three:on:2
+ tag4:four:off:1
+ tag5:five:off:2
+ tag6:six:off:3
+ tag7:seven:off:3
+ tag8:eight:off:4
+ tag11:1one:off:0
+ tag12:1two:off:1
+ tag13:1three:on:2
+ tag14:1four:off:1
+ tag15:1five:off:2
+ tag16:1six:off:3
+ tag17:1seven:off:3
+ tag18:1eight:off:4
+ tag21:2one:off:0
+ tag22:2two:off:1
+ tag23:2three:on:2
+ tag24:2four:off:1
+ tag25:2five:off:2
+ tag26:2six:off:3
+ tag27:2seven:off:3
+ tag28:2eight:off:4
+ tag9:nine:off:1
+EOF
+
+$DIALOG --title "TREE VIEW DIALOG" \
+ --scrollbar \
+ --treeview "TreeView demo" 0 0 10 `cat $input | sed -e 's/:/ /g'` 2> $output
+
+retval=$?
+
+tempfile=$output
+. ./report-tempfile
Modified: vendor/dialog/dist/samples/wheel
===================================================================
--- vendor/dialog/dist/samples/wheel 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/wheel 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: wheel,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: wheel,v 1.8 2012/06/29 09:59:40 tom Exp $
. ./setup-vars
@@ -17,10 +17,10 @@
# Takes an integer, multiplies it for COLS, divides for 132
scalex() {
- echo $[$1*$COLS/132]
+ expr $1 \* $COLS / 132
}
scaley() {
- echo $[$1*$ROWS/60]
+ expr $1 \* $ROWS / 60
}
$DIALOG --backtitle "$TITLE" --no-shadow \
Property changes on: vendor/dialog/dist/samples/wheel
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/whiptail.rc
===================================================================
--- vendor/dialog/dist/samples/whiptail.rc 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/whiptail.rc 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,4 +1,4 @@
-# $Id: whiptail.rc,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: whiptail.rc,v 1.6 2012/12/01 01:15:04 tom Exp $
# vile:confmode
# Run-time configuration file for dialog, matches whiptail's color scheme.
#
@@ -139,4 +139,4 @@
searchbox_border2_color = dialog_color
# Menu box border2 color
-menubox_border2_color = dialog_color
+menubox_border2_color = screen_color
Added: vendor/dialog/dist/samples/with-dquotes
===================================================================
--- vendor/dialog/dist/samples/with-dquotes (rev 0)
+++ vendor/dialog/dist/samples/with-dquotes 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,3 @@
+#!/bin/sh
+# $Id: with-dquotes,v 1.1 2012/07/03 09:40:19 tom Exp $
+DIALOGOPTS="$DIALOGOPTS --quoted" "$@"
Added: vendor/dialog/dist/samples/with-squotes
===================================================================
--- vendor/dialog/dist/samples/with-squotes (rev 0)
+++ vendor/dialog/dist/samples/with-squotes 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,3 @@
+#!/bin/sh
+# $Id: with-squotes,v 1.1 2012/07/03 09:40:29 tom Exp $
+DIALOGOPTS="$DIALOGOPTS --single-quoted" "$@"
Modified: vendor/dialog/dist/samples/yesno
===================================================================
--- vendor/dialog/dist/samples/yesno 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/yesno 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: yesno,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: yesno,v 1.9 2010/01/14 01:11:11 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/yesno
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/yesno-both
===================================================================
--- vendor/dialog/dist/samples/yesno-both 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/yesno-both 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: yesno-both,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: yesno-both,v 1.5 2010/01/13 10:40:39 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/yesno-both
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/yesno-extra
===================================================================
--- vendor/dialog/dist/samples/yesno-extra 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/yesno-extra 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: yesno-extra,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: yesno-extra,v 1.5 2010/01/13 10:40:39 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/yesno-extra
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/yesno-help
===================================================================
--- vendor/dialog/dist/samples/yesno-help 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/yesno-help 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: yesno-help,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: yesno-help,v 1.5 2010/01/13 10:40:39 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/yesno-help
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/yesno-utf8
===================================================================
--- vendor/dialog/dist/samples/yesno-utf8 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/yesno-utf8 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: yesno-utf8,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: yesno-utf8,v 1.7 2010/01/14 01:11:23 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/yesno-utf8
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/yesno2
===================================================================
--- vendor/dialog/dist/samples/yesno2 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/yesno2 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: yesno2,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: yesno2,v 1.7 2010/01/13 10:40:39 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/yesno2
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/yesno3
===================================================================
--- vendor/dialog/dist/samples/yesno3 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/yesno3 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: yesno3,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: yesno3,v 1.6 2010/01/13 10:40:39 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/yesno3
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/samples/yesno4
===================================================================
--- vendor/dialog/dist/samples/yesno4 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/samples/yesno4 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: yesno4,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+# $Id: yesno4,v 1.1 2010/01/14 10:26:40 tom Exp $
. ./setup-vars
Property changes on: vendor/dialog/dist/samples/yesno4
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: vendor/dialog/dist/tailbox.c
===================================================================
--- vendor/dialog/dist/tailbox.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/tailbox.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: tailbox.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: tailbox.c,v 1.68 2012/11/18 15:48:52 tom Exp $
*
* tailbox.c -- implements the tail box
*
- * Copyright 2000-2010,2011 Thomas E. Dickey
+ * Copyright 2000-2011,2012 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -34,7 +34,7 @@
const char **buttons;
int hscroll;
int old_hscroll;
- char line[MAX_LEN + 1];
+ char line[MAX_LEN + 2];
off_t last_pos;
} MY_OBJ;
Modified: vendor/dialog/dist/textbox.c
===================================================================
--- vendor/dialog/dist/textbox.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/textbox.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: textbox.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: textbox.c,v 1.110 2012/12/01 01:48:08 tom Exp $
*
* textbox.c -- implements the text box
*
- * Copyright 2000-2010,2011 Thomas E. Dickey
+ * Copyright 2000-2011,2012 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -55,6 +55,7 @@
long fpos;
if ((fpos = (long) lseek(obj->fd, (off_t) offset, mode)) == -1) {
switch (mode) {
+ default:
case SEEK_CUR:
dlg_exiterr("Cannot get file position");
break;
@@ -75,6 +76,37 @@
return lseek_obj(obj, 0L, SEEK_CUR);
}
+static void
+lseek_set(MY_OBJ * obj, long offset)
+{
+ long actual = lseek_obj(obj, offset, SEEK_SET);
+
+ if (actual != offset) {
+ dlg_exiterr("Cannot set file position to %ld (actual %ld)\n",
+ offset, actual);
+ }
+}
+
+static void
+lseek_end(MY_OBJ * obj, long offset)
+{
+ long actual = lseek_obj(obj, offset, SEEK_END);
+
+ if (actual > offset) {
+ obj->file_size = actual;
+ }
+}
+
+static void
+lseek_cur(MY_OBJ * obj, long offset)
+{
+ long actual = lseek_obj(obj, offset, SEEK_CUR);
+
+ if (actual != offset) {
+ dlg_trace_msg("Lseek returned %ld, expected %ld\n", actual, offset);
+ }
+}
+
static char *
xalloc(size_t size)
{
@@ -197,7 +229,7 @@
fpos = ftell_obj(obj);
- lseek_obj(obj, fpos - obj->fd_bytes_read, SEEK_SET);
+ lseek_set(obj, fpos - obj->fd_bytes_read);
/* Allocate space for read buffer */
buftab = xalloc((size_t) val + 1);
@@ -224,7 +256,7 @@
count++;
}
- lseek_obj(obj, fpos, SEEK_SET);
+ lseek_set(obj, fpos);
free(buftab);
return count;
}
@@ -309,10 +341,10 @@
/* Really possible to move backward BUF_SIZE/2 bytes? */
if (fpos < BUF_SIZE / 2 + obj->fd_bytes_read) {
/* No, move less than */
- lseek_obj(obj, 0L, SEEK_SET);
+ lseek_set(obj, 0L);
val_to_tabize = fpos - obj->fd_bytes_read;
} else { /* Move backward BUF_SIZE/2 bytes */
- lseek_obj(obj, -(BUF_SIZE / 2 + obj->fd_bytes_read), SEEK_CUR);
+ lseek_cur(obj, -(BUF_SIZE / 2 + obj->fd_bytes_read));
val_to_tabize = BUF_SIZE / 2;
}
read_high(obj, BUF_SIZE);
@@ -340,10 +372,10 @@
/* Really possible to move backward BUF_SIZE/2 bytes? */
if (fpos < BUF_SIZE / 2 + obj->fd_bytes_read) {
/* No, move less than */
- lseek_obj(obj, 0L, SEEK_SET);
+ lseek_set(obj, 0L);
val_to_tabize = fpos - obj->fd_bytes_read;
} else { /* Move backward BUF_SIZE/2 bytes */
- lseek_obj(obj, -(BUF_SIZE / 2 + obj->fd_bytes_read), SEEK_CUR);
+ lseek_cur(obj, -(BUF_SIZE / 2 + obj->fd_bytes_read));
val_to_tabize = BUF_SIZE / 2;
}
read_high(obj, BUF_SIZE);
@@ -493,7 +525,7 @@
searchbox_attr,
searchbox_border_attr,
searchbox_border2_attr);
- wattrset(widget, searchbox_title_attr);
+ (void) wattrset(widget, searchbox_title_attr);
(void) wmove(widget, 0, (box_width - len_caption) / 2);
indx = dlg_index_wchars(caption);
@@ -567,7 +599,7 @@
}
#endif
/* ESC pressed, or no search term, reprint page to clear box */
- wattrset(obj->text, dialog_attr);
+ (void) wattrset(obj->text, dialog_attr);
back_lines(obj, obj->page_length);
return TRUE;
}
@@ -596,7 +628,7 @@
if (found == FALSE) { /* not found */
(void) beep();
/* Restore program state to that before searching */
- lseek_obj(obj, fpos, SEEK_SET);
+ lseek_set(obj, fpos);
read_high(obj, BUF_SIZE);
@@ -612,7 +644,7 @@
back_lines(obj, 1L);
}
/* Reprint page */
- wattrset(obj->text, dialog_attr);
+ (void) wattrset(obj->text, dialog_attr);
moved = TRUE;
} else { /* no need to find */
(void) beep();
@@ -674,7 +706,7 @@
WINDOW *dialog;
bool moved;
int result = DLG_EXIT_UNKNOWN;
- int button = dialog_vars.extra_button ? dlg_defaultno_button() : 0;
+ int button = dlg_default_button();
int min_width = 12;
search_term[0] = '\0'; /* no search term entered yet */
@@ -692,10 +724,10 @@
/* Get file size. Actually, 'file_size' is the real file size - 1,
since it's only the last byte offset from the beginning */
- obj.file_size = lseek_obj(&obj, 0L, SEEK_END);
+ lseek_end(&obj, 0L);
/* Restore file pointer to beginning of file after getting file size */
- lseek_obj(&obj, 0L, SEEK_SET);
+ lseek_set(&obj, 0L);
read_high(&obj, BUF_SIZE);
@@ -833,7 +865,7 @@
if (fpos > obj.fd_bytes_read) {
/* Yes, we have to read it in */
- lseek_obj(&obj, 0L, SEEK_SET);
+ lseek_set(&obj, 0L);
read_high(&obj, BUF_SIZE);
}
@@ -848,7 +880,7 @@
if (fpos < obj.file_size) {
/* Yes, we have to read it in */
- lseek_obj(&obj, -BUF_SIZE, SEEK_END);
+ lseek_end(&obj, -BUF_SIZE);
read_high(&obj, BUF_SIZE);
}
Modified: vendor/dialog/dist/timebox.c
===================================================================
--- vendor/dialog/dist/timebox.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/timebox.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: timebox.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: timebox.c,v 1.54 2013/03/17 15:03:41 tom Exp $
*
* timebox.c -- implements the timebox dialog
*
- * Copyright 2001-2010,2011 Thomas E. Dickey
+ * Copyright 2001-2012,2013 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -41,8 +41,6 @@
struct _box;
-typedef int (*BOX_DRAW) (struct _box *, struct tm *);
-
typedef struct _box {
WINDOW *parent;
WINDOW *window;
@@ -184,7 +182,7 @@
WINDOW *dialog;
time_t now_time = time((time_t *) 0);
struct tm current;
- int state = dlg_defaultno_button();
+ int state = dlg_default_button();
const char **buttons = dlg_ok_labels();
char *prompt = dlg_strclone(subtitle);
char buffer[MAX_LEN];
@@ -296,12 +294,6 @@
/* handle function-keys */
if (fkey) {
switch (key) {
- case DLGK_MOUSE(0):
- result = DLG_EXIT_OK;
- break;
- case DLGK_MOUSE(1):
- result = DLG_EXIT_CANCEL;
- break;
case DLGK_MOUSE('H'):
state = sHR;
break;
@@ -312,7 +304,7 @@
state = sSC;
break;
case DLGK_ENTER:
- result = button;
+ result = dlg_ok_buttoncode(button);
break;
case DLGK_FIELD_PREV:
state = dlg_prev_ok_buttonindex(state, sHR);
@@ -362,7 +354,11 @@
goto retry;
#endif
default:
- if (obj != 0) {
+ if (is_DLGK_MOUSE(key)) {
+ result = dlg_ok_buttoncode(key - M_EVENT);
+ if (result < 0)
+ result = DLG_EXIT_OK;
+ } else if (obj != 0) {
int step = next_or_previous(key);
if (step != 0) {
obj->value += step;
@@ -416,6 +412,7 @@
dlg_add_result(buffer);
dlg_add_separator();
+ dlg_add_last_key(-1);
return CleanupResult(result, dialog, prompt, &save_vars);
}
Modified: vendor/dialog/dist/trace.c
===================================================================
--- vendor/dialog/dist/trace.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/trace.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
/*
- * $Id: trace.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: trace.c,v 1.20 2011/10/18 10:47:26 tom Exp $
*
* trace.c -- implements screen-dump and keystroke-logging
*
Added: vendor/dialog/dist/treeview.c
===================================================================
--- vendor/dialog/dist/treeview.c (rev 0)
+++ vendor/dialog/dist/treeview.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -0,0 +1,658 @@
+/*
+ * $Id: treeview.c,v 1.24 2013/09/02 17:13:33 tom Exp $
+ *
+ * treeview.c -- implements the treeview dialog
+ *
+ * Copyright 2012,2013 Thomas E. Dickey
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License, version 2.1
+ * as published by the Free Software Foundation.
+ *
+ * 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to
+ * Free Software Foundation, Inc.
+ * 51 Franklin St., Fifth Floor
+ * Boston, MA 02110, USA.
+ */
+
+#include <dialog.h>
+#include <dlg_keys.h>
+
+#define INDENT 3
+#define MIN_HIGH (1 + (5 * MARGIN))
+
+typedef struct {
+ /* the outer-window */
+ WINDOW *dialog;
+ bool is_check;
+ int box_y;
+ int box_x;
+ int check_x;
+ int item_x;
+ int use_height;
+ int use_width;
+ /* the inner-window */
+ WINDOW *list;
+ DIALOG_LISTITEM *items;
+ int item_no;
+ int *depths;
+ const char *states;
+} ALL_DATA;
+
+/*
+ * Print list item. The 'selected' parameter is true if 'choice' is the
+ * current item. That one is colored differently from the other items.
+ */
+static void
+print_item(ALL_DATA * data,
+ DIALOG_LISTITEM * item,
+ const char *states,
+ int depths,
+ int choice,
+ int selected)
+{
+ WINDOW *win = data->list;
+ chtype save = dlg_get_attrs(win);
+ int i;
+ bool first = TRUE;
+ int climit = (getmaxx(win) - data->check_x + 1);
+ const char *show = (dialog_vars.no_items
+ ? item->name
+ : item->text);
+
+ /* Clear 'residue' of last item */
+ (void) wattrset(win, menubox_attr);
+ (void) wmove(win, choice, 0);
+ for (i = 0; i < data->use_width; i++)
+ (void) waddch(win, ' ');
+
+ (void) wmove(win, choice, data->check_x);
+ (void) wattrset(win, selected ? check_selected_attr : check_attr);
+ (void) wprintw(win,
+ data->is_check ? "[%c]" : "(%c)",
+ states[item->state]);
+ (void) wattrset(win, menubox_attr);
+
+ (void) wattrset(win, selected ? item_selected_attr : item_attr);
+ for (i = 0; i < depths; ++i) {
+ int j;
+ (void) wmove(win, choice, data->item_x + INDENT * i);
+ (void) waddch(win, ACS_VLINE);
+ for (j = INDENT - 1; j > 0; --j)
+ (void) waddch(win, ' ');
+ }
+ (void) wmove(win, choice, data->item_x + INDENT * depths);
+
+ dlg_print_listitem(win, show, climit, first, selected);
+
+ if (selected) {
+ dlg_item_help(item->help);
+ }
+ (void) wattrset(win, save);
+}
+
+static void
+print_list(ALL_DATA * data,
+ int choice,
+ int scrollamt,
+ int max_choice)
+{
+ int i;
+ int cur_y, cur_x;
+
+ getyx(data->dialog, cur_y, cur_x);
+
+ for (i = 0; i < max_choice; i++) {
+ print_item(data,
+ &data->items[scrollamt + i],
+ data->states,
+ data->depths[scrollamt + i],
+ i, i == choice);
+ }
+ (void) wnoutrefresh(data->list);
+
+ dlg_draw_scrollbar(data->dialog,
+ (long) (scrollamt),
+ (long) (scrollamt),
+ (long) (scrollamt + max_choice),
+ (long) (data->item_no),
+ data->box_x + data->check_x,
+ data->box_x + data->use_width,
+ data->box_y,
+ data->box_y + data->use_height + 1,
+ menubox_border2_attr,
+ menubox_border_attr);
+
+ (void) wmove(data->dialog, cur_y, cur_x);
+}
+
+static bool
+check_hotkey(DIALOG_LISTITEM * items, int choice)
+{
+ bool result = FALSE;
+
+ if (dlg_match_char(dlg_last_getc(),
+ (dialog_vars.no_tags
+ ? items[choice].text
+ : items[choice].name))) {
+ result = TRUE;
+ }
+ return result;
+}
+
+/*
+ * This is an alternate interface to 'treeview' which allows the application
+ * to read the list item states back directly without putting them in the
+ * output buffer.
+ */
+int
+dlg_treeview(const char *title,
+ const char *cprompt,
+ int height,
+ int width,
+ int list_height,
+ int item_no,
+ DIALOG_LISTITEM * items,
+ const char *states,
+ int *depths,
+ int flag,
+ int *current_item)
+{
+ /* *INDENT-OFF* */
+ static DLG_KEYS_BINDING binding[] = {
+ HELPKEY_BINDINGS,
+ ENTERKEY_BINDINGS,
+ DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_RIGHT ),
+ DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ),
+ DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ),
+ DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_LEFT ),
+ DLG_KEYS_DATA( DLGK_ITEM_FIRST, KEY_HOME ),
+ DLG_KEYS_DATA( DLGK_ITEM_LAST, KEY_END ),
+ DLG_KEYS_DATA( DLGK_ITEM_LAST, KEY_LL ),
+ DLG_KEYS_DATA( DLGK_ITEM_NEXT, '+' ),
+ DLG_KEYS_DATA( DLGK_ITEM_NEXT, KEY_DOWN ),
+ DLG_KEYS_DATA( DLGK_ITEM_NEXT, CHR_NEXT ),
+ DLG_KEYS_DATA( DLGK_ITEM_PREV, '-' ),
+ DLG_KEYS_DATA( DLGK_ITEM_PREV, KEY_UP ),
+ DLG_KEYS_DATA( DLGK_ITEM_PREV, CHR_PREVIOUS ),
+ DLG_KEYS_DATA( DLGK_PAGE_NEXT, KEY_NPAGE ),
+ DLG_KEYS_DATA( DLGK_PAGE_NEXT, DLGK_MOUSE(KEY_NPAGE) ),
+ DLG_KEYS_DATA( DLGK_PAGE_PREV, KEY_PPAGE ),
+ DLG_KEYS_DATA( DLGK_PAGE_PREV, DLGK_MOUSE(KEY_PPAGE) ),
+ END_KEYS_BINDING
+ };
+ /* *INDENT-ON* */
+
+#ifdef KEY_RESIZE
+ int old_height = height;
+ int old_width = width;
+#endif
+ ALL_DATA all;
+ int i, j, key2, found, x, y, cur_y, box_x, box_y;
+ int key = 0, fkey;
+ int button = dialog_state.visit_items ? -1 : dlg_default_button();
+ int choice = dlg_default_listitem(items);
+ int scrollamt = 0;
+ int max_choice;
+ int was_mouse;
+ int use_height;
+ int use_width, name_width, text_width, tree_width;
+ int result = DLG_EXIT_UNKNOWN;
+ int num_states;
+ WINDOW *dialog, *list;
+ char *prompt = dlg_strclone(cprompt);
+ const char **buttons = dlg_ok_labels();
+ const char *widget_name;
+
+ /* we need at least two states */
+ if (states == 0 || strlen(states) < 2)
+ states = " *";
+ num_states = (int) strlen(states);
+
+ memset(&all, 0, sizeof(all));
+ all.items = items;
+ all.item_no = item_no;
+ all.states = states;
+ all.depths = depths;
+
+ dlg_does_output();
+ dlg_tab_correct_str(prompt);
+
+ /*
+ * If this is a radiobutton list, ensure that no more than one item is
+ * selected initially. Allow none to be selected, since some users may
+ * wish to provide this flavor.
+ */
+ if (flag == FLAG_RADIO) {
+ bool first = TRUE;
+
+ for (i = 0; i < item_no; i++) {
+ if (items[i].state) {
+ if (first) {
+ first = FALSE;
+ } else {
+ items[i].state = 0;
+ }
+ }
+ }
+ } else {
+ all.is_check = TRUE;
+ }
+ widget_name = "treeview";
+#ifdef KEY_RESIZE
+ retry:
+#endif
+
+ use_height = list_height;
+ use_width = dlg_calc_list_width(item_no, items) + 10;
+ use_width = MAX(26, use_width);
+ if (use_height == 0) {
+ /* calculate height without items (4) */
+ dlg_auto_size(title, prompt, &height, &width, MIN_HIGH, use_width);
+ dlg_calc_listh(&height, &use_height, item_no);
+ } else {
+ dlg_auto_size(title, prompt, &height, &width, MIN_HIGH + use_height, use_width);
+ }
+ dlg_button_layout(buttons, &width);
+ dlg_print_size(height, width);
+ dlg_ctl_size(height, width);
+
+ x = dlg_box_x_ordinate(width);
+ y = dlg_box_y_ordinate(height);
+
+ dialog = dlg_new_window(height, width, y, x);
+ dlg_register_window(dialog, widget_name, binding);
+ dlg_register_buttons(dialog, widget_name, buttons);
+
+ dlg_mouse_setbase(x, y);
+
+ dlg_draw_box2(dialog, 0, 0, height, width, dialog_attr, border_attr, border2_attr);
+ dlg_draw_bottom_box2(dialog, border_attr, border2_attr, dialog_attr);
+ dlg_draw_title(dialog, title);
+
+ (void) wattrset(dialog, dialog_attr);
+ dlg_print_autowrap(dialog, prompt, height, width);
+
+ all.use_width = width - 4;
+ cur_y = getcury(dialog);
+ box_y = cur_y + 1;
+ box_x = (width - all.use_width) / 2 - 1;
+
+ /*
+ * After displaying the prompt, we know how much space we really have.
+ * Limit the list to avoid overwriting the ok-button.
+ */
+ if (use_height + MIN_HIGH > height - cur_y)
+ use_height = height - MIN_HIGH - cur_y;
+ if (use_height <= 0)
+ use_height = 1;
+
+ max_choice = MIN(use_height, item_no);
+
+ /* create new window for the list */
+ list = dlg_sub_window(dialog, use_height, all.use_width,
+ y + box_y + 1, x + box_x + 1);
+
+ /* draw a box around the list items */
+ dlg_draw_box(dialog, box_y, box_x,
+ use_height + 2 * MARGIN,
+ all.use_width + 2 * MARGIN,
+ menubox_border_attr, menubox_border2_attr);
+
+ text_width = 0;
+ name_width = 0;
+ tree_width = 0;
+ /* Find length of longest item to center treeview */
+ for (i = 0; i < item_no; i++) {
+ tree_width = MAX(tree_width, INDENT * depths[i]);
+ text_width = MAX(text_width, dlg_count_columns(items[i].text));
+ name_width = MAX(name_width, dlg_count_columns(items[i].name));
+ }
+ if (dialog_vars.no_tags && !dialog_vars.no_items) {
+ tree_width += text_width;
+ } else if (dialog_vars.no_items) {
+ tree_width += name_width;
+ } else {
+ tree_width += (text_width + name_width);
+ }
+
+ use_width = (all.use_width - 4);
+ tree_width = MIN(tree_width, all.use_width);
+
+ all.check_x = (use_width - tree_width) / 2;
+ all.item_x = ((dialog_vars.no_tags
+ ? 0
+ : (dialog_vars.no_items
+ ? 0
+ : (2 + name_width)))
+ + all.check_x + 4);
+
+ /* ensure we are scrolled to show the current choice */
+ if (choice >= (max_choice + scrollamt)) {
+ scrollamt = choice - max_choice + 1;
+ choice = max_choice - 1;
+ }
+
+ /* register the new window, along with its borders */
+ dlg_mouse_mkbigregion(box_y + 1, box_x,
+ use_height, all.use_width + 2,
+ KEY_MAX, 1, 1, 1 /* by lines */ );
+
+ all.dialog = dialog;
+ all.box_x = box_x;
+ all.box_y = box_y;
+ all.use_height = use_height;
+ all.list = list;
+ print_list(&all, choice, scrollamt, max_choice);
+
+ dlg_draw_buttons(dialog, height - 2, 0, buttons, button, FALSE, width);
+
+ dlg_trace_win(dialog);
+ while (result == DLG_EXIT_UNKNOWN) {
+ if (button < 0) /* --visit-items */
+ wmove(dialog, box_y + choice + 1, box_x + all.check_x + 2);
+
+ key = dlg_mouse_wgetch(dialog, &fkey);
+ if (dlg_result_key(key, fkey, &result))
+ break;
+
+ was_mouse = (fkey && is_DLGK_MOUSE(key));
+ if (was_mouse)
+ key -= M_EVENT;
+
+ if (was_mouse && (key >= KEY_MAX)) {
+ i = (key - KEY_MAX);
+ if (i < max_choice) {
+ choice = (key - KEY_MAX);
+ print_list(&all, choice, scrollamt, max_choice);
+
+ key = ' '; /* force the selected item to toggle */
+ } else {
+ beep();
+ continue;
+ }
+ fkey = FALSE;
+ } else if (was_mouse && key >= KEY_MIN) {
+ key = dlg_lookup_key(dialog, key, &fkey);
+ }
+
+ /*
+ * A space toggles the item status.
+ */
+ if (key == ' ') {
+ int current = scrollamt + choice;
+ int next = items[current].state + 1;
+
+ if (next >= num_states)
+ next = 0;
+
+ if (flag == FLAG_CHECK) { /* checklist? */
+ items[current].state = next;
+ } else {
+ for (i = 0; i < item_no; i++) {
+ if (i != current) {
+ items[i].state = 0;
+ }
+ }
+ if (items[current].state) {
+ items[current].state = next ? next : 1;
+ } else {
+ items[current].state = 1;
+ }
+ }
+ print_list(&all, choice, scrollamt, max_choice);
+ continue; /* wait for another key press */
+ }
+
+ /*
+ * Check if key pressed matches first character of any item tag in
+ * list. If there is more than one match, we will cycle through
+ * each one as the same key is pressed repeatedly.
+ */
+ found = FALSE;
+ if (!fkey) {
+ if (button < 0 || !dialog_state.visit_items) {
+ for (j = scrollamt + choice + 1; j < item_no; j++) {
+ if (check_hotkey(items, j)) {
+ found = TRUE;
+ i = j - scrollamt;
+ break;
+ }
+ }
+ if (!found) {
+ for (j = 0; j <= scrollamt + choice; j++) {
+ if (check_hotkey(items, j)) {
+ found = TRUE;
+ i = j - scrollamt;
+ break;
+ }
+ }
+ }
+ if (found)
+ dlg_flush_getc();
+ } else if ((j = dlg_char_to_button(key, buttons)) >= 0) {
+ button = j;
+ ungetch('\n');
+ continue;
+ }
+ }
+
+ /*
+ * A single digit (1-9) positions the selection to that line in the
+ * current screen.
+ */
+ if (!found
+ && (key <= '9')
+ && (key > '0')
+ && (key - '1' < max_choice)) {
+ found = TRUE;
+ i = key - '1';
+ }
+
+ if (!found) {
+ if (fkey) {
+ found = TRUE;
+ switch (key) {
+ case DLGK_ITEM_FIRST:
+ i = -scrollamt;
+ break;
+ case DLGK_ITEM_LAST:
+ i = item_no - 1 - scrollamt;
+ break;
+ case DLGK_PAGE_PREV:
+ if (choice)
+ i = 0;
+ else if (scrollamt != 0)
+ i = -MIN(scrollamt, max_choice);
+ else
+ continue;
+ break;
+ case DLGK_PAGE_NEXT:
+ i = MIN(choice + max_choice, item_no - scrollamt - 1);
+ break;
+ case DLGK_ITEM_PREV:
+ i = choice - 1;
+ if (choice == 0 && scrollamt == 0)
+ continue;
+ break;
+ case DLGK_ITEM_NEXT:
+ i = choice + 1;
+ if (scrollamt + choice >= item_no - 1)
+ continue;
+ break;
+ default:
+ found = FALSE;
+ break;
+ }
+ }
+ }
+
+ if (found) {
+ if (i != choice) {
+ if (i < 0 || i >= max_choice) {
+ if (i < 0) {
+ scrollamt += i;
+ choice = 0;
+ } else {
+ choice = max_choice - 1;
+ scrollamt += (i - max_choice + 1);
+ }
+ print_list(&all, choice, scrollamt, max_choice);
+ } else {
+ choice = i;
+ print_list(&all, choice, scrollamt, max_choice);
+ }
+ }
+ continue; /* wait for another key press */
+ }
+
+ if (fkey) {
+ switch (key) {
+ case DLGK_ENTER:
+ result = dlg_enter_buttoncode(button);
+ break;
+ case DLGK_FIELD_PREV:
+ button = dlg_prev_button(buttons, button);
+ dlg_draw_buttons(dialog, height - 2, 0, buttons, button,
+ FALSE, width);
+ break;
+ case DLGK_FIELD_NEXT:
+ button = dlg_next_button(buttons, button);
+ dlg_draw_buttons(dialog, height - 2, 0, buttons, button,
+ FALSE, width);
+ break;
+#ifdef KEY_RESIZE
+ case KEY_RESIZE:
+ /* reset data */
+ height = old_height;
+ width = old_width;
+ /* repaint */
+ dlg_clear();
+ dlg_del_window(dialog);
+ refresh();
+ dlg_mouse_free_regions();
+ goto retry;
+#endif
+ default:
+ if (was_mouse) {
+ if ((key2 = dlg_ok_buttoncode(key)) >= 0) {
+ result = key2;
+ break;
+ }
+ beep();
+ }
+ }
+ } else {
+ beep();
+ }
+ }
+
+ dlg_del_window(dialog);
+ dlg_mouse_free_regions();
+ free(prompt);
+ *current_item = (scrollamt + choice);
+ return result;
+}
+
+/*
+ * Display a set of items as a tree.
+ */
+int
+dialog_treeview(const char *title,
+ const char *cprompt,
+ int height,
+ int width,
+ int list_height,
+ int item_no,
+ char **items,
+ int flag)
+{
+ int result;
+ int i, j;
+ DIALOG_LISTITEM *listitems;
+ int *depths;
+ bool show_status = FALSE;
+ int current = 0;
+ char *help_result;
+
+ listitems = dlg_calloc(DIALOG_LISTITEM, (size_t) item_no + 1);
+ assert_ptr(listitems, "dialog_treeview");
+
+ depths = dlg_calloc(int, (size_t) item_no + 1);
+ assert_ptr(depths, "dialog_treeview");
+
+ for (i = j = 0; i < item_no; ++i) {
+ listitems[i].name = items[j++];
+ listitems[i].text = (dialog_vars.no_items
+ ? dlg_strempty()
+ : items[j++]);
+ listitems[i].state = !dlg_strcmp(items[j++], "on");
+ depths[i] = atoi(items[j++]);
+ listitems[i].help = ((dialog_vars.item_help)
+ ? items[j++]
+ : dlg_strempty());
+ }
+ dlg_align_columns(&listitems[0].text, (int) sizeof(DIALOG_LISTITEM), item_no);
+
+ result = dlg_treeview(title,
+ cprompt,
+ height,
+ width,
+ list_height,
+ item_no,
+ listitems,
+ NULL,
+ depths,
+ flag,
+ ¤t);
+
+ switch (result) {
+ case DLG_EXIT_OK: /* FALLTHRU */
+ case DLG_EXIT_EXTRA:
+ show_status = TRUE;
+ break;
+ case DLG_EXIT_HELP:
+ dlg_add_help_listitem(&result, &help_result, &listitems[current]);
+ if ((show_status = dialog_vars.help_status)) {
+ if (dialog_vars.separate_output) {
+ dlg_add_string(help_result);
+ dlg_add_separator();
+ } else {
+ dlg_add_quoted(help_result);
+ }
+ } else {
+ dlg_add_string(help_result);
+ }
+ break;
+ }
+
+ if (show_status) {
+ for (i = 0; i < item_no; i++) {
+ if (listitems[i].state) {
+ if (dialog_vars.separate_output) {
+ dlg_add_string(listitems[i].name);
+ dlg_add_separator();
+ } else {
+ if (dlg_need_separator())
+ dlg_add_separator();
+ if (flag == FLAG_CHECK)
+ dlg_add_quoted(listitems[i].name);
+ else
+ dlg_add_string(listitems[i].name);
+ }
+ }
+ }
+ dlg_add_last_key(-1);
+ }
+
+ dlg_free_columns(&listitems[0].text, (int) sizeof(DIALOG_LISTITEM), item_no);
+ free(depths);
+ free(listitems);
+ return result;
+}
Modified: vendor/dialog/dist/ui_getc.c
===================================================================
--- vendor/dialog/dist/ui_getc.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/ui_getc.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: ui_getc.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: ui_getc.c,v 1.67 2013/03/24 23:53:19 tom Exp $
*
* ui_getc.c - user interface glue for getc()
*
- * Copyright 2001-2010,2011 Thomas E. Dickey
+ * Copyright 2001-2012,2013 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -284,6 +284,36 @@
}
/*
+ * Report the last key entered by the user. The 'mode' parameter controls
+ * the way it is separated from other results:
+ * -2 (no separator)
+ * -1 (separator after the key name)
+ * 0 (separator is optionally before the key name)
+ * 1 (same as -1)
+ */
+void
+dlg_add_last_key(int mode)
+{
+ if (dialog_vars.last_key) {
+ if (mode >= 0) {
+ if (mode > 0) {
+ dlg_add_last_key(-1);
+ } else {
+ if (dlg_need_separator())
+ dlg_add_separator();
+ dlg_add_last_key(-2);
+ }
+ } else {
+ char temp[80];
+ sprintf(temp, "%d", last_getc);
+ dlg_add_string(temp);
+ if (mode == -1)
+ dlg_add_separator();
+ }
+ }
+}
+
+/*
* Check if the stream has been unexpectedly closed, returning false in that
* case.
*/
@@ -440,12 +470,9 @@
if (!*fkey || *fkey != before_fkey) {
switch (ch) {
case CHR_LITERAL:
- if (!literal) {
- literal = TRUE;
- keypad(win, FALSE);
- continue;
- }
- break;
+ literal = TRUE;
+ keypad(win, FALSE);
+ continue;
case CHR_REPAINT:
(void) touchwin(win);
(void) wrefresh(curscr);
Modified: vendor/dialog/dist/util.c
===================================================================
--- vendor/dialog/dist/util.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/util.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: util.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: util.c,v 1.258 2013/09/22 00:41:40 tom Exp $
*
* util.c -- miscellaneous utilities for dialog
*
- * Copyright 2000-2010,2011 Thomas E. Dickey
+ * Copyright 2000-2012,2013 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -193,7 +193,7 @@
chtype attr = A_NORMAL;
int backwidth = dlg_count_columns(dialog_vars.backtitle);
- wattrset(stdscr, screen_attr);
+ (void) wattrset(stdscr, screen_attr);
(void) wmove(stdscr, 0, 1);
dlg_print_text(stdscr, dialog_vars.backtitle, COLS - 2, &attr);
for (i = 0; i < COLS - backwidth; i++)
@@ -215,7 +215,7 @@
{
int i, j;
- wattrset(win, attr);
+ (void) wattrset(win, attr);
for (i = 0; i < height; i++) {
(void) wmove(win, i, 0);
for (j = 0; j < width; j++)
@@ -271,6 +271,18 @@
return open(device, mode);
}
+#ifdef NCURSES_VERSION
+static int
+my_putc(int ch)
+{
+ char buffer[2];
+ int fd = fileno(dialog_state.screen_output);
+
+ buffer[0] = (char) ch;
+ return (int) write(fd, buffer, (size_t) 1);
+}
+#endif
+
/*
* Do some initialization for dialog.
*
@@ -315,22 +327,26 @@
*/
dialog_state.pipe_input = stdin;
if (fileno(input) != fileno(stdin)) {
- if (dup(fileno(input)) >= 0
+ if ((fd1 = dup(fileno(input))) >= 0
&& (fd2 = dup(fileno(stdin))) >= 0) {
(void) dup2(fileno(input), fileno(stdin));
dialog_state.pipe_input = fdopen(fd2, "r");
if (fileno(stdin) != 0) /* some functions may read fd #0 */
(void) dup2(fileno(stdin), 0);
- } else
+ } else {
dlg_exiterr("cannot open tty-input");
+ }
+ close(fd1);
} else if (!isatty(fileno(stdin))) {
- if (open_terminal(&device, O_RDONLY) >= 0
- && (fd2 = dup(fileno(stdin))) >= 0) {
- dialog_state.pipe_input = fdopen(fd2, "r");
- if (freopen(device, "r", stdin) == 0)
- dlg_exiterr("cannot open tty-input");
- if (fileno(stdin) != 0) /* some functions may read fd #0 */
- (void) dup2(fileno(stdin), 0);
+ if ((fd1 = open_terminal(&device, O_RDONLY)) >= 0) {
+ if ((fd2 = dup(fileno(stdin))) >= 0) {
+ dialog_state.pipe_input = fdopen(fd2, "r");
+ if (freopen(device, "r", stdin) == 0)
+ dlg_exiterr("cannot open tty-input");
+ if (fileno(stdin) != 0) /* some functions may read fd #0 */
+ (void) dup2(fileno(stdin), 0);
+ }
+ close(fd1);
}
free(device);
}
@@ -373,19 +389,20 @@
* Cancel xterm's alternate-screen mode.
*/
if (!dialog_vars.keep_tite
- && (dialog_state.screen_output != stdout
+ && (fileno(dialog_state.screen_output) != fileno(stdout)
|| isatty(fileno(dialog_state.screen_output)))
&& key_mouse != 0 /* xterm and kindred */
&& isprivate(enter_ca_mode)
&& isprivate(exit_ca_mode)) {
/*
- * initscr() or newterm() already did putp(enter_ca_mode) as a side
+ * initscr() or newterm() already wrote enter_ca_mode as a side
* effect of initializing the screen. It would be nice to not even
* do that, but we do not really have access to the correct copy of
* the terminfo description until those functions have been invoked.
*/
- (void) putp(exit_ca_mode);
- (void) putp(clear_screen);
+ (void) refresh();
+ (void) tputs(exit_ca_mode, 0, my_putc);
+ (void) tputs(clear_screen, 0, my_putc);
/*
* Prevent ncurses from switching "back" to the normal screen when
* exiting from dialog. That would move the cursor to the original
@@ -572,18 +589,21 @@
int
dlg_count_real_columns(const char *text)
{
- int result = dlg_count_columns(text);
- if (result && dialog_vars.colors) {
- int hidden = 0;
- while (*text) {
- if (dialog_vars.colors && isOurEscape(text)) {
- hidden += ESCAPE_LEN;
- text += ESCAPE_LEN;
- } else {
- ++text;
+ int result = 0;
+ if (*text) {
+ result = dlg_count_columns(text);
+ if (result && dialog_vars.colors) {
+ int hidden = 0;
+ while (*text) {
+ if (dialog_vars.colors && isOurEscape(text)) {
+ hidden += ESCAPE_LEN;
+ text += ESCAPE_LEN;
+ } else {
+ ++text;
+ }
}
+ result -= hidden;
}
- result -= hidden;
}
return result;
}
@@ -629,6 +649,58 @@
#endif
/*
+ * Print the name (tag) or text from a DIALOG_LISTITEM, highlighting the
+ * first character if selected.
+ */
+void
+dlg_print_listitem(WINDOW *win,
+ const char *text,
+ int climit,
+ bool first,
+ int selected)
+{
+ chtype attr = A_NORMAL;
+ int limit;
+ const int *cols;
+ chtype attrs[4];
+
+ if (text == 0)
+ text = "";
+
+ if (first) {
+ const int *indx = dlg_index_wchars(text);
+ attrs[3] = tag_key_selected_attr;
+ attrs[2] = tag_key_attr;
+ attrs[1] = tag_selected_attr;
+ attrs[0] = tag_attr;
+
+ (void) wattrset(win, selected ? attrs[3] : attrs[2]);
+ (void) waddnstr(win, text, indx[1]);
+
+ if ((int) strlen(text) > indx[1]) {
+ limit = dlg_limit_columns(text, climit, 1);
+ if (limit > 1) {
+ (void) wattrset(win, selected ? attrs[1] : attrs[0]);
+ (void) waddnstr(win,
+ text + indx[1],
+ indx[limit] - indx[1]);
+ }
+ }
+ } else {
+ attrs[1] = item_selected_attr;
+ attrs[0] = item_attr;
+
+ cols = dlg_index_columns(text);
+ limit = dlg_limit_columns(text, climit, 0);
+
+ if (limit > 0) {
+ (void) wattrset(win, selected ? attrs[1] : attrs[0]);
+ dlg_print_text(win, text, cols[limit], &attr);
+ }
+ }
+}
+
+/*
* Print up to 'cols' columns from 'text', optionally rendering our escape
* sequence for attributes and color.
*/
@@ -751,8 +823,8 @@
const char *prompt,
int lm, int rm, int *x)
{
- const char *wrap_ptr = prompt;
- const char *test_ptr = prompt;
+ const char *wrap_ptr;
+ const char *test_ptr;
const char *hide_ptr = 0;
const int *cols = dlg_index_columns(prompt);
const int *indx = dlg_index_wchars(prompt);
@@ -855,6 +927,7 @@
test_ptr++;
if (*test_ptr == '\n')
test_ptr++;
+ dlg_finish_string(prompt);
return (test_ptr);
}
@@ -977,12 +1050,12 @@
#endif
dummy = newwin(high, width, 0, 0);
if (dummy == 0) {
- wattrset(win, dialog_attr);
+ (void) wattrset(win, dialog_attr);
dlg_print_autowrap(win, prompt, height + 1 + (3 * MARGIN), width);
last = 0;
} else {
wbkgdset(dummy, dialog_attr | ' ');
- wattrset(dummy, dialog_attr);
+ (void) wattrset(dummy, dialog_attr);
werase(dummy);
dlg_print_autowrap(dummy, prompt, high, width);
getyx(dummy, y, x);
@@ -1013,7 +1086,7 @@
(void) sprintf(buffer, "%d%%", percent);
(void) waddstr(win, buffer);
if ((len = (int) strlen(buffer)) < 4) {
- wattrset(win, border_attr);
+ (void) wattrset(win, border_attr);
whline(win, dlg_boxchar(ACS_HLINE), 4 - len);
}
}
@@ -1024,7 +1097,7 @@
#endif
{
(void) offset;
- wattrset(win, dialog_attr);
+ (void) wattrset(win, dialog_attr);
dlg_print_autowrap(win, prompt, height + 1 + (3 * MARGIN), width);
last = 0;
}
@@ -1355,7 +1428,7 @@
int i, j;
chtype save = dlg_get_attrs(win);
- wattrset(win, 0);
+ (void) wattrset(win, 0);
for (i = 0; i < height; i++) {
(void) wmove(win, y + i, x);
for (j = 0; j < width; j++)
@@ -1378,7 +1451,7 @@
else
(void) waddch(win, boxchar | ' ');
}
- wattrset(win, save);
+ (void) wattrset(win, save);
}
void
@@ -1541,7 +1614,7 @@
if (UseShadow(dw)) {
#if !USE_WCHGAT
chtype save = dlg_get_attrs(dw->shadow);
- wattrset(dw->shadow, draw ? shadow_attr : screen_attr);
+ (void) wattrset(dw->shadow, draw ? shadow_attr : screen_attr);
#endif
for (i = 0; i < SHADOW_ROWS; ++i) {
for (j = 0; j < width; ++j) {
@@ -1555,7 +1628,7 @@
}
(void) wnoutrefresh(dw->shadow);
#if !USE_WCHGAT
- wattrset(dw->shadow, save);
+ (void) wattrset(dw->shadow, save);
#endif
}
}
@@ -1797,11 +1870,26 @@
dlg_calc_list_width(int item_no, DIALOG_LISTITEM * items)
{
int n, i, len1 = 0, len2 = 0;
+ int bits = ((dialog_vars.no_tags ? 1 : 0)
+ + (dialog_vars.no_items ? 2 : 0));
+
for (i = 0; i < item_no; ++i) {
- if ((n = dlg_count_columns(items[i].name)) > len1)
- len1 = n;
- if ((n = dlg_count_columns(items[i].text)) > len2)
- len2 = n;
+ switch (bits) {
+ case 0:
+ /* FALLTHRU */
+ case 1:
+ if ((n = dlg_count_columns(items[i].name)) > len1)
+ len1 = n;
+ if ((n = dlg_count_columns(items[i].text)) > len2)
+ len2 = n;
+ break;
+ case 2:
+ /* FALLTHRU */
+ case 3:
+ if ((n = dlg_count_columns(items[i].name)) > len1)
+ len1 = n;
+ break;
+ }
}
return len1 + len2;
}
@@ -1901,10 +1989,11 @@
chtype save = dlg_get_attrs(win);
int x = centered(getmaxx(win), title);
- wattrset(win, title_attr);
+ (void) wattrset(win, title_attr);
wmove(win, 0, x);
dlg_print_text(win, title, getmaxx(win) - x, &attr);
- wattrset(win, save);
+ (void) wattrset(win, save);
+ dlg_finish_string(title);
}
}
@@ -1915,14 +2004,14 @@
int height = getmaxy(win);
int i;
- wattrset(win, on_left);
+ (void) wattrset(win, on_left);
(void) wmove(win, height - 3, 0);
(void) waddch(win, dlg_boxchar(ACS_LTEE));
for (i = 0; i < width - 2; i++)
(void) waddch(win, dlg_boxchar(ACS_HLINE));
- wattrset(win, on_right);
+ (void) wattrset(win, on_right);
(void) waddch(win, dlg_boxchar(ACS_RTEE));
- wattrset(win, on_inside);
+ (void) wattrset(win, on_inside);
(void) wmove(win, height - 2, 1);
for (i = 0; i < width - 2; i++)
(void) waddch(win, ' ');
@@ -1980,8 +2069,8 @@
if (dialog_state.all_windows != 0)
erase_childs_shadow(q);
del_subwindows(q->normal);
+ dlg_unregister_window(q->normal);
delwin(q->normal);
- dlg_unregister_window(q->normal);
free(q);
}
doupdate();
@@ -2007,7 +2096,8 @@
DIALOG_WINDOWS *p = dlg_calloc(DIALOG_WINDOWS, 1);
(void) parent;
- if ((win = newwin(height, width, y, x)) == 0) {
+ if (p == 0
+ || (win = newwin(height, width, y, x)) == 0) {
dlg_exiterr("Can't make new window at (%d,%d), size (%d,%d).\n",
y, x, height, width);
}
@@ -2123,7 +2213,7 @@
chtype attr = A_NORMAL;
int y, x;
- wattrset(stdscr, itemhelp_attr);
+ (void) wattrset(stdscr, itemhelp_attr);
(void) wmove(stdscr, LINES - 1, 0);
(void) wclrtoeol(stdscr);
(void) addch(' ');
@@ -2415,7 +2505,7 @@
? FIX_SINGLE
: FIX_DOUBLE);
- if (dialog_vars.quoted || must_quote(string)) {
+ if (must_quote(string)) {
temp[1] = '\0';
dlg_add_result(my_quote);
while (*string != '\0') {
@@ -2467,6 +2557,32 @@
dlg_add_result(separator);
}
+#define HELP_PREFIX "HELP "
+
+void
+dlg_add_help_listitem(int *result, char **tag, DIALOG_LISTITEM * item)
+{
+ dlg_add_result(HELP_PREFIX);
+ if (USE_ITEM_HELP(item->help)) {
+ *tag = dialog_vars.help_tags ? item->name : item->help;
+ *result = DLG_EXIT_ITEM_HELP;
+ } else {
+ *tag = item->name;
+ }
+}
+
+void
+dlg_add_help_formitem(int *result, char **tag, DIALOG_FORMITEM * item)
+{
+ dlg_add_result(HELP_PREFIX);
+ if (USE_ITEM_HELP(item->help)) {
+ *tag = dialog_vars.help_tags ? item->name : item->help;
+ *result = DLG_EXIT_ITEM_HELP;
+ } else {
+ *tag = item->name;
+ }
+}
+
/*
* Some widgets support only one value of a given variable - save/restore the
* global dialog_vars so we can override it consistently.
Modified: vendor/dialog/dist/version.c
===================================================================
--- vendor/dialog/dist/version.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/version.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,5 +1,5 @@
/*
- * $Id: version.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: version.c,v 1.6 2010/01/15 23:34:46 tom Exp $
*
* version.c -- dialog's version string
*
Modified: vendor/dialog/dist/yesno.c
===================================================================
--- vendor/dialog/dist/yesno.c 2018-06-15 16:18:16 UTC (rev 10957)
+++ vendor/dialog/dist/yesno.c 2018-06-15 16:21:14 UTC (rev 10958)
@@ -1,9 +1,9 @@
/*
- * $Id: yesno.c,v 1.1.1.1 2011-12-18 03:01:46 laffer1 Exp $
+ * $Id: yesno.c,v 1.57 2012/12/01 01:48:21 tom Exp $
*
* yesno.c -- implements the yes/no box
*
- * Copyright 1999-2010,2011 Thomas E. Dickey
+ * Copyright 1999-2011,2012 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -37,13 +37,7 @@
static DLG_KEYS_BINDING binding[] = {
HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
- DLG_KEYS_DATA( DLGK_ENTER, ' ' ),
- DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_DOWN ),
- DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_RIGHT ),
- DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ),
- DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_UP ),
- DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ),
- DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_LEFT ),
+ TRAVERSE_BINDINGS,
SCROLLKEY_BINDINGS,
END_KEYS_BINDING
};
@@ -52,7 +46,7 @@
int x, y;
int key = 0, fkey;
int code;
- int button = dlg_defaultno_button();
+ int button = dlg_default_button();
WINDOW *dialog = 0;
int result = DLG_EXIT_UNKNOWN;
char *prompt = dlg_strclone(cprompt);
@@ -92,7 +86,7 @@
dlg_draw_title(dialog, title);
dlg_draw_helpline(dialog, FALSE);
- wattrset(dialog, dialog_attr);
+ (void) wattrset(dialog, dialog_attr);
page = height - (1 + 3 * MARGIN);
dlg_draw_buttons(dialog,
More information about the Midnightbsd-cvs
mailing list