Merge branch 'maint' into master

diff --git a/.gitignore b/.gitignore
index 046ccbc..eddd488 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 /Makefile
 /gnushogi/Makefile
 /gnushogi/Makefile.profile
+/doc/Makefile
 /xshogi/Makefile
 
 *.o
@@ -23,7 +24,7 @@
 /xshogi/xshogi
 
 /doc/gnushogi*.info
-/doc/gnushogi*.html
+/doc/gnushogi/
 /doc/*.ps
 /doc/*.pdf
 /doc/*.aux

diff --git a/NEWS b/NEWS
index 43dac7c..ffdc61b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,6 @@
 GNU shogi news
 --------------
 
-This file starts with GNU Shogi 1.3 (07/01/1999).
-
 Changes in version 1.4.1 (unpublished):
 
 * Initial support for the MiniShogi variant, for now as a separate
@@ -57,3 +55,5 @@ Changes in version 1.3 (07/1999):
   The man page is included in the texinfo file.  The (separate) man pages have
   been updated to deal with the new command-line options for gnushogi.
 
+
+This file starts with GNU Shogi 1.3 (07/01/1999).

diff --git a/README b/README
index e1c96e3..79a0198 100644 (file)
--- a/README
+++ b/README
@@ -1,15 +1,19 @@
-GNU Shogi, release 1.4.0
+GNU Shogi, release 1.4.1 (rc0)
 ------------------------
 
-This is release 1.4.0 of GNU shogi, a program which plays shogi (Japanese
-chess), as well as xshogi, the graphical interface to GNU shogi.  GNU shogi
-and xshogi were originally written by Matthias Mutz (mutz@fmi.uni-passau.de),
-have been maintained by Mike Vanier (mvanier@bbb.caltech.edu) and are now maintained
-by Luis Felipe Strano Moraes (luis.strano@gmail.com). GNU shogi was in turn based on 
-GNU Chess 4.0, i.e. the first version of GNU Shogi was obtained by "simply" modifying
-the chess-specific parts of GNU Chess 4.0.
-We would like to thank the authors of GNU Chess 4.0 for making the sources of
-that program available.
+This is release 1.4.1 of GNU shogi, a program which plays shogi
+(Japanese chess), as well as xshogi, the graphical interface to GNU
+shogi.
+
+GNU shogi and xshogi were originally written by Matthias Mutz
+<mutz@fmi.uni-passau.de>, have been maintained by Mike Vanier
+<mvanier@bbb.caltech.edu> in the 1.3.x era, by Luis Felipe Strano
+Moraes <luis.strano@gmail.com> until 1.4.0, and are now maintained by
+Yann Dirson <ydirson@free.fr>. GNU shogi was in turn based on GNU
+Chess 4.0, i.e. the first version of GNU Shogi was obtained by
+"simply" modifying the chess-specific parts of GNU Chess 4.0.  We
+would like to thank the authors of GNU Chess 4.0 for making the
+sources of that program available.
 
 See the file NEWS for the new features of this release.
 
@@ -19,5 +23,4 @@ on shogi please look at the files in the doc directory or read the info file.
 Please email bugs, comments, suggestions, and wish lists regarding GNU shogi
 to me.  And enjoy the program :-)
 
-Luis Felipe Strano Moraes (luis.strano@gmail.com)
-
+Yann Dirson <ydirson@free.fr>

diff --git a/configure.ac b/configure.ac
index b13f537..146e17a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT([gnushogi],[1.4.0+],[https://savannah.gnu.org/bugs/?group=gnushogi])
+AC_INIT([gnushogi],[1.4.1-rc0+],[https://savannah.gnu.org/bugs/?group=gnushogi])
 AC_CONFIG_SRCDIR([gnushogi/gnushogi.h])
 AC_CONFIG_HEADER(config.h)
 
@@ -47,8 +47,8 @@ AS_IF([test "x$with_curses" != xno],
     [-ltermcap])])
 
 # other libraries.
-AC_CHECK_LIB(m, pow)
-AC_CHECK_LIB(termcap, tgoto)
+AC_CHECK_LIB([m], [pow])
+AC_CHECK_LIB([termcap], [tgoto])
 
 
 
@@ -103,19 +103,18 @@ AC_MSG_NOTICE([library functions])
 AC_FUNC_FORK
 AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MALLOC
-AC_FUNC_SETVBUF_REVERSED
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS([dup2 gethostname gettimeofday memset pow strcasecmp])
 AC_CHECK_FUNCS([strchr strerror strrchr strstr strtol])
-AC_CHECK_FUNCS(memcpy bcopy)
-AC_CHECK_FUNCS(setlinebuf setvbuf)
+AC_CHECK_FUNCS([memcpy bcopy])
+AC_CHECK_FUNCS([setvbuf setlinebuf])
 
 
 #
 # Set various user-definable options.
 #
 
-AC_ARG_ENABLE(minishogi,
+AC_ARG_ENABLE([minishogi],
 [  --enable-minishogi
         Build gnuminishogi instead of gnushogi (default: no)],
 [AC_DEFINE([MINISHOGI], [], [Define to build gnuminishogi instead of gnushogi])
@@ -130,36 +129,36 @@ SECOND_SHOGI_PROGRAM=gnushogi
 FIRST_HOST=localhost
 SECOND_HOST=localhost
 
-AC_ARG_ENABLE(xshogi,
+AC_ARG_ENABLE([xshogi],
 AS_HELP_STRING([--enable-xshogi],
   [compile the xshogi graphical interface to GNU shogi (default: no)]),
-enable_xshogi=$enableval,
-enable_xshogi=no)
+[enable_xshogi=$enableval],
+[enable_xshogi=no])
 
-AC_ARG_WITH(top-part-bitmaps,
+AC_ARG_WITH([top-part-bitmaps],
 AS_HELP_STRING([--with-top-part-bitmaps],
   [use top part of Kanji bitmaps only in xshogi]),
-OPT=-DTOP_PART_BITMAPS)
+[OPT=-DTOP_PART_BITMAPS])
 
-AC_ARG_WITH(first-shogi-program,
+AC_ARG_WITH([first-shogi-program],
 AS_HELP_STRING([--with-first-shogi-program=PROGNAME],
   [use PROGNAME as the first shogi program in xshogi (default: gnushogi)]),
-FIRST_SHOGI_PROGRAM=$withval)
+[FIRST_SHOGI_PROGRAM=$withval])
 
-AC_ARG_WITH(second-shogi-program,
+AC_ARG_WITH([second-shogi-program],
 AS_HELP_STRING([--with-second-shogi-program=PROGNAME],
   [use PROGNAME as the second shogi program in xshogi (default: gnushogi)]),
-SECOND_SHOGI_PROGRAM=$withval)
+[SECOND_SHOGI_PROGRAM=$withval])
 
-AC_ARG_WITH(first-host,
+AC_ARG_WITH([first-host],
 AS_HELP_STRING([--with-first-host=HOSTNAME],
   [use HOSTNAME as the machine on which the first shogi program runs in xshogi (default: localhost)]),
-FIRST_HOST=$withval)
+[FIRST_HOST=$withval])
 
-AC_ARG_WITH(second-host,
+AC_ARG_WITH([second-host],
 AS_HELP_STRING([--with-second-host=HOSTNAME],
   [use HOSTNAME as the machine on which the second shogi program runs in xshogi (default: localhost)]),
-SECOND_HOST=$withval)
+[SECOND_HOST=$withval])
 
 AC_SUBST(OPT)
 AC_SUBST(FIRST_SHOGI_PROGRAM)

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 7fd7993..03fbc90 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -18,7 +18,7 @@ pdf:
 # texi2html.
 
 html:
-       texi2html -split_node $(SRCDIR)/gnushogi.texinfo
+       makeinfo --html --split=section $(SRCDIR)/gnushogi.texinfo
 
 ps: dvi
        dvips -t letter gnushogi.dvi -o gnushogi.ps

diff --git a/gnushogi/commondsp.c b/gnushogi/commondsp.c
index 235d078..4e3eb07 100644 (file)
--- a/gnushogi/commondsp.c
+++ b/gnushogi/commondsp.c
@@ -31,6 +31,10 @@
  *
  */
 
