[lwatch-cvs] files configure.ac,NONE,1.1 depcomp,NONE,1.1 Makefile.am,1.1,1.2 Makefile.in,1.4,1.5 ac
Brought to you by:
arturcz
|
From: <ar...@us...> - 2003-01-28 23:31:07
|
Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1:/tmp/cvs-serv28711
Modified Files:
Makefile.am Makefile.in aclocal.m4 configure install-sh
missing mkinstalldirs
Added Files:
configure.ac depcomp
Removed Files:
acconfig.h autoscan.log config.guess config.sub configure.in
Log Message:
- autotools cleaning
--- NEW FILE: configure.ac ---
# autoconf source file
# $Id: configure.ac,v 1.1 2003/01/28 23:31:01 arturcz Exp $
# $Source: /cvsroot/lwatch/files/configure.ac,v $
AC_PREREQ(2.57)
AC_INIT([lwatch], [0.1], [ar...@he...])
AM_INIT_AUTOMAKE([lwatch],[0.1])
#AC_CONFIG_SRCDIR([acolors.c]) #FIXME: a co ja mam z tym zrobiæ?
AM_CONFIG_HEADER(src/config.h)
# Checks for programs.
AC_PROG_CC
AM_PROG_LEX
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([fcntl.h stddef.h stdlib.h string.h sys/param.h unistd.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
# Checks for library functions.
AC_FUNC_MALLOC
AC_FUNC_REALLOC
AC_TYPE_SIGNAL
AC_FUNC_VPRINTF
AC_CHECK_FUNCS([memset strcasecmp strchr])
AC_CONFIG_FILES([src/Makefile Makefile])
AC_OUTPUT
--- NEW FILE: depcomp ---
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
# Copyright 1999, 2000 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.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# Originally written by Alexandre Oliva <ol...@dc...>.
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
fi
# `libtool' can also be set to `yes' or `no'.
depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
# Some modes work just like other modes, but use different flags. We
# parameterize here, but still list the modes in the big case below,
# to make depend.m4 easier to write. Note that we *cannot* use a case
# here, because this file can only contain one case statement.
if test "$depmode" = hp; then
# HP compiler uses -M and no extra arg.
gccflag=-M
depmode=gcc
fi
if test "$depmode" = dashXmstdout; then
# This is just like dashmstdout with a different argument.
dashmflag=-xM
depmode=dashmstdout
fi
case "$depmode" in
gcc3)
## gcc 3 implements dependency tracking that does exactly what
## we want. Yay! Note: for some reason libtool 1.4 doesn't like
## it if -MD -MP comes after the -MF stuff. Hmm.
"$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
exit $stat
fi
mv "$tmpdepfile" "$depfile"
;;
gcc)
## There are various ways to get dependency output from gcc. Here's
## why we pick this rather obscure method:
## - Don't want to use -MD because we'd like the dependencies to end
## up in a subdir. Having to rename by hand is ugly.
## (We might end up doing this anyway to support other compilers.)
## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
## -MM, not -M (despite what the docs say).
## - Using -M directly means running the compiler twice (even worse
## than renaming).
if test -z "$gccflag"; then
gccflag=-MD,
fi
"$@" -Wp,"$gccflag$tmpdepfile"
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
exit $stat
fi
rm -f "$depfile"
echo "$object : \\" > "$depfile"
alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
## The second -e expression handles DOS-style file names with drive letters.
sed -e 's/^[^:]*: / /' \
-e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
## This next piece of magic avoids the `deleted header file' problem.
## The problem is that when a header file which appears in a .P file
## is deleted, the dependency causes make to die (because there is
## typically no way to rebuild the header). We avoid this by adding
## dummy dependencies for each header file. Too bad gcc doesn't do
## this for us directly.
tr ' ' '
' < "$tmpdepfile" |
## Some versions of gcc put a space before the `:'. On the theory
## that the space means something, we add a space to the output as
## well.
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
hp)
# This case exists only to let depend.m4 do its work. It works by
# looking at the text of this script. This case will never be run,
# since it is checked for above.
exit 1
;;
sgi)
if test "$libtool" = yes; then
"$@" "-Wp,-MDupdate,$tmpdepfile"
else
"$@" -MDupdate "$tmpdepfile"
fi
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
exit $stat
fi
rm -f "$depfile"
if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
echo "$object : \\" > "$depfile"
# Clip off the initial element (the dependent). Don't try to be
# clever and replace this with sed code, as IRIX sed won't handle
# lines with more than a fixed number of characters (4096 in
# IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
# the IRIX cc adds comments like `#:fec' to the end of the
# dependency line.
tr ' ' '
' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
tr '
' ' ' >> $depfile
echo >> $depfile
# The second pass generates a dummy entry for each header file.
tr ' ' '
' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
>> $depfile
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
# "include basename.Plo" scheme.
echo "#dummy" > "$depfile"
fi
rm -f "$tmpdepfile"
;;
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
# in a .u file. This file always lives in the current directory.
# Also, the AIX compiler puts `$object:' at the start of each line;
# $object doesn't have directory information.
stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
tmpdepfile="$stripped.u"
outname="$stripped.o"
if test "$libtool" = yes; then
"$@" -Wc,-M
else
"$@" -M
fi
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
exit $stat
fi
if test -f "$tmpdepfile"; then
# Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
# "include basename.Plo" scheme.
echo "#dummy" > "$depfile"
fi
rm -f "$tmpdepfile"
;;
tru64)
# The Tru64 AIX compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
# At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
# dependencies in `foo.d' instead, so we check for that too.
# Subdirectories are respected.
tmpdepfile1="$object.d"
tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'`
if test "$libtool" = yes; then
"$@" -Wc,-MD
else
"$@" -MD
fi
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile1" "$tmpdepfile2"
exit $stat
fi
if test -f "$tmpdepfile1"; then
tmpdepfile="$tmpdepfile1"
else
tmpdepfile="$tmpdepfile2"
fi
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
# That's a space and a tab in the [].
sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
echo "#dummy" > "$depfile"
fi
rm -f "$tmpdepfile"
;;
#nosideeffect)
# This comment above is used by automake to tell side-effect
# dependency tracking mechanisms from slower ones.
dashmstdout)
# Important note: in order to support this mode, a compiler *must*
# always write the proprocessed file to stdout, regardless of -o,
# because we must use -o when running libtool.
test -z "$dashmflag" && dashmflag=-M
( IFS=" "
case " $* " in
*" --mode=compile "*) # this is libtool, let us make it quiet
for arg
do # cycle over the arguments
case "$arg" in
"--mode=compile")
# insert --quiet before "--mode=compile"
set fnord "$@" --quiet
shift # fnord
;;
esac
set fnord "$@" "$arg"
shift # fnord
shift # "$arg"
done
;;
esac
"$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
) &
proc=$!
"$@"
stat=$?
wait "$proc"
if test "$stat" != 0; then exit $stat; fi
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
tr ' ' '
' < "$tmpdepfile" | \
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
dashXmstdout)
# This case only exists to satisfy depend.m4. It is never actually
# run, as this mode is specially recognized in the preamble.
exit 1
;;
makedepend)
# X makedepend
(
shift
cleared=no
for arg in "$@"; do
case $cleared in no)
set ""; shift
cleared=yes
esac
case "$arg" in
-D*|-I*)
set fnord "$@" "$arg"; shift;;
-*)
;;
*)
set fnord "$@" "$arg"; shift;;
esac
done
obj_suffix="`echo $object | sed 's/^.*\././'`"
touch "$tmpdepfile"
${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
) &
proc=$!
"$@"
stat=$?
wait "$proc"
if test "$stat" != 0; then exit $stat; fi
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
tail +3 "$tmpdepfile" | tr ' ' '
' | \
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile" "$tmpdepfile".bak
;;
cpp)
# Important note: in order to support this mode, a compiler *must*
# always write the proprocessed file to stdout, regardless of -o,
# because we must use -o when running libtool.
( IFS=" "
case " $* " in
*" --mode=compile "*)
for arg
do # cycle over the arguments
case $arg in
"--mode=compile")
# insert --quiet before "--mode=compile"
set fnord "$@" --quiet
shift # fnord
;;
esac
set fnord "$@" "$arg"
shift # fnord
shift # "$arg"
done
;;
esac
"$@" -E |
sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
sed '$ s: \\$::' > "$tmpdepfile"
) &
proc=$!
"$@"
stat=$?
wait "$proc"
if test "$stat" != 0; then exit $stat; fi
rm -f "$depfile"
echo "$object : \\" > "$depfile"
cat < "$tmpdepfile" >> "$depfile"
sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
msvisualcpp)
# Important note: in order to support this mode, a compiler *must*
# always write the proprocessed file to stdout, regardless of -o,
# because we must use -o when running libtool.
( IFS=" "
case " $* " in
*" --mode=compile "*)
for arg
do # cycle over the arguments
case $arg in
"--mode=compile")
# insert --quiet before "--mode=compile"
set fnord "$@" --quiet
shift # fnord
;;
esac
set fnord "$@" "$arg"
shift # fnord
shift # "$arg"
done
;;
esac
"$@" -E |
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
) &
proc=$!
"$@"
stat=$?
wait "$proc"
if test "$stat" != 0; then exit $stat; fi
rm -f "$depfile"
echo "$object : \\" > "$depfile"
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
echo " " >> "$depfile"
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
rm -f "$tmpdepfile"
;;
none)
exec "$@"
;;
*)
echo "Unknown depmode $depmode" 1>&2
exit 1
;;
esac
exit 0
Index: Makefile.am
===================================================================
RCS file: /cvsroot/lwatch/files/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am 8 Aug 2002 14:03:50 -0000 1.1
--- Makefile.am 28 Jan 2003 23:31:00 -0000 1.2
***************
*** 1 ****
! SUBDIRS = src doc
--- 1 ----
! SUBDIRS = src
Index: Makefile.in
===================================================================
RCS file: /cvsroot/lwatch/files/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.in 16 Nov 2002 23:18:26 -0000 1.4
--- Makefile.in 28 Jan 2003 23:31:00 -0000 1.5
***************
*** 1,6 ****
! # Makefile.in generated by automake 1.6.3 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,5 ----
! # Makefile.in generated automatically by automake 1.5 from Makefile.am.
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
***************
*** 14,17 ****
--- 13,17 ----
@SET_MAKE@
+
SHELL = @SHELL@
***************
*** 44,54 ****
AUTOHEADER = @AUTOHEADER@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
--- 44,50 ----
***************
*** 60,89 ****
PRE_UNINSTALL = :
POST_UNINSTALL = :
- build_alias = @build_alias@
- build_triplet = @build@
- host_alias = @host_alias@
- host_triplet = @host@
- target_alias = @target_alias@
- target_triplet = @target@
-
- EXEEXT = @EXEEXT@
- OBJEXT = @OBJEXT@
- PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@
AWK = @AWK@
CC = @CC@
DEPDIR = @DEPDIR@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LEX = @LEX@
! LEXLIB = @LEXLIB@
! LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
PACKAGE = @PACKAGE@
- STRIP = @STRIP@
VERSION = @VERSION@
am__include = @am__include@
am__quote = @am__quote@
- d2m = @d2m@
install_sh = @install_sh@
! SUBDIRS = src doc
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--- 56,74 ----
PRE_UNINSTALL = :
POST_UNINSTALL = :
AMTAR = @AMTAR@
AWK = @AWK@
CC = @CC@
DEPDIR = @DEPDIR@
+ EXEEXT = @EXEEXT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LEX = @LEX@
! OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
VERSION = @VERSION@
am__include = @am__include@
am__quote = @am__quote@
install_sh = @install_sh@
!
! SUBDIRS = src
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
***************
*** 98,123 ****
uninstall-recursive check-recursive installcheck-recursive
DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
! Makefile.in NEWS TODO acconfig.h aclocal.m4 config.guess \
! config.sub configure configure.in depcomp install-sh missing \
! mkinstalldirs
DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive
.SUFFIXES:
!
! am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
! configure.lineno
! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
! cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
! $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
! $(ACLOCAL_M4): configure.in
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
uninstall-info-am:
--- 83,106 ----
uninstall-recursive check-recursive installcheck-recursive
DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
! Makefile.in NEWS aclocal.m4 configure configure.ac depcomp \
! install-sh missing mkinstalldirs
DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive
.SUFFIXES:
! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
! cd $(top_builddir) && \
! CONFIG_HEADERS= CONFIG_LINKS= \
! CONFIG_FILES=$@ $(SHELL) ./config.status
$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
! $(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
! $(ACLOCAL_M4): configure.ac
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
uninstall-info-am:
***************
*** 130,134 ****
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
! @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
--- 113,117 ----
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
! @set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
***************
*** 150,154 ****
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
! @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
case "$@" in \
--- 133,137 ----
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
! @set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
case "$@" in \
***************
*** 178,188 ****
done
- ETAGS = etags
- ETAGSFLAGS =
-
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
--- 161,168 ----
done
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
***************
*** 190,194 ****
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! mkid -fID $$unique
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
--- 170,174 ----
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! mkid -fID $$unique $(LISP)
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
***************
*** 201,205 ****
fi; \
done; \
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
--- 181,185 ----
fi; \
done; \
! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
***************
*** 207,216 ****
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)$$tags$$unique" \
! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! $$tags $$unique
GTAGS:
! here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here
--- 187,195 ----
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
GTAGS:
! here=`CDPATH=: && cd $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here
***************
*** 218,251 ****
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = .
distdir = $(PACKAGE)-$(VERSION)
- am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
-
GZIP_ENV = --best
- distcleancheck_listfiles = find . -type f -print
distdir: $(DISTFILES)
! $(am__remove_distdir)
mkdir $(distdir)
! @list='$(DISTFILES)'; for file in $$list; do \
! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! dir="/$$dir"; \
! $(mkinstalldirs) "$(distdir)$$dir"; \
! else \
! dir=''; \
fi; \
if test -d $$d/$$file; then \
! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! fi; \
! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
test -f $(distdir)/$$file \
--- 197,221 ----
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = .
+ # Avoid unsightly `./'.
distdir = $(PACKAGE)-$(VERSION)
GZIP_ENV = --best
distdir: $(DISTFILES)
! -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
mkdir $(distdir)
! @for file in $(DISTFILES); do \
! if test -f $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! $(mkinstalldirs) "$(distdir)/$$dir"; \
fi; \
if test -d $$d/$$file; then \
! cp -pR $$d/$$file $(distdir) \
! || exit 1; \
else \
test -f $(distdir)/$$file \
***************
*** 254,258 ****
fi; \
done
! list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
--- 224,228 ----
fi; \
done
! for subdir in $(SUBDIRS); do \
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
***************
*** 272,282 ****
! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
! dist-gzip: distdir
! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! $(am__remove_distdir)
!
! dist dist-all: distdir
$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! $(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
--- 242,248 ----
! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
! dist: distdir
$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
# This target untars the dist file and tries a VPATH configuration. Then
***************
*** 284,288 ****
# tarfile.
distcheck: dist
! $(am__remove_distdir)
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
chmod -R a-w $(distdir); chmod a+w $(distdir)
--- 250,254 ----
# tarfile.
distcheck: dist
! -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
chmod -R a-w $(distdir); chmod a+w $(distdir)
***************
*** 290,297 ****
mkdir $(distdir)/=inst
chmod a-w $(distdir)
! dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
&& cd $(distdir)/=build \
&& ../configure --srcdir=.. --prefix=$$dc_install_base \
- $(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
--- 256,262 ----
mkdir $(distdir)/=inst
chmod a-w $(distdir)
! dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \
&& cd $(distdir)/=build \
&& ../configure --srcdir=.. --prefix=$$dc_install_base \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
***************
*** 301,322 ****
&& $(MAKE) $(AM_MAKEFLAGS) uninstall \
&& (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
! || { echo "ERROR: files left after uninstall:" ; \
! find $$dc_install_base -type f -print ; \
! exit 1; } >&2 ) \
! && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
&& rm -f $(distdir).tar.gz \
! && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
! $(am__remove_distdir)
@echo "$(distdir).tar.gz is ready for distribution" | \
sed 'h;s/./=/g;p;x;p;x'
- 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 after distclean:" ; \
- $(distcleancheck_listfiles) ; \
- exit 1; } >&2
check-am: all-am
check: check-recursive
--- 266,280 ----
&& $(MAKE) $(AM_MAKEFLAGS) uninstall \
&& (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
! || (echo "Error: files left after uninstall" 1>&2; \
! exit 1) ) \
! && $(MAKE) $(AM_MAKEFLAGS) dist \
! && $(MAKE) $(AM_MAKEFLAGS) distclean \
&& rm -f $(distdir).tar.gz \
! && (test `find . -type f -print | wc -l` -eq 0 \
! || (echo "Error: files left after distclean" 1>&2; \
! exit 1) )
! -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
@echo "$(distdir).tar.gz is ready for distribution" | \
sed 'h;s/./=/g;p;x;p;x'
check-am: all-am
check: check-recursive
***************
*** 336,340 ****
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
--- 294,297 ----
***************
*** 344,348 ****
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
--- 301,305 ----
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic:
***************
*** 353,358 ****
clean-am: clean-generic mostlyclean-am
distclean: distclean-recursive
! -rm -f $(am__CONFIG_DISTCLEAN_FILES)
distclean-am: clean-am distclean-generic distclean-tags
--- 310,318 ----
clean-am: clean-generic mostlyclean-am
+ dist-all: distdir
+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
distclean: distclean-recursive
! -rm -f config.status config.cache config.log
distclean-am: clean-am distclean-generic distclean-tags
***************
*** 376,381 ****
maintainer-clean: maintainer-clean-recursive
! -rm -f $(am__CONFIG_DISTCLEAN_FILES)
! -rm -rf autom4te.cache
maintainer-clean-am: distclean-am maintainer-clean-generic
--- 336,340 ----
maintainer-clean: maintainer-clean-recursive
!
maintainer-clean-am: distclean-am maintainer-clean-generic
***************
*** 389,405 ****
.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
! clean-generic clean-recursive dist dist-all dist-gzip distcheck \
! distclean distclean-generic distclean-recursive distclean-tags \
! distcleancheck distdir dvi dvi-am dvi-recursive info info-am \
! info-recursive install install-am install-data install-data-am \
! install-data-recursive install-exec install-exec-am \
! install-exec-recursive install-info install-info-am \
! install-info-recursive install-man install-recursive \
! install-strip installcheck installcheck-am installdirs \
! installdirs-am installdirs-recursive maintainer-clean \
! maintainer-clean-generic maintainer-clean-recursive mostlyclean \
! mostlyclean-generic mostlyclean-recursive tags tags-recursive \
! uninstall uninstall-am uninstall-info-am \
! uninstall-info-recursive uninstall-recursive
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 348,364 ----
.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
! clean-generic clean-recursive dist dist-all distcheck distclean \
! distclean-generic distclean-recursive distclean-tags distdir \
! dvi dvi-am dvi-recursive info info-am info-recursive install \
! install-am install-data install-data-am install-data-recursive \
! install-exec install-exec-am install-exec-recursive \
! install-info install-info-am install-info-recursive install-man \
! install-recursive install-strip installcheck installcheck-am \
! installdirs installdirs-am installdirs-recursive \
! maintainer-clean maintainer-clean-generic \
! maintainer-clean-recursive mostlyclean mostlyclean-generic \
! mostlyclean-recursive tags tags-recursive uninstall \
! uninstall-am uninstall-info-am uninstall-info-recursive \
! uninstall-recursive
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/lwatch/files/aclocal.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** aclocal.m4 16 Nov 2002 23:18:26 -0000 1.2
--- aclocal.m4 28 Jan 2003 23:31:00 -0000 1.3
***************
*** 1,5 ****
! # aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
! # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
--- 1,5 ----
! # aclocal.m4 generated automatically by aclocal 1.5
! # Copyright 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
***************
*** 12,39 ****
# PARTICULAR PURPOSE.
! # Do all the work for Automake. -*- Autoconf -*-
!
! # This macro actually does too much some checks are only needed if
! # 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.
!
! # 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 8
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
--- 12,20 ----
# PARTICULAR PURPOSE.
! # Do all the work for Automake. This macro actually does too much --
! # some checks are only needed if your package does certain things.
! # But this isn't really a big deal.
! # serial 5
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
***************
*** 44,93 ****
! AC_PREREQ([2.52])
! # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
! # the ones we care about.
! m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
! # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
! # AM_INIT_AUTOMAKE([OPTIONS])
! # -----------------------------------------------
! # The call with PACKAGE and VERSION arguments is the old style
! # call (pre autoconf-2.50), which is being phased out. PACKAGE
! # and VERSION should now be passed to AC_INIT and removed from
! # the call to AM_INIT_AUTOMAKE.
! # We support both call styles for the transition. After
! # the next Automake release, Autoconf can make the AC_INIT
! # arguments mandatory, and then we can depend on a new Autoconf
! # release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
! [AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
! AC_REQUIRE([AC_PROG_INSTALL])dnl
# test to see if srcdir already configured
! if test "`cd $srcdir && pwd`" != "`pwd`" &&
test -f $srcdir/config.status; then
! AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
fi
# Define the identity of the package.
! dnl Distinguish between old-style and new-style calls.
! m4_ifval([$2],
! [m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
! AC_SUBST([PACKAGE], [$1])dnl
! 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],,
[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
! AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
# Some tools Automake needs.
AC_REQUIRE([AM_SANITY_CHECK])dnl
AC_REQUIRE([AC_ARG_PROGRAM])dnl
! AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
AM_MISSING_PROG(AUTOCONF, autoconf)
! AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo)
--- 25,84 ----
! # We require 2.13 because we rely on SHELL being computed by configure.
! AC_PREREQ([2.13])
! # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
! # -----------------------------------------------------------
! # If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED.
! # The purpose of this macro is to provide the user with a means to
! # check macros which are provided without letting her know how the
! # information is coded.
! # If this macro is not defined by Autoconf, define it here.
! ifdef([AC_PROVIDE_IFELSE],
! [],
! [define([AC_PROVIDE_IFELSE],
! [ifdef([AC_PROVIDE_$1],
! [$2], [$3])])])
!
! # AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE])
! # ----------------------------------------------
AC_DEFUN([AM_INIT_AUTOMAKE],
! [AC_REQUIRE([AC_PROG_INSTALL])dnl
# test to see if srcdir already configured
! if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
test -f $srcdir/config.status; then
! AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first])
fi
# Define the identity of the package.
! PACKAGE=$1
! AC_SUBST(PACKAGE)dnl
! VERSION=$2
! AC_SUBST(VERSION)dnl
! ifelse([$3],,
[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
! AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
!
! # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
! # the ones we care about.
! ifdef([m4_pattern_allow],
! [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl
!
! # Autoconf 2.50 always computes EXEEXT. However we need to be
! # compatible with 2.13, for now. So we always define EXEEXT, but we
! # don't compute it.
! AC_SUBST(EXEEXT)
! # Similar for OBJEXT -- only we only use OBJEXT if the user actually
! # requests that it be used. This is a bit dumb.
! : ${OBJEXT=o}
! AC_SUBST(OBJEXT)
# Some tools Automake needs.
AC_REQUIRE([AM_SANITY_CHECK])dnl
AC_REQUIRE([AC_ARG_PROGRAM])dnl
! AM_MISSING_PROG(ACLOCAL, aclocal)
AM_MISSING_PROG(AUTOCONF, autoconf)
! AM_MISSING_PROG(AUTOMAKE, automake)
AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo)
***************
*** 99,105 ****
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
!
! _AM_IF_OPTION([no-dependencies],,
! [AC_PROVIDE_IFELSE([AC_PROG_][CC],
[_AM_DEPENDENCIES(CC)],
[define([AC_PROG_][CC],
--- 90,96 ----
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
! AC_REQUIRE([AM_DEP_TRACK])dnl
! AC_REQUIRE([AM_SET_DEPDIR])dnl
! AC_PROVIDE_IFELSE([AC_PROG_][CC],
[_AM_DEPENDENCIES(CC)],
[define([AC_PROG_][CC],
***************
*** 110,187 ****
defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
])
- ])
-
- # Copyright 2002 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
-
- # AM_AUTOMAKE_VERSION(VERSION)
- # ----------------------------
- # Automake X.Y traces this macro to ensure aclocal.m4 has been
- # generated from the m4 files accompanying Automake X.Y.
- AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])
-
- # AM_SET_CURRENT_AUTOMAKE_VERSION
- # -------------------------------
- # Call AM_AUTOMAKE_VERSION so it can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.6.3])])
-
- # Helper functions for option handling. -*- Autoconf -*-
-
- # Copyright 2001, 2002 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 2
-
- # _AM_MANGLE_OPTION(NAME)
- # -----------------------
- AC_DEFUN([_AM_MANGLE_OPTION],
- [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
- # _AM_SET_OPTION(NAME)
- # ------------------------------
- # Set option NAME. Presently that only means defining a flag for this option.
- AC_DEFUN([_AM_SET_OPTION],
- [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
- # _AM_SET_OPTIONS(OPTIONS)
- # ----------------------------------
- # OPTIONS is a space-separated list of Automake options.
- AC_DEFUN([_AM_SET_OPTIONS],
- [AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
- # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
- # -------------------------------------------
- # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
- AC_DEFUN([_AM_IF_OPTION],
- [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
#
--- 101,104 ----
***************
*** 189,209 ****
#
- # Copyright 1996, 1997, 2000, 2001 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 3
--- 106,109 ----
***************
*** 249,273 ****
AC_MSG_RESULT(yes)])
- # -*- Autoconf -*-
-
! # Copyright 1997, 1999, 2000, 2001 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 3
# AM_MISSING_PROG(NAME, PROGRAM)
--- 149,154 ----
AC_MSG_RESULT(yes)])
! # serial 2
# AM_MISSING_PROG(NAME, PROGRAM)
***************
*** 291,295 ****
else
am_missing_run=
! AC_MSG_WARN([`missing' script is too old or missing])
fi
])
--- 172,177 ----
else
am_missing_run=
! am_backtick='`'
! AC_MSG_WARN([${am_backtick}missing' script is too old or missing])
fi
])
***************
*** 297,317 ****
# AM_AUX_DIR_EXPAND
- # Copyright 2001 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.
-
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
--- 179,182 ----
***************
*** 352,361 ****
# configured tree to be moved without reconfiguration.
- # Rely on autoconf to set up CDPATH properly.
- AC_PREREQ([2.50])
-
AC_DEFUN([AM_AUX_DIR_EXPAND], [
# expand $ac_aux_dir to an absolute path
! am_aux_dir=`cd $ac_aux_dir && pwd`
])
--- 217,223 ----
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND], [
# expand $ac_aux_dir to an absolute path
! am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
])
***************
*** 363,384 ****
# ------------------
# Define $install_sh.
-
- # Copyright 2001 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.
-
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--- 225,228 ----
***************
*** 386,408 ****
AC_SUBST(install_sh)])
- # AM_PROG_INSTALL_STRIP
-
- # Copyright 2001 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.
-
# One issue with vendor `install' (even GNU) is that you can't
# specify the program used to strip binaries. This is especially
--- 230,233 ----
***************
*** 414,425 ****
AC_DEFUN([AM_PROG_INSTALL_STRIP],
[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
- # Installed binaries are usually stripped using `strip' when the user
- # run `make install-strip'. However `strip' might not be the right
- # tool to use in cross-compilation environments, therefore Automake
- # will honor the `STRIP' environment variable to overrule this program.
- dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
- if test "$cross_compiling" != no; then
- AC_CHECK_TOOL([STRIP], [strip], :)
- fi
INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
--- 239,242 ----
***************
*** 427,446 ****
# serial 4 -*- Autoconf -*-
- # Copyright 1999, 2000, 2001 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.
--- 244,247 ----
***************
*** 454,460 ****
# _AM_DEPENDENCIES(NAME)
! # ----------------------
# See how the compiler implements dependency checking.
! # NAME is "CC", "CXX", "GCJ", or "OBJC".
# We try a few techniques and use that to set a single cache variable.
#
--- 255,261 ----
# _AM_DEPENDENCIES(NAME)
! # ---------------------
# See how the compiler implements dependency checking.
! # NAME is "CC", "CXX" or "OBJC".
# We try a few techniques and use that to set a single cache variable.
#
***************
*** 471,475 ****
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
[$1], CXX, [depcc="$CXX" am_compiler_list=],
! [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=])
--- 272,276 ----
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
[$1], CXX, [depcc="$CXX" am_compiler_list=],
! [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc']
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=])
***************
*** 533,537 ****
fi
])
! AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
])
--- 334,339 ----
fi
])
! $1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type"
! AC_SUBST([$1DEPMODE])
])
***************
*** 551,555 ****
fi
rmdir .deps 2>/dev/null
! AC_SUBST([DEPDIR])
])
--- 353,357 ----
fi
rmdir .deps 2>/dev/null
! AC_SUBST(DEPDIR)
])
***************
*** 566,611 ****
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
! AC_SUBST([AMDEPBACKSLASH])
])
! # Generate code to set up dependency tracking. -*- Autoconf -*-
!
! # Copyright 1999, 2000, 2001, 2002 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 2
! # _AM_OUTPUT_DEPENDENCY_COMMANDS
! # ------------------------------
! AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
! [for mf in $CONFIG_FILES; do
! # Strip MF so we end up with the name of the file.
! mf=`echo "$mf" | sed -e 's/:.*$//'`
! # Check whether this is an Automake generated Makefile or not.
! # We used to match only the files named `Makefile.in', but
! # some people rename them; so instead we look at the file content.
! # Grep'ing the first line is not enough: some people post-process
! # each Makefile.in and add a new line on top of each file to say so.
! # So let's grep whole file.
! if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
! dirpart=`AS_DIRNAME("$mf")`
! else
! continue
! fi
! grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
# Extract the definition of DEP_FILES from the Makefile without
# running `make'.
--- 368,395 ----
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
! pushdef([subst], defn([AC_SUBST]))
! subst(AMDEPBACKSLASH)
! popdef([subst])
])
! # Generate code to set up dependency tracking.
! # This macro should only be invoked once -- use via AC_REQUIRE.
! # Usage:
! # AM_OUTPUT_DEPENDENCY_COMMANDS
! #
! # This code is only required when automatic dependency tracking
! # is enabled. FIXME. This creates each `.P' file that we will
! # need in order to bootstrap the dependency handling code.
! AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[
! AC_OUTPUT_COMMANDS([
! test x"$AMDEP_TRUE" != x"" ||
! for mf in $CONFIG_FILES; do
! case "$mf" in
! Makefile) dirpart=.;;
! */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;;
! *) continue;;
! esac
! grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
# Extract the definition of DEP_FILES from the Makefile without
# running `make'.
***************
*** 631,674 ****
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
! fdir=`AS_DIRNAME(["$file"])`
! AS_MKDIR_P([$dirpart/$fdir])
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
done
! ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
!
!
! # AM_OUTPUT_DEPENDENCY_COMMANDS
! # -----------------------------
! # This macro should only be invoked once -- use via AC_REQUIRE.
! #
! # This code is only required when automatic dependency tracking
! # is enabled. FIXME. This creates each `.P' file that we will
! # need in order to bootstrap the dependency handling code.
! AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
! [AC_CONFIG_COMMANDS([depfiles],
! [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
! [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
! ])
!
! # Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*-
!
! # 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 2
# AM_MAKE_INCLUDE()
--- 415,426 ----
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
! fdir=`echo "$file" | sed -e 's|/[^/]*$||'`
! $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
done
! ], [AMDEP_TRUE="$AMDEP_TRUE"
! ac_aux_dir="$ac_aux_dir"])])
# AM_MAKE_INCLUDE()
***************
*** 683,687 ****
# If we don't find an include directive, just comment out the code.
AC_MSG_CHECKING([for style of include used by $am_make])
! am__include="#"
am__quote=
_am_result=none
--- 435,439 ----
# If we don't find an include directive, just comment out the code.
AC_MSG_CHECKING([for style of include used by $am_make])
! am__include='#'
am__quote=
_am_result=none
***************
*** 703,707 ****
if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
am__include=.include
! am__quote="\""
_am_result=BSD
fi
--- 455,459 ----
if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
am__include=.include
! am__quote='"'
_am_result=BSD
fi
***************
*** 713,745 ****
])
! # AM_CONDITIONAL -*- Autoconf -*-
!
! # Copyright 1997, 2000, 2001 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 5
!
! AC_PREREQ(2.52)
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
# Define a conditional.
AC_DEFUN([AM_CONDITIONAL],
! [ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
! [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
AC_SUBST([$1_TRUE])
AC_SUBST([$1_FALSE])
--- 465,485 ----
])
! # serial 3
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
# Define a conditional.
+ #
+ # FIXME: Once using 2.50, use this:
+ # m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl
AC_DEFUN([AM_CONDITIONAL],
! [ifelse([$1], [TRUE],
! [errprint(__file__:__line__: [$0: invalid condition: $1
! ])dnl
! m4exit(1)])dnl
! ifelse([$1], [FALSE],
! [errprint(__file__:__line__: [$0: invalid condition: $1
! ])dnl
! m4exit(1)])dnl
AC_SUBST([$1_TRUE])
AC_SUBST([$1_FALSE])
***************
*** 750,782 ****
$1_TRUE='#'
$1_FALSE=
! fi
! AC_CONFIG_COMMANDS_PRE(
! [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
! AC_MSG_ERROR([conditional \"$1\" was never defined.
! Usually this means the macro was only invoked conditionally.])
! fi])])
!
! # Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
!
! # Copyright 1996, 1997, 2000, 2001 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.
! AC_PREREQ([2.52])
! # serial 6
# When config.status generates a header, we must update the stamp-h file.
--- 490,498 ----
$1_TRUE='#'
$1_FALSE=
! fi])
! # Like AC_CONFIG_HEADER, but automatically create stamp file.
! # serial 3
# When config.status generates a header, we must update the stamp-h file.
***************
*** 785,869 ****
# and everything past the last "/".
# _AM_DIRNAME(PATH)
# -----------------
# Like AS_DIRNAME, only do it during macro expansion
AC_DEFUN([_AM_DIRNAME],
! [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
! m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
! m4_if(regexp([$1], [^/.*]), -1,
[.],
! patsubst([$1], [^\(/\).*], [\1])),
! patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
! patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
! ])# _AM_DIRNAME
!
!
! # The stamp files are numbered to have different names.
! # We could number them on a directory basis, but that's additional
! # complications, let's have a unique counter.
! m4_define([_AM_STAMP_Count], [0])
!
!
! # _AM_STAMP(HEADER)
! # -----------------
! # The name of the stamp file for HEADER.
! AC_DEFUN([_AM_STAMP],
! [m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
! AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
! [:.*])))/stamp-h[]_AM_STAMP_Count])
!
!
! # _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
! # ------------------------------------------------------------
! # We used to try to get a real timestamp in stamp-h. But the fear is that
! # that will cause unnecessary cvs conflicts.
! AC_DEFUN([_AM_CONFIG_HEADER],
! [# Add the stamp file to the list of files AC keeps track of,
! # along with our hook.
! AC_CONFIG_HEADERS([$1],
! [# update the timestamp
! echo 'timestamp for $1' >"_AM_STAMP([$1])"
! $2],
! [$3])
! ])# _AM_CONFIG_HEADER
!
!
! # AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
! # --------------------------------------------------------------
! AC_DEFUN([AM_CONFIG_HEADER],
! [AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
! ])# AM_CONFIG_HEADER
!
!
! # Copyright 1998, 1999, 2000, 2001, 2002 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...
[truncated message content] |