[lwatch-cvs] files Makefile.in,1.7,1.8 aclocal.m4,1.5,1.6 configure,1.5,1.6
Brought to you by:
arturcz
|
From: <ar...@us...> - 2003-02-02 23:30:39
|
Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1:/tmp/cvs-serv13210
Modified Files:
Makefile.in aclocal.m4 configure
Log Message:
- developing environment: autoconf 2.57-2, automake-1.7.2-3
(bede ucinal lapy, za uzywanie innych wersji, deby do woody'ego u mnie)
Index: Makefile.in
===================================================================
RCS file: /cvsroot/lwatch/files/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.in 2 Feb 2003 20:38:19 -0000 1.7
--- Makefile.in 2 Feb 2003 23:30:32 -0000 1.8
***************
*** 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
--- 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
***************
*** 14,37 ****
@SET_MAKE@
- SHELL = @SHELL@
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
-
- bindir = @bindir@
- sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
- sysconfdir = @sysconfdir@
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
- libdir = @libdir@
- infodir = @infodir@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
--- 15,21 ----
***************
*** 39,53 ****
top_builddir = .
! ACLOCAL = @ACLOCAL@
! AUTOCONF = @AUTOCONF@
! AUTOMAKE = @AUTOMAKE@
! AUTOHEADER = @AUTOHEADER@
!
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@
! INSTALL_DATA = @INSTALL_DATA@
! INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
! transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
--- 23,33 ----
top_builddir = .
! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
! install_sh_DATA = $(install_sh) -c -m 644
! install_sh_PROGRAM = $(install_sh) -c
! install_sh_SCRIPT = $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
! transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
***************
*** 56,74 ****
PRE_UNINSTALL = :
POST_UNINSTALL = :
AMTAR = @AMTAR@
AWK = @AWK@
CC = @CC@
DEPDIR = @DEPDIR@
EXEEXT = @EXEEXT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LEX = @LEX@
LN_S = @LN_S@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
VERSION = @VERSION@
am__include = @am__include@
am__quote = @am__quote@
install_sh = @install_sh@
!
SUBDIRS = src
subdir = .
--- 36,110 ----
PRE_UNINSTALL = :
POST_UNINSTALL = :
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
VERSION = @VERSION@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_STRIP = @ac_ct_STRIP@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__quote = @am__quote@
+ bindir = @bindir@
+ build_alias = @build_alias@
+ datadir = @datadir@
+ exec_prefix = @exec_prefix@
+ host_alias = @host_alias@
+ includedir = @includedir@
+ infodir = @infodir@
install_sh = @install_sh@
! libdir = @libdir@
! libexecdir = @libexecdir@
! localstatedir = @localstatedir@
! mandir = @mandir@
! oldincludedir = @oldincludedir@
! prefix = @prefix@
! program_transform_name = @program_transform_name@
! sbindir = @sbindir@
! sharedstatedir = @sharedstatedir@
! sysconfdir = @sysconfdir@
! target_alias = @target_alias@
SUBDIRS = src
subdir = .
***************
*** 79,86 ****
DIST_SOURCES =
! RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
! uninstall-info-recursive all-recursive install-data-recursive \
! install-exec-recursive 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 configure configure.ac depcomp \
--- 115,123 ----
DIST_SOURCES =
! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
! ps-recursive install-info-recursive uninstall-info-recursive \
! all-recursive install-data-recursive install-exec-recursive \
! 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 configure configure.ac depcomp \
***************
*** 90,100 ****
.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)
--- 127,138 ----
.SUFFIXES:
+
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno
$(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) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
***************
*** 114,118 ****
# (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//`; \
--- 152,156 ----
# (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//`; \
***************
*** 134,138 ****
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
! @set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
case "$@" in \
--- 172,176 ----
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
! @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
case "$@" in \
***************
*** 161,169 ****
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
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; \
--- 199,217 ----
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
+ ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ ETAGS = etags
+ ETAGSFLAGS =
+
+ CTAGS = ctags
+ CTAGSFLAGS =
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; \
***************
*** 171,175 ****
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! mkid -fID $$unique $(LISP)
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
--- 219,223 ----
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! mkid -fID $$unique
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
***************
*** 182,186 ****
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; \
--- 230,234 ----
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; \
***************
*** 188,222 ****
$(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
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 \
--- 236,302 ----
$(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
!
! ctags: CTAGS
! CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
! tags=; \
! here=`pwd`; \
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
! test -z "$(CTAGS_ARGS)$$tags$$unique" \
! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
! $$tags $$unique
GTAGS:
! here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
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
+ distuninstallcheck_listfiles = find . -type f -print
+ distcleancheck_listfiles = find . -type f -print
distdir: $(DISTFILES)
! $(am__remove_distdir)
mkdir $(distdir)
! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
! list='$(DISTFILES)'; for file in $$list; do \
! case $$file in \
! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
! esac; \
! 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 \
***************
*** 225,229 ****
fi; \
done
! for subdir in $(SUBDIRS); do \
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
--- 305,309 ----
fi; \
done
! list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
***************
*** 243,249 ****
! -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
--- 323,333 ----
! -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
***************
*** 251,255 ****
# 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)
--- 335,339 ----
# 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)
***************
*** 257,263 ****
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 \
--- 341,349 ----
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) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
***************
*** 266,281 ****
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
&& $(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
--- 352,390 ----
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
&& $(MAKE) $(AM_MAKEFLAGS) uninstall \
! && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
! distuninstallcheck \
! && chmod -R a-w "$$dc_install_base" \
! && ({ \
! (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
! distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
! } || { rm -rf "$$dc_destdir"; exit 1; }) \
! && rm -rf "$$dc_destdir" \
! && $(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'
+ distuninstallcheck:
+ cd $(distuninstallcheck_dir) \
+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ if test -n "$(DESTDIR)"; then \
+ echo " (check DESTDIR support)"; \
+ fi ; \
+ $(distuninstallcheck_listfiles) ; \
+ 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) ; \
+ exit 1; } >&2
check-am: all-am
check: check-recursive
***************
*** 295,298 ****
--- 404,408 ----
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
***************
*** 302,306 ****
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic:
--- 412,416 ----
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
***************
*** 311,319 ****
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
--- 421,426 ----
clean-am: clean-generic mostlyclean-am
distclean: distclean-recursive
! -rm -f $(am__CONFIG_DISTCLEAN_FILES)
distclean-am: clean-am distclean-generic distclean-tags
***************
*** 337,341 ****
maintainer-clean: maintainer-clean-recursive
!
maintainer-clean-am: distclean-am maintainer-clean-generic
--- 444,449 ----
maintainer-clean: maintainer-clean-recursive
! -rm -f $(am__CONFIG_DISTCLEAN_FILES)
! -rm -rf autom4te.cache
maintainer-clean-am: distclean-am maintainer-clean-generic
***************
*** 344,365 ****
mostlyclean-am: mostlyclean-generic
uninstall-am: uninstall-info-am
uninstall-info: uninstall-info-recursive
! .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.
--- 452,483 ----
mostlyclean-am: mostlyclean-generic
+ pdf: pdf-recursive
+
+ pdf-am:
+
+ ps: ps-recursive
+
+ ps-am:
+
uninstall-am: uninstall-info-am
uninstall-info: uninstall-info-recursive
! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
! clean-generic clean-recursive ctags ctags-recursive dist \
! dist-all dist-gzip distcheck distclean distclean-generic \
! distclean-recursive distclean-tags distcleancheck distdir \
! distuninstallcheck 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 pdf pdf-am \
! pdf-recursive ps ps-am ps-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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** aclocal.m4 2 Feb 2003 20:38:19 -0000 1.5
--- aclocal.m4 2 Feb 2003 23:30:33 -0000 1.6
***************
*** 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
--- 1,5 ----
! # generated automatically by aclocal 1.7.2 -*- Autoconf -*-
! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
***************
*** 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
--- 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
***************
*** 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)
--- 44,103 ----
! AC_PREREQ([2.54])
+ # 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
! # test whether we have cygpath
! if test -z "$CYGPATH_W"; then
! if (cygpath --version) >/dev/null 2>/dev/null; then
! CYGPATH_W='cygpath -w'
! else
! CYGPATH_W=echo
! fi
! fi
! AC_SUBST([CYGPATH_W])
! # 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)
***************
*** 90,109 ****
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],
! defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
! AC_PROVIDE_IFELSE([AC_PROG_][CXX],
[_AM_DEPENDENCIES(CXX)],
! [define([AC_PROG_][CXX],
! defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
])
#
# Check to make sure that the build environment is sane.
#
# serial 3
--- 109,231 ----
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],
! defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
! AC_PROVIDE_IFELSE([AC_PROG_CXX],
[_AM_DEPENDENCIES(CXX)],
! [define([AC_PROG_CXX],
! defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
! ])
])
+
+ # When config.status generates a header, we must update the stamp-h file.
+ # This file resides in the same directory as the config header
+ # that is generated. The stamp files are numbered to have different names.
+
+ # Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+ # loop where config.status creates the headers, so we can generate
+ # 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])
+
+ # 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.7"])
+
+ # 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.7.2])])
+
+ # 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])])
+
#
# Check to make sure that the build environment is sane.
#
+ # 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
***************
*** 149,154 ****
AC_MSG_RESULT(yes)])
! # serial 2
# AM_MISSING_PROG(NAME, PROGRAM)
--- 271,295 ----
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)
***************
*** 172,177 ****
else
am_missing_run=
! am_backtick='`'
! AC_MSG_WARN([${am_backtick}missing' script is too old or missing])
fi
])
--- 313,317 ----
else
am_missing_run=
! AC_MSG_WARN([`missing' script is too old or missing])
fi
])
***************
*** 179,182 ****
--- 319,339 ----
# 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
***************
*** 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`
])
--- 374,383 ----
# 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`
])
***************
*** 225,228 ****
--- 385,406 ----
# ------------------
# 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
***************
*** 230,233 ****
--- 408,430 ----
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
***************
*** 239,242 ****
--- 436,447 ----
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])])
***************
*** 244,247 ****
--- 449,468 ----
# 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.
***************
*** 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.
#
--- 476,482 ----
# _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.
#
***************
*** 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=])
--- 493,497 ----
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=])
***************
*** 320,324 ****
source=conftest.c object=conftest.o \
depfile=conftest.Po tmpdepfile=conftest.TPo \
! $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
grep conftest.h conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
--- 541,545 ----
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
***************
*** 334,339 ****
fi
])
! $1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type"
! AC_SUBST([$1DEPMODE])
])
--- 555,562 ----
fi
])
! AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
! AM_CONDITIONAL([am__fastdep$1], [
! test "x$enable_dependency_tracking" != xno \
! && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
])
***************
*** 353,357 ****
fi
rmdir .deps 2>/dev/null
! AC_SUBST(DEPDIR)
])
--- 576,580 ----
fi
rmdir .deps 2>/dev/null
! AC_SUBST([DEPDIR])
])
***************
*** 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'.
--- 591,636 ----
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'.
***************
*** 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()
--- 656,701 ----
# 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"])
! ])
!
! # 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
! # 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()
***************
*** 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
--- 710,714 ----
# 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
***************
*** 445,449 ****
# be invoked under some other name (usually "gmake"), in which
# case it prints its new name instead of `make'.
! if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
am__include=include
am__quote=
--- 720,724 ----
# be invoked under some other name (usually "gmake"), in which
# case it prints its new name instead of `make'.
! if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
am__include=include
am__quote=
***************
*** 455,459 ****
if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
am__include=.include
! am__quote='"'
_am_result=BSD
fi
--- 730,734 ----
if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
am__include=.include
! am__quote="\""
_am_result=BSD
fi
***************
*** 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])
--- 740,772 ----
])
! # 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])
***************
*** 490,569 ****
$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.
! # This file resides in the same directory as the config header
! # that is generated. We must strip everything past the first ":",
! # and everything past the last "/".
! AC_PREREQ([2.12])
! AC_DEFUN([AM_CONFIG_HEADER],
! [ifdef([AC_FOREACH],dnl
! [dnl init our file count if it isn't already
! m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0]))
! dnl prepare to store our destination file list for use in config.status
! AC_FOREACH([_AM_File], [$1],
! [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*]))
! m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index))
! dnl and add it to the list of files AC keeps track of, along
! dnl with our hook
! AC_CONFIG_HEADERS(_AM_File,
! dnl COMMANDS, [, INIT-CMDS]
! [# update the timestamp
! echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index["
! ][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS
! m4_popdef([_AM_Dest])])],dnl
! [AC_CONFIG_HEADER([$1])
! AC_OUTPUT_COMMANDS(
! ifelse(patsubst([$1], [[^ ]], []),
! [],
! [test -z "$CONFIG_HEADERS" || echo timestamp >dnl
! patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl
! [am_indx=1
! for am_file in $1; do
! case " \$CONFIG_HEADERS " in
! *" \$am_file "*)
! am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\`
! if test -n "\$am_dir"; then
! am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\`
! for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do
! am_tmpdir=\$am_tmpdir\$am_subdir/
! if test ! -d \$am_tmpdir; then
! mkdir \$am_tmpdir
! fi
! done
! fi
! echo timestamp > "\$am_dir"stamp-h\$am_indx
! ;;
! esac
! am_indx=\`expr \$am_indx + 1\`
! done])
! ])]) # AM_CONFIG_HEADER
! # _AM_DIRNAME(PATH)
! # -----------------
! # Like AS_DIRNAME, only do it during macro expansion
! AC_DEFUN([_AM_DIRNAME],
! [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
! m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1,
! m4_if(m4_regexp([$1], [^/.*]), -1,
! [.],
! m4_patsubst([$1], [^\(/\).*], [\1])),
! m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
! m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
! ]) # _AM_DIRNAME
# AM_PROG_LEX
! # Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
AC_DEFUN([AM_PROG_LEX],
! [AC_REQUIRE([AM_MISSING_HAS_RUN])
! AC_CHECK_PROGS(LEX, flex lex, [${am_missing_run}flex])
! AC_PROG_LEX
! AC_DECL_YYTEXT])
--- 777,844 ----
$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
+
+ # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
+ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+
+
+ # 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 330, Boston, MA
+ # 02111-1307, USA.
+
+ # serial 3
+
+ AC_PREREQ(2.50)
# AM_PROG_LEX
! # -----------
! # Autoconf leaves LEX=: if lex or flex can't be found. Change that to a
! # "missing" invocation, for better error output.
AC_DEFUN([AM_PROG_LEX],
! [AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
! AC_REQUIRE([AC_PROG_LEX])dnl
! if test "$LEX" = :; then
! LEX=${am_missing_run}flex
! fi])
Index: configure
===================================================================
RCS file: /cvsroot/lwatch/files/configure,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** configure 2 Feb 2003 20:38:19 -0000 1.5
--- configure 2 Feb 2003 23:30:33 -0000 1.6
***************
*** 1,5 ****
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.53 for lwatch 0.1.
#
# Report bugs to <ar...@he...>.
--- 1,5 ----
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.57 for lwatch 0.1.
#
[...3677 lines suppressed...]
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
***************
*** 5193,5198 ****
if test "$no_create" != yes; then
ac_cs_success=:
exec 5>/dev/null
! $SHELL $CONFIG_STATUS || ac_cs_success=false
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
--- 5644,5652 ----
if test "$no_create" != yes; then
ac_cs_success=:
+ ac_config_status_args=
+ test "$silent" = yes &&
+ ac_config_status_args="$ac_config_status_args --quiet"
exec 5>/dev/null
! $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
|