texinfo update (Tue Oct 19 08:22:01 EDT 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.400
retrieving revision 1.401
diff -c -r1.400 -r1.401
*** ChangeLog   18 Oct 2004 01:04:27 -0000      1.400
--- ChangeLog   19 Oct 2004 11:55:57 -0000      1.401
***************
*** 1,3 ****
--- 1,10 ----
+ 2004-10-19  Stepan Kasal  <address@hidden>
+ 
+       * configure.ac: When cross compiling, we have to remove
+         ./config.status, not "$native_tools"/config.status.
+         Replace ``echo'' with AC_MSG_NOTICE.  Quote the variable
+         values passed to ``env.''
+ 
  2004-10-17  Karl Berry  <address@hidden>
  
        * makeinfo/node.c (cm_node): don't output <br> after the
Index: configure.ac
===================================================================
RCS file: /cvsroot/texinfo/texinfo/configure.ac,v
retrieving revision 1.42
retrieving revision 1.43
diff -c -r1.42 -r1.43
*** configure.ac        17 Oct 2004 20:50:24 -0000      1.42
--- configure.ac        19 Oct 2004 11:55:57 -0000      1.43
***************
*** 1,5 ****
  # Process this file with autoconf to produce a configure script.
! # $Id: configure.ac,v 1.42 2004/10/17 20:50:24 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.43 2004/10/19 11:55:57 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
***************
*** 96,115 ****
    native_tools=tools
    test -d "$native_tools" || mkdir "$native_tools"
    confdir=`(cd "$srcdir";pwd)`
!   echo "doing configure of native tools (${build})"
!   cd "$native_tools" || exit 1
!   # Make sure the secondary configure won't complain
!   # that it's "already configured."
    rm -f config.status
    # Run secondary configure in alternate environment or
    # it gets the wrong CC etc.  env -i gives this build host configure
    # a clean environment.
!   env -i CC=${BUILD_CC} AR=${BUILD_AR} RANLIB=${BUILD_RANLIB} PATH=${PATH} \
        tools_only=1 \
      ${confdir}/configure --build=${build} --host=${build} \
                           --disable-rpath --disable-nls
    cd .. || exit 1
!   echo "Continuing with main configure (${host})"
  fi
  AC_SUBST(native_tools)
  AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]])
--- 96,116 ----
    native_tools=tools
    test -d "$native_tools" || mkdir "$native_tools"
    confdir=`(cd "$srcdir";pwd)`
!   # Make sure the secondary configure won't fail with
!   # "error: source directory already configured".
    rm -f config.status
+   AC_MSG_NOTICE([[Doing configure of native tools (${build}).]])
+   cd "$native_tools" || exit 1
    # Run secondary configure in alternate environment or
    # it gets the wrong CC etc.  env -i gives this build host configure
    # a clean environment.
!   env -i CC="${BUILD_CC}" AR="${BUILD_AR}" RANLIB="${BUILD_RANLIB}" \
!       PATH="${PATH}" \
        tools_only=1 \
      ${confdir}/configure --build=${build} --host=${build} \
                           --disable-rpath --disable-nls
    cd .. || exit 1
!   AC_MSG_NOTICE([[Continuing with main configure (${host}).]])
  fi
  AC_SUBST(native_tools)
  AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]])
P ChangeLog
P configure.ac