|
From: Patrick C. <pa...@us...> - 2003-12-20 16:36:38
|
Update of /cvsroot/linux-decnet/latd
In directory sc8-pr-cvs1:/tmp/cvs-serv13923
Modified Files:
aclocal.m4 clientsession.cc configure.in
Log Message:
automake update
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/linux-decnet/latd/aclocal.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** aclocal.m4 17 Mar 2003 08:17:11 -0000 1.2
--- aclocal.m4 20 Dec 2003 16:36:31 -0000 1.3
***************
*** 1,3 ****
! # generated automatically by aclocal 1.7.3 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
--- 1,3 ----
! # generated automatically by aclocal 1.7.9 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
***************
*** 4069,4073 ****
# your package does certain things. But this isn't really a big deal.
! # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
--- 4069,4073 ----
# your package does certain things. But this isn't really a big deal.
! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
***************
*** 4087,4098 ****
# 02111-1307, USA.
! # serial 9
!
! # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
! # written in clear, in which case automake, when reading aclocal.m4,
! # will think it sees a *use*, and therefore will trigger all it's
! # C support machinery. Also note that it means that autoscan, seeing
! # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
!
AC_PREREQ([2.54])
--- 4087,4091 ----
# 02111-1307, USA.
! # serial 10
AC_PREREQ([2.54])
***************
*** 4223,4227 ****
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
! [AM_AUTOMAKE_VERSION([1.7.3])])
# Helper functions for option handling. -*- Autoconf -*-
--- 4216,4220 ----
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
! [AM_AUTOMAKE_VERSION([1.7.9])])
# Helper functions for option handling. -*- Autoconf -*-
***************
*** 4605,4608 ****
--- 4598,4608 ----
cp "$am_depcomp" conftest.dir
cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
am_cv_$1_dependencies_compiler_type=none
***************
*** 4611,4620 ****
fi
for depmode in $am_compiler_list; do
# We need to recreate these files for each test, as the compiler may
# overwrite some of them when testing with obscure command lines.
# This happens at least with the AIX C compiler.
! echo '#include "conftest.h"' > conftest.c
! echo 'int i;' > conftest.h
! echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
case $depmode in
--- 4611,4627 ----
fi
for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
# We need to recreate these files for each test, as the compiler may
# overwrite some of them when testing with obscure command lines.
# This happens at least with the AIX C compiler.
! : > sub/conftest.c
! for i in 1 2 3 4 5 6; do
! echo '#include "conftst'$i'.h"' >> sub/conftest.c
! : > sub/conftst$i.h
! done
! echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
case $depmode in
***************
*** 4634,4642 ****
# handle `-M -o', and we need to detect this.
if depmode=$depmode \
! source=conftest.c object=conftest.o \
! depfile=conftest.Po tmpdepfile=conftest.TPo \
! $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \
>/dev/null 2>conftest.err &&
! grep conftest.h conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
--- 4641,4650 ----
# handle `-M -o', and we need to detect this.
if depmode=$depmode \
! source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
! depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
! $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
! grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
! grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
***************
*** 4773,4777 ****
# Check to see how 'make' treats includes. -*- Autoconf -*-
! # Copyright (C) 2001, 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
--- 4781,4785 ----
# Check to see how 'make' treats includes. -*- Autoconf -*-
! # Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
***************
*** 4798,4803 ****
[am_make=${MAKE-make}
cat > confinc << 'END'
! doit:
@echo done
END
# If we don't find an include directive, just comment out the code.
--- 4806,4812 ----
[am_make=${MAKE-make}
cat > confinc << 'END'
! am__doit:
@echo done
+ .PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
***************
*** 4827,4833 ****
fi
fi
! AC_SUBST(am__include)
! AC_SUBST(am__quote)
! AC_MSG_RESULT($_am_result)
rm -f confinc confmf
])
--- 4836,4842 ----
fi
fi
! AC_SUBST([am__include])
! AC_SUBST([am__quote])
! AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
Index: clientsession.cc
===================================================================
RCS file: /cvsroot/linux-decnet/latd/clientsession.cc,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** clientsession.cc 5 Apr 2003 10:01:20 -0000 1.26
--- clientsession.cc 20 Dec 2003 16:36:31 -0000 1.27
***************
*** 20,23 ****
--- 20,24 ----
#include <termios.h>
#include <list>
+ #include <cassert>
#include <queue>
#include <string>
Index: configure.in
===================================================================
RCS file: /cvsroot/linux-decnet/latd/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** configure.in 28 May 2003 15:56:08 -0000 1.7
--- configure.in 20 Dec 2003 16:36:31 -0000 1.8
***************
*** 3,7 ****
dnl Checks that we are given a good source directory.
AC_INIT(latcp.cc)
! AM_INIT_AUTOMAKE(latd, 1.19)
dnl Checks for programs.
--- 3,7 ----
dnl Checks that we are given a good source directory.
AC_INIT(latcp.cc)
! AM_INIT_AUTOMAKE(latd, 1.50)
dnl Checks for programs.
|
