texinfo update (Fri Aug 5 05:52:01 EDT 2005)

texinfo-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo update (Fri Aug 5 05:52:01 EDT 2005)

From:	Karl Berry
Subject:	texinfo update (Fri Aug 5 05:52:01 EDT 2005)
Date:	Fri, 05 Aug 2005 05:52:10 -0400
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.524
retrieving revision 1.525
diff -c -r1.524 -r1.525
*** ChangeLog   5 Aug 2005 09:19:17 -0000       1.524
--- ChangeLog   5 Aug 2005 09:25:44 -0000       1.525
***************
*** 1,5 ****
--- 1,11 ----
  2005-08-05  Stepan Kasal  <address@hidden>
  
+       * configure.ac: (auto)update.
+       * info/Makefile.am, makeinfo/Makefile.am, utils/Makefile.am: 
s/INCLUDES/AM_CPPFLAGS/
+       * lib/Makefile.am (INCLUDES): Remove.
+ 
+ 2005-08-05  Stepan Kasal  <address@hidden>
+ 
        * doc/texinfo.tex (\Efloat): Revert the previous change, ...
        (\commondummiesnofonts): ... instead, add the three commands here.
  
Index: configure.ac
===================================================================
RCS file: /cvsroot/texinfo/texinfo/configure.ac,v
retrieving revision 1.58
retrieving revision 1.59
diff -c -r1.58 -r1.59
*** configure.ac        28 May 2005 22:33:51 -0000      1.58
--- configure.ac        5 Aug 2005 09:25:44 -0000       1.59
***************
*** 1,5 ****
  # Process this file with autoconf to produce a configure script.
! # $Id: configure.ac,v 1.58 2005/05/28 22:33:51 karl Exp $
  #
  # This file is free software; as a special exception the author gives
  # unlimited permission to copy and/or distribute it, with or without
--- 1,5 ----
  # Process this file with autoconf to produce a configure script.
! # $Id: configure.ac,v 1.59 2005/08/05 09:25:44 kasal Exp $
  #
  # This file is free software; as a special exception the author gives
  # unlimited permission to copy and/or distribute it, with or without
***************
*** 135,149 ****
  # HP-UX 9 (at least) needs -lncurses which defines termcap variables PC etc.
  AC_MSG_CHECKING(for library with termcap variables)
  AC_CACHE_VAL(ac_cv_var_ospeed,
! oldLIBS=$LIBS
  for trylib in $termlib ${TERMLIB_VARIANTS}; do
     if test "x$trylib" != "x$termlib"; then
       LIBS="$oldLIBS -l$termlib -l$trylib"
     else
       LIBS="$oldLIBS -l$termlib"
     fi
!    AC_TRY_LINK(,
! [#ifdef HAVE_NCURSES_TERMCAP_H
  #include <ncurses/termcap.h>
  #else
  #ifdef HAVE_TERMCAP_H
--- 135,148 ----
  # HP-UX 9 (at least) needs -lncurses which defines termcap variables PC etc.
  AC_MSG_CHECKING(for library with termcap variables)
  AC_CACHE_VAL(ac_cv_var_ospeed,
! [oldLIBS=$LIBS
  for trylib in $termlib ${TERMLIB_VARIANTS}; do
     if test "x$trylib" != "x$termlib"; then
       LIBS="$oldLIBS -l$termlib -l$trylib"
     else
       LIBS="$oldLIBS -l$termlib"
     fi
!    AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[#ifdef HAVE_NCURSES_TERMCAP_H
  #include <ncurses/termcap.h>
  #else
  #ifdef HAVE_TERMCAP_H
***************
*** 162,171 ****
  UP++;
  PC++;
  return ospeed != 0;
! ], ac_cv_var_ospeed=$trylib; break)
  done
  LIBS=$oldLIBS
! )
  AC_MSG_RESULT($ac_cv_var_ospeed)
  if test -n "$ac_cv_var_ospeed" \
     && test "x$termlib" != "x$ac_cv_var_ospeed"; then
--- 161,170 ----
  UP++;
  PC++;
  return ospeed != 0;
! ]])], [ac_cv_var_ospeed=$trylib; break])
  done
  LIBS=$oldLIBS
! ])
  AC_MSG_RESULT($ac_cv_var_ospeed)
  if test -n "$ac_cv_var_ospeed" \
     && test "x$termlib" != "x$ac_cv_var_ospeed"; then
Index: info/Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -r1.8 -r1.9
*** info/Makefile.am    28 Oct 2004 14:03:27 -0000      1.8
--- info/Makefile.am    5 Aug 2005 09:25:44 -0000       1.9
***************
*** 1,4 ****
! # $Id: Makefile.am,v 1.8 2004/10/28 14:03:27 karl Exp $
  # Makefile.am for texinfo/info.
  # Run automake in .. to produce Makefile.in from this.
  #
--- 1,4 ----
! # $Id: Makefile.am,v 1.9 2005/08/05 09:25:44 kasal Exp $
  # Makefile.am for texinfo/info.
  # Run automake in .. to produce Makefile.in from this.
  #
***************
*** 22,28 ****
  # -I. for funs.h.
  # Automake puts -I.. and -I$(srcdir) into DEFS by default, but
  # we need to override it, so include them ourselves.
