[7766] Fix building info reader on MinGW.

[eliz]

Revision: 7766
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7766
Author:   eliz
Date:     2017-04-30 11:01:01 -0400 (Sun, 30 Apr 2017)
Log Message:
-----------
Fix building info reader on MinGW.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/terminal.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2017-04-30 14:57:26 UTC (rev 7765)
+++ trunk/ChangeLog     2017-04-30 15:01:01 UTC (rev 7766)
@@ -1,5 +1,9 @@
 2017-04-30  Eli Zaretskii  <address@hidden>
 
+       * info/terminal.c [HAVE_TERMCAP_H]: Don't take this branch for
+       MinGW, as some MinGW ports of ncurses install termcap.h in
+       addition to ncurses/termcap.h.
+
        * tp/Texinfo/Convert/XSParagraph/xspara.c [_WIN32]: Include
        ctype.h, to work around MinGW compilation errors due to Gnulib
        replacement of wint_t type.

Modified: trunk/info/terminal.c
===================================================================
--- trunk/info/terminal.c       2017-04-30 14:57:26 UTC (rev 7765)
+++ trunk/info/terminal.c       2017-04-30 15:01:01 UTC (rev 7766)
@@ -30,13 +30,13 @@
 #include <signal.h>
 
 /* The Unix termcap interface code. */
-/* With MinGW, if the user has ncurses installed, including
-   ncurses/termcap.h will cause the Info binary depend on the ncurses
+/* With MinGW, if the user has ncurses installed, including termcap.h
+   or ncurses/termcap.h will cause the Info binary depend on the ncurses
    DLL, just because BC and PC are declared there, although they are
    never used in the MinGW build.  Avoid that useless dependency.  */
 #if defined (HAVE_NCURSES_TERMCAP_H) && !defined (__MINGW32__)
 #include <ncurses/termcap.h>
-#elif defined (HAVE_TERMCAP_H)
+#elif defined (HAVE_TERMCAP_H) && !defined (__MINGW32__)
 #include <termcap.h>
 #else  /* (!HAVE_NCURSES_TERMCAP_H || __MINGW32__) && !HAVE_TERMCAP_H */
 /* On Solaris2, sys/types.h #includes sys/reg.h, which #defines PC.