texinfo ChangeLog Makefile.am configure.ac man/...

[karl]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     karl <karl>     12/12/14 19:36:54

Modified files:
        .              : ChangeLog Makefile.am configure.ac 
        man            : Makefile.am 

Log message:
        HAVE_TERMLIBS: build info stuff conditionally

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1476&r2=1.1477
http://cvs.savannah.gnu.org/viewcvs/texinfo/Makefile.am?cvsroot=texinfo&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/texinfo/configure.ac?cvsroot=texinfo&r1=1.128&r2=1.129
http://cvs.savannah.gnu.org/viewcvs/texinfo/man/Makefile.am?cvsroot=texinfo&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1476
retrieving revision 1.1477
diff -u -b -r1.1476 -r1.1477
--- ChangeLog   14 Dec 2012 18:57:41 -0000      1.1476
+++ ChangeLog   14 Dec 2012 19:36:53 -0000      1.1477
@@ -1,3 +1,12 @@
+2012-12-14  Ineiev  <address@hidden>  (tiny change)
+
+       * configure.ac (HAVE_TERMLIBS): new conditional.  End with
+       repeated warning about no terminal library for visibility.
+       * Makefile.am (SUBDIRS) [HAVE_TERMLIBS]: only include info/ if
+       new conditional is true.
+       * man/Makefile.am (man_MANS) [HAVE_TERMLIBS]: likewise for making
+       info.1 and infokey.1.
+
 2012-12-14  Thien-Thi Nguyen  <address@hidden>  (tiny change)
 
        * doc/texinfo.txi (Three Arguments):

Index: Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- Makefile.am 2 Dec 2012 23:58:34 -0000       1.38
+++ Makefile.am 14 Dec 2012 19:36:53 -0000      1.39
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.38 2012/12/02 23:58:34 karl Exp $
+# $Id: Makefile.am,v 1.39 2012/12/14 19:36:53 karl Exp $
 # Makefile.am for texinfo.
 # Process this file with automake to produce Makefile.in in all directories.
 #
@@ -26,16 +26,23 @@
 # distribution directory.
 TEXINFO_TEX = doc/texinfo.tex
 
+SUBDIRS =
 if TOOLS_ONLY
   # Build native tools only.
-  SUBDIRS = gnulib/lib info install-info tp util
+  SUBDIRS += gnulib/lib install-info tp util
+if HAVE_TERMLIBS
+    SUBDIRS += info
+endif
 else
   # All subdirectories.
   # Do libs first since the C programs depend on it.
-  # Do doc and man last so makeinfo will be built when we get there.
+  # Do doc and man last so things will be built when we get there.
   # Others are alphabetical.
-  SUBDIRS = $(native_tools) gnulib/lib \
-            install-info info po po_document tp Pod-Simple-Texinfo util \
+  SUBDIRS += $(native_tools) gnulib/lib
+if HAVE_TERMLIBS
+  SUBDIRS += info
+endif
+  SUBDIRS += install-info po po_document tp Pod-Simple-Texinfo util \
            doc man
 endif
 

Index: configure.ac
===================================================================
RCS file: /sources/texinfo/texinfo/configure.ac,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- configure.ac        10 Dec 2012 01:34:12 -0000      1.128
+++ configure.ac        14 Dec 2012 19:36:53 -0000      1.129
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-# $Id: configure.ac,v 1.128 2012/12/10 01:34:12 pertusus Exp $
+# $Id: configure.ac,v 1.129 2012/12/14 19:36:53 karl Exp $
 #
 # Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 # Free Software Foundation, Inc.
@@ -179,10 +179,12 @@
   AC_CHECK_LIB(${termlib}, tgetent,
      [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
-  AC_MSG_WARN([probably need a terminal library, one of: ${TERMLIB_VARIANTS}])
+  AC_MSG_WARN([info needs a terminal library, one of: ${TERMLIB_VARIANTS}])
+  have_termlib=no
 fi
 
 # Checks for variables.
@@ -225,6 +227,7 @@
   TERMLIBS="${TERMLIBS} -l${ac_cv_var_ospeed}"
 fi
 AC_SUBST(TERMLIBS)#
+AM_CONDITIONAL(HAVE_TERMLIBS, [[test "x$TERMLIBS" != x]])
 
 # Do not use <ncurses/termcap.h> unless we're linking with ncurses.
 # Must come after the termlib tests.
@@ -407,3 +410,9 @@
 ])
 
 AC_OUTPUT
+
+# Summarize warnings to make them more visible.
+if test $have_termlib = no; then
+  AC_MSG_WARN([Could not find a terminal library among ${TERMLIB_VARIANTS}])
+  AC_MSG_WARN([The programs from \`info' directory will not be built.])
+fi

Index: man/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/man/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- man/Makefile.am     23 Nov 2012 00:19:00 -0000      1.4
+++ man/Makefile.am     14 Dec 2012 19:36:53 -0000      1.5
@@ -1,7 +1,7 @@
-# $Id: Makefile.am,v 1.4 2012/11/23 00:19:00 pertusus Exp $
+# $Id: Makefile.am,v 1.5 2012/12/14 19:36:53 karl Exp $
 # Makefile.am for texinfo/man.
 #
-# Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 # Free Software Foundation, Inc.
 #
 # This file is free software; as a special exception the author gives
@@ -13,7 +13,13 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 # These are generated using help2man.
-man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 texi2dvi.1
+man_MANS = install-info.1 makeinfo.1 texindex.1 texi2dvi.1
+
+# These require the build in info/, thus can't do if we failed to find a
+# terminal library.
+if HAVE_TERMLIBS
+man_MANS += info.1 infokey.1
+endif
 
 # These are hand-written.
 man_MANS += info.5 texinfo.5