! INCLUDES = -I. -I$(top_srcdir)/lib -I../intl -I.. -I$(srcdir)
  DEFS += -DLOCALEDIR=\"$(localedir)\" -DINFODIR=\"$(infodir)\" \
        -DINFODIR2=\"$(infodir2)\"
  LDADD = ../lib/libtxi.a $(TERMLIBS) $(LIBINTL)
--- 22,28 ----
  # -I. for funs.h.
  # Automake puts -I.. and -I$(srcdir) into DEFS by default, but
  # we need to override it, so include them ourselves.
! AM_CPPFLAGS = -I. -I$(top_srcdir)/lib -I.. -I$(srcdir)
  DEFS += -DLOCALEDIR=\"$(localedir)\" -DINFODIR=\"$(infodir)\" \
        -DINFODIR2=\"$(infodir2)\"
  LDADD = ../lib/libtxi.a $(TERMLIBS) $(LIBINTL)
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/lib/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** lib/Makefile.am     6 Nov 2004 22:05:59 -0000       1.7
--- lib/Makefile.am     5 Aug 2005 09:25:44 -0000       1.8
***************
*** 1,4 ****
! # $Id: Makefile.am,v 1.7 2004/11/06 22:05:59 karl Exp $
  # Makefile.am for texinfo/lib.
  # Run automake in .. to produce Makefile.in from this.
  #
--- 1,4 ----
! # $Id: Makefile.am,v 1.8 2005/08/05 09:25:44 kasal Exp $
  # Makefile.am for texinfo/lib.
  # Run automake in .. to produce Makefile.in from this.
  #
***************
*** 11,17 ****
  # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  
  noinst_LIBRARIES = libtxi.a
- INCLUDES = -I../intl
  
  # Don't need to list alloca.c, etc., Automake includes them.
  libtxi_a_SOURCES = getopt.c getopt.h getopt1.c getopt_.h getopt_int.h \
--- 11,16 ----
Index: makeinfo/Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** makeinfo/Makefile.am        11 Apr 2004 17:56:46 -0000      1.5
--- makeinfo/Makefile.am        5 Aug 2005 09:25:44 -0000       1.6
***************
*** 1,4 ****
! # $Id: Makefile.am,v 1.5 2004/04/11 17:56:46 karl Exp $
  # Makefile.am for texinfo/makeinfo.
  # Run automake in .. to produce Makefile.in from this.
  #
--- 1,4 ----
! # $Id: Makefile.am,v 1.6 2005/08/05 09:25:44 kasal Exp $
  # Makefile.am for texinfo/makeinfo.
  # Run automake in .. to produce Makefile.in from this.
  #
***************
*** 13,19 ****
  bin_PROGRAMS = makeinfo
  
  localedir = $(datadir)/locale
! INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
  LDADD = ../lib/libtxi.a $(LIBINTL)
  
  makeinfo_SOURCES = \
--- 13,19 ----
  bin_PROGRAMS = makeinfo
  
  localedir = $(datadir)/locale
! AM_CPPFLAGS = -I$(top_srcdir)/lib -DLOCALEDIR=\"$(localedir)\"
  LDADD = ../lib/libtxi.a $(LIBINTL)
  
  makeinfo_SOURCES = \
Index: util/Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** util/Makefile.am    26 Aug 2004 11:43:18 -0000      1.14
--- util/Makefile.am    5 Aug 2005 09:25:44 -0000       1.15
***************
*** 1,4 ****
! # $Id: Makefile.am,v 1.14 2004/08/26 11:43:18 karl Exp $
  # Makefile.am for texinfo/util.
  # Run automake in .. to produce Makefile.in from this.
  #
--- 1,4 ----
! # $Id: Makefile.am,v 1.15 2005/08/05 09:25:44 kasal Exp $
  # Makefile.am for texinfo/util.
  # Run automake in .. to produce Makefile.in from this.
  #
***************
*** 23,29 ****
  transform = s/ginstall-info/install-info/; $(program_transform_name)
  
  localedir = $(datadir)/locale
! INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
  LDADD = ../lib/libtxi.a $(LIBINTL)
  
  dist_pkgdata_DATA = texinfo.dtd texinfo.xsl
--- 23,29 ----
  transform = s/ginstall-info/install-info/; $(program_transform_name)
  
  localedir = $(datadir)/locale
! AM_CPPFLAGS = -I$(top_srcdir)/lib -DLOCALEDIR=\"$(localedir)\"
  LDADD = ../lib/libtxi.a $(LIBINTL)
  
  dist_pkgdata_DATA = texinfo.dtd texinfo.xsl
P ChangeLog
P configure.ac
P info/Makefile.am
P lib/Makefile.am
P makeinfo/Makefile.am
P util/Makefile.am
[Prev in Thread]
Current Thread
[Next in Thread]
texinfo update (Fri Aug 5 05:52:01 EDT 2005), Karl Berry <=
Prev by Date: texinfo update (Fri Aug 5 05:22:01 EDT 2005)
Next by Date: texinfo update (Sat Aug 6 12:22:01 EDT 2005)
Previous by thread: texinfo update (Fri Aug 5 05:22:01 EDT 2005)
Next by thread: texinfo update (Sat Aug 6 12:22:01 EDT 2005)
Index(es):
- Date
- Thread