Re: [tin 2.0.0] snaphsots
Thomas Dickey <[email protected]> Sun, 01 May 2011 19:41:15 -0400
| Newsgroups | gmane.network.tin.devel |
|---|---|
| Message-ID | <[email protected]> |
On Sun, May 01, 2011 at 12:43:45PM +0200, Dennis Preiser wrote: > On Sun, May 01, 2011 at 12:39:37AM +0200, Urs Jan?en wrote: > > I've made snapshots of the upcomming tin 2.0.0 release. > > - several configure macros were updated (please test build on non > > linux systems and with other compilers than gcc) > > With these changes HAVE_NCURSESW_NCURSES_H remains undefined in > autoconf.h here (MacOSX). > > I have an older (non-widec) ncurses under /usr and a current ncursesw > under $HOME/sw. I call configure like this: > > ..configure --with-screen=ncursesw --with-curses-dir=$HOME/sw ... > > $HOME/sw/include/ncursesw/ncurses.h exists. yes, but the configure script is finding ncursesw/curses.h first (now). Either would be correct. Looks like when I added the check for ncurses*-config, then I noticed that I needed to add a check to keep #defines such as HAVE_NCURSESW_NCURSES_H intact. I implemented that using CF_CURSES_HEADER, which can derive more variations than CF_NCURSES_HEADER - noting that all of the symbols in the former are generated, while the latter provides just a few special cases. We can address this in different ways: a) modify CF_CURSES_HEADER to check for ncurses.h before curses.h That's less intrusive to tin, of course. Also, arguably the <ncursesw/ncurses.h> makes it plainly one of the ncurses variations. I'm attaching a patch for this. b) just update the symbols and #include's in tin. In a way this is preferable since "curses.h" is both the standard name as well as being the actual file (ncurses.h is a symbolic link). -- Thomas E. Dickey <[email protected]> http://invisible-island.net ftp://invisible-island.net
tin-2.0.0-20110501.patch
(text/x-diff, 1.9 KB)
# patch by Thomas E. Dickey <[email protected]> # created Sun May 1 23:40:01 UTC 2011 # ------------------------------------------------------------------------------ # aclocal.m4 | 8 ++++---- # configure | 20 ++++++++++---------- # 2 files changed, 14 insertions(+), 14 deletions(-) # ------------------------------------------------------------------------------ Index: aclocal.m4 --- tin-2.0.0/aclocal.m4 2011-04-30 21:46:39.000000000 +0000 +++ tin-2.0.0-20110501/aclocal.m4 2011-05-01 23:34:53.000000000 +0000 @@ -1882,10 +1882,10 @@ AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[ cf_cv_ncurses_header=none for cf_header in ifelse($1,,,[ \ - $1/curses.h \ - $1/ncurses.h]) \ - curses.h \ - ncurses.h ifelse($1,,[ncurses/curses.h ncurses/ncurses.h]) + $1/ncurses.h \ + $1/curses.h]) \ + ncurses.h \ + curses.h ifelse($1,,[ncurses/ncurses.h ncurses/curses.h]) do AC_TRY_COMPILE([#include <${cf_header}>], [initscr(); tgoto("?", 0,0)], Index: configure --- tin-2.0.0/configure 2011-04-30 22:43:11.000000000 +0000 +++ tin-2.0.0-20110501/configure 2011-05-01 23:38:38.000000000 +0000 @@ -7233,10 +7233,10 @@ cf_cv_ncurses_header=none for cf_header in \ - ncurses/curses.h \ - ncurses/ncurses.h \ - curses.h \ - ncurses.h + ncurses/ncurses.h \ + ncurses/curses.h \ + ncurses.h \ + curses.h do cat > conftest.$ac_ext <<EOF #line 7243 "configure" @@ -8605,10 +8605,10 @@ cf_cv_ncurses_header=none for cf_header in \ - ncursesw/curses.h \ - ncursesw/ncurses.h \ - curses.h \ - ncurses.h + ncursesw/ncurses.h \ + ncursesw/curses.h \ + ncurses.h \ + curses.h do cat > conftest.$ac_ext <<EOF #line 8615 "configure" @@ -9848,8 +9848,8 @@ cf_cv_ncurses_header=none for cf_header in \ - curses.h \ - ncurses.h ncurses/curses.h ncurses/ncurses.h + ncurses.h \ + curses.h ncurses/ncurses.h ncurses/curses.h do cat > conftest.$ac_ext <<EOF #line 9856 "configure"
signature.asc
(application/pgp-signature, 197 B)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAk2975sACgkQcCNT4PfkjtuOugCgqujQ/BIC6asOk2NAiJ1+5yl8 M0sAmQGbETXq4vIxqIspXo7oUJD3VhTr =JT28 -----END PGP SIGNATURE-----