+/* request *snprintf prototypes */
+#define _POSIX_C_SOURCE 200112L
+#include <stdio.h>
+
 #if defined HAVE_GETTIMEOFDAY
 #include <sys/time.h>
 #endif

diff --git a/gnushogi/cursesdsp.c b/gnushogi/cursesdsp.c
index 6300368..277f185 100644 (file)
--- a/gnushogi/cursesdsp.c
+++ b/gnushogi/cursesdsp.c
@@ -30,6 +30,8 @@
  * ----------------------------------------------------------------------
  */
 
+/* request *snprintf prototypes*/
+#define _POSIX_C_SOURCE 200112L
 
 #include <ctype.h>
 #include <signal.h>

diff --git a/gnushogi/rawdsp.c b/gnushogi/rawdsp.c
index 6e621b6..09d977a 100644 (file)
--- a/gnushogi/rawdsp.c
+++ b/gnushogi/rawdsp.c
@@ -241,13 +241,13 @@ Raw_Initialize(void)
         /* needed because of inconsistency between MSVC run-time system and gcc includes */
         setbuf(stdout, NULL);
 #else
-#ifdef HAVE_SETLINEBUF
-        setlinebuf(stdout);
-#else
-#  ifdef HAVE_SETVBUF
+#ifdef HAVE_SETVBUF
         setvbuf(stdout, NULL, _IOLBF, BUFSIZ);
+#else
+#  ifdef HAVE_SETLINEBUF
+        setlinebuf(stdout);
 #  else
-#    error "Need setlinebuf() or setvbuf() to compile gnushogi!"
+#    error "Need setvbuf() or setlinebuf() to compile gnushogi!"
 #  endif
 #endif
 #endif