[lwatch-cvs] files ChangeLog,1.18,1.19 Makefile.in,1.19,1.20 TODO,1.27,1.28 aclocal.m4,1.6,1.7 confi
Brought to you by:
arturcz
|
From: <ar...@us...> - 2004-01-03 23:05:20
|
Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1:/tmp/cvs-serv4155
Modified Files:
ChangeLog Makefile.in TODO aclocal.m4 configure
Log Message:
input_fifo is obsoleted
Index: ChangeLog
===================================================================
RCS file: /cvsroot/lwatch/files/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ChangeLog 27 Aug 2003 23:43:57 -0000 1.18
--- ChangeLog 3 Jan 2004 23:05:12 -0000 1.19
***************
*** 1,3 ****
! 0.4:
0.3: - --fifo and -f are deprecated, use --input and -i instead (arturcz)
--- 1,3 ----
! 0.4: - input_fifo is obsoleted now, use input_file instead
0.3: - --fifo and -f are deprecated, use --input and -i instead (arturcz)
Index: Makefile.in
===================================================================
RCS file: /cvsroot/lwatch/files/Makefile.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Makefile.in 4 Apr 2003 22:16:31 -0000 1.19
--- Makefile.in 3 Jan 2004 23:05:12 -0000 1.20
***************
*** 1,6 ****
! # Makefile.in generated by automake 1.7.2 from Makefile.am.
# @configure_input@
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
--- 1,6 ----
! # Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
***************
*** 92,95 ****
--- 92,96 ----
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
***************
*** 140,146 ****
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive
! DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
! Makefile.in NEWS TODO aclocal.m4 config.guess config.sub \
! configure configure.ac depcomp install-sh missing mkinstalldirs
DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive
--- 141,148 ----
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive
! DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
! COPYING ChangeLog INSTALL Makefile.am NEWS TODO aclocal.m4 \
! config.guess config.sub configure configure.ac depcomp \
! install-sh missing mkinstalldirs
DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive
***************
*** 245,251 ****
tags=; \
here=`pwd`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
! test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
fi; \
done; \
--- 247,259 ----
tags=; \
here=`pwd`; \
+ if (etags --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ else \
+ include_option=--include; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
! test -f $$subdir/TAGS && \
! tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
***************
*** 363,372 ****
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
chmod -R a-w $(distdir); chmod a+w $(distdir)
! mkdir $(distdir)/=build
! mkdir $(distdir)/=inst
chmod a-w $(distdir)
! dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
! && cd $(distdir)/=build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \
--- 371,380 ----
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
chmod -R a-w $(distdir); chmod a+w $(distdir)
! mkdir $(distdir)/_build
! mkdir $(distdir)/_inst
chmod a-w $(distdir)
! dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
! && cd $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \
***************
*** 395,399 ****
sed 'h;s/./=/g;p;x;p;x'
distuninstallcheck:
! cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
--- 403,407 ----
sed 'h;s/./=/g;p;x;p;x'
distuninstallcheck:
! @cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
***************
*** 404,412 ****
exit 1; } >&2
distcleancheck: distclean
! if test '$(srcdir)' = . ; then \
echo "ERROR: distcleancheck can only run from a VPATH build" ; \
exit 1 ; \
fi
! test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left in build directory after distclean:" ; \
$(distcleancheck_listfiles) ; \
--- 412,420 ----
exit 1; } >&2
distcleancheck: distclean
! @if test '$(srcdir)' = . ; then \
echo "ERROR: distcleancheck can only run from a VPATH build" ; \
exit 1 ; \
fi
! @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left in build directory after distclean:" ; \
$(distcleancheck_listfiles) ; \
***************
*** 429,433 ****
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
! INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
--- 437,441 ----
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
***************
*** 437,441 ****
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
--- 445,449 ----
distclean-generic:
! -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
***************
*** 448,451 ****
--- 456,460 ----
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-tags
***************
*** 470,474 ****
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
! -rm -rf autom4te.cache
maintainer-clean-am: distclean-am maintainer-clean-generic
--- 479,484 ----
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
! -rm -rf $(top_srcdir)/autom4te.cache
! -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
Index: TODO
===================================================================
RCS file: /cvsroot/lwatch/files/TODO,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** TODO 19 Sep 2003 18:58:32 -0000 1.27
--- TODO 3 Jan 2004 23:05:12 -0000 1.28
***************
*** 3,9 ****
Now (for 0.4):
- - obsolete input_fifo
- versioning of configuration file
- - die() at input_fifo
- run as daemon
- configure: --with-pcre support
--- 3,7 ----
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/lwatch/files/aclocal.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** aclocal.m4 2 Feb 2003 23:30:33 -0000 1.6
--- aclocal.m4 3 Jan 2004 23:05:12 -0000 1.7
***************
*** 1,3 ****
! # generated automatically by aclocal 1.7.2 -*- 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
***************
*** 17,21 ****
# your package does certain things. But this isn't really a big deal.
! # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
--- 17,21 ----
# 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.
***************
*** 35,46 ****
# 02111-1307, USA.
! # serial 8
!
! # 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])
--- 35,39 ----
# 02111-1307, USA.
! # serial 10
AC_PREREQ([2.54])
***************
*** 87,92 ****
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
! AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
! AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
_AM_IF_OPTION([no-define],,
--- 80,85 ----
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
! AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
! AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
_AM_IF_OPTION([no-define],,
***************
*** 109,112 ****
--- 102,106 ----
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ AC_REQUIRE([AM_SET_LEADING_DOT])dnl
_AM_IF_OPTION([no-dependencies],,
***************
*** 131,135 ****
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
! [_am_stamp_count=`expr ${_am_stamp_count-0} + 1`
echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
--- 125,138 ----
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
! [# Compute $1's index in $config_headers.
! _am_stamp_count=1
! for _am_header in $config_headers :; do
! case $_am_header in
! $1 | $1:* )
! break ;;
! * )
! _am_stamp_count=`expr $_am_stamp_count + 1` ;;
! esac
! done
echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
***************
*** 161,165 ****
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
! [AM_AUTOMAKE_VERSION([1.7.2])])
# Helper functions for option handling. -*- Autoconf -*-
--- 164,168 ----
# 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 -*-
***************
*** 447,453 ****
AC_SUBST([INSTALL_STRIP_PROGRAM])])
! # serial 4 -*- Autoconf -*-
! # Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
--- 450,489 ----
AC_SUBST([INSTALL_STRIP_PROGRAM])])
! # -*- Autoconf -*-
! # Copyright (C) 2003 Free Software Foundation, Inc.
! # This program is free software; you can redistribute it and/or modify
! # it under the terms of the GNU General Public License as published by
! # the Free Software Foundation; either version 2, or (at your option)
! # any later version.
!
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY; without even the implied warranty of
! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! # GNU General Public License for more details.
!
! # You should have received a copy of the GNU General Public License
! # along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
! # 02111-1307, USA.
!
! # serial 1
!
! # Check whether the underlying file-system supports filenames
! # with a leading dot. For instance MS-DOS doesn't.
! AC_DEFUN([AM_SET_LEADING_DOT],
! [rm -rf .tst 2>/dev/null
! mkdir .tst 2>/dev/null
! if test -d .tst; then
! am__leading_dot=.
! else
! am__leading_dot=_
! fi
! rmdir .tst 2>/dev/null
! AC_SUBST([am__leading_dot])])
!
! # serial 5 -*- Autoconf -*-
!
! # Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
***************
*** 510,513 ****
--- 546,556 ----
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
***************
*** 516,525 ****
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
--- 559,575 ----
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
***************
*** 539,549 ****
# 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>&1 &&
! grep conftest.h conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
! am_cv_$1_dependencies_compiler_type=$depmode
! break
fi
done
--- 589,606 ----
# 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
! # (even with -Werror). So we grep stderr for any message
! # that says an option was ignored.
! if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
! am_cv_$1_dependencies_compiler_type=$depmode
! break
! fi
fi
done
***************
*** 567,580 ****
# This macro is AC_REQUIREd in _AM_DEPENDENCIES
AC_DEFUN([AM_SET_DEPDIR],
! [rm -f .deps 2>/dev/null
! mkdir .deps 2>/dev/null
! if test -d .deps; then
! DEPDIR=.deps
! else
! # MS-DOS does not allow filenames that begin with a dot.
! DEPDIR=_deps
! fi
! rmdir .deps 2>/dev/null
! AC_SUBST([DEPDIR])
])
--- 624,629 ----
# This macro is AC_REQUIREd in _AM_DEPENDENCIES
AC_DEFUN([AM_SET_DEPDIR],
! [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
! AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
])
***************
*** 680,684 ****
# 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
--- 729,733 ----
# 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
***************
*** 705,710 ****
[am_make=${MAKE-make}
cat > confinc << 'END'
! doit:
@echo done
END
# If we don't find an include directive, just comment out the code.
--- 754,760 ----
[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.
***************
*** 734,740 ****
fi
fi
! AC_SUBST(am__include)
! AC_SUBST(am__quote)
! AC_MSG_RESULT($_am_result)
rm -f confinc confmf
])
--- 784,790 ----
fi
fi
! AC_SUBST([am__include])
! AC_SUBST([am__quote])
! AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
Index: configure
===================================================================
RCS file: /cvsroot/lwatch/files/configure,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** configure 7 Apr 2003 14:51:39 -0000 1.39
--- configure 3 Jan 2004 23:05:12 -0000 1.40
***************
*** 1,9 ****
#! /bin/sh
! # From configure.ac Revision: 1.32 .
# Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.57 for lwatch 0.3.
#
! # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
! # Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
--- 1,8 ----
[...3383 lines suppressed...]
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
***************
*** 6299,6306 ****
as_dir=`(dirname "$as_dir") 2>/dev/null ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
! X"$as_dir" : 'X\(//\)[^/]' \| \
! X"$as_dir" : 'X\(//\)$' \| \
! X"$as_dir" : 'X\(/\)' \| \
! . : '\(.\)' 2>/dev/null ||
echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--- 6701,6708 ----
as_dir=`(dirname "$as_dir") 2>/dev/null ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
! X"$as_dir" : 'X\(//\)[^/]' \| \
! X"$as_dir" : 'X\(//\)$' \| \
! X"$as_dir" : 'X\(/\)' \| \
! . : '\(.\)' 2>/dev/null ||
echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|