[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[5244] no termlib necessary if HOST_IS_WINDOWS
From: |
karl |
Subject: |
[5244] no termlib necessary if HOST_IS_WINDOWS |
Date: |
Wed, 20 Mar 2013 23:22:05 +0000 |
Revision: 5244
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5244
Author: karl
Date: 2013-03-20 23:22:05 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
no termlib necessary if HOST_IS_WINDOWS
Modified Paths:
--------------
trunk/ChangeLog
trunk/Makefile.am
trunk/configure.ac
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2013-03-20 23:05:29 UTC (rev 5243)
+++ trunk/ChangeLog 2013-03-20 23:22:05 UTC (rev 5244)
@@ -1,3 +1,10 @@
+2013-03-20 Eli Zaretskii <address@hidden>
+
+ * Makefile.am (SUBDIRS): If HOST_IS_WINDOWS, add 'info' to SUBDIRS
+ even if HAVE_TERMLIBS is false.
+ * configure.ac <have_termlib>: Don't bother warning on MinGW as
+ well.
+
2013-03-20 Karl Berry <address@hidden>
* man/Makefile.am (man_rule_0): set EXEEXT="" since it's
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2013-03-20 23:05:29 UTC (rev 5243)
+++ trunk/Makefile.am 2013-03-20 23:22:05 UTC (rev 5244)
@@ -35,7 +35,12 @@
SUBDIRS += gnulib/lib install-info tp util
if HAVE_TERMLIBS
SUBDIRS += info
+else
+# DOS/Windows don't need TERMLIBS to build Info
+if HOST_IS_WINDOWS
+ SUBDIRS += info
endif
+endif
else
# All subdirectories.
# Do libs first since the C programs depend on it.
@@ -44,7 +49,12 @@
SUBDIRS += $(native_tools) gnulib/lib
if HAVE_TERMLIBS
SUBDIRS += info
+else
+# DOS/Windows don't need TERMLIBS to build Info
+if HOST_IS_WINDOWS
+ SUBDIRS += info
endif
+endif
SUBDIRS += install-info po po_document tp Pod-Simple-Texinfo util \
doc man
endif
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2013-03-20 23:05:29 UTC (rev 5243)
+++ trunk/configure.ac 2013-03-20 23:22:05 UTC (rev 5244)
@@ -223,9 +223,10 @@
[TERMLIBS="${TERMLIBS} -l${termlib}"; break])
done
have_termlib=yes
-# don't bother warning on djgpp, it doesn't have a term library, it
-# ports each termcap-needing program separately according to its needs.
-if test -z "$TERMLIBS" && echo "$build" | grep -v djgpp >/dev/null; then
+# don't bother warning on djgpp and MinGW, they don't have a term library,
+# and port each termcap-needing program separately according to the needs.
+if test -z "$TERMLIBS" \
+ && echo "$build" | grep -v djgpp | grep -v mingw >/dev/null; then
AC_MSG_WARN([info needs a terminal library, one of: ${TERMLIB_VARIANTS}])
have_termlib=no
fi
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [5244] no termlib necessary if HOST_IS_WINDOWS,
karl <=