diff --git a/ChangeLog b/ChangeLog index 473e2c2..b52d281 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,19 @@ E-MailRelay Change Log ====================== +1.0.0 -> 1.0.1 +-------------- +* In proxy mode unexpected client-side disconnects and timeouts result in ".bad" files [bug-id 659039]. +* Require successful "AUTH" before "MAIL FROM" when using "--server-auth". +* Better word-wrap on "--help" output. +* Use of RedHat's "functions" code, and support for "chkconfig", added to the "init.d" script. +* Builds with gcc3.2 (1.0.0-pl5). +* Fix for files left as "busy" after a connection failure in proxy mode [bug-id 631032] (1.0.0-pl3/4/5). +* Trivial documentation fixes (1.0.0-pl3). +* Fix for the double-dot escape bug in the client protocol [bug-id 611624] (1.0.0-pl2). +* Fix build when using gcc2.96 rather than gcc2.95 (1.0.0-pl1). +* Fix default spool directory in example scripts (1.0.0-pl1). + 0.9.9 -> 1.0.0 -------------- * Briefer "--help" output; works with "--verbose". @@ -22,7 +35,7 @@ E-MailRelay Change Log * Spool files writeable by preprocessor when server started as root. * Default directories in executables and scripts come from "configure". * The "init.d" script is renamed "emailrelay" (was "emailrelay.sh"). -* Man pages are gzippped when installed. +* Man pages are gzipped when installed. * Fix for access violation under Windows NT when client disconnects. * Use of event log when compiled on Windows NT. * Fix for info-after-flush bug when using the administration interface. [rc2] @@ -80,8 +93,8 @@ Windows fixes and improvements... 0.9.2 -> 0.9.3 -------------- -* Proxy mode (--immediate and --as-proxy). -* Message preprocessing (--filter). +* Proxy mode ("--immediate" and "--as-proxy"). +* Message preprocessing ("--filter"). * Message store classes better separated using abstract interfaces. * Improved notification script, with MIME encoding. * Builds with old 2.91 version of gcc. @@ -90,7 +103,7 @@ Windows fixes and improvements... -------------- * Better autoconf detection. * Workround for FreeBSD uname() feature. -* Added missing .sh_ files to the distribution. +* Added missing ".sh_" files to the distribution. * Fixed a benign directory iterator bug. * Use of gcc's "exception" header. diff --git a/Makefile.am b/Makefile.am index 936832e..636ef21 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Makefile.in b/Makefile.in index 2d21618..a6580a3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,8 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated by automake 1.6.3 from Makefile.am. +# @configure_input@ -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,26 +12,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# -# Copyright (C) 2001-2002 Graeme Walker -# -# 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 of the License, 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., 675 Mass Ave, Cambridge, MA 02139, USA. -# - - +@SET_MAKE@ SHELL = @SHELL@ srcdir = @srcdir@ @@ -50,13 +33,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = . ACLOCAL = @ACLOCAL@ @@ -64,31 +43,44 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +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) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +AMTAR = @AMTAR@ AR = @AR@ AWK = @AWK@ CC = @CC@ COMPILER_VERSION = @COMPILER_VERSION@ CXX = @CXX@ +DEPDIR = @DEPDIR@ GZIP = @GZIP@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_MAN2HTML = @HAVE_MAN2HTML@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ MAKE = @MAKE@ -MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +STRIP = @STRIP@ VERSION = @VERSION@ +am__include = @am__include@ +am__quote = @am__quote@ e_docdir = @e_docdir@ e_examplesdir = @e_examplesdir@ e_initdir = @e_initdir@ @@ -96,88 +88,102 @@ e_libexecdir = @e_libexecdir@ e_man1dir = @e_man1dir@ e_sbindir = @e_sbindir@ e_spooldir = @e_spooldir@ +install_sh = @install_sh@ +# +# Copyright (C) 2001-2003 Graeme Walker +# +# 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 of the License, 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# EXTRA_DIST = emailrelay.spec ChangeLog SUBDIRS = src bin lib doc e_doc_DATA = NEWS README changelog.gz CLEANFILES = changelog.gz +subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = -DATA = $(e_doc_DATA) - -DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ -Makefile.am Makefile.in NEWS acinclude.m4 aclocal.m4 config.h.in \ -configure configure.ac install-sh missing mkinstalldirs +CONFIG_CLEAN_FILES = +DIST_SOURCES = +DATA = $(e_doc_DATA) -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) +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 acinclude.m4 aclocal.m4 config.h.in configure \ + configure.ac depcomp install-sh missing mkinstalldirs +DIST_SUBDIRS = $(SUBDIRS) +all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive -TAR = tar -GZIP_ENV = --best -all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status +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) -$(ACLOCAL_M4): configure.ac acinclude.m4 - cd $(srcdir) && $(ACLOCAL) - -config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +$(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) -config.h: stamp-h +$(ACLOCAL_M4): configure.ac acinclude.m4 + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + +config.h: stamp-h1 @if test ! -f $@; then \ - rm -f stamp-h; \ - $(MAKE) stamp-h; \ + rm -f stamp-h1; \ + $(MAKE) stamp-h1; \ else :; fi -stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=config.h \ - $(SHELL) ./config.status - @echo timestamp > stamp-h 2> /dev/null -$(srcdir)/config.h.in: $(srcdir)/stamp-h.in - @if test ! -f $@; then \ - rm -f $(srcdir)/stamp-h.in; \ - $(MAKE) $(srcdir)/stamp-h.in; \ - else :; fi -$(srcdir)/stamp-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) + +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h + +$(srcdir)/config.h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOHEADER) - @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null - -mostlyclean-hdr: - -clean-hdr: + touch $(srcdir)/config.h.in distclean-hdr: - -rm -f config.h - -maintainer-clean-hdr: - + -rm -f config.h stamp-h1 +uninstall-info-am: +e_docDATA_INSTALL = $(INSTALL_DATA) install-e_docDATA: $(e_doc_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(e_docdir) @list='$(e_doc_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(e_docdir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(e_docdir)/$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(e_docdir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(e_docdir)/$$p; \ - fi; fi; \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(e_docDATA_INSTALL) $$d$$p $(DESTDIR)$(e_docdir)/$$f"; \ + $(e_docDATA_INSTALL) $$d$$p $(DESTDIR)$(e_docdir)/$$f; \ done uninstall-e_docDATA: @$(NORMAL_UNINSTALL) - list='$(e_doc_DATA)'; for p in $$list; do \ - rm -f $(DESTDIR)$(e_docdir)/$$p; \ + @list='$(e_doc_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(e_docdir)/$$f"; \ + rm -f $(DESTDIR)$(e_docdir)/$$f; \ done # This directory's subdirectories are mostly independent; you can cd @@ -186,13 +192,8 @@ uninstall-e_docDATA: # (1) if the variable is set in `config.status', edit `config.status' # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. - -@SET_MAKE@ - -all-recursive install-data-recursive install-exec-recursive \ -installdirs-recursive install-recursive uninstall-recursive \ -check-recursive installcheck-recursive info-recursive dvi-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ +$(RECURSIVE_TARGETS): + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -212,13 +213,18 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - test "$$subdir" != "." || dot_seen=yes; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ + rev="$$rev ."; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ @@ -235,129 +241,168 @@ tags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done +ETAGS = etags +ETAGSFLAGS = + tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ +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; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) + mkid -fID $$unique -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP) +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ + fi; \ done; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ + list='$(SOURCES) $(HEADERS) config.h.in $(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 "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique -mostlyclean-tags: - -clean-tags: +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID - -maintainer-clean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +top_distdir = . distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) + +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 \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" \ + distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ + done + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -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 # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - -rm -rf $(distdir) - GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz + $(am__remove_distdir) + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - + chmod -R a-w $(distdir); chmod a+w $(distdir) mkdir $(distdir)/=build mkdir $(distdir)/=inst - dc_install_base=`cd $(distdir)/=inst && pwd`; \ - cd $(distdir)/=build \ + 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 \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) dist - -rm -rf $(distdir) - @banner="$(distdir).tar.gz is ready for distribution"; \ - dashes=`echo "$$banner" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - echo "$$dashes" -dist: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) - -rm -rf $(distdir) -dist-all: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) - -rm -rf $(distdir) -distdir: $(DISTFILES) - -rm -rf $(distdir) - mkdir $(distdir) - -chmod 777 $(distdir) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done - for subdir in $(SUBDIRS); do \ - if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ - || exit 1; \ - fi; \ - done -info-am: -info: info-recursive -dvi-am: -dvi: dvi-recursive + && $(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 -installcheck-am: -installcheck: installcheck-recursive -all-recursive-am: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive +all-am: Makefile $(DATA) config.h +installdirs: installdirs-recursive +installdirs-am: + $(mkinstalldirs) $(DESTDIR)$(e_docdir) -install-exec-am: +install: install-recursive install-exec: install-exec-recursive - -install-data-am: install-e_docDATA install-data: install-data-recursive +uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-recursive -uninstall-am: uninstall-e_docDATA uninstall-local -uninstall: uninstall-recursive -all-am: Makefile $(DATA) config.h -all-redirect: all-recursive-am + +installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: installdirs-recursive -installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(e_docdir) - - + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: @@ -365,50 +410,69 @@ clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) +distclean-am: clean-am distclean-generic distclean-hdr distclean-tags + +dvi: dvi-recursive + +dvi-am: + +info: info-recursive + +info-am: + +install-data-am: install-e_docDATA + +install-exec-am: + +install-info: install-info-recursive + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf autom4te.cache +maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive -clean-am: clean-hdr clean-tags clean-generic mostlyclean-am +mostlyclean-am: mostlyclean-generic -clean: clean-recursive +uninstall-am: uninstall-e_docDATA uninstall-info-am uninstall-local -distclean-am: distclean-hdr distclean-tags distclean-generic clean-am +uninstall-info: uninstall-info-recursive -distclean: distclean-recursive - -rm -f config.status - -maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \ - maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-recursive - -rm -f config.status - -.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ -uninstall-e_docDATA install-e_docDATA install-data-recursive \ -uninstall-data-recursive install-exec-recursive \ -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ -all-recursive check-recursive installcheck-recursive info-recursive \ -dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ -maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \ -install-exec-am install-exec install-data-am install-data install-am \ -install uninstall-local uninstall-am uninstall all-redirect all-am all \ -installdirs-am installdirs mostlyclean-generic distclean-generic \ -clean-generic maintainer-clean-generic clean mostlyclean distclean \ -maintainer-clean +.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-hdr 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-e_docDATA \ + 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-e_docDATA uninstall-info-am \ + uninstall-info-recursive uninstall-local uninstall-recursive changelog.gz: ChangeLog if test -n "$(GZIP)" ; then $(GZIP) -c $(top_srcdir)/ChangeLog > changelog.tmp && mv changelog.tmp changelog.gz ; fi uninstall-local: -rmdir $(DESTDIR)$(e_docdir) 2>/dev/null - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/README b/README index 510eba8..112d570 100644 --- a/README +++ b/README @@ -66,7 +66,7 @@ doxygen (www.doxygen.org), is available in a separate package, Configurations -------------- -The code was developed on SuSE Linux 7.1 using: +The code was originally developed on SuSE Linux 7.1 using: * linux 2.4.10 * gcc 2.95.3 * glibc 2.2.4 (libc.so.6) @@ -76,6 +76,11 @@ The code was developed on SuSE Linux 7.1 using: and ported to Windows 98 using: * MSVC 6.0 +Recent releases were developed on SuSE Linux 8.0 and +RedHat Linux 8.0 using: +* gcc 2.95.3 and 3.2 +* autoconf 2.53 + The code has also been built successfully on: * Windows NT 4.0 * MacOS X diff --git a/acinclude.m4 b/acinclude.m4 index cd100c7..5a14f02 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,5 +1,4 @@ -dnl -dnl Copyright (C) 2001-2002 Graeme Walker +dnl Copyright (C) 2001-2003 Graeme Walker dnl dnl This program is free software; you can redistribute it and/or dnl modify it under the terms of the GNU General Public License @@ -18,7 +17,9 @@ dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. dnl dnl === +dnl socketlen_t dnl derived from lars brinkhoff... +dnl AC_DEFUN(ACLOCAL_TYPE_SOCKLEN_T, [AC_CACHE_CHECK([for socklen_t], aclocal_cv_type_socklen_t, [ @@ -36,6 +37,8 @@ AC_DEFUN(ACLOCAL_TYPE_SOCKLEN_T, fi ]) +dnl gmtime_r +dnl AC_DEFUN([ACLOCAL_CHECK_GMTIME_R], [AC_CACHE_CHECK([for gmtime_r], aclocal_cv_gmtime_r, [ @@ -52,6 +55,8 @@ AC_DEFUN([ACLOCAL_CHECK_GMTIME_R], fi ]) +dnl localtime_r +dnl AC_DEFUN([ACLOCAL_CHECK_LOCALTIME_R], [AC_CACHE_CHECK([for localtime_r], aclocal_cv_localtime_r, [ @@ -68,12 +73,19 @@ AC_DEFUN([ACLOCAL_CHECK_LOCALTIME_R], fi ]) +dnl gcc version +dnl used for -Ilib/ -- only needed for pre 3.0 gcc +dnl AC_DEFUN([ACLOCAL_COMPILER_VERSION], [ - COMPILER_VERSION=`$CXX --version 2>/dev/null | sed 's/\./ /;s/\..*//;s/ /\./;s/ .*//;s/^/gcc/'` +changequote(<<,>>) + COMPILER_VERSION=`$CXX --version 2>/dev/null | sed q | sed 's/[^0-9 .]*//g;s/\./ /g;s/^ *//;s/ /./;s/ .*//;s/^/gcc/'` +changequote([,]) AC_SUBST(COMPILER_VERSION) ]) +dnl fhs +dnl AC_DEFUN([ENABLE_FHS], [ if test "$enable_fhs" = "yes" @@ -82,6 +94,8 @@ then fi ]) +dnl fhs +dnl AC_DEFUN([FHS_COMPLIANCE], [ # tweaks for fhs compliance... diff --git a/aclocal.m4 b/aclocal.m4 index ab7c840..5cc779d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,17 +1,17 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4-p5 +# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- -dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. -dnl -dnl Copyright (C) 2001-2002 Graeme Walker +dnl Copyright (C) 2001-2003 Graeme Walker dnl dnl This program is free software; you can redistribute it and/or dnl modify it under the terms of the GNU General Public License @@ -30,7 +30,9 @@ dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. dnl dnl === +dnl socketlen_t dnl derived from lars brinkhoff... +dnl AC_DEFUN(ACLOCAL_TYPE_SOCKLEN_T, [AC_CACHE_CHECK([for socklen_t], aclocal_cv_type_socklen_t, [ @@ -48,6 +50,8 @@ AC_DEFUN(ACLOCAL_TYPE_SOCKLEN_T, fi ]) +dnl gmtime_r +dnl AC_DEFUN([ACLOCAL_CHECK_GMTIME_R], [AC_CACHE_CHECK([for gmtime_r], aclocal_cv_gmtime_r, [ @@ -64,6 +68,8 @@ AC_DEFUN([ACLOCAL_CHECK_GMTIME_R], fi ]) +dnl localtime_r +dnl AC_DEFUN([ACLOCAL_CHECK_LOCALTIME_R], [AC_CACHE_CHECK([for localtime_r], aclocal_cv_localtime_r, [ @@ -80,12 +86,19 @@ AC_DEFUN([ACLOCAL_CHECK_LOCALTIME_R], fi ]) +dnl gcc version +dnl used for -Ilib/ -- only needed for pre 3.0 gcc +dnl AC_DEFUN([ACLOCAL_COMPILER_VERSION], [ - COMPILER_VERSION=`$CXX --version 2>/dev/null | sed 's/\./ /;s/\..*//;s/ /\./;s/ .*//;s/^/gcc/'` +changequote(<<,>>) + COMPILER_VERSION=`$CXX --version 2>/dev/null | sed q | sed 's/[^0-9 .]*//g;s/\./ /g;s/^ *//;s/ /./;s/ .*//;s/^/gcc/'` +changequote([,]) AC_SUBST(COMPILER_VERSION) ]) +dnl fhs +dnl AC_DEFUN([ENABLE_FHS], [ if test "$enable_fhs" = "yes" @@ -94,6 +107,8 @@ then fi ]) +dnl fhs +dnl AC_DEFUN([FHS_COMPLIANCE], [ # tweaks for fhs compliance... @@ -127,61 +142,223 @@ AC_DEFUN([FHS_COMPLIANCE], ]) -# 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. +# Do all the work for Automake. -*- Autoconf -*- -# serial 1 +# 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. -dnl Usage: -dnl AM_INIT_AUTOMAKE(package,version, [no-define]) +# 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 +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +AC_PREREQ([2.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([AC_PROG_INSTALL]) -PACKAGE=[$1] -AC_SUBST(PACKAGE) -VERSION=[$2] -AC_SUBST(VERSION) -dnl test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then +[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 -ifelse([$3],, -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) -AC_REQUIRE([AM_SANITY_CHECK]) -AC_REQUIRE([AC_ARG_PROGRAM]) -dnl FIXME This is truly gross. -missing_dir=`cd $ac_aux_dir && pwd` -AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) -AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) -AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) -AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -AC_REQUIRE([AC_PROG_MAKE_SET])]) + +# 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) +AM_MISSING_PROG(AMTAR, tar) +AM_PROG_INSTALL_SH +AM_PROG_INSTALL_STRIP +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +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 +]) +]) + +# 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])]) # # 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 + +# AM_SANITY_CHECK +# --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) # Just in case sleep 1 -echo timestamp > conftestfile +echo timestamp > conftest.file # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "[$]*" = "X"; then + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$[*]" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftestfile` + set X `ls -t $srcdir/configure conftest.file` fi - if test "[$]*" != "X $srcdir/configure conftestfile" \ - && test "[$]*" != "X conftestfile $srcdir/configure"; then + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then # If neither matched, then we have a broken ls. This can happen # if, for instance, CONFIG_SHELL is bash and it inherits a @@ -191,7 +368,7 @@ if ( alias in your environment]) fi - test "[$]2" = conftestfile + test "$[2]" = conftest.file ) then # Ok. @@ -200,45 +377,591 @@ else AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -rm -f conftest* AC_MSG_RESULT(yes)]) -dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) -dnl The program must properly implement --version. +# -*- 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) +# ------------------------------ AC_DEFUN([AM_MISSING_PROG], -[AC_MSG_CHECKING(for working $2) -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if ($2 --version) < /dev/null > /dev/null 2>&1; then - $1=$2 - AC_MSG_RESULT(found) -else - $1="$3/missing $2" - AC_MSG_RESULT(missing) -fi +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) -# Like AC_CONFIG_HEADER, but automatically create stamp file. +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) +fi +]) + +# 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 +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# 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` +]) + +# AM_PROG_INSTALL_SH +# ------------------ +# 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 +install_sh=${install_sh-"$am_aux_dir/install-sh"} +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 +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +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])]) + +# 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. + + +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + + +# _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. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +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=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + for depmode in $am_compiler_list; do + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + echo '#include "conftest.h"' > conftest.c + echo 'int i;' > conftest.h + echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=conftest.c object=conftest.o \ + depfile=conftest.Po tmpdepfile=conftest.TPo \ + $SHELL ./depcomp $depcc -c 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 + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[rm -f .deps 2>/dev/null +mkdir .deps 2>/dev/null +if test -d .deps; then + DEPDIR=.deps +else + # MS-DOS does not allow filenames that begin with a dot. + DEPDIR=_deps +fi +rmdir .deps 2>/dev/null +AC_SUBST([DEPDIR]) +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking Speeds up one-time builds + --enable-dependency-tracking Do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +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'. + DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + test -z "$DEPDIR" && continue + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n -e '/^U = / s///p' < "$mf"` + test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" + # We invoke sed twice because it is the simplest approach to + # changing $(DEPDIR) to its actual value in the expansion. + for file in `sed -n -e ' + /^DEP_FILES = .*\\\\$/ { + s/^DEP_FILES = // + :loop + s/\\\\$// + p + n + /\\\\$/ b loop + p + } + /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # 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() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +doit: + @echo done +END +# 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 +# First try GNU make style include. +echo "include confinc" > confmf +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# In particular we don't look at `^make:' because GNU make might +# 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= + _am_result=GNU +fi +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote="\"" + _am_result=BSD + fi +fi +AC_SUBST(am__include) +AC_SUBST(am__quote) +AC_MSG_RESULT($_am_result) +rm -f confinc confmf +]) + +# 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]) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $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. +# 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 "/". + +# _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_PREREQ([2.12]) -AC_CONFIG_HEADER([$1]) -dnl When config.status generates a header, we must update the stamp-h file. -dnl This file resides in the same directory as the config header -dnl that is generated. We must strip everything past the first ":", -dnl and everything past the last "/". -AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl -ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, -<>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, -<>; do - case " <<$>>CONFIG_HEADERS " in - *" <<$>>am_file "*<<)>> - echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx - ;; - esac - am_indx=`expr "<<$>>am_indx" + 1` -done<<>>dnl>>) -changequote([,]))]) +[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])]) +])# AM_CONFIG_HEADER diff --git a/bin/Makefile.am b/bin/Makefile.am index 421bd64..744f965 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -22,8 +22,9 @@ EXTRA_DIST = emailrelay-doxygen-filter.sh_ emailrelay-test.sh_ emailrelay-soak.s noinst_SCRIPTS = emailrelay-doxygen-filter.sh emailrelay-test.sh emailrelay-soak.sh e_init_SCRIPTS = emailrelay e_examples_DATA = emailrelay-process.sh emailrelay-notify.sh emailrelay-deliver.sh emailrelay-resubmit.sh +work_scripts = txt2mu.sh mu2html.sh expand.sh txt2html.sh emailrelay.sh -CLEANFILES = $(noinst_SCRIPTS) $(e_init_SCRIPTS) $(e_examples_DATA) +CLEANFILES = $(noinst_SCRIPTS) $(e_init_SCRIPTS) $(e_examples_DATA) $(work_scripts) TESTS = emailrelay-test.sh diff --git a/bin/Makefile.in b/bin/Makefile.in index 368c09b..2e01e4e 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -1,6 +1,8 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated by automake 1.6.3 from Makefile.am. +# @configure_input@ -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,8 +12,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ + # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -28,8 +32,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # - - SHELL = @SHELL@ srcdir = @srcdir@ @@ -50,13 +52,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ @@ -64,31 +62,44 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +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) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +AMTAR = @AMTAR@ AR = @AR@ AWK = @AWK@ CC = @CC@ COMPILER_VERSION = @COMPILER_VERSION@ CXX = @CXX@ +DEPDIR = @DEPDIR@ GZIP = @GZIP@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_MAN2HTML = @HAVE_MAN2HTML@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ MAKE = @MAKE@ -MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +STRIP = @STRIP@ VERSION = @VERSION@ +am__include = @am__include@ +am__quote = @am__quote@ e_docdir = @e_docdir@ e_examplesdir = @e_examplesdir@ e_initdir = @e_initdir@ @@ -96,154 +107,184 @@ e_libexecdir = @e_libexecdir@ e_man1dir = @e_man1dir@ e_sbindir = @e_sbindir@ e_spooldir = @e_spooldir@ +install_sh = @install_sh@ EXTRA_DIST = emailrelay-doxygen-filter.sh_ emailrelay-test.sh_ emailrelay-soak.sh_ emailrelay.sh_ txt2html.sh_ txt2mu.sh_ mu2html.sh_ expand.sh_ emailrelay-notify.sh_ emailrelay-resubmit.sh_ emailrelay-deliver.sh_ emailrelay-process.sh_ noinst_SCRIPTS = emailrelay-doxygen-filter.sh emailrelay-test.sh emailrelay-soak.sh e_init_SCRIPTS = emailrelay e_examples_DATA = emailrelay-process.sh emailrelay-notify.sh emailrelay-deliver.sh emailrelay-resubmit.sh +work_scripts = txt2mu.sh mu2html.sh expand.sh txt2html.sh emailrelay.sh -CLEANFILES = $(noinst_SCRIPTS) $(e_init_SCRIPTS) $(e_examples_DATA) +CLEANFILES = $(noinst_SCRIPTS) $(e_init_SCRIPTS) $(e_examples_DATA) $(work_scripts) TESTS = emailrelay-test.sh SUFFIXES = .sh_ .sh +subdir = bin mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../config.h -CONFIG_CLEAN_FILES = -SCRIPTS = $(e_init_SCRIPTS) $(noinst_SCRIPTS) +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SCRIPTS = $(e_init_SCRIPTS) $(noinst_SCRIPTS) -DATA = $(e_examples_DATA) +DIST_SOURCES = +DATA = $(e_examples_DATA) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = Makefile.am Makefile.in +all: all-am - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect .SUFFIXES: -.SUFFIXES: .sh .sh_ -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps bin/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - +.SUFFIXES: .sh_ .sh +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu bin/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +e_initSCRIPT_INSTALL = $(INSTALL_SCRIPT) install-e_initSCRIPTS: $(e_init_SCRIPTS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(e_initdir) @list='$(e_init_SCRIPTS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(e_initdir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_SCRIPT) $$p $(DESTDIR)$(e_initdir)/`echo $$p|sed '$(transform)'`; \ - else if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(e_initdir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(e_initdir)/`echo $$p|sed '$(transform)'`; \ - else :; fi; fi; \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(e_initSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(e_initdir)/$$f"; \ + $(e_initSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(e_initdir)/$$f; \ + else :; fi; \ done uninstall-e_initSCRIPTS: @$(NORMAL_UNINSTALL) - list='$(e_init_SCRIPTS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(e_initdir)/`echo $$p|sed '$(transform)'`; \ + @list='$(e_init_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " rm -f $(DESTDIR)$(e_initdir)/$$f"; \ + rm -f $(DESTDIR)$(e_initdir)/$$f; \ done - +uninstall-info-am: +e_examplesDATA_INSTALL = $(INSTALL_DATA) install-e_examplesDATA: $(e_examples_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(e_examplesdir) @list='$(e_examples_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(e_examplesdir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(e_examplesdir)/$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(e_examplesdir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(e_examplesdir)/$$p; \ - fi; fi; \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(e_examplesDATA_INSTALL) $$d$$p $(DESTDIR)$(e_examplesdir)/$$f"; \ + $(e_examplesDATA_INSTALL) $$d$$p $(DESTDIR)$(e_examplesdir)/$$f; \ done uninstall-e_examplesDATA: @$(NORMAL_UNINSTALL) - list='$(e_examples_DATA)'; for p in $$list; do \ - rm -f $(DESTDIR)$(e_examplesdir)/$$p; \ + @list='$(e_examples_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(e_examplesdir)/$$f"; \ + rm -f $(DESTDIR)$(e_examplesdir)/$$f; \ done tags: TAGS TAGS: -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +check-TESTS: $(TESTS) + @failed=0; all=0; xfail=0; xpass=0; \ + srcdir=$(srcdir); export srcdir; \ + list='$(TESTS)'; \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ + elif test -f $$tst; then dir=; \ + else dir="$(srcdir)/"; fi; \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *" $$tst "*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ + ;; \ + *) \ + echo "PASS: $$tst"; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *" $$tst "*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ + echo "FAIL: $$tst"; \ + ;; \ + esac; \ + fi; \ + done; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ + banner="All $$all tests passed"; \ + else \ + banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ + banner="$$failed of $$all tests failed"; \ + else \ + banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ + fi; \ + fi; \ + dashes=`echo "$$banner" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + else :; fi +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -subdir = bin +top_distdir = .. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ + @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 \ - cp -pr $$d/$$file $(distdir)/$$file; \ + 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 \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done -check-TESTS: $(TESTS) - @failed=0; all=0; \ - srcdir=$(srcdir); export srcdir; \ - for tst in $(TESTS); do \ - if test -f $$tst; then dir=.; \ - else dir="$(srcdir)"; fi; \ - if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \ - all=`expr $$all + 1`; \ - echo "PASS: $$tst"; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - failed=`expr $$failed + 1`; \ - echo "FAIL: $$tst"; \ - fi; \ - done; \ - if test "$$failed" -eq 0; then \ - banner="All $$all tests passed"; \ - else \ - banner="$$failed of $$all tests failed"; \ - fi; \ - dashes=`echo "$$banner" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - echo "$$dashes"; \ - test "$$failed" -eq 0 -info-am: -info: info-am -dvi-am: -dvi: dvi-am check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am +all-am: Makefile $(SCRIPTS) $(DATA) -install-data-am: install-e_initSCRIPTS install-e_examplesDATA \ - install-data-local +installdirs: + $(mkinstalldirs) $(DESTDIR)$(e_initdir) $(DESTDIR)$(e_examplesdir) + +install: install-am +install-exec: install-exec-am install-data: install-data-am +uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-e_initSCRIPTS uninstall-e_examplesDATA \ - uninstall-local -uninstall: uninstall-am -all-am: Makefile $(SCRIPTS) $(DATA) -all-redirect: all-am + +installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - $(mkinstalldirs) $(DESTDIR)$(e_initdir) $(DESTDIR)$(e_examplesdir) - - + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: @@ -251,35 +292,58 @@ clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-generic mostlyclean-am - + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." clean: clean-am -distclean-am: distclean-generic clean-am +clean-am: clean-generic mostlyclean-am distclean: distclean-am -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +info: info-am + +info-am: + +install-data-am: install-data-local install-e_examplesDATA \ + install-e_initSCRIPTS + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-am -.PHONY: uninstall-e_initSCRIPTS install-e_initSCRIPTS \ -uninstall-e_examplesDATA install-e_examplesDATA tags distdir \ -check-TESTS info-am info dvi-am dvi check check-am installcheck-am \ -installcheck install-exec-am install-exec install-data-local \ -install-data-am install-data install-am install uninstall-local \ -uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +uninstall-am: uninstall-e_examplesDATA uninstall-e_initSCRIPTS \ + uninstall-info-am uninstall-local + +.PHONY: all all-am check check-TESTS check-am clean clean-generic \ + distclean distclean-generic distdir dvi dvi-am info info-am \ + install install-am install-data install-data-am \ + install-data-local install-e_examplesDATA install-e_initSCRIPTS \ + install-exec install-exec-am install-info install-info-am \ + install-man install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic uninstall uninstall-am \ + uninstall-e_examplesDATA uninstall-e_initSCRIPTS \ + uninstall-info-am uninstall-local .sh_.sh: @@ -298,7 +362,6 @@ install-data-local: install-e_examplesDATA install-e_initSCRIPTS uninstall-local: -rmdir $(DESTDIR)$(e_examplesdir) 2>/dev/null - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/bin/emailrelay-deliver.sh_ b/bin/emailrelay-deliver.sh_ index b080ff1..7288a1b 100644 --- a/bin/emailrelay-deliver.sh_ +++ b/bin/emailrelay-deliver.sh_ @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -29,7 +29,7 @@ # usage: emailrelay-deliver.sh [] # -store="__SPOOL_DIR__/emailrelay" +store="__SPOOL_DIR__" postmaster="root" procmail="procmail" diff --git a/bin/emailrelay-doxygen-filter.sh_ b/bin/emailrelay-doxygen-filter.sh_ index afd1103..5d83899 100644 --- a/bin/emailrelay-doxygen-filter.sh_ +++ b/bin/emailrelay-doxygen-filter.sh_ @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -190,7 +190,7 @@ then elif test "${type}" = "cpp" -a "${classes}" -gt 0 then - cat "${1}" | SourceFilter + cat "${1}" | SourceFilter | PostFilter else cat "${1}" | PreFilter | HeaderFilter | PostFilter diff --git a/bin/emailrelay-notify.sh_ b/bin/emailrelay-notify.sh_ index efb7abe..62b87f0 100644 --- a/bin/emailrelay-notify.sh_ +++ b/bin/emailrelay-notify.sh_ @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -44,7 +44,7 @@ procmail="procmail" # parse the command line # -store="__SPOOL_DIR__/emailrelay" +store="__SPOOL_DIR__" if test $# -ge 1 then store="${1}" diff --git a/bin/emailrelay-process.sh_ b/bin/emailrelay-process.sh_ index c461349..0fb9bc6 100644 --- a/bin/emailrelay-process.sh_ +++ b/bin/emailrelay-process.sh_ @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/emailrelay-resubmit.sh_ b/bin/emailrelay-resubmit.sh_ index b318005..47103b9 100644 --- a/bin/emailrelay-resubmit.sh_ +++ b/bin/emailrelay-resubmit.sh_ @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -28,7 +28,7 @@ # usage: emailrelay-resubmit.sh [] # -store="__SPOOL_DIR__/emailrelay" +store="__SPOOL_DIR__" retry_limit="5" # parse the command line diff --git a/bin/emailrelay-soak.sh_ b/bin/emailrelay-soak.sh_ index 73ee86c..a213111 100644 --- a/bin/emailrelay-soak.sh_ +++ b/bin/emailrelay-soak.sh_ @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/emailrelay-test.sh_ b/bin/emailrelay-test.sh_ index fa6e959..00693f0 100644 --- a/bin/emailrelay-test.sh_ +++ b/bin/emailrelay-test.sh_ @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/emailrelay.sh_ b/bin/emailrelay.sh_ index 98abe67..a16f0de 100644 --- a/bin/emailrelay.sh_ +++ b/bin/emailrelay.sh_ @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -25,19 +25,31 @@ # use in the SysV-init system (/etc/init.d). # # See also: LSB, start_daemon (lsb), startproc (suse), -# install_initd (lsb), insserv (suse) +# install_initd (lsb), insserv (suse), +# /usr/share/doc/initscripts*/sysvinitfiles (redhat) # # usage: emailrelay { start [] | stop | restart | force-reload | status } # - -# LSB comment block +## +# RedHat comment block... +# +# chkconfig: 345 80 20 +# description: E-MailRelay is a store-and-forward Message Transfer Agent. +# pidfile: /var/run/emailrelay.pid +# processname: emailrelay +# +## +# LSB comment block... +# +# The bogus 345 run-levels are a workround for a buggy RedHat chkconfig which +# reads the LSB comment block (incorrectly) as an undocumented 'feature'. # ### BEGIN INIT INFO # Provides: emailrelay # Required-Start: $network # Required-Stop: $network -# Default-Start: 3 4 5 -# Default-Stop: 3 4 5 +# Default-Start: 345 3 4 5 +# Default-Stop: 345 3 4 5 # Description: E-MailRelay store-and-forward Message Transfer Agent. ### END INIT INFO @@ -47,6 +59,10 @@ if test -f /etc/rc.status then style="suse" . /etc/rc.status +elif test -f /etc/init.d/functions +then + style="redhat" + . /etc/init.d/functions elif test -f /lib/lsb/init-functions then style="lsb" @@ -134,6 +150,65 @@ function unix_exit() ## +function redhat_reset() +{ + redhat_errno="0" +} + +function redhat_message() +{ + echo -n "${1}" +} + +function redhat_status() +{ + redhat_errno="$?" + if test "${1}" = "-v" -a "${redhat_errno}" -eq 0 + then + success + fi + if test "${1}" = "-v" -a "${redhat_errno}" -ne 0 + then + failure + fi +} + +function redhat_startproc() +{ + initlog -q --cmd="$*" + redhat_errno="$?" + #touch /var/lock/subsys/emailrelay + return ${redhat_errno} +} + +function redhat_killproc() +{ + killproc "`basename ${emailrelay}`" + redhat_errno="$?" + #rm -f /var/lock/subsys/emailrelay + return ${redhat_errno} +} + +function redhat_checkproc() +{ + if test -f "${pid_file}" && test "`cat ${pid_file}`" != "" && kill -0 "`cat ${pid_file}`" 2>/dev/null + then + return 0 + elif test -f "${pid_file}" + then + return 1 + else + return 3 + fi +} + +function redhat_exit() +{ + exit "${redhat_errno}" +} + +## + function suse_reset() { rc_reset @@ -196,7 +271,7 @@ function lsb_status() function lsb_startproc() { - start_daemon "`basename \"${1}\"`" + start_daemon $@ } function lsb_killproc() diff --git a/bin/expand.sh_ b/bin/expand.sh_ index feb84e2..953936a 100644 --- a/bin/expand.sh_ +++ b/bin/expand.sh_ @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/mu2html.sh_ b/bin/mu2html.sh_ index 2e090c9..2a55ebd 100644 --- a/bin/mu2html.sh_ +++ b/bin/mu2html.sh_ @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -272,6 +272,7 @@ then ${awk} '{print}' > ${tmp} title="`${awk} '/^h1/ { sub(\"[^:]*:\",\"\") ; print ; exit }' ${tmp}`" ${awk} '{print}' ${tmp} | Main "${title}" "${stylesheet}" "${full}" | Anchorise + rm -f ${tmp} else Main "${title}" "${stylesheet}" "${full}" | Anchorise fi diff --git a/bin/txt2html.sh_ b/bin/txt2html.sh_ index cab317d..448512f 100644 --- a/bin/txt2html.sh_ +++ b/bin/txt2html.sh_ @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/txt2mu.sh_ b/bin/txt2mu.sh_ index 95d135c..b39fbb0 100644 --- a/bin/txt2mu.sh_ +++ b/bin/txt2mu.sh_ @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/config.h.in b/config.h.in index 3867cd7..19c5714 100644 --- a/config.h.in +++ b/config.h.in @@ -1,42 +1,84 @@ -/* config.h.in. Generated automatically from configure.ac by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ -/* Define if you have the header file, and it defines `DIR'. */ +/* Define to 1 if you have the header file, and it defines `DIR'. + */ #undef HAVE_DIRENT_H -/* Define if you have the `glob' function. */ +/* Define to 1 if you have the `glob' function. */ #undef HAVE_GLOB /* Define if gmtime_r in time.h */ #undef HAVE_GMTIME_R +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + /* Define if localtime_r in time.h */ #undef HAVE_LOCALTIME_R -/* Define if you have the header file, and it defines `DIR'. */ +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the header file, and it defines `DIR'. */ #undef HAVE_NDIR_H /* Define if socklen_t type definition in sys/socket.h */ #undef HAVE_SOCKLEN_T -/* Define if you have the header file, and it defines `DIR'. */ +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ #undef HAVE_SYS_DIR_H -/* Define if you have the header file, and it defines `DIR'. */ +/* Define to 1 if you have the header file, and it defines `DIR'. + */ #undef HAVE_SYS_NDIR_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_TIME_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H /* Name of package */ #undef PACKAGE -/* Define if you have the ANSI C header files. */ +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -/* Define if you can safely include both and . */ +/* Define to 1 if you can safely include both and . */ #undef TIME_WITH_SYS_TIME /* Version number of package */ diff --git a/configure b/configure index 603c216..092f0e0 100755 --- a/configure +++ b/configure @@ -1,24 +1,22 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52. +# Generated by GNU Autoconf 2.53. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi -# Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -28,8 +26,165 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +# NLS nuisances. +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + +(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && + { $as_unset LANG || test "${LANG+set}" != set; } || + { LANG=C; export LANG; } +(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && + { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || + { LC_ALL=C; export LC_ALL; } +(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && + { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || + { LC_TIME=C; export LC_TIME; } +(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && + { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || + { LC_CTYPE=C; export LC_CTYPE; } +(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && + { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || + { LANGUAGE=C; export LANGUAGE; } +(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && + { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || + { LC_COLLATE=C; export LC_COLLATE; } +(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && + { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || + { LC_NUMERIC=C; export LC_NUMERIC; } +(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && + { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || + { LC_MESSAGES=C; export LC_MESSAGES; } + + # Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` +as_me=`(basename "$0") 2>/dev/null || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conftest.sh + echo "exit 0" >>conftest.sh + chmod +x conftest.sh + if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conftest.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr @@ -57,22 +212,12 @@ rm -f conf$$ conf$$.exe conf$$.file as_executable_p="test -f" -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } # IFS # We need space, tab and new line, in precisely that order. @@ -81,7 +226,8 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } + # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -96,7 +242,8 @@ exec 6>&1 ac_default_prefix=/usr/local cross_compiling=no subdirs= -MFLAGS= MAKEFLAGS= +MFLAGS= +MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. @@ -104,7 +251,51 @@ SHELL=${CONFIG_SHELL-/bin/sh} # only ac_max_sed_lines should be used. : ${ac_max_here_lines=38} +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= + ac_unique_file="src/gsmtp/gsmtp.h" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#if HAVE_SYS_TYPES_H +# include +#endif +#if HAVE_SYS_STAT_H +# include +#endif +#if STDC_HEADERS +# include +# include +#else +# if HAVE_STDLIB_H +# include +# endif +#endif +#if HAVE_STRING_H +# if !STDC_HEADERS && HAVE_MEMORY_H +# include +# endif +# include +#endif +#if HAVE_STRINGS_H +# include +#endif +#if HAVE_INTTYPES_H +# include +#else +# if HAVE_STDINT_H +# include +# endif +#endif +#if HAVE_UNISTD_H +# include +#endif" + # Initialize some variables set by options. ac_init_help= @@ -144,13 +335,6 @@ oldincludedir='/usr/include' infodir='${prefix}/info' mandir='${prefix}/man' -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= - ac_prev= for ac_option do @@ -283,7 +467,7 @@ do with_fp=no ;; -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) + | --no-cr | --no-c | -n) no_create=yes ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ @@ -462,7 +646,7 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done @@ -474,18 +658,19 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done # There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. +# FIXME: To remove some day. build=$build_alias host=$host_alias target=$target_alias -# FIXME: should be removed in autoconf 3.0. +# FIXME: To remove some day. if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe @@ -501,13 +686,23 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + ac_confdir=`(dirname "$0") 2>/dev/null || +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$0" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then srcdir=.. @@ -517,10 +712,10 @@ else fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 { (exit 1); exit 1; }; } else - { echo "$as_me: error: cannot find sources in $srcdir" >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } fi fi @@ -572,7 +767,7 @@ ac_cv_env_CPP_value=$CPP if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. - cat <&2 + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi cd $ac_popdir done @@ -698,31 +915,31 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then - cat <<\EOF + cat <<\_ACEOF -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -EOF +_ACEOF exit 0 fi exec 5>config.log -cat >&5 <&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52. Invocation command line was +generated by GNU Autoconf 2.53. Invocation command line was $ $0 $@ -EOF +_ACEOF { cat <<_ASUNAME -## ---------- ## -## Platform. ## -## ---------- ## +## --------- ## +## Platform. ## +## --------- ## hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` uname -m = `(uname -m) 2>/dev/null || echo unknown` @@ -741,17 +958,27 @@ hostinfo = `(hostinfo) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -PATH = $PATH - _ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + echo "PATH: $as_dir" +done + } >&5 -cat >&5 <&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF -EOF # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. @@ -762,15 +989,17 @@ for ac_arg do case $ac_arg in -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; + | --no-cr | --no-c | -n ) continue ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + continue ;; *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - ac_sep=" " ;; - *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" - ac_sep=" " ;; + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + ac_sep=" " ;; esac # Get rid of the leading space. done @@ -778,14 +1007,19 @@ done # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. +# WARNING: Be sure not to use single quotes in there, as some shells, +# such as our DU 5.0 friend, will then `close' the trap. trap 'exit_status=$? # Save into config.log some information that might help in debugging. - echo >&5 - echo "## ----------------- ##" >&5 - echo "## Cache variables. ##" >&5 - echo "## ----------------- ##" >&5 - echo >&5 - # The following way of writing the cache mishandles newlines in values, + { + echo + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, { (set) 2>&1 | case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in @@ -799,21 +1033,24 @@ trap 'exit_status=$? "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; -} >&5 - sed "/^$/d" confdefs.h >conftest.log - if test -s conftest.log; then - echo >&5 - echo "## ------------ ##" >&5 - echo "## confdefs.h. ##" >&5 - echo "## ------------ ##" >&5 - echo >&5 - cat conftest.log >&5 - fi - (echo; echo) >&5 - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" >&5 - echo "$as_me: exit $exit_status" >&5 - rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && +} + echo + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## +## confdefs.h. ## +## ----------- ## +_ASBOX + echo + sed "/^$/d" confdefs.h + echo + fi + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" + } >&5 + rm -f core core.* *.core && + rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do @@ -826,6 +1063,33 @@ rm -rf conftest* confdefs.h # AIX cpp loses on an empty file, so make sure it contains at least a newline. echo >confdefs.h +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + + # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then @@ -837,9 +1101,9 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:840: loading site script $ac_site_file" >&5 + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} - cat "$ac_site_file" >&5 + sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi done @@ -848,7 +1112,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:851: loading cache $cache_file" >&5 + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -856,7 +1120,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:859: creating cache $cache_file" >&5 + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -872,42 +1136,42 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:875: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:879: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:885: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:887: former value: $ac_old_val" >&5 + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:889: current value: $ac_new_val" >&5 + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; esac - # Pass precious variables to config.status. It doesn't matter if - # we pass some twice (in addition to the command line arguments). + # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" - ;; + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:908: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:910: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -918,27 +1182,24 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac -echo "#! $SHELL" >conftest.sh -echo "exit 0" >>conftest.sh -chmod +x conftest.sh -if { (echo "$as_me:930: PATH=\".;.\"; conftest.sh") >&5 - (PATH=".;."; conftest.sh) 2>&5 - ac_status=$? - echo "$as_me:933: \$? = $ac_status" >&5 - (exit $ac_status); }; then - ac_path_separator=';' -else - ac_path_separator=: -fi -PATH_SEPARATOR="$ac_path_separator" -rm -f conftest.sh + + + + + + + + + + + + + + + + +am__api_version="1.6" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -956,7 +1217,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:959: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -976,43 +1237,48 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:979: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_IFS=$IFS; IFS=$ac_path_separator - for ac_dir in $PATH; do - IFS=$ac_save_IFS - # Account for people who put trailing slashes in PATH elements. - case $ac_dir/ in - / | ./ | .// | /cC/* \ - | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ - | /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if $as_executable_p "$ac_dir/$ac_prog"; then - if test $ac_prog = install && - grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi done - ;; - esac - done + done + ;; +esac +done + fi if test "${ac_cv_path_install+set}" = set; then @@ -1025,7 +1291,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:1028: result: $INSTALL" >&5 +echo "$as_me:$LINENO: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -1036,50 +1302,50 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:1039: checking whether build environment is sane" >&5 +echo "$as_me:$LINENO: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 -echo timestamp > conftestfile +echo timestamp > conftest.file # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` if test "$*" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftestfile` + set X `ls -t $srcdir/configure conftest.file` fi - if test "$*" != "X $srcdir/configure conftestfile" \ - && test "$*" != "X conftestfile $srcdir/configure"; then + rm -f conftest.file + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then # If neither matched, then we have a broken ls. This can happen # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { echo "$as_me:1062: error: ls -t appears to fail. Make sure there is not a broken + { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&5 echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&2;} { (exit 1); exit 1; }; } fi - test "$2" = conftestfile + test "$2" = conftest.file ) then # Ok. : else - { { echo "$as_me:1075: error: newly created file is older than distributed files! + { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! Check your system clock" >&5 echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -rm -f conftest* -echo "$as_me:1082: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 test "$program_prefix" != NONE && program_transform_name="s,^,$program_prefix,;$program_transform_name" @@ -1094,16 +1360,70 @@ _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed -echo "$as_me:1097: checking whether ${MAKE-make} sets \${MAKE}" >&5 + +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` + +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 +echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} +fi + +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_AWK+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + echo "$as_me:$LINENO: result: $AWK" >&5 +echo "${ECHO_T}$AWK" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$AWK" && break +done + +echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.make <<\EOF + cat >conftest.make <<\_ACEOF all: @echo 'ac_maketemp="${MAKE}"' -EOF +_ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` if test -n "$ac_maketemp"; then @@ -1114,112 +1434,157 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:1117: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:1121: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi -PACKAGE=emailrelay - -VERSION=1.0.0 - -if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { { echo "$as_me:1131: error: source directory already configured; run \"make distclean\" there first" >&5 + # test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } fi -cat >>confdefs.h <>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" -EOF +_ACEOF -cat >>confdefs.h <>confdefs.h <<_ACEOF #define VERSION "$VERSION" -EOF +_ACEOF -missing_dir=`cd $ac_aux_dir && pwd` -echo "$as_me:1145: checking for working aclocal" >&5 -echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (aclocal --version) < /dev/null > /dev/null 2>&1; then - ACLOCAL=aclocal - echo "$as_me:1152: result: found" >&5 -echo "${ECHO_T}found" >&6 +# Some tools Automake needs. + +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} + + +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + + +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} + + +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + + +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + + +AMTAR=${AMTAR-"${am_missing_run}tar"} + +install_sh=${install_sh-"$am_aux_dir/install-sh"} + +# 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. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ACLOCAL="$missing_dir/missing aclocal" - echo "$as_me:1156: result: missing" >&5 -echo "${ECHO_T}missing" >&6 + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo "$as_me:1160: checking for working autoconf" >&5 -echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (autoconf --version) < /dev/null > /dev/null 2>&1; then - AUTOCONF=autoconf - echo "$as_me:1167: result: found" >&5 -echo "${ECHO_T}found" >&6 +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - AUTOCONF="$missing_dir/missing autoconf" - echo "$as_me:1171: result: missing" >&5 -echo "${ECHO_T}missing" >&6 + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo "$as_me:1175: checking for working automake" >&5 -echo $ECHO_N "checking for working automake... $ECHO_C" >&6 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (automake --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake - echo "$as_me:1182: result: found" >&5 -echo "${ECHO_T}found" >&6 + STRIP=$ac_ct_STRIP else - AUTOMAKE="$missing_dir/missing automake" - echo "$as_me:1186: result: missing" >&5 -echo "${ECHO_T}missing" >&6 + STRIP="$ac_cv_prog_STRIP" fi -echo "$as_me:1190: checking for working autoheader" >&5 -echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (autoheader --version) < /dev/null > /dev/null 2>&1; then - AUTOHEADER=autoheader - echo "$as_me:1197: result: found" >&5 -echo "${ECHO_T}found" >&6 -else - AUTOHEADER="$missing_dir/missing autoheader" - echo "$as_me:1201: result: missing" >&5 -echo "${ECHO_T}missing" >&6 fi +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -echo "$as_me:1205: checking for working makeinfo" >&5 -echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (makeinfo --version) < /dev/null > /dev/null 2>&1; then - MAKEINFO=makeinfo - echo "$as_me:1212: result: found" >&5 -echo "${ECHO_T}found" >&6 -else - MAKEINFO="$missing_dir/missing makeinfo" - echo "$as_me:1216: result: missing" >&5 -echo "${ECHO_T}missing" >&6 -fi +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. + + +# Add the stamp file to the list of files AC keeps track of, +# along with our hook. ac_config_headers="$ac_config_headers config.h" -ac_config_commands="$ac_config_commands default-1" + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -1229,7 +1594,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1232: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1237,25 +1602,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1247: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1255: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1258: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1264,7 +1632,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1267: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1272,25 +1640,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1282: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1290: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1293: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1303,7 +1674,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1306: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1311,25 +1682,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1321: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1329: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1332: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1338,7 +1712,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1341: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1346,25 +1720,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1356: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1364: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1367: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1377,7 +1754,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1380: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1386,19 +1763,22 @@ else ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -fi -ac_cv_prog_CC="cc" -echo "$as_me:1400: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done if test $ac_prog_rejected = yes; then @@ -1410,7 +1790,7 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$ac_dir/$ac_word" ${1+"$@"} + set dummy "$as_dir/$ac_word" ${1+"$@"} shift ac_cv_prog_CC="$@" fi @@ -1419,10 +1799,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1422: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1425: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1433,7 +1813,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1436: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1441,25 +1821,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1451: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1459: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1462: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1472,7 +1855,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1475: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1480,25 +1863,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1490: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1498: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1501: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1510,34 +1896,41 @@ fi fi -test -z "$CC" && { { echo "$as_me:1513: error: no acceptable cc found in \$PATH" >&5 -echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} + +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1518:" \ +echo "$as_me:$LINENO:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1521: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1524: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1526: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1529: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1531: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1534: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1538 "configure" +#line $LINENO "configure" #include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -1551,22 +1944,26 @@ ac_clean_files="$ac_clean_files a.out a.exe" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1554: checking for C compiler default output" >&5 +echo "$as_me:$LINENO: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1557: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1560: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last # resort. -for ac_file in `ls a.exe conftest.exe 2>/dev/null; + +# Be careful to initialize this variable, since it used to be cached. +# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +ac_cv_exeext= +for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null; ls a.out conftest 2>/dev/null; ls a.* conftest.* 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;; a.out ) # We found the default executable, but exeext='' is most # certainly right. break;; @@ -1580,34 +1977,34 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1583: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1589: result: $ac_file" >&5 +echo "$as_me:$LINENO: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1594: checking whether the C compiler works" >&5 +echo "$as_me:$LINENO: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1600: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1603: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1610: error: cannot run C compiled programs. + { { echo "$as_me:$LINENO: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} @@ -1615,24 +2012,24 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1618: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe conftest$ac_cv_exeext ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1625: checking whether we are cross compiling" >&5 +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1627: result: $cross_compiling" >&5 +echo "$as_me:$LINENO: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1630: checking for executable suffix" >&5 -echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1632: \"$ac_link\"") >&5 +echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1635: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -1648,27 +2045,33 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1651: error: cannot compute EXEEXT: cannot compile and link" >&5 -echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1657: result: $ac_cv_exeext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1663: checking for object suffix" >&5 -echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1669 "configure" +#line $LINENO "configure" #include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -1678,10 +2081,10 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1681: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1684: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in @@ -1693,26 +2096,32 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1696: error: cannot compute OBJEXT: cannot compile" >&5 -echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5 +echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1703: result: $ac_cv_objext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1707: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1713 "configure" +#line $LINENO "configure" #include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -1725,16 +2134,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1728: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1731: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1734: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1737: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1746,21 +2155,27 @@ rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1749: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1755: checking whether $CC accepts -g" >&5 +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1761 "configure" +#line $LINENO "configure" #include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -1770,16 +2185,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1773: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1776: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1779: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1782: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else @@ -1789,7 +2204,7 @@ ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1792: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1816,16 +2231,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1819: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1822: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1825: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1828: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1837,10 +2252,16 @@ if { (eval echo "$as_me:1819: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1840 "configure" +#line $LINENO "configure" #include "confdefs.h" #include $ac_declaration +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -1850,16 +2271,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1853: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1856: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1859: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1862: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -1869,9 +2290,15 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 1872 "configure" +#line $LINENO "configure" #include "confdefs.h" $ac_declaration +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -1881,16 +2308,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1884: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1887: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1890: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1893: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -1916,6 +2343,148 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +rm -f .deps 2>/dev/null +mkdir .deps 2>/dev/null +if test -d .deps; then + DEPDIR=.deps +else + # MS-DOS does not allow filenames that begin with a dot. + DEPDIR=_deps +fi +rmdir .deps 2>/dev/null + + +ac_config_commands="$ac_config_commands depfiles" + + +am_make=${MAKE-make} +cat > confinc << 'END' +doit: + @echo done +END +# If we don't find an include directive, just comment out the code. +echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# In particular we don't look at `^make:' because GNU make might +# 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= + _am_result=GNU +fi +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote="\"" + _am_result=BSD + fi +fi + + +echo "$as_me:$LINENO: result: $_am_result" >&5 +echo "${ECHO_T}$_am_result" >&6 +rm -f confinc confmf + +# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then + enableval="$enable_dependency_tracking" + +fi; +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi + + +if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi + + + + +depcc="$CC" am_compiler_list= + +echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + echo '#include "conftest.h"' > conftest.c + echo 'int i;' > conftest.h + echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=conftest.c object=conftest.o \ + depfile=conftest.Po tmpdepfile=conftest.TPo \ + $SHELL ./depcomp $depcc -c 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 + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi +echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -1927,7 +2496,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1930: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1935,25 +2504,28 @@ else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" -echo "$as_me:1945: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:1953: result: $CXX" >&5 + echo "$as_me:$LINENO: result: $CXX" >&5 echo "${ECHO_T}$CXX" >&6 else - echo "$as_me:1956: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1966,7 +2538,7 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1969: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1974,25 +2546,28 @@ else if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CXX="$ac_prog" -echo "$as_me:1984: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - echo "$as_me:1992: result: $ac_ct_CXX" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 echo "${ECHO_T}$ac_ct_CXX" >&6 else - echo "$as_me:1995: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2003,35 +2578,42 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++" CXX=$ac_ct_CXX fi + # Provide some information about the compiler. -echo "$as_me:2007:" \ +echo "$as_me:$LINENO:" \ "checking for C++ compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:2010: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:2013: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:2015: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:2018: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:2020: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:2023: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -echo "$as_me:2026: checking whether we are using the GNU C++ compiler" >&5 +echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2032 "configure" +#line $LINENO "configure" #include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2044,16 +2626,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2047: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2050: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2053: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2056: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -2065,21 +2647,27 @@ rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:2068: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS CXXFLAGS="-g" -echo "$as_me:2074: checking whether $CXX accepts -g" >&5 +echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cxx_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2080 "configure" +#line $LINENO "configure" #include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2089,16 +2677,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2092: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2095: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2098: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2101: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cxx_g=yes else @@ -2108,7 +2696,7 @@ ac_cv_prog_cxx_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2111: result: $ac_cv_prog_cxx_g" >&5 +echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS @@ -2135,10 +2723,16 @@ for ac_declaration in \ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 2138 "configure" +#line $LINENO "configure" #include "confdefs.h" #include $ac_declaration +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2148,16 +2742,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2151: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2154: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2157: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2160: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -2167,9 +2761,15 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 2170 "configure" +#line $LINENO "configure" #include "confdefs.h" $ac_declaration +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2179,16 +2779,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2182: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2185: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2188: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2191: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -2210,10 +2810,79 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +depcc="$CXX" am_compiler_list= + +echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + + am_cv_CXX_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + echo '#include "conftest.h"' > conftest.c + echo 'int i;' > conftest.h + echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=conftest.c object=conftest.o \ + depfile=conftest.Po tmpdepfile=conftest.TPo \ + $SHELL ./depcomp $depcc -c 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 + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CXX_dependencies_compiler_type=none +fi + +fi +echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:2216: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2221,25 +2890,28 @@ else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:2231: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:2239: result: $RANLIB" >&5 + echo "$as_me:$LINENO: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:2242: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2248,7 +2920,7 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:2251: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2256,15 +2928,18 @@ else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:2266: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" @@ -2272,10 +2947,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:2275: result: $ac_ct_RANLIB" >&5 + echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:2278: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2296,43 +2971,48 @@ fi # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:2299: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_IFS=$IFS; IFS=$ac_path_separator - for ac_dir in $PATH; do - IFS=$ac_save_IFS - # Account for people who put trailing slashes in PATH elements. - case $ac_dir/ in - / | ./ | .// | /cC/* \ - | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ - | /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if $as_executable_p "$ac_dir/$ac_prog"; then - if test $ac_prog = install && - grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi done - ;; - esac - done + done + ;; +esac +done + fi if test "${ac_cv_path_install+set}" = set; then @@ -2345,7 +3025,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2348: result: $INSTALL" >&5 +echo "$as_me:$LINENO: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2356,11 +3036,11 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -for ac_prog in mawk gawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2363: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2368,25 +3048,28 @@ else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_AWK="$ac_prog" -echo "$as_me:2378: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:2386: result: $AWK" >&5 + echo "$as_me:$LINENO: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:2389: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2397,7 +3080,7 @@ for ac_prog in make gmake do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2400: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2405,25 +3088,28 @@ else if test -n "$MAKE"; then ac_cv_prog_MAKE="$MAKE" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_MAKE="$ac_prog" -echo "$as_me:2415: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MAKE="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi MAKE=$ac_cv_prog_MAKE if test -n "$MAKE"; then - echo "$as_me:2423: result: $MAKE" >&5 + echo "$as_me:$LINENO: result: $MAKE" >&5 echo "${ECHO_T}$MAKE" >&6 else - echo "$as_me:2426: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2434,7 +3120,7 @@ for ac_prog in ar gar do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2437: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2442,25 +3128,28 @@ else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_AR="$ac_prog" -echo "$as_me:2452: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:2460: result: $AR" >&5 + echo "$as_me:$LINENO: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:2463: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2471,7 +3160,7 @@ for ac_prog in gzip do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2474: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_GZIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2479,25 +3168,28 @@ else if test -n "$GZIP"; then ac_cv_prog_GZIP="$GZIP" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_GZIP="$ac_prog" -echo "$as_me:2489: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_GZIP="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi GZIP=$ac_cv_prog_GZIP if test -n "$GZIP"; then - echo "$as_me:2497: result: $GZIP" >&5 + echo "$as_me:$LINENO: result: $GZIP" >&5 echo "${ECHO_T}$GZIP" >&6 else - echo "$as_me:2500: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2506,7 +3198,7 @@ done # Extract the first word of "doxygen", so it can be a program name with args. set dummy doxygen; ac_word=$2 -echo "$as_me:2509: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_HAVE_DOXYGEN+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2514,31 +3206,34 @@ else if test -n "$HAVE_DOXYGEN"; then ac_cv_prog_HAVE_DOXYGEN="$HAVE_DOXYGEN" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_HAVE_DOXYGEN="yes" -echo "$as_me:2524: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_HAVE_DOXYGEN="yes" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi HAVE_DOXYGEN=$ac_cv_prog_HAVE_DOXYGEN if test -n "$HAVE_DOXYGEN"; then - echo "$as_me:2532: result: $HAVE_DOXYGEN" >&5 + echo "$as_me:$LINENO: result: $HAVE_DOXYGEN" >&5 echo "${ECHO_T}$HAVE_DOXYGEN" >&6 else - echo "$as_me:2535: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "man2html", so it can be a program name with args. set dummy man2html; ac_word=$2 -echo "$as_me:2541: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_HAVE_MAN2HTML+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2546,29 +3241,37 @@ else if test -n "$HAVE_MAN2HTML"; then ac_cv_prog_HAVE_MAN2HTML="$HAVE_MAN2HTML" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_HAVE_MAN2HTML="yes" -echo "$as_me:2556: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_HAVE_MAN2HTML="yes" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi HAVE_MAN2HTML=$ac_cv_prog_HAVE_MAN2HTML if test -n "$HAVE_MAN2HTML"; then - echo "$as_me:2564: result: $HAVE_MAN2HTML" >&5 + echo "$as_me:$LINENO: result: $HAVE_MAN2HTML" >&5 echo "${ECHO_T}$HAVE_MAN2HTML" >&6 else - echo "$as_me:2567: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi - COMPILER_VERSION=`$CXX --version 2>/dev/null | sed 's/\./ /;s/\..*//;s/ /\./;s/ .*//;s/^/gcc/'` + + + COMPILER_VERSION=`$CXX --version 2>/dev/null | sed q | sed 's/[^0-9 .]*//g;s/\./ /g;s/^ *//;s/ /./;s/ .*//;s/^/gcc/'` + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -2576,7 +3279,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:2579: checking for library containing gethostbyname" >&5 + +echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5 echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6 if test "${ac_cv_search_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2584,7 +3288,7 @@ else ac_func_search_save_LIBS=$LIBS ac_cv_search_gethostbyname=no cat >conftest.$ac_ext <<_ACEOF -#line 2587 "configure" +#line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -2594,6 +3298,12 @@ extern "C" /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char gethostbyname (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2603,16 +3313,16 @@ gethostbyname (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2606: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2609: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2612: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2615: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_search_gethostbyname="none required" else @@ -2624,7 +3334,7 @@ if test "$ac_cv_search_gethostbyname" = no; then for ac_lib in nsl; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 2627 "configure" +#line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -2634,6 +3344,12 @@ extern "C" /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char gethostbyname (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2643,16 +3359,16 @@ gethostbyname (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2646: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2649: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2652: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2655: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_search_gethostbyname="-l$ac_lib" break @@ -2665,14 +3381,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:2668: result: $ac_cv_search_gethostbyname" >&5 +echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_search_gethostbyname" >&6 if test "$ac_cv_search_gethostbyname" != no; then test "$ac_cv_search_gethostbyname" = "none required" || LIBS="$ac_cv_search_gethostbyname $LIBS" fi -echo "$as_me:2675: checking for library containing connect" >&5 +echo "$as_me:$LINENO: checking for library containing connect" >&5 echo $ECHO_N "checking for library containing connect... $ECHO_C" >&6 if test "${ac_cv_search_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2680,7 +3396,7 @@ else ac_func_search_save_LIBS=$LIBS ac_cv_search_connect=no cat >conftest.$ac_ext <<_ACEOF -#line 2683 "configure" +#line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -2690,6 +3406,12 @@ extern "C" /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char connect (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2699,16 +3421,16 @@ connect (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2702: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2705: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2708: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2711: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_search_connect="none required" else @@ -2720,7 +3442,7 @@ if test "$ac_cv_search_connect" = no; then for ac_lib in socket; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 2723 "configure" +#line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -2730,6 +3452,12 @@ extern "C" /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char connect (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2739,16 +3467,16 @@ connect (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2742: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2745: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2748: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2751: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_search_connect="-l$ac_lib" break @@ -2761,19 +3489,20 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:2764: result: $ac_cv_search_connect" >&5 +echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5 echo "${ECHO_T}$ac_cv_search_connect" >&6 if test "$ac_cv_search_connect" != no; then test "$ac_cv_search_connect" = "none required" || LIBS="$ac_cv_search_connect $LIBS" fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:2776: checking how to run the C preprocessor" >&5 +echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -2794,18 +3523,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 2797 "configure" +#line $LINENO "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2802: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2808: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2828,17 +3557,17 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 2831 "configure" +#line $LINENO "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2835: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2841: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2875,7 +3604,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2878: result: $CPP" >&5 +echo "$as_me:$LINENO: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2885,18 +3614,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 2888 "configure" +#line $LINENO "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2893: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2899: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2919,17 +3648,17 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 2922 "configure" +#line $LINENO "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2926: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2932: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2957,7 +3686,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:2960: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2968,13 +3697,14 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:2971: checking for ANSI C header files" >&5 + +echo "$as_me:$LINENO: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2977 "configure" +#line $LINENO "configure" #include "confdefs.h" #include #include @@ -2982,13 +3712,13 @@ else #include _ACEOF -if { (eval echo "$as_me:2985: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2991: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3010,7 +3740,7 @@ rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 3013 "configure" +#line $LINENO "configure" #include "confdefs.h" #include @@ -3028,7 +3758,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 3031 "configure" +#line $LINENO "configure" #include "confdefs.h" #include @@ -3049,7 +3779,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 3052 "configure" +#line $LINENO "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -3075,51 +3805,63 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:3078: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3081: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:3083: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3086: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +( exit $ac_status ) ac_cv_header_stdc=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:3099: result: $ac_cv_header_stdc" >&5 +echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define STDC_HEADERS 1 -EOF +_ACEOF fi + + + + + ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:3112: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3118 "configure" +#line $LINENO "configure" #include "confdefs.h" #include #include <$ac_hdr> +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -3130,16 +3872,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3133: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3136: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3139: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3142: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -3149,12 +3891,12 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3152: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 -EOF +_ACEOF ac_header_dirent=$ac_hdr; break fi @@ -3162,15 +3904,15 @@ fi done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then - echo "$as_me:3165: checking for opendir in -ldir" >&5 -echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 -if test "${ac_cv_lib_dir_opendir+set}" = set; then + echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 +if test "${ac_cv_search_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldir $LIBS" + ac_func_search_save_LIBS=$LIBS +ac_cv_search_opendir=no cat >conftest.$ac_ext <<_ACEOF -#line 3173 "configure" +#line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3180,6 +3922,12 @@ extern "C" /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char opendir (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -3189,42 +3937,28 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3192: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3195: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3198: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3201: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_dir_opendir=yes + ac_cv_search_opendir="none required" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_dir_opendir=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:3212: result: $ac_cv_lib_dir_opendir" >&5 -echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 -if test $ac_cv_lib_dir_opendir = yes; then - LIBS="$LIBS -ldir" -fi - -else - echo "$as_me:3219: checking for opendir in -lx" >&5 -echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 -if test "${ac_cv_lib_x_opendir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lx $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 3227 "configure" +if test "$ac_cv_search_opendir" = no; then + for ac_lib in dir; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3234,6 +3968,12 @@ extern "C" /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char opendir (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -3243,46 +3983,164 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3246: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3249: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3252: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3255: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_x_opendir=yes + ac_cv_search_opendir="-l$ac_lib" +break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_x_opendir=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + done fi -echo "$as_me:3266: result: $ac_cv_lib_x_opendir" >&5 -echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 -if test $ac_cv_lib_x_opendir = yes; then - LIBS="$LIBS -lx" +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6 +if test "$ac_cv_search_opendir" != no; then + test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" + +fi + +else + echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 +if test "${ac_cv_search_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_func_search_save_LIBS=$LIBS +ac_cv_search_opendir=no +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char opendir (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +opendir (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_opendir="none required" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +if test "$ac_cv_search_opendir" = no; then + for ac_lib in x; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char opendir (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +opendir (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_opendir="-l$ac_lib" +break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + done +fi +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6 +if test "$ac_cv_search_opendir" != no; then + test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" + fi fi -echo "$as_me:3274: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3280 "configure" +#line $LINENO "configure" #include "confdefs.h" #include #include #include +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -3293,16 +4151,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3296: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3299: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3302: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3305: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -3312,36 +4170,133 @@ ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3315: result: $ac_cv_header_time" >&5 +echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define TIME_WITH_SYS_TIME 1 -EOF +_ACEOF fi +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + + + + + + + + + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +$ac_includes_default + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_Header=no" +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + for ac_header in unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3328: checking for $ac_header" >&5 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 3334 "configure" + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:3338: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3344: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3352,44 +4307,110 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:3363: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + done + for ac_header in sys/time.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3376: checking for $ac_header" >&5 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 3382 "configure" + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:3386: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3392: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3400,34 +4421,62 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:3411: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + done + for ac_func in glob do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:3424: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3430 "configure" +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -3441,6 +4490,12 @@ extern "C" char $ac_func (); char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -3458,16 +4513,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3461: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3464: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3467: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3470: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -3477,12 +4532,12 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:3480: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF fi done @@ -3493,17 +4548,24 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:3496: checking for socklen_t" >&5 + +echo "$as_me:$LINENO: checking for socklen_t" >&5 echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6 if test "${aclocal_cv_type_socklen_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3503 "configure" +#line $LINENO "configure" #include "confdefs.h" #include #include +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -3513,16 +4575,16 @@ socklen_t len = 42; return len; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3516: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3519: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3522: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3525: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then aclocal_cv_type_socklen_t=yes else @@ -3533,32 +4595,38 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3536: result: $aclocal_cv_type_socklen_t" >&5 +echo "$as_me:$LINENO: result: $aclocal_cv_type_socklen_t" >&5 echo "${ECHO_T}$aclocal_cv_type_socklen_t" >&6 if test $aclocal_cv_type_socklen_t = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_SOCKLEN_T 1 -EOF +_ACEOF else -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_SOCKLEN_T 0 -EOF +_ACEOF fi -echo "$as_me:3552: checking for gmtime_r" >&5 +echo "$as_me:$LINENO: checking for gmtime_r" >&5 echo $ECHO_N "checking for gmtime_r... $ECHO_C" >&6 if test "${aclocal_cv_gmtime_r+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3559 "configure" +#line $LINENO "configure" #include "confdefs.h" #include +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -3568,16 +4636,16 @@ gmtime_r((time_t*)0,(struct tm*)0) ; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3571: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3574: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3577: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3580: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then aclocal_cv_gmtime_r=yes else @@ -3588,32 +4656,38 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3591: result: $aclocal_cv_gmtime_r" >&5 +echo "$as_me:$LINENO: result: $aclocal_cv_gmtime_r" >&5 echo "${ECHO_T}$aclocal_cv_gmtime_r" >&6 if test $aclocal_cv_gmtime_r = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_GMTIME_R 1 -EOF +_ACEOF else -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_GMTIME_R 0 -EOF +_ACEOF fi -echo "$as_me:3607: checking for localtime_r" >&5 +echo "$as_me:$LINENO: checking for localtime_r" >&5 echo $ECHO_N "checking for localtime_r... $ECHO_C" >&6 if test "${aclocal_cv_localtime_r+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3614 "configure" +#line $LINENO "configure" #include "confdefs.h" #include +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -3623,16 +4697,16 @@ localtime_r((time_t*)0,(struct tm*)0) ; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3626: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3629: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3632: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3635: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then aclocal_cv_localtime_r=yes else @@ -3643,22 +4717,23 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3646: result: $aclocal_cv_localtime_r" >&5 +echo "$as_me:$LINENO: result: $aclocal_cv_localtime_r" >&5 echo "${ECHO_T}$aclocal_cv_localtime_r" >&6 if test $aclocal_cv_localtime_r = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_LOCALTIME_R 1 -EOF +_ACEOF else -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_LOCALTIME_R 0 -EOF +_ACEOF fi + # Check whether --enable-fhs or --disable-fhs was given. if test "${enable_fhs+set}" = set; then enableval="$enable_fhs" @@ -3713,6 +4788,7 @@ then fi + SET_MAKE="" ac_config_files="$ac_config_files Makefile src/Makefile src/glib/Makefile src/gnet/Makefile src/gsmtp/Makefile src/main/Makefile src/win32/Makefile lib/Makefile lib/gcc2.95/Makefile lib/msvc6.0/Makefile bin/Makefile doc/Makefile" @@ -3792,25 +4868,36 @@ fi DEFS=-DHAVE_CONFIG_H +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi + : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:3798: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL -# Generated automatically by configure. +# Generated by $as_me. # Run this file to recreate the current configuration. # Compiler output produced by configure, useful for debugging # configure, is in config.log if it exists. debug=false SHELL=\${CONFIG_SHELL-$SHELL} -ac_cs_invocation="\$0 \$@" - _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF + +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh @@ -3819,8 +4906,167 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +# NLS nuisances. +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + +(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && + { $as_unset LANG || test "${LANG+set}" != set; } || + { LANG=C; export LANG; } +(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && + { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || + { LC_ALL=C; export LC_ALL; } +(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && + { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || + { LC_TIME=C; export LC_TIME; } +(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && + { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || + { LC_CTYPE=C; export LC_CTYPE; } +(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && + { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || + { LANGUAGE=C; export LANGUAGE; } +(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && + { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || + { LC_COLLATE=C; export LC_COLLATE; } +(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && + { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || + { LC_NUMERIC=C; export LC_NUMERIC; } +(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && + { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || + { LC_MESSAGES=C; export LC_MESSAGES; } + + # Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` +as_me=`(basename "$0") 2>/dev/null || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conftest.sh + echo "exit 0" >>conftest.sh + chmod +x conftest.sh + if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conftest.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr @@ -3848,22 +5094,12 @@ rm -f conf$$ conf$$.exe conf$$.file as_executable_p="test -f" -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } # IFS # We need space, tab and new line, in precisely that order. @@ -3872,10 +5108,34 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } exec 6>&1 +# Open the log real soon, to keep \$[0] and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. Logging --version etc. is OK. +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX +} >&5 +cat >&5 <<_CSEOF + +This file was extended by $as_me, which was +generated by GNU Autoconf 2.53. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +_CSEOF +echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +echo >&5 _ACEOF # Files that config.status was made for. @@ -3895,7 +5155,7 @@ if test -n "$ac_config_commands"; then echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS fi -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF ac_cs_usage="\ \`$as_me' instantiates files from templates according to the @@ -3922,12 +5182,12 @@ Configuration commands: $config_commands Report bugs to ." -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.52, +configured by $0, generated by GNU Autoconf 2.53, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -3936,9 +5196,9 @@ This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir INSTALL="$INSTALL" -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF # If no file are specified by the user, then we need to provide default # value. By we need to know if files were specified by the user. ac_need_defaults=: @@ -3960,18 +5220,18 @@ do case $1 in # Handling of the options. -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:3974: error: ambiguous option: $1 + { { echo "$as_me:$LINENO: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -3990,7 +5250,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:3993: error: unrecognized option: $1 + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -4002,32 +5262,20 @@ Try \`$0 --help' for more information." >&2;} shift done -exec 5>>config.log -cat >&5 << _ACEOF - -## ----------------------- ## -## Running config.status. ## -## ----------------------- ## - -This file was extended by $as_me 2.52, executed with - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - > $ac_cs_invocation -on `(hostname || uname -n) 2>/dev/null | sed 1q` - _ACEOF -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # INIT-COMMANDS section. # -EOF +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -cat >>$CONFIG_STATUS <<\EOF +_ACEOF + + + +cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case "$ac_config_target" in @@ -4044,9 +5292,9 @@ do "lib/msvc6.0/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/msvc6.0/Makefile" ;; "bin/Makefile" ) CONFIG_FILES="$CONFIG_FILES bin/Makefile" ;; "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; - "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; + "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - *) { { echo "$as_me:4049: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -4084,9 +5332,9 @@ $debug || { (exit 1); exit 1; } } -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # CONFIG_FILES section. @@ -4099,6 +5347,12 @@ if test -n "\$CONFIG_FILES"; then sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF s,@SHELL@,$SHELL,;t t +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@exec_prefix@,$exec_prefix,;t t s,@prefix@,$prefix,;t t s,@program_transform_name@,$program_transform_name,;t t @@ -4114,19 +5368,13 @@ s,@includedir@,$includedir,;t t s,@oldincludedir@,$oldincludedir,;t t s,@infodir@,$infodir,;t t s,@mandir@,$mandir,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@build_alias@,$build_alias,;t t s,@host_alias@,$host_alias,;t t s,@target_alias@,$target_alias,;t t +s,@DEFS@,$DEFS,;t t s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@DEFS@,$DEFS,;t t s,@LIBS@,$LIBS,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t @@ -4138,6 +5386,12 @@ s,@AUTOCONF@,$AUTOCONF,;t t s,@AUTOMAKE@,$AUTOMAKE,;t t s,@AUTOHEADER@,$AUTOHEADER,;t t s,@MAKEINFO@,$MAKEINFO,;t t +s,@AMTAR@,$AMTAR,;t t +s,@install_sh@,$install_sh,;t t +s,@STRIP@,$STRIP,;t t +s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t +s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t +s,@AWK@,$AWK,;t t s,@SET_MAKE@,$SET_MAKE,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t @@ -4146,12 +5400,19 @@ s,@CPPFLAGS@,$CPPFLAGS,;t t s,@ac_ct_CC@,$ac_ct_CC,;t t s,@EXEEXT@,$EXEEXT,;t t s,@OBJEXT@,$OBJEXT,;t t +s,@DEPDIR@,$DEPDIR,;t t +s,@am__include@,$am__include,;t t +s,@am__quote@,$am__quote,;t t +s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t +s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t +s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t +s,@CCDEPMODE@,$CCDEPMODE,;t t s,@CXX@,$CXX,;t t s,@CXXFLAGS@,$CXXFLAGS,;t t s,@ac_ct_CXX@,$ac_ct_CXX,;t t +s,@CXXDEPMODE@,$CXXDEPMODE,;t t s,@RANLIB@,$RANLIB,;t t s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -s,@AWK@,$AWK,;t t s,@MAKE@,$MAKE,;t t s,@AR@,$AR,;t t s,@GZIP@,$GZIP,;t t @@ -4168,9 +5429,9 @@ s,@e_man1dir@,$e_man1dir,;t t s,@e_examplesdir@,$e_examplesdir,;t t CEOF -EOF +_ACEOF - cat >>$CONFIG_STATUS <<\EOF + cat >>$CONFIG_STATUS <<\_ACEOF # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. ac_max_sed_lines=48 @@ -4209,8 +5470,8 @@ EOF fi fi # test -n "$CONFIG_FILES" -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in @@ -4224,7 +5485,8 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + ac_dir=`(dirname "$ac_file") 2>/dev/null || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| \ @@ -4235,8 +5497,7 @@ echo X"$ac_file" | /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in + { case "$ac_dir" in [\\/]* | ?:[\\/]* ) as_incr_dir=;; *) as_incr_dir=.;; esac @@ -4247,48 +5508,68 @@ for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do ?:) as_incr_dir=$as_mkdir_dir ;; *) as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" + test -d "$as_incr_dir" || + mkdir "$as_incr_dir" || + { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; } ;; esac done; } - ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` - else - ac_dir_suffix= ac_dots= - fi + ac_builddir=. - case $srcdir in - .) ac_srcdir=. - if test -z "$ac_dots"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; +if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +else + ac_dir_suffix= ac_top_builddir= +fi + +case $srcdir in + .) # No --srcdir option. We are building in place. + ac_srcdir=. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; *) # Relative path. - ac_srcdir=$ac_dots$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_dots$srcdir ;; - esac + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; +esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_dots$INSTALL ;; + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac if test x"$ac_file" != x-; then - { echo "$as_me:4283: creating $ac_file" >&5 + { echo "$as_me:$LINENO: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: - # /* config.h. Generated automatically by config.status. */ - configure_input="Generated automatically from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + configure_input= + else + configure_input="$ac_file. " + fi + configure_input=$configure_input"Generated from `echo $ac_file_in | + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -4298,7 +5579,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:4301: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -4311,23 +5592,29 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:4314: error: cannot find input file: $f" >&5 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; esac done` || { (exit 1); exit 1; } -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b s,@configure_input@,$configure_input,;t t s,@srcdir@,$ac_srcdir,;t t +s,@abs_srcdir@,$ac_abs_srcdir,;t t s,@top_srcdir@,$ac_top_srcdir,;t t +s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t +s,@builddir@,$ac_builddir,;t t +s,@abs_builddir@,$ac_abs_builddir,;t t +s,@top_builddir@,$ac_top_builddir,;t t +s,@abs_top_builddir@,$ac_abs_top_builddir,;t t s,@INSTALL@,$ac_INSTALL,;t t " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out rm -f $tmp/stdin @@ -4339,8 +5626,8 @@ s,@INSTALL@,$ac_INSTALL,;t t fi done -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF # # CONFIG_HEADER section. @@ -4372,7 +5659,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:4375: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -4383,7 +5670,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:4386: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -4396,7 +5683,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:4399: error: cannot find input file: $f" >&5 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -4405,7 +5692,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} # Remove the trailing spaces. sed 's/[ ]*$//' $ac_file_inputs >$tmp/in -EOF +_ACEOF # Transform confdefs.h into two sed scripts, `conftest.defines' and # `conftest.undefs', that substitutes the proper values into @@ -4421,16 +5708,16 @@ rm -f conftest.defines conftest.undefs # `end' is used to avoid that the second main sed command (meant for # 0-ary CPP macros) applies to n-ary macro definitions. # See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\EOF +cat >confdef2sed.sed <<\_ACEOF s/[\\&,]/\\&/g s,[\\$`],\\&,g t clear : clear -s,^[ ]*#[ ]*define[ ][ ]*\(\([^ (][^ (]*\)([^)]*)\)[ ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp t end s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp : end -EOF +_ACEOF # If some macros were called several times there might be several times # the same #defines, which is useless. Nevertheless, we may not want to # sort them, since we want the *last* AC-DEFINE to be honored. @@ -4441,9 +5728,9 @@ rm -f confdef2sed.sed # This sed command replaces #undef with comments. This is necessary, for # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. -cat >>conftest.undefs <<\EOF +cat >>conftest.undefs <<\_ACEOF s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -EOF +_ACEOF # Break up conftest.defines because some shells have a limit on the size # of here documents, and old seds have small limits too (100 cmds). @@ -4500,23 +5787,24 @@ do done rm -f conftest.undefs -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: - # /* config.h. Generated automatically by config.status. */ + # /* config.h. Generated by config.status. */ if test x"$ac_file" = x-; then - echo "/* Generated automatically by configure. */" >$tmp/config.h + echo "/* Generated by configure. */" >$tmp/config.h else - echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h + echo "/* $ac_file. Generated by configure. */" >$tmp/config.h fi cat $tmp/in >>$tmp/config.h rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:4516: $ac_file is unchanged" >&5 + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + ac_dir=`(dirname "$ac_file") 2>/dev/null || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| \ @@ -4527,8 +5815,7 @@ echo X"$ac_file" | /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in + { case "$ac_dir" in [\\/]* | ?:[\\/]* ) as_incr_dir=;; *) as_incr_dir=.;; esac @@ -4539,12 +5826,15 @@ for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do ?:) as_incr_dir=$as_mkdir_dir ;; *) as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" + test -d "$as_incr_dir" || + mkdir "$as_incr_dir" || + { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; } ;; esac done; } - fi rm -f $ac_file mv $tmp/config.h $ac_file fi @@ -4552,9 +5842,15 @@ done; } cat $tmp/config.h rm -f $tmp/config.h fi + # Run the commands associated with the file. + case $ac_file in + config.h ) # update the timestamp +echo 'timestamp for config.h' >"./stamp-h1" + ;; + esac done -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF # # CONFIG_COMMANDS section. @@ -4562,20 +5858,152 @@ cat >>$CONFIG_STATUS <<\EOF for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue ac_dest=`echo "$ac_file" | sed 's,:.*,,'` ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_dir=`(dirname "$ac_dest") 2>/dev/null || +$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_dest" : 'X\(//\)[^/]' \| \ + X"$ac_dest" : 'X\(//\)$' \| \ + X"$ac_dest" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$ac_dest" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + ac_builddir=. +if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +else + ac_dir_suffix= ac_top_builddir= +fi + +case $srcdir in + .) # No --srcdir option. We are building in place. + ac_srcdir=. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; +esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + + + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 +echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in - default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ;; + depfiles ) test x"$AMDEP_TRUE" != x"" || 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=`(dirname "$mf") 2>/dev/null || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + else + continue + fi + grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue + # Extract the definition of DEP_FILES from the Makefile without + # running `make'. + DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + test -z "$DEPDIR" && continue + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n -e '/^U = / s///p' < "$mf"` + test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" + # We invoke sed twice because it is the simplest approach to + # changing $(DEPDIR) to its actual value in the expansion. + for file in `sed -n -e ' + /^DEP_FILES = .*\\\\$/ { + s/^DEP_FILES = // + :loop + s/\\\\$// + p + n + /\\\\$/ b loop + p + } + /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`(dirname "$file") 2>/dev/null || +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { case $dirpart/$fdir in + [\\/]* | ?:[\\/]* ) as_incr_dir=;; + *) as_incr_dir=.;; +esac +as_dummy=$dirpart/$fdir +for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do + case $as_mkdir_dir in + # Skip DOS drivespec + ?:) as_incr_dir=$as_mkdir_dir ;; + *) + as_incr_dir=$as_incr_dir/$as_mkdir_dir + test -d "$as_incr_dir" || + mkdir "$as_incr_dir" || + { { echo "$as_me:$LINENO: error: cannot create $dirpart/$fdir" >&5 +echo "$as_me: error: cannot create $dirpart/$fdir" >&2;} + { (exit 1); exit 1; }; } + ;; + esac +done; } + + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +done + ;; esac done -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } -EOF +_ACEOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. # Unfortunately, on DOS this fails, as config.log is still kept open @@ -4594,3 +6022,4 @@ if test "$no_create" != yes; then $ac_cs_success || { (exit 1); exit 1; } fi + diff --git a/configure.ac b/configure.ac index a2820b0..7e2d819 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl -dnl Copyright (C) 2001-2002 Graeme Walker +dnl Copyright (C) 2001-2003 Graeme Walker dnl dnl This program is free software; you can redistribute it and/or dnl modify it under the terms of the GNU General Public License @@ -21,7 +21,7 @@ dnl dnl Process this file with autoconf to produce a configure script. AC_INIT(src/gsmtp/gsmtp.h) -AM_INIT_AUTOMAKE(emailrelay,1.0.0) +AM_INIT_AUTOMAKE(emailrelay,1.0.1) AM_CONFIG_HEADER(config.h) dnl === diff --git a/depcomp b/depcomp new file mode 100755 index 0000000..807b991 --- /dev/null +++ b/depcomp @@ -0,0 +1,423 @@ +#! /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 . + +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'. + +if test -z "$depfile"; then + base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'` + dir=`echo "$object" | sed 's,/.*$,/,'` + if test "$dir" = "$object"; then + dir= + fi + # FIXME: should be _deps on DOS. + depfile="$dir.deps/$base" +fi + +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 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. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + + if test "$libtool" = yes; then + tmpdepfile1="$dir.libs/$base.lo.d" + tmpdepfile2="$dir.libs/$base.d" + "$@" -Wc,-MD + else + tmpdepfile1="$dir$base.o.d" + tmpdepfile2="$dir$base.d" + "$@" -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. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + + # Remove `-o $object'. We will use -o /dev/null later, + # however we can't do the remplacement now because + # `-o $object' might simply not be used + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg + ;; + esac + done + + test -z "$dashmflag" && dashmflag=-M + "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + 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) + "$@" || exit $? + # 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} -o"$obj_suffix" -f"$tmpdepfile" "$@" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + sed '1,2d' "$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. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + + # Remove `-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg + ;; + esac + done + + "$@" -E | + sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed '$ s: \\$::' > "$tmpdepfile" + 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. + "$@" || exit $? + IFS=" " + for arg + do + case "$arg" in + "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") + set fnord "$@" + shift + shift + ;; + *) + set fnord "$@" "$arg" + shift + shift + ;; + esac + done + "$@" -E | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" + 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 diff --git a/doc/Makefile.am b/doc/Makefile.am index fdad2f8..9884461 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -99,6 +99,7 @@ install-data-local: install-e_docDATA install-e_man1DATA if test "$(HAVE_DOXYGEN)" = "yes" ; then for file in doxygen/* ; do $(INSTALL) $$file $(DESTDIR)$(e_docdir)/$$file ; done ; fi uninstall-local: + -rm -f $(DESTDIR)$(e_docdir)/doxygen/* 2>/dev/null -rmdir $(DESTDIR)$(e_docdir)/doxygen 2>/dev/null -rmdir $(DESTDIR)$(e_docdir) 2>/dev/null diff --git a/doc/Makefile.in b/doc/Makefile.in index b1999ce..80c74a3 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,6 +1,8 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated by automake 1.6.3 from Makefile.am. +# @configure_input@ -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,8 +12,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ + # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -28,8 +32,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # - - SHELL = @SHELL@ srcdir = @srcdir@ @@ -50,13 +52,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ @@ -64,31 +62,44 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +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) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +AMTAR = @AMTAR@ AR = @AR@ AWK = @AWK@ CC = @CC@ COMPILER_VERSION = @COMPILER_VERSION@ CXX = @CXX@ +DEPDIR = @DEPDIR@ GZIP = @GZIP@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_MAN2HTML = @HAVE_MAN2HTML@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ MAKE = @MAKE@ -MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +STRIP = @STRIP@ VERSION = @VERSION@ +am__include = @am__include@ +am__quote = @am__quote@ e_docdir = @e_docdir@ e_examplesdir = @e_examplesdir@ e_initdir = @e_initdir@ @@ -96,6 +107,7 @@ e_libexecdir = @e_libexecdir@ e_man1dir = @e_man1dir@ e_sbindir = @e_sbindir@ e_spooldir = @e_spooldir@ +install_sh = @install_sh@ stylesheet = emailrelay.css txt_files = developer.txt reference.txt userguide.txt windows.txt @@ -124,118 +136,112 @@ converter_helper2 = $(top_builddir)/bin/mu2html.sh converter_helper2_src = $(top_srcdir)/bin/mu2html.sh_ converter_helper3 = $(top_builddir)/bin/expand.sh converter_helper3_src = $(top_srcdir)/bin/expand.sh_ +subdir = doc mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../config.h -CONFIG_CLEAN_FILES = -SCRIPTS = $(noinst_SCRIPTS) +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SCRIPTS = $(noinst_SCRIPTS) -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DATA = $(e_doc_DATA) $(e_man1_DATA) +DIST_SOURCES = +DATA = $(e_doc_DATA) $(e_man1_DATA) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = Makefile.am Makefile.in +all: all-am - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect .SUFFIXES: -.SUFFIXES: .html .txt -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - +.SUFFIXES: .txt .html +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu doc/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +uninstall-info-am: +e_docDATA_INSTALL = $(INSTALL_DATA) install-e_docDATA: $(e_doc_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(e_docdir) @list='$(e_doc_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(e_docdir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(e_docdir)/$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(e_docdir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(e_docdir)/$$p; \ - fi; fi; \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(e_docDATA_INSTALL) $$d$$p $(DESTDIR)$(e_docdir)/$$f"; \ + $(e_docDATA_INSTALL) $$d$$p $(DESTDIR)$(e_docdir)/$$f; \ done uninstall-e_docDATA: @$(NORMAL_UNINSTALL) - list='$(e_doc_DATA)'; for p in $$list; do \ - rm -f $(DESTDIR)$(e_docdir)/$$p; \ + @list='$(e_doc_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(e_docdir)/$$f"; \ + rm -f $(DESTDIR)$(e_docdir)/$$f; \ done - +e_man1DATA_INSTALL = $(INSTALL_DATA) install-e_man1DATA: $(e_man1_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(e_man1dir) @list='$(e_man1_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(e_man1dir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(e_man1dir)/$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(e_man1dir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(e_man1dir)/$$p; \ - fi; fi; \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(e_man1DATA_INSTALL) $$d$$p $(DESTDIR)$(e_man1dir)/$$f"; \ + $(e_man1DATA_INSTALL) $$d$$p $(DESTDIR)$(e_man1dir)/$$f; \ done uninstall-e_man1DATA: @$(NORMAL_UNINSTALL) - list='$(e_man1_DATA)'; for p in $$list; do \ - rm -f $(DESTDIR)$(e_man1dir)/$$p; \ + @list='$(e_man1_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(e_man1dir)/$$f"; \ + rm -f $(DESTDIR)$(e_man1dir)/$$f; \ done tags: TAGS TAGS: +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = doc +top_distdir = .. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ + @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 \ - cp -pr $$d/$$file $(distdir)/$$file; \ + 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 \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done -info-am: -info: info-am -dvi-am: -dvi: dvi-am check-am: all-am check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am +all-am: Makefile $(SCRIPTS) $(DATA) -install-data-am: install-e_docDATA install-e_man1DATA install-data-local +installdirs: + $(mkinstalldirs) $(DESTDIR)$(e_docdir) $(DESTDIR)$(e_man1dir) + +install: install-am +install-exec: install-exec-am install-data: install-data-am +uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-e_docDATA uninstall-e_man1DATA uninstall-local -uninstall: uninstall-am -all-am: Makefile $(SCRIPTS) $(DATA) -all-redirect: all-am + +installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - $(mkinstalldirs) $(DESTDIR)$(e_docdir) $(DESTDIR)$(e_man1dir) - - + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: @@ -243,34 +249,56 @@ clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-generic mostlyclean-am - + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." clean: clean-am -distclean-am: distclean-generic clean-am +clean-am: clean-generic mostlyclean-am distclean: distclean-am -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +info: info-am + +info-am: + +install-data-am: install-data-local install-e_docDATA install-e_man1DATA + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-am -.PHONY: uninstall-e_docDATA install-e_docDATA uninstall-e_man1DATA \ -install-e_man1DATA tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-local install-data-am install-data install-am install \ -uninstall-local uninstall-am uninstall all-redirect all-am all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +uninstall-am: uninstall-e_docDATA uninstall-e_man1DATA uninstall-info-am \ + uninstall-local + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-data-local \ + install-e_docDATA install-e_man1DATA install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic uninstall uninstall-am uninstall-e_docDATA \ + uninstall-e_man1DATA uninstall-info-am uninstall-local .txt.html: @@ -327,9 +355,9 @@ install-data-local: install-e_docDATA install-e_man1DATA if test "$(HAVE_DOXYGEN)" = "yes" ; then for file in doxygen/* ; do $(INSTALL) $$file $(DESTDIR)$(e_docdir)/$$file ; done ; fi uninstall-local: + -rm -f $(DESTDIR)$(e_docdir)/doxygen/* 2>/dev/null -rmdir $(DESTDIR)$(e_docdir)/doxygen 2>/dev/null -rmdir $(DESTDIR)$(e_docdir) 2>/dev/null - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/developer.txt b/doc/developer.txt index 93f5017..0b53333 100644 --- a/doc/developer.txt +++ b/doc/developer.txt @@ -253,4 +253,4 @@ to reassign a std::auto_ptr<>. -Copyright (C) 2001-2002 Graeme Walker . All rights reserved. +Copyright (C) 2001-2003 Graeme Walker . All rights reserved. diff --git a/doc/emailrelay-passwd.1 b/doc/emailrelay-passwd.1 index 313b51e..3ffa7df 100644 --- a/doc/emailrelay-passwd.1 +++ b/doc/emailrelay-passwd.1 @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2001-2002 Graeme Walker +.\" Copyright (C) 2001-2003 Graeme Walker .\" .\" This program is free software; you can redistribute it and/or .\" modify it under the terms of the GNU General Public License diff --git a/doc/emailrelay-poke.1 b/doc/emailrelay-poke.1 index 12673cd..ab16a93 100644 --- a/doc/emailrelay-poke.1 +++ b/doc/emailrelay-poke.1 @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2001-2002 Graeme Walker +.\" Copyright (C) 2001-2003 Graeme Walker .\" .\" This program is free software; you can redistribute it and/or .\" modify it under the terms of the GNU General Public License diff --git a/doc/emailrelay-submit.1 b/doc/emailrelay-submit.1 index 5a76340..0b4aa84 100644 --- a/doc/emailrelay-submit.1 +++ b/doc/emailrelay-submit.1 @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2001-2002 Graeme Walker +.\" Copyright (C) 2001-2003 Graeme Walker .\" .\" This program is free software; you can redistribute it and/or .\" modify it under the terms of the GNU General Public License diff --git a/doc/emailrelay.1 b/doc/emailrelay.1 index 2aa431b..14af47b 100644 --- a/doc/emailrelay.1 +++ b/doc/emailrelay.1 @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2001-2002 Graeme Walker +.\" Copyright (C) 2001-2003 Graeme Walker .\" .\" This program is free software; you can redistribute it and/or .\" modify it under the terms of the GNU General Public License diff --git a/doc/index.html b/doc/index.html index 71b7dbd..d164c13 100644 --- a/doc/index.html +++ b/doc/index.html @@ -21,4 +21,4 @@ - + diff --git a/doc/reference.txt b/doc/reference.txt index c29eacb..a2b858b 100644 --- a/doc/reference.txt +++ b/doc/reference.txt @@ -263,7 +263,7 @@ sendmail command-line interface rather than SMTP): #!/bin/sh # content="${1}" - envelope="`echo \"${content}\" | sed 's/content/envelope/'`" + envelope="`echo \"${content}\" | sed 's/content/envelope.new/'`" ip="`awk '/MailRelay-Client:/ {print $2;exit}' \"${envelope}\"`" if test "${ip}" = "192.168.0.2" then @@ -318,7 +318,7 @@ Some other points are: * Strings are dynamically allocated, so buffer overflow/truncation issues are avoided. * By default connections to the SMTP and administrative ports will be rejected if they come from remote machines. * No configuration parameters can be changed through the administrative interface. -* No exec(), system() or popen() calls are used other than execve() to spawn the mail processor. +* No exec(), system() or popen() calls are used other than execve() to spawn the mail processor and address verifier. * The submit utility is installed as set-group-id with group ownership of "daemon". Authentication @@ -516,7 +516,7 @@ defined at run-time. For example, building with "configure --enable-fhs ; make ; make install DESTDIR=/root" would create a spool directory "/root/var/spool/emailrelay", but the server -run as "/root/usr/sbin/emailrelay --as-server" would use a expect a spool directory +run as "/root/usr/sbin/emailrelay --as-server" would expect a spool directory of "/var/spool/emailrelay". This could be fixed by either adding "--spool-dir /root/var/spool/emailrelay" to the server command-line, or by creating the "/var/spool/emailrelay" directory manually. @@ -526,4 +526,4 @@ directory exists, or in "/tmp" otherwise. -Copyright (C) 2001-2002 Graeme Walker . All rights reserved. +Copyright (C) 2001-2003 Graeme Walker . All rights reserved. diff --git a/doc/userguide.txt b/doc/userguide.txt index b165ec0..973cda6 100644 --- a/doc/userguide.txt +++ b/doc/userguide.txt @@ -327,4 +327,4 @@ Glossary -Copyright (C) 2001-2002 Graeme Walker . All rights reserved. +Copyright (C) 2001-2003 Graeme Walker . All rights reserved. diff --git a/doc/windows.txt b/doc/windows.txt index 3fec16b..f1870f9 100644 --- a/doc/windows.txt +++ b/doc/windows.txt @@ -105,4 +105,4 @@ taskbar, desktop or "Start->Programs->StartUp" shortcuts. -Copyright (C) 2001-2002 Graeme Walker . All rights reserved. +Copyright (C) 2001-2003 Graeme Walker . All rights reserved. diff --git a/emailrelay.spec b/emailrelay.spec index 35d6c46..e7325b9 100644 --- a/emailrelay.spec +++ b/emailrelay.spec @@ -1,10 +1,10 @@ Summary: Simple e-mail message transfer agent using SMTP Name: emailrelay -Version: 1.0.0 +Version: 1.0.1 Release: 1 Copyright: GPL Group: System Environment/Daemons -Source: http://emailrelay.sourceforge.net/.../emailrelay-src-1.0.0.tar.gz +Source: http://emailrelay.sourceforge.net/.../emailrelay-src-1.0.1.tar.gz BuildRoot: /tmp/emailrelay-install %define prefix /usr @@ -75,6 +75,6 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Jul 3 2002 Graeme Walker +* Wed Jul 3 2003 Graeme Walker - Initial version. diff --git a/install-sh b/install-sh index e9de238..11870f1 100755 --- a/install-sh +++ b/install-sh @@ -109,7 +109,7 @@ then echo "install: no input file specified" exit 1 else - true + : fi if [ x"$dir_arg" != x ]; then @@ -120,7 +120,7 @@ if [ x"$dir_arg" != x ]; then instcmd=: chmodcmd="" else - instcmd=mkdir + instcmd=$mkdirprog fi else @@ -128,9 +128,9 @@ else # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. - if [ -f $src -o -d $src ] + if [ -f "$src" ] || [ -d "$src" ] then - true + : else echo "install: $src does not exist" exit 1 @@ -141,7 +141,7 @@ else echo "install: no destination specified" exit 1 else - true + : fi # If destination is a directory, append the input filename; if your system @@ -151,7 +151,7 @@ else then dst="$dst"/`basename $src` else - true + : fi fi @@ -163,8 +163,8 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` # Skip lots of stat calls in the usual case. if [ ! -d "$dstdir" ]; then -defaultIFS=' -' +defaultIFS=' + ' IFS="${IFS-${defaultIFS}}" oIFS="${IFS}" @@ -183,7 +183,7 @@ while [ $# -ne 0 ] ; do then $mkdirprog "${pathcomp}" else - true + : fi pathcomp="${pathcomp}/" @@ -194,10 +194,10 @@ if [ x"$dir_arg" != x ] then $doit $instcmd $dst && - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi else # If we're going to rename the final executable, determine the name now. @@ -216,7 +216,7 @@ else then dstfile=`basename $dst` else - true + : fi # Make a temp file name in the proper directory. @@ -235,10 +235,10 @@ else # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $instcmd $src $dsttmp" command. - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi && # Now rename the file to the real destination. diff --git a/lib/Makefile.am b/lib/Makefile.am index 3ea7673..bdf914f 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/Makefile.in b/lib/Makefile.in index 3f1d606..3ed3582 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,6 +1,8 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated by automake 1.6.3 from Makefile.am. +# @configure_input@ -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,26 +12,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# -# Copyright (C) 2001-2002 Graeme Walker -# -# 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 of the License, 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., 675 Mass Ave, Cambridge, MA 02139, USA. -# - - +@SET_MAKE@ SHELL = @SHELL@ srcdir = @srcdir@ @@ -50,13 +33,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ @@ -64,31 +43,44 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +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) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +AMTAR = @AMTAR@ AR = @AR@ AWK = @AWK@ CC = @CC@ COMPILER_VERSION = @COMPILER_VERSION@ CXX = @CXX@ +DEPDIR = @DEPDIR@ GZIP = @GZIP@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_MAN2HTML = @HAVE_MAN2HTML@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ MAKE = @MAKE@ -MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +STRIP = @STRIP@ VERSION = @VERSION@ +am__include = @am__include@ +am__quote = @am__quote@ e_docdir = @e_docdir@ e_examplesdir = @e_examplesdir@ e_initdir = @e_initdir@ @@ -96,27 +88,48 @@ e_libexecdir = @e_libexecdir@ e_man1dir = @e_man1dir@ e_sbindir = @e_sbindir@ e_spooldir = @e_spooldir@ +install_sh = @install_sh@ +# +# Copyright (C) 2001-2003 Graeme Walker +# +# 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 of the License, 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# SUBDIRS = gcc2.95 msvc6.0 +subdir = lib mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../config.h -CONFIG_CLEAN_FILES = -DIST_COMMON = Makefile.am Makefile.in +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +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 = Makefile.am Makefile.in +DIST_SUBDIRS = $(SUBDIRS) +all: all-recursive -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu lib/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -124,13 +137,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status # (1) if the variable is set in `config.status', edit `config.status' # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. - -@SET_MAKE@ - -all-recursive install-data-recursive install-exec-recursive \ -installdirs-recursive install-recursive uninstall-recursive \ -check-recursive installcheck-recursive info-recursive dvi-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ +$(RECURSIVE_TARGETS): + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -150,13 +158,18 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - test "$$subdir" != "." || dot_seen=yes; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ + rev="$$rev ."; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ @@ -173,133 +186,167 @@ tags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done +ETAGS = etags +ETAGSFLAGS = + tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ +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; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) + mkid -fID $$unique -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ + fi; \ done; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ + 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 "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique -mostlyclean-tags: - -clean-tags: +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -maintainer-clean-tags: - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = lib +top_distdir = .. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ + @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 \ - cp -pr $$d/$$file $(distdir)/$$file; \ + 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 \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done - for subdir in $(SUBDIRS); do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" \ + distdir=../$(distdir)/$$subdir \ + distdir) \ || exit 1; \ fi; \ done -info-am: -info: info-recursive -dvi-am: -dvi: dvi-recursive check-am: all-am check: check-recursive -installcheck-am: -installcheck: installcheck-recursive -install-exec-am: -install-exec: install-exec-recursive - -install-data-am: -install-data: install-data-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-recursive -uninstall-am: -uninstall: uninstall-recursive all-am: Makefile -all-redirect: all-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-tags mostlyclean-generic - -mostlyclean: mostlyclean-recursive - -clean-am: clean-tags clean-generic mostlyclean-am - + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." clean: clean-recursive -distclean-am: distclean-tags distclean-generic clean-am +clean-am: clean-generic mostlyclean-am distclean: distclean-recursive -maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +info: info-recursive + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-recursive + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-recursive -.PHONY: install-data-recursive uninstall-data-recursive \ -install-exec-recursive uninstall-exec-recursive installdirs-recursive \ -uninstalldirs-recursive all-recursive check-recursive \ -installcheck-recursive info-recursive dvi-recursive \ -mostlyclean-recursive distclean-recursive clean-recursive \ -maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs-am \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic +mostlyclean: mostlyclean-recursive + +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 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. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/lib/gcc2.95/Makefile.am b/lib/gcc2.95/Makefile.am index d69a8b0..38069ee 100644 --- a/lib/gcc2.95/Makefile.am +++ b/lib/gcc2.95/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/gcc2.95/Makefile.in b/lib/gcc2.95/Makefile.in index 8777357..dafd393 100644 --- a/lib/gcc2.95/Makefile.in +++ b/lib/gcc2.95/Makefile.in @@ -1,6 +1,8 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated by automake 1.6.3 from Makefile.am. +# @configure_input@ -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,8 +12,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ + # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -28,8 +32,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # - - SHELL = @SHELL@ srcdir = @srcdir@ @@ -50,13 +52,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. ACLOCAL = @ACLOCAL@ @@ -64,31 +62,44 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +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) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +AMTAR = @AMTAR@ AR = @AR@ AWK = @AWK@ CC = @CC@ COMPILER_VERSION = @COMPILER_VERSION@ CXX = @CXX@ +DEPDIR = @DEPDIR@ GZIP = @GZIP@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_MAN2HTML = @HAVE_MAN2HTML@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ MAKE = @MAKE@ -MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +STRIP = @STRIP@ VERSION = @VERSION@ +am__include = @am__include@ +am__quote = @am__quote@ e_docdir = @e_docdir@ e_examplesdir = @e_examplesdir@ e_initdir = @e_initdir@ @@ -96,106 +107,126 @@ e_libexecdir = @e_libexecdir@ e_man1dir = @e_man1dir@ e_sbindir = @e_sbindir@ e_spooldir = @e_spooldir@ +install_sh = @install_sh@ EXTRA_DIST = iostream limits sstream xlocale +subdir = lib/gcc2.95 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../config.h -CONFIG_CLEAN_FILES = -DIST_COMMON = Makefile.am Makefile.in +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +DIST_SOURCES = +DIST_COMMON = Makefile.am Makefile.in +all: all-am - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib/gcc2.95/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu lib/gcc2.95/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +uninstall-info-am: tags: TAGS TAGS: +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = lib/gcc2.95 +top_distdir = ../.. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ + @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 \ - cp -pr $$d/$$file $(distdir)/$$file; \ + 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 \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done -info-am: -info: info-am -dvi-am: -dvi: dvi-am check-am: all-am check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am +all-am: Makefile -install-data-am: +installdirs: + +install: install-am +install-exec: install-exec-am install-data: install-data-am +uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: -uninstall: uninstall-am -all-am: Makefile -all-redirect: all-am + +installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - - + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-generic mostlyclean-am - + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." clean: clean-am -distclean-am: distclean-generic clean-am +clean-am: clean-generic mostlyclean-am distclean: distclean-am -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-am -.PHONY: tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +uninstall-am: uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/lib/gcc2.95/iostream b/lib/gcc2.95/iostream index 6e4ac3c..ba46864 100644 --- a/lib/gcc2.95/iostream +++ b/lib/gcc2.95/iostream @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/lib/gcc2.95/limits b/lib/gcc2.95/limits index 7e799d6..0b22578 100644 --- a/lib/gcc2.95/limits +++ b/lib/gcc2.95/limits @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/lib/gcc2.95/sstream b/lib/gcc2.95/sstream index 51cda98..478e71c 100644 --- a/lib/gcc2.95/sstream +++ b/lib/gcc2.95/sstream @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/lib/gcc2.95/xlocale b/lib/gcc2.95/xlocale index 151ce3e..ed29464 100644 --- a/lib/gcc2.95/xlocale +++ b/lib/gcc2.95/xlocale @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/lib/msvc6.0/Makefile.am b/lib/msvc6.0/Makefile.am index dea76e6..fd13591 100644 --- a/lib/msvc6.0/Makefile.am +++ b/lib/msvc6.0/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/msvc6.0/Makefile.in b/lib/msvc6.0/Makefile.in index f364cb0..8e3df15 100644 --- a/lib/msvc6.0/Makefile.in +++ b/lib/msvc6.0/Makefile.in @@ -1,6 +1,8 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated by automake 1.6.3 from Makefile.am. +# @configure_input@ -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,8 +12,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ + # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -28,8 +32,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # - - SHELL = @SHELL@ srcdir = @srcdir@ @@ -50,13 +52,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. ACLOCAL = @ACLOCAL@ @@ -64,31 +62,44 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +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) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +AMTAR = @AMTAR@ AR = @AR@ AWK = @AWK@ CC = @CC@ COMPILER_VERSION = @COMPILER_VERSION@ CXX = @CXX@ +DEPDIR = @DEPDIR@ GZIP = @GZIP@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_MAN2HTML = @HAVE_MAN2HTML@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ MAKE = @MAKE@ -MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +STRIP = @STRIP@ VERSION = @VERSION@ +am__include = @am__include@ +am__quote = @am__quote@ e_docdir = @e_docdir@ e_examplesdir = @e_examplesdir@ e_initdir = @e_initdir@ @@ -96,106 +107,126 @@ e_libexecdir = @e_libexecdir@ e_man1dir = @e_man1dir@ e_sbindir = @e_sbindir@ e_spooldir = @e_spooldir@ +install_sh = @install_sh@ EXTRA_DIST = cstdio cstdlib cstring ctime +subdir = lib/msvc6.0 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../config.h -CONFIG_CLEAN_FILES = -DIST_COMMON = Makefile.am Makefile.in +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +DIST_SOURCES = +DIST_COMMON = Makefile.am Makefile.in +all: all-am - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib/msvc6.0/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu lib/msvc6.0/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +uninstall-info-am: tags: TAGS TAGS: +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = lib/msvc6.0 +top_distdir = ../.. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ + @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 \ - cp -pr $$d/$$file $(distdir)/$$file; \ + 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 \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done -info-am: -info: info-am -dvi-am: -dvi: dvi-am check-am: all-am check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am +all-am: Makefile -install-data-am: +installdirs: + +install: install-am +install-exec: install-exec-am install-data: install-data-am +uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: -uninstall: uninstall-am -all-am: Makefile -all-redirect: all-am + +installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - - + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-generic mostlyclean-am - + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." clean: clean-am -distclean-am: distclean-generic clean-am +clean-am: clean-generic mostlyclean-am distclean: distclean-am -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-am -.PHONY: tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +uninstall-am: uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/lib/msvc6.0/cstdio b/lib/msvc6.0/cstdio index 4651209..9e3ddda 100644 --- a/lib/msvc6.0/cstdio +++ b/lib/msvc6.0/cstdio @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/lib/msvc6.0/cstdlib b/lib/msvc6.0/cstdlib index 0dda25b..d427799 100644 --- a/lib/msvc6.0/cstdlib +++ b/lib/msvc6.0/cstdlib @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/lib/msvc6.0/cstring b/lib/msvc6.0/cstring index e8f917f..0bde778 100644 --- a/lib/msvc6.0/cstring +++ b/lib/msvc6.0/cstring @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/lib/msvc6.0/ctime b/lib/msvc6.0/ctime index 7bca0a1..60e2246 100644 --- a/lib/msvc6.0/ctime +++ b/lib/msvc6.0/ctime @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/missing b/missing index d46f79f..6a37006 100755 --- a/missing +++ b/missing @@ -1,7 +1,7 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 2001 Free Software Foundation, Inc. -# Franc,ois Pinard , 1996. +# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc. +# Originally by Fran,cois Pinard , 1996. # 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 @@ -18,19 +18,37 @@ # 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. + if test $# -eq 0; then echo 1>&2 "Try \`$0 --help' for more information" exit 1 fi +run=: + # In the cases where this matters, `missing' is being run in the # srcdir already. -if test -f configure.in; then +if test -f configure.ac; then configure_ac=configure.ac else configure_ac=configure.in fi +case "$1" in +--run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + ;; +esac + +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. case "$1" in -h|--h|--he|--hel|--help) @@ -43,6 +61,7 @@ error status if there is no known handling for PROGRAM. Options: -h, --help display this help and exit -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails Supported PROGRAM values: aclocal touch file \`aclocal.m4' @@ -51,13 +70,15 @@ Supported PROGRAM values: automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c + help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file + tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch]" ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing - GNU libit 0.0" + echo "missing 0.4 - GNU automake" ;; -*) @@ -66,31 +87,46 @@ Supported PROGRAM values: exit 1 ;; - aclocal) + aclocal*) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acinclude.m4' or \`$configure_ac'. You might want + you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; autoconf) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if - you modified \`$configure_ac'. You might want to install the + you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." touch configure ;; autoheader) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acconfig.h' or \`$configure_ac'. You might want + you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' $configure_ac` + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" touch_files= for f in $files; do @@ -103,10 +139,15 @@ WARNING: \`$1' is missing on your system. You should only need it if touch $touch_files ;; - automake) + automake*) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`$configure_ac'. + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | @@ -114,6 +155,34 @@ WARNING: \`$1' is missing on your system. You should only need it if while read f; do touch "$f"; done ;; + autom4te) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + + echo 1>&2 "\ +WARNING: \`$1' is needed, and you do not seem to have it handy on your + system. You might have modified some files without having the + proper tools for further handling them. + You can get \`$1Help2man' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` + test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo "#! /bin/sh" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" + chmod +x $file + exit 1 + fi + ;; + bison|yacc) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if @@ -167,7 +236,37 @@ WARNING: \`$1' is missing on your system. You should only need it if fi ;; + help2man) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + + echo 1>&2 "\ +WARNING: \`$1' is missing on your system. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` + fi + if [ -f "$file" ]; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit 1 + fi + ;; + makeinfo) + if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then + # We have makeinfo, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -183,6 +282,45 @@ WARNING: \`$1' is missing on your system. You should only need it if touch $file ;; + tar) + shift + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + fi + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar "$@" && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar "$@" && exit 0 + fi + firstarg="$1" + if shift; then + case "$firstarg" in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + case "$firstarg" in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + fi + + echo 1>&2 "\ +WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + *) echo 1>&2 "\ WARNING: \`$1' is needed, and you do not seem to have it handy on your diff --git a/mkinstalldirs b/mkinstalldirs index 4f58503..8ab885e 100755 --- a/mkinstalldirs +++ b/mkinstalldirs @@ -4,9 +4,53 @@ # Created: 1993-05-16 # Public domain -# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $ - errstatus=0 +dirmode="" + +usage="\ +Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." + +# process command line arguments +while test $# -gt 0 ; do + case "${1}" in + -h | --help | --h* ) # -h for help + echo "${usage}" 1>&2; exit 0 ;; + -m ) # -m PERM arg + shift + test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } + dirmode="${1}" + shift ;; + -- ) shift; break ;; # stop option processing + -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option + * ) break ;; # first non-opt arg + esac +done + +for file +do + if test -d "$file"; then + shift + else + break + fi +done + +case $# in +0) exit 0 ;; +esac + +case $dirmode in +'') + if mkdir -p -- . 2>/dev/null; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" + fi ;; +*) + if mkdir -m "$dirmode" -p -- . 2>/dev/null; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" + fi ;; +esac for file do @@ -22,13 +66,24 @@ do esac if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" + echo "mkdir $pathcomp" - mkdir "$pathcomp" || lasterr=$? + mkdir "$pathcomp" || lasterr=$? - if test ! -d "$pathcomp"; then - errstatus=$lasterr - fi + if test ! -d "$pathcomp"; then + errstatus=$lasterr + else + if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" + + lasterr="" + chmod "$dirmode" "$pathcomp" || lasterr=$? + + if test ! -z "$lasterr"; then + errstatus=$lasterr + fi + fi + fi fi pathcomp="$pathcomp/" @@ -37,4 +92,8 @@ done exit $errstatus +# Local Variables: +# mode: shell-script +# sh-indentation: 3 +# End: # mkinstalldirs ends here diff --git a/src/Makefile.am b/src/Makefile.am index ed3e6c2..2b3110c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/src/Makefile.in b/src/Makefile.in index 9946127..ceb0bf2 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,6 +1,8 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated by automake 1.6.3 from Makefile.am. +# @configure_input@ -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,26 +12,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# -# Copyright (C) 2001-2002 Graeme Walker -# -# 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 of the License, 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., 675 Mass Ave, Cambridge, MA 02139, USA. -# - - +@SET_MAKE@ SHELL = @SHELL@ srcdir = @srcdir@ @@ -50,13 +33,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ @@ -64,31 +43,44 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +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) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +AMTAR = @AMTAR@ AR = @AR@ AWK = @AWK@ CC = @CC@ COMPILER_VERSION = @COMPILER_VERSION@ CXX = @CXX@ +DEPDIR = @DEPDIR@ GZIP = @GZIP@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_MAN2HTML = @HAVE_MAN2HTML@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ MAKE = @MAKE@ -MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +STRIP = @STRIP@ VERSION = @VERSION@ +am__include = @am__include@ +am__quote = @am__quote@ e_docdir = @e_docdir@ e_examplesdir = @e_examplesdir@ e_initdir = @e_initdir@ @@ -96,27 +88,48 @@ e_libexecdir = @e_libexecdir@ e_man1dir = @e_man1dir@ e_sbindir = @e_sbindir@ e_spooldir = @e_spooldir@ +install_sh = @install_sh@ +# +# Copyright (C) 2001-2003 Graeme Walker +# +# 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 of the License, 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# SUBDIRS = glib gnet gsmtp main win32 +subdir = src mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../config.h -CONFIG_CLEAN_FILES = -DIST_COMMON = Makefile.am Makefile.in +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +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 = Makefile.am Makefile.in +DIST_SUBDIRS = $(SUBDIRS) +all: all-recursive -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -124,13 +137,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status # (1) if the variable is set in `config.status', edit `config.status' # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. - -@SET_MAKE@ - -all-recursive install-data-recursive install-exec-recursive \ -installdirs-recursive install-recursive uninstall-recursive \ -check-recursive installcheck-recursive info-recursive dvi-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ +$(RECURSIVE_TARGETS): + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -150,13 +158,18 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - test "$$subdir" != "." || dot_seen=yes; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ + rev="$$rev ."; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ @@ -173,133 +186,167 @@ tags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done +ETAGS = etags +ETAGSFLAGS = + tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ +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; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) + mkid -fID $$unique -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ + fi; \ done; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ + 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 "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique -mostlyclean-tags: - -clean-tags: +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -maintainer-clean-tags: - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = src +top_distdir = .. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ + @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 \ - cp -pr $$d/$$file $(distdir)/$$file; \ + 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 \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done - for subdir in $(SUBDIRS); do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" \ + distdir=../$(distdir)/$$subdir \ + distdir) \ || exit 1; \ fi; \ done -info-am: -info: info-recursive -dvi-am: -dvi: dvi-recursive check-am: all-am check: check-recursive -installcheck-am: -installcheck: installcheck-recursive -install-exec-am: -install-exec: install-exec-recursive - -install-data-am: -install-data: install-data-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-recursive -uninstall-am: -uninstall: uninstall-recursive all-am: Makefile -all-redirect: all-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-tags mostlyclean-generic - -mostlyclean: mostlyclean-recursive - -clean-am: clean-tags clean-generic mostlyclean-am - + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." clean: clean-recursive -distclean-am: distclean-tags distclean-generic clean-am +clean-am: clean-generic mostlyclean-am distclean: distclean-recursive -maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +info: info-recursive + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-recursive + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-recursive -.PHONY: install-data-recursive uninstall-data-recursive \ -install-exec-recursive uninstall-exec-recursive installdirs-recursive \ -uninstalldirs-recursive all-recursive check-recursive \ -installcheck-recursive info-recursive dvi-recursive \ -mostlyclean-recursive distclean-recursive clean-recursive \ -maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs-am \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic +mostlyclean: mostlyclean-recursive + +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 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. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/src/glib/Makefile.am b/src/glib/Makefile.am index 1a95fdd..f055bef 100644 --- a/src/glib/Makefile.am +++ b/src/glib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/src/glib/Makefile.in b/src/glib/Makefile.in index fc79b8d..3c117e6 100644 --- a/src/glib/Makefile.in +++ b/src/glib/Makefile.in @@ -1,6 +1,8 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated by automake 1.6.3 from Makefile.am. +# @configure_input@ -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,26 +12,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# -# Copyright (C) 2001-2002 Graeme Walker -# -# 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 of the License, 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., 675 Mass Ave, Cambridge, MA 02139, USA. -# - - +@SET_MAKE@ SHELL = @SHELL@ srcdir = @srcdir@ @@ -50,13 +33,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. ACLOCAL = @ACLOCAL@ @@ -64,31 +43,44 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +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) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +AMTAR = @AMTAR@ AR = @AR@ AWK = @AWK@ CC = @CC@ COMPILER_VERSION = @COMPILER_VERSION@ CXX = @CXX@ +DEPDIR = @DEPDIR@ GZIP = @GZIP@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_MAN2HTML = @HAVE_MAN2HTML@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ MAKE = @MAKE@ -MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +STRIP = @STRIP@ VERSION = @VERSION@ +am__include = @am__include@ +am__quote = @am__quote@ e_docdir = @e_docdir@ e_examplesdir = @e_examplesdir@ e_initdir = @e_initdir@ @@ -96,295 +88,356 @@ e_libexecdir = @e_libexecdir@ e_man1dir = @e_man1dir@ e_sbindir = @e_sbindir@ e_spooldir = @e_spooldir@ +install_sh = @install_sh@ -EXTRA_DIST = garg_win32.cpp gcleanup_win32.cpp gdaemon_win32.cpp gdatetime_win32.cpp gdirectory_win32.cpp gfs_win32.cpp glogoutput_win32.cpp gprocess_win32.cpp gfile_win32.cpp gregistry_win32.cpp gregistry.h md5c.c md5.h +# +# Copyright (C) 2001-2003 Graeme Walker +# +# 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 of the License, 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# +EXTRA_DIST = \ + garg_win32.cpp \ + gcleanup_win32.cpp \ + gdaemon_win32.cpp \ + gdatetime_win32.cpp \ + gdirectory_win32.cpp \ + gfs_win32.cpp \ + glogoutput_win32.cpp \ + gprocess_win32.cpp \ + gfile_win32.cpp \ + gregistry_win32.cpp \ + gregistry.h \ + md5c.c \ + md5.h INCLUDES = -I$(top_srcdir)/lib/$(COMPILER_VERSION) noinst_LIBRARIES = libglib.a -libglib_a_SOURCES = garg.cpp garg.h garg_unix.cpp gassert.h gconvert.h gcleanup.h gcleanup_unix.cpp gdaemon.h gdaemon_unix.cpp gdate.cpp gdate.h gdatetime.cpp gdatetime.h gdatetime_unix.cpp gdebug.h gdef.h gdirectory.cpp gdirectory.h gdirectory_unix.cpp gexception.cpp gexception.h gfile.cpp gfile.h gfile_unix.cpp gfs.h gfs_unix.cpp ggetopt.cpp ggetopt.h glog.cpp glog.h glogoutput.cpp glogoutput.h glogoutput_unix.cpp gmd5.cpp gmd5.h gmemory.h gnoncopyable.h gpath.cpp gpath.h gpidfile.cpp gpidfile.h gprocess.h gprocess_unix.cpp groot.cpp groot.h gsetter.h gstatemachine.h gstr.cpp gstr.h gstrings.h gtime.cpp gtime.h +libglib_a_SOURCES = \ + garg.cpp \ + garg.h \ + garg_unix.cpp \ + gassert.h \ + gconvert.h \ + gcleanup.h \ + gcleanup_unix.cpp \ + gdaemon.h \ + gdaemon_unix.cpp \ + gdate.cpp \ + gdate.h \ + gdatetime.cpp \ + gdatetime.h \ + gdatetime_unix.cpp \ + gdebug.h \ + gdef.h \ + gdirectory.cpp \ + gdirectory.h \ + gdirectory_unix.cpp \ + gexception.cpp \ + gexception.h \ + gfile.cpp \ + gfile.h \ + gfile_unix.cpp \ + gfs.h \ + gfs_unix.cpp \ + ggetopt.cpp \ + ggetopt.h \ + glog.cpp \ + glog.h \ + glogoutput.cpp \ + glogoutput.h \ + glogoutput_unix.cpp \ + gmd5.cpp \ + gmd5.h \ + gmemory.h \ + gnoncopyable.h \ + gpath.cpp \ + gpath.h \ + gpidfile.cpp \ + gpidfile.h \ + gprocess.h \ + gprocess_unix.cpp \ + groot.cpp \ + groot.h \ + gsetter.h \ + gstatemachine.h \ + gstr.cpp \ + gstr.h \ + gstrings.h \ + gtime.cpp \ + gtime.h +subdir = src/glib mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../config.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) +libglib_a_AR = $(AR) cru +libglib_a_LIBADD = +am_libglib_a_OBJECTS = garg.$(OBJEXT) garg_unix.$(OBJEXT) \ + gcleanup_unix.$(OBJEXT) gdaemon_unix.$(OBJEXT) gdate.$(OBJEXT) \ + gdatetime.$(OBJEXT) gdatetime_unix.$(OBJEXT) \ + gdirectory.$(OBJEXT) gdirectory_unix.$(OBJEXT) \ + gexception.$(OBJEXT) gfile.$(OBJEXT) gfile_unix.$(OBJEXT) \ + gfs_unix.$(OBJEXT) ggetopt.$(OBJEXT) glog.$(OBJEXT) \ + glogoutput.$(OBJEXT) glogoutput_unix.$(OBJEXT) gmd5.$(OBJEXT) \ + gpath.$(OBJEXT) gpidfile.$(OBJEXT) gprocess_unix.$(OBJEXT) \ + groot.$(OBJEXT) gstr.$(OBJEXT) gtime.$(OBJEXT) +libglib_a_OBJECTS = $(am_libglib_a_OBJECTS) -DEFS = @DEFS@ -I. -I$(srcdir) -I../.. +DEFS = @DEFS@ +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -libglib_a_LIBADD = -libglib_a_OBJECTS = garg.o garg_unix.o gcleanup_unix.o gdaemon_unix.o \ -gdate.o gdatetime.o gdatetime_unix.o gdirectory.o gdirectory_unix.o \ -gexception.o gfile.o gfile_unix.o gfs_unix.o ggetopt.o glog.o \ -glogoutput.o glogoutput_unix.o gmd5.o gpath.o gpidfile.o \ -gprocess_unix.o groot.o gstr.o gtime.o -CXXFLAGS = @CXXFLAGS@ -CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/garg.Po ./$(DEPDIR)/garg_unix.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gcleanup_unix.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gdaemon_unix.Po ./$(DEPDIR)/gdate.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gdatetime.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gdatetime_unix.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gdirectory.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gdirectory_unix.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gexception.Po ./$(DEPDIR)/gfile.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gfile_unix.Po ./$(DEPDIR)/gfs_unix.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/ggetopt.Po ./$(DEPDIR)/glog.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/glogoutput.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/glogoutput_unix.Po ./$(DEPDIR)/gmd5.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gpath.Po ./$(DEPDIR)/gpidfile.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gprocess_unix.Po ./$(DEPDIR)/groot.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gstr.Po ./$(DEPDIR)/gtime.Po +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) -CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ +CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ +CXXFLAGS = @CXXFLAGS@ CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +DIST_SOURCES = $(libglib_a_SOURCES) +DIST_COMMON = Makefile.am Makefile.in SOURCES = $(libglib_a_SOURCES) -OBJECTS = $(libglib_a_OBJECTS) -all: all-redirect +all: all-am + .SUFFIXES: -.SUFFIXES: .S .c .cpp .o .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/glib/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -mostlyclean-noinstLIBRARIES: +.SUFFIXES: .cpp .o .obj +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/glib/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) - -distclean-noinstLIBRARIES: - -maintainer-clean-noinstLIBRARIES: - -.c.o: - $(COMPILE) -c $< - -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< +libglib.a: $(libglib_a_OBJECTS) $(libglib_a_DEPENDENCIES) + -rm -f libglib.a + $(libglib_a_AR) libglib.a $(libglib_a_OBJECTS) $(libglib_a_LIBADD) + $(RANLIB) libglib.a mostlyclean-compile: - -rm -f *.o core *.core - -clean-compile: + -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c -maintainer-clean-compile: +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/garg.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/garg_unix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gcleanup_unix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdaemon_unix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdate.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdatetime.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdatetime_unix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdirectory.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdirectory_unix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gexception.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfile.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfile_unix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfs_unix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ggetopt.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glog.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glogoutput.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glogoutput_unix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmd5.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpath.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpidfile.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gprocess_unix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/groot.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gstr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtime.Po@am__quote@ + +distclean-depend: + -rm -rf ./$(DEPDIR) -libglib.a: $(libglib_a_OBJECTS) $(libglib_a_DEPENDENCIES) - -rm -f libglib.a - $(AR) cru libglib.a $(libglib_a_OBJECTS) $(libglib_a_LIBADD) - $(RANLIB) libglib.a .cpp.o: - $(CXXCOMPILE) -c $< +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + +.cpp.obj: +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXXCOMPILE) -c -o $@ `cygpath -w $<` +CXXDEPMODE = @CXXDEPMODE@ +uninstall-info-am: + +ETAGS = etags +ETAGSFLAGS = tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ +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; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) + mkid -fID $$unique -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ + 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 "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique -mostlyclean-tags: - -clean-tags: +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -maintainer-clean-tags: - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = src/glib +top_distdir = ../.. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ + @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 \ - cp -pr $$d/$$file $(distdir)/$$file; \ + 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 \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done -garg.o: garg.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \ - ../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits garg.h \ - gpath.h gstrings.h gstr.h gexception.h gdebug.h glogoutput.h \ - glog.h gassert.h -garg_unix.o: garg_unix.cpp gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits garg.h gdebug.h glogoutput.h glog.h \ - gassert.h -gcleanup_unix.o: gcleanup_unix.cpp gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gcleanup.h gpath.h gstrings.h \ - gexception.h gprocess.h groot.h gnoncopyable.h glog.h -gdaemon_unix.o: gdaemon_unix.cpp gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gdaemon.h gexception.h gpidfile.h \ - gpath.h gstrings.h gprocess.h -gdate.o: gdate.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \ - ../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gdate.h \ - gdatetime.h gexception.h gdebug.h glogoutput.h glog.h gassert.h -gdatetime.o: gdatetime.cpp gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gdatetime.h gexception.h gstr.h \ - gstrings.h gassert.h glogoutput.h glog.h -gdatetime_unix.o: gdatetime_unix.cpp gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gdatetime.h gexception.h -gdirectory.o: gdirectory.cpp gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gdirectory.h gpath.h gstrings.h \ - gexception.h gfs.h glog.h -gdirectory_unix.o: gdirectory_unix.cpp gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gdirectory.h gpath.h gstrings.h \ - gexception.h gfs.h gfile.h gdebug.h glogoutput.h glog.h \ - gassert.h -gexception.o: gexception.cpp gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gexception.h -gfile.o: gfile.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \ - ../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gfile.h \ - gpath.h gstrings.h gexception.h gprocess.h glog.h -gfile_unix.o: gfile_unix.cpp gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gfile.h gpath.h gstrings.h \ - gexception.h gprocess.h -gfs_unix.o: gfs_unix.cpp gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gfs.h -ggetopt.o: ggetopt.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \ - ../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits glog.h \ - gstrings.h gstr.h gexception.h ggetopt.h garg.h gassert.h \ - glogoutput.h gdebug.h -glog.o: glog.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \ - ../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits glog.h \ - glogoutput.h -glogoutput.o: glogoutput.cpp gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits glogoutput.h glog.h -glogoutput_unix.o: glogoutput_unix.cpp gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits glogoutput.h glog.h -gmd5.o: gmd5.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \ - ../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gmd5.h \ - gexception.h gstr.h gstrings.h gassert.h glogoutput.h glog.h \ - md5.h md5c.c -gpath.o: gpath.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \ - ../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gpath.h \ - gstrings.h gfs.h gstr.h gexception.h gdebug.h glogoutput.h \ - glog.h gassert.h -gpidfile.o: gpidfile.cpp gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gpidfile.h gexception.h gpath.h \ - gstrings.h gprocess.h gcleanup.h gfile.h gdebug.h glogoutput.h \ - glog.h gassert.h -gprocess_unix.o: gprocess_unix.cpp gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gprocess.h gexception.h gpath.h \ - gstrings.h gassert.h glogoutput.h glog.h gfs.h -groot.o: groot.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \ - ../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits groot.h \ - gprocess.h gexception.h gpath.h gstrings.h gnoncopyable.h \ - gdebug.h glogoutput.h glog.h gassert.h -gstr.o: gstr.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \ - ../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gstr.h \ - gexception.h gstrings.h gdebug.h glogoutput.h glog.h gassert.h -gtime.o: gtime.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \ - ../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gtime.h \ - gexception.h gdatetime.h gassert.h glogoutput.h glog.h - -info-am: -info: info-am -dvi-am: -dvi: dvi-am check-am: all-am check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am +all-am: Makefile $(LIBRARIES) -install-data-am: +installdirs: + +install: install-am +install-exec: install-exec-am install-data: install-data-am +uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: -uninstall: uninstall-am -all-am: Makefile $(LIBRARIES) -all-redirect: all-am + +installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - - + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ - mostlyclean-tags mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-generic \ - mostlyclean-am - + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." clean: clean-am -distclean-am: distclean-noinstLIBRARIES distclean-compile \ - distclean-tags distclean-generic clean-am +clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am distclean: distclean-am -maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ - maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +distclean-am: clean-am distclean-compile distclean-depend \ + distclean-generic distclean-tags + +dvi: dvi-am + +dvi-am: + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-am -.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ -clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ -mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile tags mostlyclean-tags distclean-tags \ -clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ -check-am installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +uninstall-am: uninstall-info-am + +.PHONY: GTAGS all all-am check check-am clean clean-generic \ + clean-noinstLIBRARIES distclean distclean-compile \ + distclean-depend distclean-generic distclean-tags distdir dvi \ + dvi-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic tags uninstall uninstall-am \ + uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/src/glib/garg.cpp b/src/glib/garg.cpp index 07bb7f2..55dcd31 100644 --- a/src/glib/garg.cpp +++ b/src/glib/garg.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/garg.h b/src/glib/garg.h index 315564a..b8bc55e 100644 --- a/src/glib/garg.h +++ b/src/glib/garg.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/garg_unix.cpp b/src/glib/garg_unix.cpp index 80cba91..e96dacb 100644 --- a/src/glib/garg_unix.cpp +++ b/src/glib/garg_unix.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/garg_win32.cpp b/src/glib/garg_win32.cpp index b83ded3..7fb9aa2 100644 --- a/src/glib/garg_win32.cpp +++ b/src/glib/garg_win32.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gassert.h b/src/glib/gassert.h index 2e92235..c9fb4a1 100644 --- a/src/glib/gassert.h +++ b/src/glib/gassert.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gcleanup.h b/src/glib/gcleanup.h index 5d82c07..08be869 100644 --- a/src/glib/gcleanup.h +++ b/src/glib/gcleanup.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gcleanup_unix.cpp b/src/glib/gcleanup_unix.cpp index ec0b570..11e7423 100644 --- a/src/glib/gcleanup_unix.cpp +++ b/src/glib/gcleanup_unix.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -114,8 +114,8 @@ void G::CleanupImp::installDefault( int signum ) bool G::CleanupImp::ignored( int signum ) { - static struct ::sigaction zero_action ; - struct ::sigaction action( zero_action ) ; + static struct sigaction zero_action ; + struct sigaction action( zero_action ) ; if( ::sigaction( signum , NULL , &action ) ) throw Error( "sigaction" ) ; return action.sa_handler == SIG_IGN ; @@ -123,8 +123,8 @@ bool G::CleanupImp::ignored( int signum ) void G::CleanupImp::install( int signum , void (*fn)(int) ) { - static struct ::sigaction zero_action ; - struct ::sigaction action( zero_action ) ; + static struct sigaction zero_action ; + struct sigaction action( zero_action ) ; action.sa_handler = fn ? fn : SIG_DFL ; if( ::sigaction( signum , &action , NULL ) && fn != NULL ) throw Error( "sigaction" ) ; diff --git a/src/glib/gcleanup_win32.cpp b/src/glib/gcleanup_win32.cpp index 5a489b3..859231b 100644 --- a/src/glib/gcleanup_win32.cpp +++ b/src/glib/gcleanup_win32.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gconvert.h b/src/glib/gconvert.h index c2726a3..c7f5ca2 100644 --- a/src/glib/gconvert.h +++ b/src/glib/gconvert.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gdaemon.h b/src/glib/gdaemon.h index de49579..19c2eb2 100644 --- a/src/glib/gdaemon.h +++ b/src/glib/gdaemon.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gdaemon_unix.cpp b/src/glib/gdaemon_unix.cpp index ac1fa23..713d7bc 100644 --- a/src/glib/gdaemon_unix.cpp +++ b/src/glib/gdaemon_unix.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gdaemon_win32.cpp b/src/glib/gdaemon_win32.cpp index 46f8f21..13e44d5 100644 --- a/src/glib/gdaemon_win32.cpp +++ b/src/glib/gdaemon_win32.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gdate.cpp b/src/glib/gdate.cpp index 08d79ab..30c2cb3 100644 --- a/src/glib/gdate.cpp +++ b/src/glib/gdate.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gdate.h b/src/glib/gdate.h index befe20e..e3b0b29 100644 --- a/src/glib/gdate.h +++ b/src/glib/gdate.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gdatetime.cpp b/src/glib/gdatetime.cpp index 0f59aad..74da122 100644 --- a/src/glib/gdatetime.cpp +++ b/src/glib/gdatetime.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gdatetime.h b/src/glib/gdatetime.h index c5fdba1..e71249f 100644 --- a/src/glib/gdatetime.h +++ b/src/glib/gdatetime.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gdatetime_unix.cpp b/src/glib/gdatetime_unix.cpp index 2fc8ca6..40a5df6 100644 --- a/src/glib/gdatetime_unix.cpp +++ b/src/glib/gdatetime_unix.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gdatetime_win32.cpp b/src/glib/gdatetime_win32.cpp index 96faaff..9858027 100644 --- a/src/glib/gdatetime_win32.cpp +++ b/src/glib/gdatetime_win32.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gdebug.h b/src/glib/gdebug.h index 0a9c928..51ea69d 100644 --- a/src/glib/gdebug.h +++ b/src/glib/gdebug.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gdef.h b/src/glib/gdef.h index adfbfa0..a1b9941 100644 --- a/src/glib/gdef.h +++ b/src/glib/gdef.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gdirectory.cpp b/src/glib/gdirectory.cpp index 6739614..752a756 100644 --- a/src/glib/gdirectory.cpp +++ b/src/glib/gdirectory.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gdirectory.h b/src/glib/gdirectory.h index 4fadd7d..24ee65a 100644 --- a/src/glib/gdirectory.h +++ b/src/glib/gdirectory.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gdirectory_unix.cpp b/src/glib/gdirectory_unix.cpp index 7553265..6e2532d 100644 --- a/src/glib/gdirectory_unix.cpp +++ b/src/glib/gdirectory_unix.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gdirectory_win32.cpp b/src/glib/gdirectory_win32.cpp index 3d889de..f4d5dd9 100644 --- a/src/glib/gdirectory_win32.cpp +++ b/src/glib/gdirectory_win32.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gexception.cpp b/src/glib/gexception.cpp index 2eacb2a..842ea72 100644 --- a/src/glib/gexception.cpp +++ b/src/glib/gexception.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gexception.h b/src/glib/gexception.h index 88a3f96..2095601 100644 --- a/src/glib/gexception.h +++ b/src/glib/gexception.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gfile.cpp b/src/glib/gfile.cpp index 3271bcb..072c561 100644 --- a/src/glib/gfile.cpp +++ b/src/glib/gfile.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gfile.h b/src/glib/gfile.h index ab6c1b7..36e3b95 100644 --- a/src/glib/gfile.h +++ b/src/glib/gfile.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gfile_unix.cpp b/src/glib/gfile_unix.cpp index 2425e82..6b99447 100644 --- a/src/glib/gfile_unix.cpp +++ b/src/glib/gfile_unix.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gfile_win32.cpp b/src/glib/gfile_win32.cpp index 94c8ea5..27904e0 100644 --- a/src/glib/gfile_win32.cpp +++ b/src/glib/gfile_win32.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gfs.h b/src/glib/gfs.h index c14a470..b245860 100644 --- a/src/glib/gfs.h +++ b/src/glib/gfs.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gfs_unix.cpp b/src/glib/gfs_unix.cpp index 8506b32..ae188c5 100644 --- a/src/glib/gfs_unix.cpp +++ b/src/glib/gfs_unix.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gfs_win32.cpp b/src/glib/gfs_win32.cpp index 895dd6a..dfea988 100644 --- a/src/glib/gfs_win32.cpp +++ b/src/glib/gfs_win32.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/ggetopt.cpp b/src/glib/ggetopt.cpp index ad40654..1a96fa4 100644 --- a/src/glib/ggetopt.cpp +++ b/src/glib/ggetopt.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -134,6 +134,12 @@ size_t G::GetOpt::tabDefault() return 30U ; } +//static +std::string G::GetOpt::introducerDefault() +{ + return "usage: " ; +} + //static G::GetOpt::Level G::GetOpt::levelDefault() { @@ -148,21 +154,21 @@ size_t G::GetOpt::widthLimit( size_t w ) void G::GetOpt::showUsage( std::ostream & stream , const std::string & args , bool verbose ) const { - showUsage( stream , m_args.prefix() , args , verbose ? levelDefault() : Level(1U) ) ; + showUsage( stream , m_args.prefix() , introducerDefault() , args , verbose ? levelDefault() : Level(1U) ) ; } void G::GetOpt::showUsage( std::ostream & stream , const std::string & exe , const std::string & args , - Level level , size_t tab_stop , size_t width ) const + const std::string & introducer , Level level , size_t tab_stop , size_t width ) const { stream - << usageSummary(exe,args,level,width) << std::endl + << usageSummary(exe,args,introducer,level,width) << std::endl << usageHelp(level,tab_stop,width,false) ; } std::string G::GetOpt::usageSummary( const std::string & exe , const std::string & args , - Level level , size_t width ) const + const std::string & introducer , Level level , size_t width ) const { - std::string s = std::string("usage: ") + exe + " " + usageSummarySwitches(level) + args ; + std::string s = introducer + exe + " " + usageSummarySwitches(level) + args ; if( width != 0U ) { return G::Str::wrap( s , "" , " " , widthLimit(width) ) ; diff --git a/src/glib/ggetopt.h b/src/glib/ggetopt.h index 91c5397..c2cf833 100644 --- a/src/glib/ggetopt.h +++ b/src/glib/ggetopt.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -82,7 +82,11 @@ public: static Level levelDefault() ; // Returns the default level. + static std::string introducerDefault() ; + // Returns "usage: ". + std::string usageSummary( const std::string & exe , const std::string & args , + const std::string & introducer = introducerDefault() , Level level = levelDefault() , size_t wrap_width = wrapDefault() ) const ; // Returns a one-line usage summary, as // "usage: " @@ -98,7 +102,8 @@ public: // Returns a multi-line string giving help on each switch. void showUsage( std::ostream & stream , const std::string & exe , - const std::string & args , Level level = levelDefault() , + const std::string & args , const std::string & introducer = introducerDefault() , + Level level = levelDefault() , size_t tab_stop = tabDefault() , size_t wrap_width = wrapDefault() ) const ; // Streams out multi-line usage text using diff --git a/src/glib/glog.cpp b/src/glib/glog.cpp index 0c7ee58..ea24de7 100644 --- a/src/glib/glog.cpp +++ b/src/glib/glog.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/glog.h b/src/glib/glog.h index 00df431..91aa50d 100644 --- a/src/glib/glog.h +++ b/src/glib/glog.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/glogoutput.cpp b/src/glib/glogoutput.cpp index e43563e..a229a5a 100644 --- a/src/glib/glogoutput.cpp +++ b/src/glib/glogoutput.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/glogoutput.h b/src/glib/glogoutput.h index 07fdd97..020f011 100644 --- a/src/glib/glogoutput.h +++ b/src/glib/glogoutput.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/glogoutput_unix.cpp b/src/glib/glogoutput_unix.cpp index d404a04..9d362c6 100644 --- a/src/glib/glogoutput_unix.cpp +++ b/src/glib/glogoutput_unix.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/glogoutput_win32.cpp b/src/glib/glogoutput_win32.cpp index c1acbff..92e0201 100644 --- a/src/glib/glogoutput_win32.cpp +++ b/src/glib/glogoutput_win32.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gmd5.cpp b/src/glib/gmd5.cpp index 10195f6..ad47984 100644 --- a/src/glib/gmd5.cpp +++ b/src/glib/gmd5.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gmd5.h b/src/glib/gmd5.h index 7c28f94..6688697 100644 --- a/src/glib/gmd5.h +++ b/src/glib/gmd5.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gmemory.h b/src/glib/gmemory.h index 1e21671..67e0252 100644 --- a/src/glib/gmemory.h +++ b/src/glib/gmemory.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gnoncopyable.h b/src/glib/gnoncopyable.h index 8516c8a..2700a14 100644 --- a/src/glib/gnoncopyable.h +++ b/src/glib/gnoncopyable.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gpath.cpp b/src/glib/gpath.cpp index f3ee535..df5d51e 100644 --- a/src/glib/gpath.cpp +++ b/src/glib/gpath.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gpath.h b/src/glib/gpath.h index 5637c48..7e6a43d 100644 --- a/src/glib/gpath.h +++ b/src/glib/gpath.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gpidfile.cpp b/src/glib/gpidfile.cpp index f3ea673..4291db2 100644 --- a/src/glib/gpidfile.cpp +++ b/src/glib/gpidfile.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gpidfile.h b/src/glib/gpidfile.h index 44b04e1..03fbf02 100644 --- a/src/glib/gpidfile.h +++ b/src/glib/gpidfile.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gprocess.h b/src/glib/gprocess.h index 385228e..5522c91 100644 --- a/src/glib/gprocess.h +++ b/src/glib/gprocess.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gprocess_unix.cpp b/src/glib/gprocess_unix.cpp index c6bc081..0483702 100644 --- a/src/glib/gprocess_unix.cpp +++ b/src/glib/gprocess_unix.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gprocess_win32.cpp b/src/glib/gprocess_win32.cpp index 0dcba1e..f574fd2 100644 --- a/src/glib/gprocess_win32.cpp +++ b/src/glib/gprocess_win32.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gregistry.h b/src/glib/gregistry.h index bf4fc12..27035e7 100644 --- a/src/glib/gregistry.h +++ b/src/glib/gregistry.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gregistry_win32.cpp b/src/glib/gregistry_win32.cpp index f0ad4b8..8a56b34 100644 --- a/src/glib/gregistry_win32.cpp +++ b/src/glib/gregistry_win32.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/groot.cpp b/src/glib/groot.cpp index 7f1deaf..25915ec 100644 --- a/src/glib/groot.cpp +++ b/src/glib/groot.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/groot.h b/src/glib/groot.h index c34a9a8..ad0df2c 100644 --- a/src/glib/groot.h +++ b/src/glib/groot.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gsetter.h b/src/glib/gsetter.h index e0bf45b..b51a307 100644 --- a/src/glib/gsetter.h +++ b/src/glib/gsetter.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gstatemachine.h b/src/glib/gstatemachine.h index 9d4f710..251aca9 100644 --- a/src/glib/gstatemachine.h +++ b/src/glib/gstatemachine.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gstr.cpp b/src/glib/gstr.cpp index e7ee1d7..4659acd 100644 --- a/src/glib/gstr.cpp +++ b/src/glib/gstr.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gstr.h b/src/glib/gstr.h index 99111c0..8f4dc6c 100644 --- a/src/glib/gstr.h +++ b/src/glib/gstr.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gstrings.h b/src/glib/gstrings.h index f3434b7..8a9e0f8 100644 --- a/src/glib/gstrings.h +++ b/src/glib/gstrings.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gtime.cpp b/src/glib/gtime.cpp index d7ef490..8dafdcb 100644 --- a/src/glib/gtime.cpp +++ b/src/glib/gtime.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/gtime.h b/src/glib/gtime.h index f6503a8..f40c39a 100644 --- a/src/glib/gtime.h +++ b/src/glib/gtime.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/md5.h b/src/glib/md5.h index f14d7b7..ba24f1a 100644 --- a/src/glib/md5.h +++ b/src/glib/md5.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/glib/md5c.c b/src/glib/md5c.c index 8a55148..a7b442f 100644 --- a/src/glib/md5c.c +++ b/src/glib/md5c.c @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/Makefile.am b/src/gnet/Makefile.am index c33d302..2743526 100644 --- a/src/gnet/Makefile.am +++ b/src/gnet/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/src/gnet/Makefile.in b/src/gnet/Makefile.in index c9c6f01..dc04fe7 100644 --- a/src/gnet/Makefile.in +++ b/src/gnet/Makefile.in @@ -1,6 +1,8 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated by automake 1.6.3 from Makefile.am. +# @configure_input@ -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,8 +12,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ + # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -28,8 +32,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # - - SHELL = @SHELL@ srcdir = @srcdir@ @@ -50,13 +52,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. ACLOCAL = @ACLOCAL@ @@ -64,31 +62,44 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +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) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +AMTAR = @AMTAR@ AR = @AR@ AWK = @AWK@ CC = @CC@ COMPILER_VERSION = @COMPILER_VERSION@ CXX = @CXX@ +DEPDIR = @DEPDIR@ GZIP = @GZIP@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_MAN2HTML = @HAVE_MAN2HTML@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ MAKE = @MAKE@ -MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +STRIP = @STRIP@ VERSION = @VERSION@ +am__include = @am__include@ +am__quote = @am__quote@ e_docdir = @e_docdir@ e_examplesdir = @e_examplesdir@ e_initdir = @e_initdir@ @@ -96,344 +107,312 @@ e_libexecdir = @e_libexecdir@ e_man1dir = @e_man1dir@ e_sbindir = @e_sbindir@ e_spooldir = @e_spooldir@ +install_sh = @install_sh@ -EXTRA_DIST = gclient_win32.cpp gdescriptor_win32.cpp geventloop_win32.cpp glocal_win32.cpp grequest.cpp gresolve_win32.cpp gsocket_win32.cpp +EXTRA_DIST = \ + gclient_win32.cpp \ + gdescriptor_win32.cpp \ + geventloop_win32.cpp \ + glocal_win32.cpp \ + grequest.cpp \ + gresolve_win32.cpp \ + gsocket_win32.cpp INCLUDES = -I$(top_srcdir)/lib/$(COMPILER_VERSION) -I$(top_srcdir)/src/glib noinst_LIBRARIES = libgnet.a -libgnet_a_SOURCES = gaddress_ipv4.cpp gclient.cpp gclient_unix.cpp gconnection.cpp gdescriptor_unix.cpp geventloop.cpp geventloop_unix.cpp geventhandler.cpp geventserver.cpp glinebuffer.cpp glocal_unix.cpp glocal.cpp gmonitor.cpp gresolve.cpp gresolve_ipv4.cpp gresolve_unix.cpp gserver.cpp gsocket.cpp gsocket_unix.cpp gtimer.cpp gaddress.h gclient.h gconnection.h gdescriptor.h gevent.h geventloop.h geventhandler.h geventserver.h glinebuffer.h glocal.h gmonitor.h gnet.h grequest.h gresolve.h gserver.h gsocket.h gtimer.h +libgnet_a_SOURCES = gaddress_ipv4.cpp \ + gclient.cpp \ + gclient_unix.cpp \ + gconnection.cpp \ + gdescriptor_unix.cpp \ + geventloop.cpp \ + geventloop_unix.cpp \ + geventhandler.cpp \ + geventserver.cpp \ + glinebuffer.cpp \ + glocal_unix.cpp \ + glocal.cpp \ + gmonitor.cpp \ + gresolve.cpp \ + gresolve_ipv4.cpp \ + gresolve_unix.cpp \ + gserver.cpp \ + gsocket.cpp \ + gsocket_unix.cpp \ + gtimer.cpp \ + gaddress.h \ + gclient.h \ + gconnection.h \ + gdescriptor.h \ + gevent.h \ + geventloop.h \ + geventhandler.h \ + geventserver.h \ + glinebuffer.h \ + glocal.h \ + gmonitor.h \ + gnet.h \ + grequest.h \ + gresolve.h \ + gserver.h \ + gsocket.h \ + gtimer.h +subdir = src/gnet mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../config.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) +libgnet_a_AR = $(AR) cru +libgnet_a_LIBADD = +am_libgnet_a_OBJECTS = gaddress_ipv4.$(OBJEXT) gclient.$(OBJEXT) \ + gclient_unix.$(OBJEXT) gconnection.$(OBJEXT) \ + gdescriptor_unix.$(OBJEXT) geventloop.$(OBJEXT) \ + geventloop_unix.$(OBJEXT) geventhandler.$(OBJEXT) \ + geventserver.$(OBJEXT) glinebuffer.$(OBJEXT) \ + glocal_unix.$(OBJEXT) glocal.$(OBJEXT) gmonitor.$(OBJEXT) \ + gresolve.$(OBJEXT) gresolve_ipv4.$(OBJEXT) \ + gresolve_unix.$(OBJEXT) gserver.$(OBJEXT) gsocket.$(OBJEXT) \ + gsocket_unix.$(OBJEXT) gtimer.$(OBJEXT) +libgnet_a_OBJECTS = $(am_libgnet_a_OBJECTS) -DEFS = @DEFS@ -I. -I$(srcdir) -I../.. +DEFS = @DEFS@ +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -libgnet_a_LIBADD = -libgnet_a_OBJECTS = gaddress_ipv4.o gclient.o gclient_unix.o \ -gconnection.o gdescriptor_unix.o geventloop.o geventloop_unix.o \ -geventhandler.o geventserver.o glinebuffer.o glocal_unix.o glocal.o \ -gmonitor.o gresolve.o gresolve_ipv4.o gresolve_unix.o gserver.o \ -gsocket.o gsocket_unix.o gtimer.o -CXXFLAGS = @CXXFLAGS@ -CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gaddress_ipv4.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gclient.Po ./$(DEPDIR)/gclient_unix.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gconnection.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gdescriptor_unix.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/geventhandler.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/geventloop.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/geventloop_unix.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/geventserver.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/glinebuffer.Po ./$(DEPDIR)/glocal.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/glocal_unix.Po ./$(DEPDIR)/gmonitor.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gresolve.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gresolve_ipv4.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gresolve_unix.Po ./$(DEPDIR)/gserver.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gsocket.Po ./$(DEPDIR)/gsocket_unix.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gtimer.Po +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) -CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ +CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ +CXXFLAGS = @CXXFLAGS@ CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +DIST_SOURCES = $(libgnet_a_SOURCES) +DIST_COMMON = Makefile.am Makefile.in SOURCES = $(libgnet_a_SOURCES) -OBJECTS = $(libgnet_a_OBJECTS) -all: all-redirect +all: all-am + .SUFFIXES: -.SUFFIXES: .S .c .cpp .o .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/gnet/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -mostlyclean-noinstLIBRARIES: +.SUFFIXES: .cpp .o .obj +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/gnet/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) - -distclean-noinstLIBRARIES: - -maintainer-clean-noinstLIBRARIES: - -.c.o: - $(COMPILE) -c $< - -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< +libgnet.a: $(libgnet_a_OBJECTS) $(libgnet_a_DEPENDENCIES) + -rm -f libgnet.a + $(libgnet_a_AR) libgnet.a $(libgnet_a_OBJECTS) $(libgnet_a_LIBADD) + $(RANLIB) libgnet.a mostlyclean-compile: - -rm -f *.o core *.core - -clean-compile: + -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c -maintainer-clean-compile: +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gaddress_ipv4.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gclient.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gclient_unix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gconnection.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdescriptor_unix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geventhandler.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geventloop.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geventloop_unix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geventserver.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glinebuffer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glocal.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glocal_unix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmonitor.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gresolve.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gresolve_ipv4.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gresolve_unix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gserver.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsocket.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsocket_unix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtimer.Po@am__quote@ + +distclean-depend: + -rm -rf ./$(DEPDIR) -libgnet.a: $(libgnet_a_OBJECTS) $(libgnet_a_DEPENDENCIES) - -rm -f libgnet.a - $(AR) cru libgnet.a $(libgnet_a_OBJECTS) $(libgnet_a_LIBADD) - $(RANLIB) libgnet.a .cpp.o: - $(CXXCOMPILE) -c $< +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + +.cpp.obj: +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXXCOMPILE) -c -o $@ `cygpath -w $<` +CXXDEPMODE = @CXXDEPMODE@ +uninstall-info-am: + +ETAGS = etags +ETAGSFLAGS = tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ +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; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) + mkid -fID $$unique -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ + 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 "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique -mostlyclean-tags: - -clean-tags: +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -maintainer-clean-tags: - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = src/gnet +top_distdir = ../.. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ + @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 \ - cp -pr $$d/$$file $(distdir)/$$file; \ + 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 \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done -gaddress_ipv4.o: gaddress_ipv4.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gnet.h gaddress.h \ - ../../src/glib/gexception.h ../../src/glib/gconvert.h \ - ../../src/glib/gstrings.h ../../src/glib/gstr.h \ - ../../src/glib/gassert.h ../../src/glib/glogoutput.h \ - ../../src/glib/glog.h ../../src/glib/gdebug.h -gclient.o: gclient.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gnet.h gaddress.h \ - ../../src/glib/gexception.h gsocket.h gevent.h geventloop.h \ - geventhandler.h ../../src/glib/gdatetime.h gdescriptor.h \ - gresolve.h ../../src/glib/groot.h ../../src/glib/gprocess.h \ - ../../src/glib/gpath.h ../../src/glib/gstrings.h \ - ../../src/glib/gnoncopyable.h gmonitor.h gclient.h \ - gconnection.h gserver.h ../../src/glib/gdebug.h \ - ../../src/glib/glogoutput.h ../../src/glib/glog.h \ - ../../src/glib/gassert.h -gclient_unix.o: gclient_unix.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gnet.h gclient.h gaddress.h \ - ../../src/glib/gexception.h gconnection.h gsocket.h gevent.h \ - geventloop.h geventhandler.h ../../src/glib/gdatetime.h \ - gdescriptor.h -gconnection.o: gconnection.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gnet.h gconnection.h gaddress.h \ - ../../src/glib/gexception.h -gdescriptor_unix.o: gdescriptor_unix.cpp ../../src/glib/gdef.h \ - ../../config.h ../../lib/gcc2.95/iostream \ - ../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gnet.h \ - gdescriptor.h -geventhandler.o: geventhandler.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gnet.h geventhandler.h \ - ../../src/glib/gdatetime.h ../../src/glib/gexception.h \ - gdescriptor.h geventloop.h ../../src/glib/gdebug.h \ - ../../src/glib/glogoutput.h ../../src/glib/glog.h \ - ../../src/glib/gassert.h -geventloop.o: geventloop.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gnet.h geventloop.h geventhandler.h \ - ../../src/glib/gdatetime.h ../../src/glib/gexception.h \ - gdescriptor.h ../../src/glib/gdebug.h \ - ../../src/glib/glogoutput.h ../../src/glib/glog.h \ - ../../src/glib/gassert.h -geventloop_unix.o: geventloop_unix.cpp ../../src/glib/gdef.h \ - ../../config.h ../../lib/gcc2.95/iostream \ - ../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gnet.h \ - ../../src/glib/gnoncopyable.h gevent.h geventloop.h \ - geventhandler.h ../../src/glib/gdatetime.h \ - ../../src/glib/gexception.h gdescriptor.h ../../src/glib/gstr.h \ - ../../src/glib/gstrings.h ../../src/glib/gsetter.h gtimer.h \ - ../../src/glib/gdebug.h ../../src/glib/glogoutput.h \ - ../../src/glib/glog.h ../../src/glib/gassert.h -geventserver.o: geventserver.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gnet.h geventserver.h gserver.h \ - gsocket.h gaddress.h ../../src/glib/gexception.h gevent.h \ - geventloop.h geventhandler.h ../../src/glib/gdatetime.h \ - gdescriptor.h gconnection.h ../../src/glib/glog.h -glinebuffer.o: glinebuffer.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gnet.h glinebuffer.h \ - ../../src/glib/gstrings.h ../../src/glib/gdebug.h \ - ../../src/glib/glogoutput.h ../../src/glib/glog.h \ - ../../src/glib/gassert.h -glocal.o: glocal.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits glocal.h gnet.h gaddress.h \ - ../../src/glib/gexception.h ../../src/glib/gdebug.h \ - ../../src/glib/glogoutput.h ../../src/glib/glog.h \ - ../../src/glib/gassert.h -glocal_unix.o: glocal_unix.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits glocal.h gnet.h gaddress.h \ - ../../src/glib/gexception.h gresolve.h ../../src/glib/glog.h -gmonitor.o: gmonitor.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gnet.h gmonitor.h \ - ../../src/glib/gnoncopyable.h gclient.h gaddress.h \ - ../../src/glib/gexception.h gconnection.h gsocket.h gevent.h \ - geventloop.h geventhandler.h ../../src/glib/gdatetime.h \ - gdescriptor.h gserver.h ../../src/glib/gassert.h \ - ../../src/glib/glogoutput.h ../../src/glib/glog.h -gresolve.o: gresolve.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gresolve.h gnet.h gaddress.h \ - ../../src/glib/gexception.h gsocket.h gevent.h geventloop.h \ - geventhandler.h ../../src/glib/gdatetime.h gdescriptor.h \ - ../../src/glib/gstr.h ../../src/glib/gstrings.h \ - ../../src/glib/gdebug.h ../../src/glib/glogoutput.h \ - ../../src/glib/glog.h ../../src/glib/gassert.h -gresolve_ipv4.o: gresolve_ipv4.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gresolve.h gnet.h gaddress.h \ - ../../src/glib/gexception.h -gresolve_unix.o: gresolve_unix.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gresolve.h gnet.h gaddress.h \ - ../../src/glib/gexception.h gsocket.h gevent.h geventloop.h \ - geventhandler.h ../../src/glib/gdatetime.h gdescriptor.h \ - ../../src/glib/gstr.h ../../src/glib/gstrings.h \ - ../../src/glib/gdebug.h ../../src/glib/glogoutput.h \ - ../../src/glib/glog.h ../../src/glib/gassert.h -gserver.o: gserver.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gnet.h gserver.h gsocket.h gaddress.h \ - ../../src/glib/gexception.h gevent.h geventloop.h \ - geventhandler.h ../../src/glib/gdatetime.h gdescriptor.h \ - gconnection.h ../../src/glib/groot.h ../../src/glib/gprocess.h \ - ../../src/glib/gpath.h ../../src/glib/gstrings.h \ - ../../src/glib/gnoncopyable.h gmonitor.h gclient.h \ - ../../src/glib/gdebug.h ../../src/glib/glogoutput.h \ - ../../src/glib/glog.h ../../src/glib/gassert.h \ - ../../src/glib/gmemory.h -gsocket.o: gsocket.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gnet.h ../../src/glib/gassert.h \ - ../../src/glib/glogoutput.h ../../src/glib/glog.h gsocket.h \ - gaddress.h ../../src/glib/gexception.h gevent.h geventloop.h \ - geventhandler.h ../../src/glib/gdatetime.h gdescriptor.h \ - ../../src/glib/gmemory.h ../../src/glib/gdebug.h -gsocket_unix.o: gsocket_unix.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gnet.h gsocket.h gaddress.h \ - ../../src/glib/gexception.h gevent.h geventloop.h \ - geventhandler.h ../../src/glib/gdatetime.h gdescriptor.h \ - ../../src/glib/gdebug.h ../../src/glib/glogoutput.h \ - ../../src/glib/glog.h ../../src/glib/gassert.h -gtimer.o: gtimer.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gtimer.h gnet.h \ - ../../src/glib/gdatetime.h ../../src/glib/gexception.h gevent.h \ - geventloop.h geventhandler.h gdescriptor.h \ - ../../src/glib/gdebug.h ../../src/glib/glogoutput.h \ - ../../src/glib/glog.h ../../src/glib/gassert.h - -info-am: -info: info-am -dvi-am: -dvi: dvi-am check-am: all-am check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am +all-am: Makefile $(LIBRARIES) -install-data-am: +installdirs: + +install: install-am +install-exec: install-exec-am install-data: install-data-am +uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: -uninstall: uninstall-am -all-am: Makefile $(LIBRARIES) -all-redirect: all-am + +installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - - + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ - mostlyclean-tags mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-generic \ - mostlyclean-am - + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." clean: clean-am -distclean-am: distclean-noinstLIBRARIES distclean-compile \ - distclean-tags distclean-generic clean-am +clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am distclean: distclean-am -maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ - maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +distclean-am: clean-am distclean-compile distclean-depend \ + distclean-generic distclean-tags + +dvi: dvi-am + +dvi-am: + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-am -.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ -clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ -mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile tags mostlyclean-tags distclean-tags \ -clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ -check-am installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +uninstall-am: uninstall-info-am + +.PHONY: GTAGS all all-am check check-am clean clean-generic \ + clean-noinstLIBRARIES distclean distclean-compile \ + distclean-depend distclean-generic distclean-tags distdir dvi \ + dvi-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic tags uninstall uninstall-am \ + uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/src/gnet/gaddress.h b/src/gnet/gaddress.h index 0b107d9..a6405b1 100644 --- a/src/gnet/gaddress.h +++ b/src/gnet/gaddress.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gaddress_ipv4.cpp b/src/gnet/gaddress_ipv4.cpp index 93017ca..9a9754f 100644 --- a/src/gnet/gaddress_ipv4.cpp +++ b/src/gnet/gaddress_ipv4.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gclient.cpp b/src/gnet/gclient.cpp index 8f7ae12..a5b671a 100644 --- a/src/gnet/gclient.cpp +++ b/src/gnet/gclient.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gclient.h b/src/gnet/gclient.h index 55fc257..0d13bf3 100644 --- a/src/gnet/gclient.h +++ b/src/gnet/gclient.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gclient_unix.cpp b/src/gnet/gclient_unix.cpp index cce4569..41d75c0 100644 --- a/src/gnet/gclient_unix.cpp +++ b/src/gnet/gclient_unix.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gclient_win32.cpp b/src/gnet/gclient_win32.cpp index 56a9e40..e5e911f 100644 --- a/src/gnet/gclient_win32.cpp +++ b/src/gnet/gclient_win32.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gconnection.cpp b/src/gnet/gconnection.cpp index 37696d1..a811e25 100644 --- a/src/gnet/gconnection.cpp +++ b/src/gnet/gconnection.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gconnection.h b/src/gnet/gconnection.h index 5b37a18..5a8a3a2 100644 --- a/src/gnet/gconnection.h +++ b/src/gnet/gconnection.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gdescriptor.h b/src/gnet/gdescriptor.h index 1500f31..7375aab 100644 --- a/src/gnet/gdescriptor.h +++ b/src/gnet/gdescriptor.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gdescriptor_unix.cpp b/src/gnet/gdescriptor_unix.cpp index a44b983..91ca35e 100644 --- a/src/gnet/gdescriptor_unix.cpp +++ b/src/gnet/gdescriptor_unix.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gdescriptor_win32.cpp b/src/gnet/gdescriptor_win32.cpp index 309de29..e0fb145 100644 --- a/src/gnet/gdescriptor_win32.cpp +++ b/src/gnet/gdescriptor_win32.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gevent.h b/src/gnet/gevent.h index eaf98e7..ec898b8 100644 --- a/src/gnet/gevent.h +++ b/src/gnet/gevent.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/geventhandler.cpp b/src/gnet/geventhandler.cpp index a1abbb9..26ccd66 100644 --- a/src/gnet/geventhandler.cpp +++ b/src/gnet/geventhandler.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/geventhandler.h b/src/gnet/geventhandler.h index 6f6ed80..91df8c0 100644 --- a/src/gnet/geventhandler.h +++ b/src/gnet/geventhandler.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/geventloop.cpp b/src/gnet/geventloop.cpp index 6802616..d510408 100644 --- a/src/gnet/geventloop.cpp +++ b/src/gnet/geventloop.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/geventloop.h b/src/gnet/geventloop.h index 7a1589d..61ea05c 100644 --- a/src/gnet/geventloop.h +++ b/src/gnet/geventloop.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/geventloop_unix.cpp b/src/gnet/geventloop_unix.cpp index eba757d..ceb7b6c 100644 --- a/src/gnet/geventloop_unix.cpp +++ b/src/gnet/geventloop_unix.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/geventloop_win32.cpp b/src/gnet/geventloop_win32.cpp index 2e9837b..fccfcdd 100644 --- a/src/gnet/geventloop_win32.cpp +++ b/src/gnet/geventloop_win32.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/geventserver.cpp b/src/gnet/geventserver.cpp index d34a567..d6e92f1 100644 --- a/src/gnet/geventserver.cpp +++ b/src/gnet/geventserver.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/geventserver.h b/src/gnet/geventserver.h index 13f4c69..6dfe453 100644 --- a/src/gnet/geventserver.h +++ b/src/gnet/geventserver.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/glinebuffer.cpp b/src/gnet/glinebuffer.cpp index 55d22f3..97eaf38 100644 --- a/src/gnet/glinebuffer.cpp +++ b/src/gnet/glinebuffer.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/glinebuffer.h b/src/gnet/glinebuffer.h index dfed334..34fad46 100644 --- a/src/gnet/glinebuffer.h +++ b/src/gnet/glinebuffer.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/glocal.cpp b/src/gnet/glocal.cpp index 5f03a18..c0d0240 100644 --- a/src/gnet/glocal.cpp +++ b/src/gnet/glocal.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/glocal.h b/src/gnet/glocal.h index b77479a..0ac18cd 100644 --- a/src/gnet/glocal.h +++ b/src/gnet/glocal.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/glocal_unix.cpp b/src/gnet/glocal_unix.cpp index 7e14ef1..be20e2b 100644 --- a/src/gnet/glocal_unix.cpp +++ b/src/gnet/glocal_unix.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/glocal_win32.cpp b/src/gnet/glocal_win32.cpp index 30da8ef..c06ced5 100644 --- a/src/gnet/glocal_win32.cpp +++ b/src/gnet/glocal_win32.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gmonitor.cpp b/src/gnet/gmonitor.cpp index 75b1a6b..c4731d3 100644 --- a/src/gnet/gmonitor.cpp +++ b/src/gnet/gmonitor.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gmonitor.h b/src/gnet/gmonitor.h index 8f5292a..cc97db7 100644 --- a/src/gnet/gmonitor.h +++ b/src/gnet/gmonitor.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gnet.h b/src/gnet/gnet.h index f97248f..57fec09 100644 --- a/src/gnet/gnet.h +++ b/src/gnet/gnet.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/grequest.cpp b/src/gnet/grequest.cpp index 051d597..357629f 100644 --- a/src/gnet/grequest.cpp +++ b/src/gnet/grequest.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/grequest.h b/src/gnet/grequest.h index fb783e8..2d09777 100644 --- a/src/gnet/grequest.h +++ b/src/gnet/grequest.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gresolve.cpp b/src/gnet/gresolve.cpp index ad90f34..f5ebbee 100644 --- a/src/gnet/gresolve.cpp +++ b/src/gnet/gresolve.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gresolve.h b/src/gnet/gresolve.h index ffce5a8..f0de78f 100644 --- a/src/gnet/gresolve.h +++ b/src/gnet/gresolve.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gresolve_ipv4.cpp b/src/gnet/gresolve_ipv4.cpp index 5a2ef73..26eec14 100644 --- a/src/gnet/gresolve_ipv4.cpp +++ b/src/gnet/gresolve_ipv4.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gresolve_unix.cpp b/src/gnet/gresolve_unix.cpp index 1634a71..cf7a127 100644 --- a/src/gnet/gresolve_unix.cpp +++ b/src/gnet/gresolve_unix.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gresolve_win32.cpp b/src/gnet/gresolve_win32.cpp index 23bd802..cfb01b5 100644 --- a/src/gnet/gresolve_win32.cpp +++ b/src/gnet/gresolve_win32.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gserver.cpp b/src/gnet/gserver.cpp index e8ffdc7..d36a48b 100644 --- a/src/gnet/gserver.cpp +++ b/src/gnet/gserver.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gserver.h b/src/gnet/gserver.h index caeba5b..006cc70 100644 --- a/src/gnet/gserver.h +++ b/src/gnet/gserver.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gsocket.cpp b/src/gnet/gsocket.cpp index 5d44d20..3c05f0c 100644 --- a/src/gnet/gsocket.cpp +++ b/src/gnet/gsocket.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gsocket.h b/src/gnet/gsocket.h index 7e50603..291aeef 100644 --- a/src/gnet/gsocket.h +++ b/src/gnet/gsocket.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gsocket_unix.cpp b/src/gnet/gsocket_unix.cpp index 6451c8d..26389ea 100644 --- a/src/gnet/gsocket_unix.cpp +++ b/src/gnet/gsocket_unix.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gsocket_win32.cpp b/src/gnet/gsocket_win32.cpp index 71fba9c..f7439ec 100644 --- a/src/gnet/gsocket_win32.cpp +++ b/src/gnet/gsocket_win32.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gtimer.cpp b/src/gnet/gtimer.cpp index d3e5aff..22775db 100644 --- a/src/gnet/gtimer.cpp +++ b/src/gnet/gtimer.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gnet/gtimer.h b/src/gnet/gtimer.h index 03190ef..346e4b3 100644 --- a/src/gnet/gtimer.h +++ b/src/gnet/gtimer.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/Makefile.am b/src/gsmtp/Makefile.am index 46590b8..336237e 100644 --- a/src/gsmtp/Makefile.am +++ b/src/gsmtp/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/Makefile.in b/src/gsmtp/Makefile.in index 8098d40..33e979e 100644 --- a/src/gsmtp/Makefile.in +++ b/src/gsmtp/Makefile.in @@ -1,6 +1,8 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated by automake 1.6.3 from Makefile.am. +# @configure_input@ -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,8 +12,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ + # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -28,8 +32,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # - - SHELL = @SHELL@ srcdir = @srcdir@ @@ -50,13 +52,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. ACLOCAL = @ACLOCAL@ @@ -64,31 +62,44 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +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) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +AMTAR = @AMTAR@ AR = @AR@ AWK = @AWK@ CC = @CC@ COMPILER_VERSION = @COMPILER_VERSION@ CXX = @CXX@ +DEPDIR = @DEPDIR@ GZIP = @GZIP@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_MAN2HTML = @HAVE_MAN2HTML@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ MAKE = @MAKE@ -MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +STRIP = @STRIP@ VERSION = @VERSION@ +am__include = @am__include@ +am__quote = @am__quote@ e_docdir = @e_docdir@ e_examplesdir = @e_examplesdir@ e_initdir = @e_initdir@ @@ -96,414 +107,317 @@ e_libexecdir = @e_libexecdir@ e_man1dir = @e_man1dir@ e_sbindir = @e_sbindir@ e_spooldir = @e_spooldir@ +install_sh = @install_sh@ -EXTRA_DIST = gmessagestore_win32.cpp gsasl_cyrus.cpp +EXTRA_DIST = \ + gmessagestore_win32.cpp \ + gsasl_cyrus.cpp INCLUDES = -I$(top_srcdir)/lib/$(COMPILER_VERSION) -I$(top_srcdir)/src/glib -I$(top_srcdir)/src/gnet -DG_SPOOLDIR=\"$(e_spooldir)\" noinst_LIBRARIES = libgsmtp.a -libgsmtp_a_SOURCES = gadminserver.cpp gadminserver.h gbase64.cpp gbase64.h gclientprotocol.cpp gclientprotocol.h gfilestore.cpp gfilestore.h gmessagestore.cpp gmessagestore.h gmessagestore_unix.cpp gnewfile.cpp gnewfile.h gnewmessage.cpp gnewmessage.h gprotocolmessage.cpp gprotocolmessage.h gprotocolmessageforward.cpp gprotocolmessageforward.h gprotocolmessagestore.cpp gprotocolmessagestore.h gsasl_native.cpp gsasl.h gsecrets.cpp gsecrets.h gserverprotocol.cpp gserverprotocol.h gsmtp.h gsmtpclient.cpp gsmtpclient.h gsmtpserver.cpp gsmtpserver.h gstoredfile.cpp gstoredfile.h gstoredmessage.cpp gstoredmessage.h gverifier.cpp gverifier.h gxtext.cpp gxtext.h +libgsmtp_a_SOURCES = \ + gadminserver.cpp \ + gadminserver.h \ + gbase64.cpp \ + gbase64.h \ + gclientprotocol.cpp \ + gclientprotocol.h \ + gfilestore.cpp \ + gfilestore.h \ + gmessagestore.cpp \ + gmessagestore.h \ + gmessagestore_unix.cpp \ + gnewfile.cpp \ + gnewfile.h \ + gnewmessage.cpp \ + gnewmessage.h \ + gprotocolmessage.cpp \ + gprotocolmessage.h \ + gprotocolmessageforward.cpp \ + gprotocolmessageforward.h \ + gprotocolmessagestore.cpp \ + gprotocolmessagestore.h \ + gsasl_native.cpp \ + gsasl.h \ + gsecrets.cpp \ + gsecrets.h \ + gserverprotocol.cpp \ + gserverprotocol.h \ + gsmtp.h \ + gsmtpclient.cpp \ + gsmtpclient.h \ + gsmtpserver.cpp \ + gsmtpserver.h \ + gstoredfile.cpp \ + gstoredfile.h \ + gstoredmessage.cpp \ + gstoredmessage.h \ + gverifier.cpp \ + gverifier.h \ + gxtext.cpp \ + gxtext.h +subdir = src/gsmtp mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../config.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) +libgsmtp_a_AR = $(AR) cru +libgsmtp_a_LIBADD = +am_libgsmtp_a_OBJECTS = gadminserver.$(OBJEXT) gbase64.$(OBJEXT) \ + gclientprotocol.$(OBJEXT) gfilestore.$(OBJEXT) \ + gmessagestore.$(OBJEXT) gmessagestore_unix.$(OBJEXT) \ + gnewfile.$(OBJEXT) gnewmessage.$(OBJEXT) \ + gprotocolmessage.$(OBJEXT) gprotocolmessageforward.$(OBJEXT) \ + gprotocolmessagestore.$(OBJEXT) gsasl_native.$(OBJEXT) \ + gsecrets.$(OBJEXT) gserverprotocol.$(OBJEXT) \ + gsmtpclient.$(OBJEXT) gsmtpserver.$(OBJEXT) \ + gstoredfile.$(OBJEXT) gstoredmessage.$(OBJEXT) \ + gverifier.$(OBJEXT) gxtext.$(OBJEXT) +libgsmtp_a_OBJECTS = $(am_libgsmtp_a_OBJECTS) -DEFS = @DEFS@ -I. -I$(srcdir) -I../.. +DEFS = @DEFS@ +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -libgsmtp_a_LIBADD = -libgsmtp_a_OBJECTS = gadminserver.o gbase64.o gclientprotocol.o \ -gfilestore.o gmessagestore.o gmessagestore_unix.o gnewfile.o \ -gnewmessage.o gprotocolmessage.o gprotocolmessageforward.o \ -gprotocolmessagestore.o gsasl_native.o gsecrets.o gserverprotocol.o \ -gsmtpclient.o gsmtpserver.o gstoredfile.o gstoredmessage.o gverifier.o \ -gxtext.o -CXXFLAGS = @CXXFLAGS@ -CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gadminserver.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gbase64.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gclientprotocol.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gfilestore.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gmessagestore.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gmessagestore_unix.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gnewfile.Po ./$(DEPDIR)/gnewmessage.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gprotocolmessage.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gprotocolmessageforward.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gprotocolmessagestore.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gsasl_native.Po ./$(DEPDIR)/gsecrets.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gserverprotocol.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gsmtpclient.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gsmtpserver.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gstoredfile.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gstoredmessage.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gverifier.Po ./$(DEPDIR)/gxtext.Po +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) -CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ +CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ +CXXFLAGS = @CXXFLAGS@ CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +DIST_SOURCES = $(libgsmtp_a_SOURCES) +DIST_COMMON = Makefile.am Makefile.in SOURCES = $(libgsmtp_a_SOURCES) -OBJECTS = $(libgsmtp_a_OBJECTS) -all: all-redirect +all: all-am + .SUFFIXES: -.SUFFIXES: .S .c .cpp .o .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/gsmtp/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -mostlyclean-noinstLIBRARIES: +.SUFFIXES: .cpp .o .obj +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/gsmtp/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) - -distclean-noinstLIBRARIES: - -maintainer-clean-noinstLIBRARIES: - -.c.o: - $(COMPILE) -c $< - -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< +libgsmtp.a: $(libgsmtp_a_OBJECTS) $(libgsmtp_a_DEPENDENCIES) + -rm -f libgsmtp.a + $(libgsmtp_a_AR) libgsmtp.a $(libgsmtp_a_OBJECTS) $(libgsmtp_a_LIBADD) + $(RANLIB) libgsmtp.a mostlyclean-compile: - -rm -f *.o core *.core - -clean-compile: + -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c -maintainer-clean-compile: +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gadminserver.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbase64.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gclientprotocol.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfilestore.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmessagestore.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmessagestore_unix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnewfile.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnewmessage.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gprotocolmessage.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gprotocolmessageforward.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gprotocolmessagestore.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsasl_native.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsecrets.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gserverprotocol.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsmtpclient.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsmtpserver.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gstoredfile.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gstoredmessage.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gverifier.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gxtext.Po@am__quote@ + +distclean-depend: + -rm -rf ./$(DEPDIR) -libgsmtp.a: $(libgsmtp_a_OBJECTS) $(libgsmtp_a_DEPENDENCIES) - -rm -f libgsmtp.a - $(AR) cru libgsmtp.a $(libgsmtp_a_OBJECTS) $(libgsmtp_a_LIBADD) - $(RANLIB) libgsmtp.a .cpp.o: - $(CXXCOMPILE) -c $< +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + +.cpp.obj: +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXXCOMPILE) -c -o $@ `cygpath -w $<` +CXXDEPMODE = @CXXDEPMODE@ +uninstall-info-am: + +ETAGS = etags +ETAGSFLAGS = tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ +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; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) + mkid -fID $$unique -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ + 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 "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique -mostlyclean-tags: - -clean-tags: +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -maintainer-clean-tags: - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = src/gsmtp +top_distdir = ../.. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ + @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 \ - cp -pr $$d/$$file $(distdir)/$$file; \ + 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 \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done -gadminserver.o: gadminserver.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits ../../src/gnet/gnet.h \ - ../../src/gnet/geventloop.h ../../src/gnet/geventhandler.h \ - ../../src/glib/gdatetime.h ../../src/glib/gexception.h \ - ../../src/gnet/gdescriptor.h gsmtp.h ../../src/glib/glog.h \ - gadminserver.h ../../src/gnet/gserver.h \ - ../../src/gnet/gsocket.h ../../src/gnet/gaddress.h \ - ../../src/gnet/gevent.h ../../src/gnet/gconnection.h \ - ../../src/gnet/glinebuffer.h ../../src/glib/gstrings.h \ - gserverprotocol.h gprotocolmessage.h gverifier.h \ - ../../src/glib/gpath.h gsasl.h gsecrets.h \ - ../../src/glib/gstatemachine.h gsmtpclient.h \ - ../../src/gnet/gclient.h gclientprotocol.h gmessagestore.h \ - gnewmessage.h gstoredmessage.h ../../src/gnet/gtimer.h \ - ../../src/gnet/gmonitor.h ../../src/glib/gnoncopyable.h \ - ../../src/glib/gstr.h ../../src/glib/gmemory.h -gbase64.o: gbase64.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \ - ../../src/glib/glog.h gbase64.h ../../src/glib/gexception.h \ - ../../src/glib/gassert.h ../../src/glib/glogoutput.h \ - ../../src/glib/gstr.h ../../src/glib/gstrings.h -gclientprotocol.o: gclientprotocol.cpp ../../src/glib/gdef.h \ - ../../config.h ../../lib/gcc2.95/iostream \ - ../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits \ - ../../src/gnet/gnet.h gsmtp.h ../../src/glib/glog.h \ - ../../src/gnet/glocal.h ../../src/gnet/gaddress.h \ - ../../src/glib/gexception.h ../../src/glib/gfile.h \ - ../../src/glib/gpath.h ../../src/glib/gstrings.h gsasl.h \ - gsecrets.h gbase64.h ../../src/glib/gstr.h \ - ../../src/glib/gmemory.h gxtext.h gclientprotocol.h \ - gmessagestore.h gnewmessage.h gstoredmessage.h \ - ../../src/gnet/gtimer.h ../../src/glib/gdatetime.h \ - ../../src/gnet/gresolve.h ../../src/glib/gassert.h \ - ../../src/glib/glogoutput.h -gfilestore.o: gfilestore.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \ - ../../src/glib/glog.h ../../src/glib/gnoncopyable.h \ - gfilestore.h gmessagestore.h gnewmessage.h gstoredmessage.h \ - ../../src/glib/gstrings.h ../../src/glib/gpath.h \ - ../../src/glib/gexception.h ../../src/glib/gdatetime.h \ - ../../src/glib/groot.h ../../src/glib/gprocess.h gnewfile.h \ - gstoredfile.h ../../src/glib/gdirectory.h \ - ../../src/glib/gmemory.h ../../src/glib/gfile.h \ - ../../src/glib/gstr.h ../../src/glib/gassert.h \ - ../../src/glib/glogoutput.h -gmessagestore.o: gmessagestore.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \ - ../../src/glib/glog.h gmessagestore.h gnewmessage.h \ - gstoredmessage.h ../../src/glib/gstrings.h \ - ../../src/glib/gpath.h ../../src/glib/gexception.h \ - ../../src/glib/gassert.h ../../src/glib/glogoutput.h -gmessagestore_unix.o: gmessagestore_unix.cpp ../../src/glib/gdef.h \ - ../../config.h ../../lib/gcc2.95/iostream \ - ../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gsmtp.h \ - ../../src/gnet/gnet.h ../../src/glib/glog.h gmessagestore.h \ - gnewmessage.h gstoredmessage.h ../../src/glib/gstrings.h \ - ../../src/glib/gpath.h ../../src/glib/gexception.h -gnewfile.o: gnewfile.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \ - ../../src/glib/glog.h gmessagestore.h gnewmessage.h \ - gstoredmessage.h ../../src/glib/gstrings.h \ - ../../src/glib/gpath.h ../../src/glib/gexception.h gnewfile.h \ - gfilestore.h ../../src/glib/gdatetime.h \ - ../../src/glib/gnoncopyable.h ../../src/glib/groot.h \ - ../../src/glib/gprocess.h ../../src/glib/gmemory.h \ - ../../src/glib/gfile.h gxtext.h ../../src/glib/gassert.h \ - ../../src/glib/glogoutput.h -gnewmessage.o: gnewmessage.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \ - ../../src/glib/glog.h gmessagestore.h gnewmessage.h \ - gstoredmessage.h ../../src/glib/gstrings.h \ - ../../src/glib/gpath.h ../../src/glib/gexception.h -gprotocolmessage.o: gprotocolmessage.cpp ../../src/glib/gdef.h \ - ../../config.h ../../lib/gcc2.95/iostream \ - ../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gsmtp.h \ - ../../src/gnet/gnet.h ../../src/glib/glog.h gprotocolmessage.h \ - ../../src/glib/gstrings.h gverifier.h ../../src/glib/gpath.h -gprotocolmessageforward.o: gprotocolmessageforward.cpp \ - ../../src/glib/gdef.h ../../config.h ../../lib/gcc2.95/iostream \ - ../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gsmtp.h \ - ../../src/gnet/gnet.h ../../src/glib/glog.h \ - gprotocolmessageforward.h gprotocolmessage.h \ - ../../src/glib/gstrings.h gverifier.h ../../src/glib/gpath.h \ - gprotocolmessagestore.h gnewmessage.h gsmtpclient.h gsecrets.h \ - ../../src/glib/gexception.h ../../src/gnet/glinebuffer.h \ - ../../src/gnet/gclient.h ../../src/gnet/gaddress.h \ - ../../src/gnet/gconnection.h ../../src/gnet/gsocket.h \ - ../../src/gnet/gevent.h ../../src/gnet/geventloop.h \ - ../../src/gnet/geventhandler.h ../../src/glib/gdatetime.h \ - ../../src/gnet/gdescriptor.h gclientprotocol.h gmessagestore.h \ - gstoredmessage.h gsasl.h ../../src/gnet/gtimer.h \ - ../../src/glib/gmemory.h ../../src/glib/gstr.h \ - ../../src/glib/gassert.h ../../src/glib/glogoutput.h -gprotocolmessagestore.o: gprotocolmessagestore.cpp ../../src/glib/gdef.h \ - ../../config.h ../../lib/gcc2.95/iostream \ - ../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gsmtp.h \ - ../../src/gnet/gnet.h ../../src/glib/glog.h \ - gprotocolmessagestore.h gprotocolmessage.h \ - ../../src/glib/gstrings.h gverifier.h ../../src/glib/gpath.h \ - gnewmessage.h gmessagestore.h gstoredmessage.h \ - ../../src/glib/gexception.h ../../src/glib/gmemory.h \ - ../../src/glib/gstr.h ../../src/glib/gassert.h \ - ../../src/glib/glogoutput.h -gsasl_native.o: gsasl_native.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits ../../src/gnet/gnet.h gsmtp.h \ - ../../src/glib/glog.h ../../src/gnet/glocal.h \ - ../../src/gnet/gaddress.h ../../src/glib/gexception.h gsasl.h \ - gsecrets.h ../../src/glib/gpath.h ../../src/glib/gstrings.h \ - ../../src/glib/gstr.h ../../src/glib/gmd5.h \ - ../../src/glib/gdatetime.h ../../src/glib/gmemory.h \ - ../../src/glib/gdebug.h ../../src/glib/glogoutput.h \ - ../../src/glib/gassert.h -gsecrets.o: gsecrets.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \ - ../../src/glib/glog.h gsecrets.h ../../src/glib/gpath.h \ - ../../src/glib/gstrings.h ../../src/glib/gexception.h \ - ../../src/glib/groot.h ../../src/glib/gprocess.h \ - ../../src/glib/gnoncopyable.h gxtext.h ../../src/glib/gstr.h -gserverprotocol.o: gserverprotocol.cpp ../../src/glib/gdef.h \ - ../../config.h ../../lib/gcc2.95/iostream \ - ../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gsmtp.h \ - ../../src/gnet/gnet.h ../../src/glib/glog.h gserverprotocol.h \ - gprotocolmessage.h ../../src/glib/gstrings.h gverifier.h \ - ../../src/glib/gpath.h gsasl.h gsecrets.h \ - ../../src/glib/gexception.h ../../src/glib/gstatemachine.h \ - gbase64.h ../../src/glib/gdate.h ../../src/glib/gdatetime.h \ - ../../src/glib/gdebug.h ../../src/glib/glogoutput.h \ - ../../src/glib/gassert.h ../../src/glib/gtime.h \ - ../../src/glib/gstr.h -gsmtpclient.o: gsmtpclient.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits ../../src/gnet/gnet.h gsmtp.h \ - ../../src/glib/glog.h ../../src/gnet/glocal.h \ - ../../src/gnet/gaddress.h ../../src/glib/gexception.h \ - ../../src/glib/gfile.h ../../src/glib/gpath.h \ - ../../src/glib/gstrings.h ../../src/glib/gstr.h \ - ../../src/glib/gmemory.h ../../src/gnet/gtimer.h \ - ../../src/glib/gdatetime.h gsmtpclient.h gsecrets.h \ - ../../src/gnet/glinebuffer.h ../../src/gnet/gclient.h \ - ../../src/gnet/gconnection.h ../../src/gnet/gsocket.h \ - ../../src/gnet/gevent.h ../../src/gnet/geventloop.h \ - ../../src/gnet/geventhandler.h ../../src/gnet/gdescriptor.h \ - gclientprotocol.h gmessagestore.h gnewmessage.h \ - gstoredmessage.h gsasl.h ../../src/gnet/gresolve.h \ - ../../src/glib/gassert.h ../../src/glib/glogoutput.h -gsmtpserver.o: gsmtpserver.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \ - ../../src/glib/glog.h gsmtpserver.h \ - ../../src/glib/gnoncopyable.h ../../src/gnet/gserver.h \ - ../../src/gnet/gsocket.h ../../src/gnet/gaddress.h \ - ../../src/glib/gexception.h ../../src/gnet/gevent.h \ - ../../src/gnet/geventloop.h ../../src/gnet/geventhandler.h \ - ../../src/glib/gdatetime.h ../../src/gnet/gdescriptor.h \ - ../../src/gnet/gconnection.h ../../src/gnet/glinebuffer.h \ - ../../src/glib/gstrings.h gverifier.h ../../src/glib/gpath.h \ - gserverprotocol.h gprotocolmessage.h gsasl.h gsecrets.h \ - ../../src/glib/gstatemachine.h gprotocolmessagestore.h \ - gnewmessage.h gprotocolmessageforward.h gsmtpclient.h \ - ../../src/gnet/gclient.h gclientprotocol.h gmessagestore.h \ - gstoredmessage.h ../../src/gnet/gtimer.h \ - ../../src/glib/gmemory.h ../../src/gnet/glocal.h \ - ../../src/glib/gdebug.h ../../src/glib/glogoutput.h \ - ../../src/glib/gassert.h -gstoredfile.o: gstoredfile.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \ - ../../src/glib/glog.h gfilestore.h gmessagestore.h \ - gnewmessage.h gstoredmessage.h ../../src/glib/gstrings.h \ - ../../src/glib/gpath.h ../../src/glib/gexception.h \ - ../../src/glib/gdatetime.h ../../src/glib/gnoncopyable.h \ - ../../src/glib/groot.h ../../src/glib/gprocess.h gstoredfile.h \ - ../../src/glib/gmemory.h gxtext.h ../../src/glib/gfile.h \ - ../../src/glib/gstr.h ../../src/glib/gassert.h \ - ../../src/glib/glogoutput.h -gstoredmessage.o: gstoredmessage.cpp ../../src/glib/gdef.h \ - ../../config.h ../../lib/gcc2.95/iostream \ - ../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gsmtp.h \ - ../../src/gnet/gnet.h ../../src/glib/glog.h gstoredmessage.h \ - ../../src/glib/gstrings.h ../../src/glib/gpath.h -gverifier.o: gverifier.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \ - ../../src/glib/glog.h ../../src/glib/gstrings.h gverifier.h \ - ../../src/glib/gpath.h ../../src/glib/gprocess.h \ - ../../src/glib/gexception.h ../../src/glib/gfile.h \ - ../../src/glib/groot.h ../../src/glib/gnoncopyable.h \ - ../../src/glib/gstr.h ../../src/gnet/glocal.h \ - ../../src/gnet/gaddress.h ../../src/glib/gassert.h \ - ../../src/glib/glogoutput.h -gxtext.o: gxtext.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \ - ../../src/glib/glog.h gxtext.h ../../src/glib/gassert.h \ - ../../src/glib/glogoutput.h - -info-am: -info: info-am -dvi-am: -dvi: dvi-am check-am: all-am check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am +all-am: Makefile $(LIBRARIES) -install-data-am: +installdirs: + +install: install-am +install-exec: install-exec-am install-data: install-data-am +uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: -uninstall: uninstall-am -all-am: Makefile $(LIBRARIES) -all-redirect: all-am + +installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - - + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ - mostlyclean-tags mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-generic \ - mostlyclean-am - + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." clean: clean-am -distclean-am: distclean-noinstLIBRARIES distclean-compile \ - distclean-tags distclean-generic clean-am +clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am distclean: distclean-am -maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ - maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +distclean-am: clean-am distclean-compile distclean-depend \ + distclean-generic distclean-tags + +dvi: dvi-am + +dvi-am: + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-am -.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ -clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ -mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile tags mostlyclean-tags distclean-tags \ -clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ -check-am installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +uninstall-am: uninstall-info-am + +.PHONY: GTAGS all all-am check check-am clean clean-generic \ + clean-noinstLIBRARIES distclean distclean-compile \ + distclean-depend distclean-generic distclean-tags distdir dvi \ + dvi-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic tags uninstall uninstall-am \ + uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/src/gsmtp/gadminserver.cpp b/src/gsmtp/gadminserver.cpp index a86ddbd..664462d 100644 --- a/src/gsmtp/gadminserver.cpp +++ b/src/gsmtp/gadminserver.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gadminserver.h b/src/gsmtp/gadminserver.h index 12950e2..fd30733 100644 --- a/src/gsmtp/gadminserver.h +++ b/src/gsmtp/gadminserver.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gbase64.cpp b/src/gsmtp/gbase64.cpp index 58b9987..8865688 100644 --- a/src/gsmtp/gbase64.cpp +++ b/src/gsmtp/gbase64.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gbase64.h b/src/gsmtp/gbase64.h index 4d73701..bd5ab71 100644 --- a/src/gsmtp/gbase64.h +++ b/src/gsmtp/gbase64.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gclientprotocol.cpp b/src/gsmtp/gclientprotocol.cpp index 518ad1e..e03f9fc 100644 --- a/src/gsmtp/gclientprotocol.cpp +++ b/src/gsmtp/gclientprotocol.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -365,8 +365,8 @@ bool GSmtp::ClientProtocol::sendLine( std::string & line ) G::Str::readLineFrom( *(m_content.get()) , crlf() , line ) ; if( m_content->good() ) { - line.append( crlf() ) ; - return m_sender.protocolSend( line ) ; + const bool log_content = false ; + return send( line , false , log_content ) ; } else { @@ -376,16 +376,15 @@ bool GSmtp::ClientProtocol::sendLine( std::string & line ) bool GSmtp::ClientProtocol::send( const std::string & line , bool eot , bool log ) { + const bool add_prefix = !eot && line.length() && line.at(0U) == '.' ; + const std::string prefix( add_prefix ? "." : "" ) ; if( log ) - G_LOG( "GSmtp::ClientProtocol: tx>>: \"" << G::Str::toPrintableAscii(line) << "\"" ) ; + G_LOG( "GSmtp::ClientProtocol: tx>>: \"" << prefix << G::Str::toPrintableAscii(line) << "\"" ) ; if( m_timeout != 0U ) startTimer( m_timeout ) ; - if( !eot && line.length() && line.at(0U) == '.' ) - return m_sender.protocolSend( std::string(".")+line+crlf() ) ; - else - return m_sender.protocolSend( line + crlf() ) ; + return m_sender.protocolSend( prefix + line + crlf() ) ; } //static diff --git a/src/gsmtp/gclientprotocol.h b/src/gsmtp/gclientprotocol.h index 8d45fb8..b2bf007 100644 --- a/src/gsmtp/gclientprotocol.h +++ b/src/gsmtp/gclientprotocol.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gfilestore.cpp b/src/gsmtp/gfilestore.cpp index 61bfa6b..a04348e 100644 --- a/src/gsmtp/gfilestore.cpp +++ b/src/gsmtp/gfilestore.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gfilestore.h b/src/gsmtp/gfilestore.h index d3ac653..becd4b5 100644 --- a/src/gsmtp/gfilestore.h +++ b/src/gsmtp/gfilestore.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gmessagestore.cpp b/src/gsmtp/gmessagestore.cpp index 3e27225..d271deb 100644 --- a/src/gsmtp/gmessagestore.cpp +++ b/src/gsmtp/gmessagestore.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gmessagestore.h b/src/gsmtp/gmessagestore.h index 713f698..164e814 100644 --- a/src/gsmtp/gmessagestore.h +++ b/src/gsmtp/gmessagestore.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gmessagestore_unix.cpp b/src/gsmtp/gmessagestore_unix.cpp index 52d95af..2177e27 100644 --- a/src/gsmtp/gmessagestore_unix.cpp +++ b/src/gsmtp/gmessagestore_unix.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gmessagestore_win32.cpp b/src/gsmtp/gmessagestore_win32.cpp index a5208ab..5256586 100644 --- a/src/gsmtp/gmessagestore_win32.cpp +++ b/src/gsmtp/gmessagestore_win32.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gnewfile.cpp b/src/gsmtp/gnewfile.cpp index 45bb4d5..9f3d70a 100644 --- a/src/gsmtp/gnewfile.cpp +++ b/src/gsmtp/gnewfile.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gnewfile.h b/src/gsmtp/gnewfile.h index 59ec2c3..5893845 100644 --- a/src/gsmtp/gnewfile.h +++ b/src/gsmtp/gnewfile.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gnewmessage.cpp b/src/gsmtp/gnewmessage.cpp index 24cb6ed..31b5be0 100644 --- a/src/gsmtp/gnewmessage.cpp +++ b/src/gsmtp/gnewmessage.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gnewmessage.h b/src/gsmtp/gnewmessage.h index 57d4eaa..31d73d0 100644 --- a/src/gsmtp/gnewmessage.h +++ b/src/gsmtp/gnewmessage.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gprotocolmessage.cpp b/src/gsmtp/gprotocolmessage.cpp index c8ba37c..73dc8be 100644 --- a/src/gsmtp/gprotocolmessage.cpp +++ b/src/gsmtp/gprotocolmessage.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gprotocolmessage.h b/src/gsmtp/gprotocolmessage.h index 8f1357d..659b414 100644 --- a/src/gsmtp/gprotocolmessage.h +++ b/src/gsmtp/gprotocolmessage.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gprotocolmessageforward.cpp b/src/gsmtp/gprotocolmessageforward.cpp index f540b0a..326393f 100644 --- a/src/gsmtp/gprotocolmessageforward.cpp +++ b/src/gsmtp/gprotocolmessageforward.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gprotocolmessageforward.h b/src/gsmtp/gprotocolmessageforward.h index 3837a24..e06810a 100644 --- a/src/gsmtp/gprotocolmessageforward.h +++ b/src/gsmtp/gprotocolmessageforward.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gprotocolmessagestore.cpp b/src/gsmtp/gprotocolmessagestore.cpp index aa276f8..a762133 100644 --- a/src/gsmtp/gprotocolmessagestore.cpp +++ b/src/gsmtp/gprotocolmessagestore.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gprotocolmessagestore.h b/src/gsmtp/gprotocolmessagestore.h index 17b59fb..d7eb48d 100644 --- a/src/gsmtp/gprotocolmessagestore.h +++ b/src/gsmtp/gprotocolmessagestore.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gsasl.h b/src/gsmtp/gsasl.h index e81a02e..87e7d08 100644 --- a/src/gsmtp/gsasl.h +++ b/src/gsmtp/gsasl.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gsasl_cyrus.cpp b/src/gsmtp/gsasl_cyrus.cpp index 805f0c3..0de225c 100644 --- a/src/gsmtp/gsasl_cyrus.cpp +++ b/src/gsmtp/gsasl_cyrus.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gsasl_native.cpp b/src/gsmtp/gsasl_native.cpp index aaaaac1..f839a80 100644 --- a/src/gsmtp/gsasl_native.cpp +++ b/src/gsmtp/gsasl_native.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gsecrets.cpp b/src/gsmtp/gsecrets.cpp index b54cbc4..e097053 100644 --- a/src/gsmtp/gsecrets.cpp +++ b/src/gsmtp/gsecrets.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gsecrets.h b/src/gsmtp/gsecrets.h index c34ff13..0ce75e1 100644 --- a/src/gsmtp/gsecrets.h +++ b/src/gsmtp/gsecrets.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gserverprotocol.cpp b/src/gsmtp/gserverprotocol.cpp index fcd4d2d..d39695e 100644 --- a/src/gsmtp/gserverprotocol.cpp +++ b/src/gsmtp/gserverprotocol.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -300,14 +300,22 @@ void GSmtp::ServerProtocol::sendChallenge( const std::string & s ) void GSmtp::ServerProtocol::doMail( const std::string & line , bool & predicate ) { - m_pmessage.clear() ; - std::string from = parseFrom( line ) ; - bool ok = m_pmessage.setFrom( from ) ; - predicate = ok ; - if( ok ) - sendMailReply() ; + if( m_sasl.active() && ! m_authenticated ) + { + predicate = false ; + sendAuthRequired() ; + } else - sendBadFrom( from ) ; + { + m_pmessage.clear() ; + std::string from = parseFrom( line ) ; + bool ok = m_pmessage.setFrom( from ) ; + predicate = ok ; + if( ok ) + sendMailReply() ; + else + sendBadFrom( from ) ; + } } void GSmtp::ServerProtocol::doRcpt( const std::string & line , bool & predicate ) @@ -424,6 +432,11 @@ void GSmtp::ServerProtocol::sendUnrecognised( const std::string & line ) send( "500 command unrecognized: \"" + line + std::string("\"") ) ; } +void GSmtp::ServerProtocol::sendAuthRequired() +{ + send( "530 Authentication required" ) ; +} + void GSmtp::ServerProtocol::sendNoRecipients() { send( "554 no valid recipients" ) ; diff --git a/src/gsmtp/gserverprotocol.h b/src/gsmtp/gserverprotocol.h index 15e312f..e3591a5 100644 --- a/src/gsmtp/gserverprotocol.h +++ b/src/gsmtp/gserverprotocol.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -177,6 +177,7 @@ private: void sendNotVerified( const std::string & ) ; void sendWillAccept( const std::string & ) ; void sendAuthDone( bool ok ) ; + void sendAuthRequired() ; void sendOk() ; std::string parseFrom( const std::string & ) const ; std::string parseTo( const std::string & ) const ; diff --git a/src/gsmtp/gsmtp.h b/src/gsmtp/gsmtp.h index 6e2d578..60eca3f 100644 --- a/src/gsmtp/gsmtp.h +++ b/src/gsmtp/gsmtp.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gsmtpclient.cpp b/src/gsmtp/gsmtpclient.cpp index 6a63f3d..5cdf73d 100644 --- a/src/gsmtp/gsmtpclient.cpp +++ b/src/gsmtp/gsmtpclient.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -57,7 +57,8 @@ GSmtp::Client::Client( MessageStore & store , ClientCallback & callback , m_socket(NULL) , m_callback(&callback) , m_connect_timer(*this) , - m_message_index(0U) + m_message_index(0U) , + m_force_message_fail(false) { } @@ -70,8 +71,18 @@ GSmtp::Client::Client( std::auto_ptr message , ClientCallback & c m_socket(NULL) , m_callback(&callback) , m_connect_timer(*this) , - m_message_index(0U) + m_message_index(0U) , + m_force_message_fail(true) { + // The m_force_message_fail flag is set true here so that in proxy + // mode any unexpected disconnects etc on the client side result + // in failed ".bad" message files which can be retried. Strictly + // this is not correct behaviour since the proxy's client will + // get an error message which indicates that the proxy has not + // yet accepted responsibility for the message. So this behaviour + // may lead to unwanted message duplication, but pragmatically it + // may be better to have duplicated messages, rather than dropped + // ones. } std::string GSmtp::Client::init( const std::string & s ) @@ -158,9 +169,6 @@ bool GSmtp::Client::sendNext() if( message.get() == NULL ) { G_LOG_S( "GSmtp::Client: no more messages to send" ) ; - GNet::Socket * s = m_socket ; - m_socket = NULL ; - s->close() ; return false ; } m_message = message ; @@ -189,15 +197,14 @@ void GSmtp::Client::protocolDone( bool ok , bool abort , const std::string & rea G_DEBUG( "GSmtp::Client::protocolDone: " << ok << ": " << reason ) ; std::string error_message ; - if( !ok ) - error_message = std::string("smtp client protocol failure: ") + reason ; - - if( m_message.get() != NULL ) + if( ok ) { - if( ok ) - m_message->destroy() ; - else - m_message->fail( error_message ) ; + messageDestroy() ; + } + else + { + error_message = std::string("smtp client protocol failure: ") + reason ; + messageFail( error_message ) ; } if( m_store == NULL || abort || !sendNext() ) @@ -206,10 +213,18 @@ void GSmtp::Client::protocolDone( bool ok , bool abort , const std::string & rea } } -void GSmtp::Client::onDisconnect() +void GSmtp::Client::messageDestroy() { - doCallback( "connection to server lost" ) ; - m_socket = NULL ; + if( m_message.get() != NULL ) + m_message->destroy() ; + m_message <<= 0 ; +} + +void GSmtp::Client::messageFail( const std::string & reason ) +{ + if( m_message.get() != NULL ) + m_message->fail( reason ) ; + m_message <<= 0 ; } GNet::Socket & GSmtp::Client::socket() @@ -230,16 +245,42 @@ void GSmtp::Client::onData( const char * data , size_t size ) } } +void GSmtp::Client::onDisconnect() +{ + std::string reason = "connection to server lost" ; + if( m_force_message_fail ) + messageFail( reason ) ; + + finish( reason , false ) ; +} + void GSmtp::Client::onError( const std::string & error ) { G_WARNING( "GSmtp::Client: smtp client error: \"" << error << "\"" ) ; - doCallback( std::string("error on connection to server: ") + error ) ; + + std::string reason = "error on connection to server: " ; + reason += error ; + if( m_force_message_fail ) + messageFail( "connection failure" ) ; + + finish( reason , false ) ; } -void GSmtp::Client::finish( const std::string & reason ) +void GSmtp::Client::onTimeout( GNet::Timer & ) +{ + std::string reason = "connection timeout" ; + if( m_force_message_fail ) + messageFail( reason ) ; + + finish( reason ) ; +} + +void GSmtp::Client::finish( const std::string & reason , bool do_disconnect ) { doCallback( reason ) ; - disconnect() ; // GNet::Client::disconnect() + if( do_disconnect ) + disconnect() ; // GNet::Client::disconnect() + m_socket = NULL ; } void GSmtp::Client::doCallback( const std::string & reason ) @@ -280,12 +321,6 @@ unsigned int GSmtp::Client::connectionTimeout( unsigned int new_timeout ) return previous ; } -void GSmtp::Client::onTimeout( GNet::Timer & ) -{ - //G_ASSERT( &timer == &m_connect_timer ) ; - doCallback( "connection timeout" ) ; -} - // === GSmtp::Client::ClientCallback::~ClientCallback() diff --git a/src/gsmtp/gsmtpclient.h b/src/gsmtp/gsmtpclient.h index ab80736..54d5e3c 100644 --- a/src/gsmtp/gsmtpclient.h +++ b/src/gsmtp/gsmtpclient.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -81,6 +81,10 @@ public: // all message processing has finished // or that the server connection has // been lost. + // + // With this constructor the message is fail()ed + // if the connection to the downstream server + // cannot be made. std::string init( const std::string & server_address_string ) ; // Starts the sending process. Messages @@ -126,7 +130,9 @@ private: void start( StoredMessage & ) ; void doCallback( const std::string & ) ; void raiseEvent( const std::string & , const std::string & ) ; - void finish( const std::string & reason = std::string() ) ; + void finish( const std::string & reason = std::string() , bool do_disconnect = true ) ; + void messageFail( const std::string & reason ) ; + void messageDestroy() ; private: MessageStore * m_store ; @@ -140,6 +146,7 @@ private: std::string m_host ; GNet::Timer m_connect_timer ; unsigned int m_message_index ; + bool m_force_message_fail ; static unsigned int m_response_timeout ; static unsigned int m_connection_timeout ; } ; diff --git a/src/gsmtp/gsmtpserver.cpp b/src/gsmtp/gsmtpserver.cpp index 419a72b..a4c871f 100644 --- a/src/gsmtp/gsmtpserver.cpp +++ b/src/gsmtp/gsmtpserver.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gsmtpserver.h b/src/gsmtp/gsmtpserver.h index 03bbfb0..1c53934 100644 --- a/src/gsmtp/gsmtpserver.h +++ b/src/gsmtp/gsmtpserver.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gstoredfile.cpp b/src/gsmtp/gstoredfile.cpp index 19fb41b..a1349eb 100644 --- a/src/gsmtp/gstoredfile.cpp +++ b/src/gsmtp/gstoredfile.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -37,7 +37,8 @@ GSmtp::StoredFile::StoredFile( FileStore & store , const G::Path & path ) : m_store(store) , m_envelope_path(path) , m_eight_bit(false) , - m_errors(0U) + m_errors(0U) , + m_locked(false) { m_name = m_envelope_path.basename() ; size_t pos = m_name.rfind(".envelope") ; @@ -47,6 +48,13 @@ GSmtp::StoredFile::StoredFile( FileStore & store , const G::Path & path ) : GSmtp::StoredFile::~StoredFile() { + try + { + unlock() ; + } + catch(...) + { + } } std::string GSmtp::StoredFile::name() const @@ -231,17 +239,31 @@ std::string GSmtp::StoredFile::crlf() const bool GSmtp::StoredFile::lock() { FileWriter claim_writer ; - G::Path & src = m_envelope_path ; - G::Path dst( src.str() + ".busy" ) ; + const G::Path src = m_envelope_path ; + const G::Path dst( src.str() + ".busy" ) ; bool ok = G::File::rename( src , dst , G::File::NoThrow() ) ; if( ok ) { G_LOG( "GSmtp::StoredMessage: locking file \"" << src.basename() << "\"" ) ; m_envelope_path = dst ; + m_old_envelope_path = src ; + m_locked = true ; } return ok ; } +void GSmtp::StoredFile::unlock() +{ + if( m_locked ) + { + G_LOG( "GSmtp::StoredMessage: unlocking file \"" << m_envelope_path.basename() << "\"" ) ; + FileWriter claim_writer ; + G::File::rename( m_envelope_path , m_old_envelope_path ) ; + m_envelope_path = m_old_envelope_path ; + m_locked = false ; + } +} + void GSmtp::StoredFile::fail( const std::string & reason ) { try diff --git a/src/gsmtp/gstoredfile.h b/src/gsmtp/gstoredfile.h index 8d1661d..16a2ef1 100644 --- a/src/gsmtp/gstoredfile.h +++ b/src/gsmtp/gstoredfile.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -58,7 +58,8 @@ public: // Constructor. virtual ~StoredFile() ; - // Destructor. + // Destructor. Unlocks the file if it has been lock()ed + // but not destroy()ed or fail()ed. bool lock() ; // Locks the file by renaming the envelope file. @@ -118,6 +119,7 @@ private: void readAuthentication( std::istream & stream ) ; void readClientIp( std::istream & stream ) ; void readEnvelopeCore( bool ) ; + void unlock() ; private: FileStore & m_store ; @@ -125,6 +127,7 @@ private: G::Strings m_to_remote ; std::string m_from ; G::Path m_envelope_path ; + G::Path m_old_envelope_path ; std::string m_name ; std::auto_ptr m_content ; bool m_eight_bit ; @@ -132,6 +135,7 @@ private: std::string m_format ; std::string m_client_ip ; size_t m_errors ; + bool m_locked ; } ; #endif diff --git a/src/gsmtp/gstoredmessage.cpp b/src/gsmtp/gstoredmessage.cpp index e70b757..49d2c51 100644 --- a/src/gsmtp/gstoredmessage.cpp +++ b/src/gsmtp/gstoredmessage.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gstoredmessage.h b/src/gsmtp/gstoredmessage.h index 1bc711f..17a786d 100644 --- a/src/gsmtp/gstoredmessage.h +++ b/src/gsmtp/gstoredmessage.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gverifier.cpp b/src/gsmtp/gverifier.cpp index ba73799..e6ede90 100644 --- a/src/gsmtp/gverifier.cpp +++ b/src/gsmtp/gverifier.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gverifier.h b/src/gsmtp/gverifier.h index 60cd02c..4981992 100644 --- a/src/gsmtp/gverifier.h +++ b/src/gsmtp/gverifier.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -43,7 +43,7 @@ namespace GSmtp class GSmtp::Verifier { public: - struct Status + struct Status // A structure returned by GSmtp::Verifier::verify(). { bool is_valid ; bool is_local ; diff --git a/src/gsmtp/gxtext.cpp b/src/gsmtp/gxtext.cpp index 0ed94a8..569e42e 100644 --- a/src/gsmtp/gxtext.cpp +++ b/src/gsmtp/gxtext.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/gsmtp/gxtext.h b/src/gsmtp/gxtext.h index 787390f..9f4218a 100644 --- a/src/gsmtp/gxtext.h +++ b/src/gsmtp/gxtext.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/main/Makefile.am b/src/main/Makefile.am index 9aeb0bf..5fbec13 100644 --- a/src/main/Makefile.am +++ b/src/main/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/src/main/Makefile.in b/src/main/Makefile.in index d26dd27..a463613 100644 --- a/src/main/Makefile.in +++ b/src/main/Makefile.in @@ -1,6 +1,8 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated by automake 1.6.3 from Makefile.am. +# @configure_input@ -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,8 +12,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ + # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -28,10 +32,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # - -# force symbol stripping on 'make install' - - SHELL = @SHELL@ srcdir = @srcdir@ @@ -52,13 +52,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. ACLOCAL = @ACLOCAL@ @@ -66,31 +62,44 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +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) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +AMTAR = @AMTAR@ AR = @AR@ AWK = @AWK@ CC = @CC@ COMPILER_VERSION = @COMPILER_VERSION@ CXX = @CXX@ +DEPDIR = @DEPDIR@ GZIP = @GZIP@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_MAN2HTML = @HAVE_MAN2HTML@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ MAKE = @MAKE@ -MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +STRIP = @STRIP@ VERSION = @VERSION@ +am__include = @am__include@ +am__quote = @am__quote@ e_docdir = @e_docdir@ e_examplesdir = @e_examplesdir@ e_initdir = @e_initdir@ @@ -98,10 +107,29 @@ e_libexecdir = @e_libexecdir@ e_man1dir = @e_man1dir@ e_sbindir = @e_sbindir@ e_spooldir = @e_spooldir@ +install_sh = @install_sh@ +# force symbol stripping on 'make install' AM_INSTALL_PROGRAM_FLAGS = -s -EXTRA_DIST = commandline_win32.cpp common.dsp doxygen.cfg doxygen.h emailrelay.dsp emailrelay.dsw emailrelay.rc icon-32.ico icon2.ico icon3.ico icon4.ico main_win32.cpp messages.mc passwd.dsp poke.dsp resource.h submit.dsp +EXTRA_DIST = \ + commandline_win32.cpp \ + common.dsp \ + doxygen.cfg \ + doxygen.h \ + emailrelay.dsp \ + emailrelay.dsw \ + emailrelay.rc \ + icon-32.ico \ + icon2.ico \ + icon3.ico \ + icon4.ico \ + main_win32.cpp \ + messages.mc \ + passwd.dsp \ + poke.dsp \ + resource.h \ + submit.dsp INCLUDES = -I$(top_srcdir)/lib/$(COMPILER_VERSION) -I$(top_srcdir)/src/glib -I$(top_srcdir)/src/gnet -I$(top_srcdir)/src/gsmtp -DG_SPOOLDIR=\"$(e_spooldir)\" @@ -110,10 +138,23 @@ e_sbin_PROGRAMS = emailrelay emailrelay-submit emailrelay-passwd e_libexec_PROGRAMS = emailrelay-poke e_spool_DATA = -emailrelay_SOURCES = main_unix.cpp configuration.cpp configuration.h legal.cpp legal.h run.cpp run.h commandline.cpp commandline_unix.cpp commandline.h +emailrelay_SOURCES = \ + main_unix.cpp \ + configuration.cpp \ + configuration.h \ + legal.cpp \ + legal.h \ + run.cpp \ + run.h \ + commandline.cpp \ + commandline_unix.cpp \ + commandline.h -emailrelay_LDADD = $(top_builddir)/src/gsmtp/libgsmtp.a $(top_builddir)/src/glib/libglib.a $(top_builddir)/src/gnet/libgnet.a +emailrelay_LDADD = \ + $(top_builddir)/src/gsmtp/libgsmtp.a \ + $(top_builddir)/src/glib/libglib.a \ + $(top_builddir)/src/gnet/libgnet.a emailrelay_poke_SOURCES = poke.c @@ -123,395 +164,353 @@ emailrelay_passwd_SOURCES = passwd.cpp legal.cpp emailrelay_passwd_LDADD = $(top_builddir)/src/glib/libglib.a emailrelay_submit_SOURCES = submit.cpp legal.cpp -emailrelay_submit_LDADD = $(top_builddir)/src/gsmtp/libgsmtp.a $(top_builddir)/src/glib/libglib.a $(top_builddir)/src/gnet/libgnet.a +emailrelay_submit_LDADD = \ + $(top_builddir)/src/gsmtp/libgsmtp.a \ + $(top_builddir)/src/glib/libglib.a \ + $(top_builddir)/src/gnet/libgnet.a +subdir = src/main mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../config.h -CONFIG_CLEAN_FILES = -PROGRAMS = $(e_libexec_PROGRAMS) $(e_sbin_PROGRAMS) +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +e_libexec_PROGRAMS = emailrelay-poke$(EXEEXT) +e_sbin_PROGRAMS = emailrelay$(EXEEXT) emailrelay-submit$(EXEEXT) \ + emailrelay-passwd$(EXEEXT) +PROGRAMS = $(e_libexec_PROGRAMS) $(e_sbin_PROGRAMS) +am_emailrelay_OBJECTS = main_unix.$(OBJEXT) configuration.$(OBJEXT) \ + legal.$(OBJEXT) run.$(OBJEXT) commandline.$(OBJEXT) \ + commandline_unix.$(OBJEXT) +emailrelay_OBJECTS = $(am_emailrelay_OBJECTS) +emailrelay_DEPENDENCIES = $(top_builddir)/src/gsmtp/libgsmtp.a \ + $(top_builddir)/src/glib/libglib.a \ + $(top_builddir)/src/gnet/libgnet.a +emailrelay_LDFLAGS = +am_emailrelay_passwd_OBJECTS = passwd.$(OBJEXT) legal.$(OBJEXT) +emailrelay_passwd_OBJECTS = $(am_emailrelay_passwd_OBJECTS) +emailrelay_passwd_DEPENDENCIES = $(top_builddir)/src/glib/libglib.a +emailrelay_passwd_LDFLAGS = +am_emailrelay_poke_OBJECTS = poke.$(OBJEXT) +emailrelay_poke_OBJECTS = $(am_emailrelay_poke_OBJECTS) +emailrelay_poke_DEPENDENCIES = +emailrelay_poke_LDFLAGS = +am_emailrelay_submit_OBJECTS = submit.$(OBJEXT) legal.$(OBJEXT) +emailrelay_submit_OBJECTS = $(am_emailrelay_submit_OBJECTS) +emailrelay_submit_DEPENDENCIES = $(top_builddir)/src/gsmtp/libgsmtp.a \ + $(top_builddir)/src/glib/libglib.a \ + $(top_builddir)/src/gnet/libgnet.a +emailrelay_submit_LDFLAGS = -DEFS = @DEFS@ -I. -I$(srcdir) -I../.. +DEFS = @DEFS@ +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -emailrelay_poke_OBJECTS = poke.o -emailrelay_poke_DEPENDENCIES = -emailrelay_poke_LDFLAGS = -emailrelay_OBJECTS = main_unix.o configuration.o legal.o run.o \ -commandline.o commandline_unix.o -emailrelay_DEPENDENCIES = $(top_builddir)/src/gsmtp/libgsmtp.a \ -$(top_builddir)/src/glib/libglib.a $(top_builddir)/src/gnet/libgnet.a -emailrelay_LDFLAGS = -emailrelay_submit_OBJECTS = submit.o legal.o -emailrelay_submit_DEPENDENCIES = $(top_builddir)/src/gsmtp/libgsmtp.a \ -$(top_builddir)/src/glib/libglib.a $(top_builddir)/src/gnet/libgnet.a -emailrelay_submit_LDFLAGS = -emailrelay_passwd_OBJECTS = passwd.o legal.o -emailrelay_passwd_DEPENDENCIES = $(top_builddir)/src/glib/libglib.a -emailrelay_passwd_LDFLAGS = -CXXFLAGS = @CXXFLAGS@ -CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/commandline.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/commandline_unix.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/configuration.Po ./$(DEPDIR)/legal.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/main_unix.Po ./$(DEPDIR)/passwd.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/poke.Po ./$(DEPDIR)/run.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/submit.Po +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DATA = $(e_spool_DATA) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +CFLAGS = @CFLAGS@ +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +CXXLD = $(CXX) +CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ +CXXFLAGS = @CXXFLAGS@ +DIST_SOURCES = $(emailrelay_SOURCES) $(emailrelay_passwd_SOURCES) \ + $(emailrelay_poke_SOURCES) $(emailrelay_submit_SOURCES) +DATA = $(e_spool_DATA) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = Makefile.am Makefile.in +SOURCES = $(emailrelay_SOURCES) $(emailrelay_passwd_SOURCES) $(emailrelay_poke_SOURCES) $(emailrelay_submit_SOURCES) +all: all-am -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -SOURCES = $(emailrelay_poke_SOURCES) $(emailrelay_SOURCES) $(emailrelay_submit_SOURCES) $(emailrelay_passwd_SOURCES) -OBJECTS = $(emailrelay_poke_OBJECTS) $(emailrelay_OBJECTS) $(emailrelay_submit_OBJECTS) $(emailrelay_passwd_OBJECTS) - -all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .cpp .o .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/main/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -mostlyclean-e_libexecPROGRAMS: - -clean-e_libexecPROGRAMS: - -test -z "$(e_libexec_PROGRAMS)" || rm -f $(e_libexec_PROGRAMS) - -distclean-e_libexecPROGRAMS: - -maintainer-clean-e_libexecPROGRAMS: - +.SUFFIXES: .c .cpp .o .obj +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/main/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +e_libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-e_libexecPROGRAMS: $(e_libexec_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(e_libexecdir) @list='$(e_libexec_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(e_libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(e_libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(e_libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(e_libexecdir)/$$f"; \ + $(INSTALL_PROGRAM_ENV) $(e_libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(e_libexecdir)/$$f; \ else :; fi; \ done uninstall-e_libexecPROGRAMS: @$(NORMAL_UNINSTALL) - list='$(e_libexec_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(e_libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + @list='$(e_libexec_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f $(DESTDIR)$(e_libexecdir)/$$f"; \ + rm -f $(DESTDIR)$(e_libexecdir)/$$f; \ done -mostlyclean-e_sbinPROGRAMS: - -clean-e_sbinPROGRAMS: - -test -z "$(e_sbin_PROGRAMS)" || rm -f $(e_sbin_PROGRAMS) - -distclean-e_sbinPROGRAMS: - -maintainer-clean-e_sbinPROGRAMS: - +clean-e_libexecPROGRAMS: + -test -z "$(e_libexec_PROGRAMS)" || rm -f $(e_libexec_PROGRAMS) +e_sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-e_sbinPROGRAMS: $(e_sbin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(e_sbindir) @list='$(e_sbin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(e_sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(e_sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(e_sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(e_sbindir)/$$f"; \ + $(INSTALL_PROGRAM_ENV) $(e_sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(e_sbindir)/$$f; \ else :; fi; \ done uninstall-e_sbinPROGRAMS: @$(NORMAL_UNINSTALL) - list='$(e_sbin_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(e_sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + @list='$(e_sbin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f $(DESTDIR)$(e_sbindir)/$$f"; \ + rm -f $(DESTDIR)$(e_sbindir)/$$f; \ done -.c.o: - $(COMPILE) -c $< - -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< +clean-e_sbinPROGRAMS: + -test -z "$(e_sbin_PROGRAMS)" || rm -f $(e_sbin_PROGRAMS) +emailrelay$(EXEEXT): $(emailrelay_OBJECTS) $(emailrelay_DEPENDENCIES) + @rm -f emailrelay$(EXEEXT) + $(CXXLINK) $(emailrelay_LDFLAGS) $(emailrelay_OBJECTS) $(emailrelay_LDADD) $(LIBS) +emailrelay-passwd$(EXEEXT): $(emailrelay_passwd_OBJECTS) $(emailrelay_passwd_DEPENDENCIES) + @rm -f emailrelay-passwd$(EXEEXT) + $(CXXLINK) $(emailrelay_passwd_LDFLAGS) $(emailrelay_passwd_OBJECTS) $(emailrelay_passwd_LDADD) $(LIBS) +emailrelay-poke$(EXEEXT): $(emailrelay_poke_OBJECTS) $(emailrelay_poke_DEPENDENCIES) + @rm -f emailrelay-poke$(EXEEXT) + $(LINK) $(emailrelay_poke_LDFLAGS) $(emailrelay_poke_OBJECTS) $(emailrelay_poke_LDADD) $(LIBS) +emailrelay-submit$(EXEEXT): $(emailrelay_submit_OBJECTS) $(emailrelay_submit_DEPENDENCIES) + @rm -f emailrelay-submit$(EXEEXT) + $(CXXLINK) $(emailrelay_submit_LDFLAGS) $(emailrelay_submit_OBJECTS) $(emailrelay_submit_LDADD) $(LIBS) mostlyclean-compile: - -rm -f *.o core *.core - -clean-compile: + -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c -maintainer-clean-compile: +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commandline.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commandline_unix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/configuration.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/legal.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main_unix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/passwd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/poke.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/submit.Po@am__quote@ -emailrelay-poke: $(emailrelay_poke_OBJECTS) $(emailrelay_poke_DEPENDENCIES) - @rm -f emailrelay-poke - $(LINK) $(emailrelay_poke_LDFLAGS) $(emailrelay_poke_OBJECTS) $(emailrelay_poke_LDADD) $(LIBS) +distclean-depend: + -rm -rf ./$(DEPDIR) -emailrelay: $(emailrelay_OBJECTS) $(emailrelay_DEPENDENCIES) - @rm -f emailrelay - $(CXXLINK) $(emailrelay_LDFLAGS) $(emailrelay_OBJECTS) $(emailrelay_LDADD) $(LIBS) +.c.o: +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -emailrelay-submit: $(emailrelay_submit_OBJECTS) $(emailrelay_submit_DEPENDENCIES) - @rm -f emailrelay-submit - $(CXXLINK) $(emailrelay_submit_LDFLAGS) $(emailrelay_submit_OBJECTS) $(emailrelay_submit_LDADD) $(LIBS) +.c.obj: +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c `cygpath -w $<` +CCDEPMODE = @CCDEPMODE@ -emailrelay-passwd: $(emailrelay_passwd_OBJECTS) $(emailrelay_passwd_DEPENDENCIES) - @rm -f emailrelay-passwd - $(CXXLINK) $(emailrelay_passwd_LDFLAGS) $(emailrelay_passwd_OBJECTS) $(emailrelay_passwd_LDADD) $(LIBS) .cpp.o: - $(CXXCOMPILE) -c $< +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +.cpp.obj: +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXXCOMPILE) -c -o $@ `cygpath -w $<` +CXXDEPMODE = @CXXDEPMODE@ +uninstall-info-am: +e_spoolDATA_INSTALL = $(INSTALL_DATA) install-e_spoolDATA: $(e_spool_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(e_spooldir) @list='$(e_spool_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(e_spooldir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(e_spooldir)/$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(e_spooldir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(e_spooldir)/$$p; \ - fi; fi; \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(e_spoolDATA_INSTALL) $$d$$p $(DESTDIR)$(e_spooldir)/$$f"; \ + $(e_spoolDATA_INSTALL) $$d$$p $(DESTDIR)$(e_spooldir)/$$f; \ done uninstall-e_spoolDATA: @$(NORMAL_UNINSTALL) - list='$(e_spool_DATA)'; for p in $$list; do \ - rm -f $(DESTDIR)$(e_spooldir)/$$p; \ + @list='$(e_spool_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(e_spooldir)/$$f"; \ + rm -f $(DESTDIR)$(e_spooldir)/$$f; \ done +ETAGS = etags +ETAGSFLAGS = + tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ +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; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) + mkid -fID $$unique -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ + 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 "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique -mostlyclean-tags: - -clean-tags: +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -maintainer-clean-tags: - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = src/main +top_distdir = ../.. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ + @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 \ - cp -pr $$d/$$file $(distdir)/$$file; \ + 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 \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done -commandline.o: commandline.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits ../../src/gsmtp/gsmtp.h \ - ../../src/gnet/gnet.h ../../src/glib/glog.h \ - ../../src/gnet/gaddress.h ../../src/glib/gexception.h legal.h \ - configuration.h ../../src/glib/gpath.h \ - ../../src/glib/gstrings.h commandline.h ../../src/glib/garg.h \ - ../../src/glib/ggetopt.h ../../src/gsmtp/gmessagestore.h \ - ../../src/gsmtp/gnewmessage.h ../../src/gsmtp/gstoredmessage.h \ - ../../src/glib/gstr.h ../../src/glib/gdebug.h \ - ../../src/glib/glogoutput.h ../../src/glib/gassert.h -commandline_unix.o: commandline_unix.cpp ../../src/glib/gdef.h \ - ../../config.h ../../lib/gcc2.95/iostream \ - ../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits \ - ../../src/gsmtp/gsmtp.h ../../src/gnet/gnet.h \ - ../../src/glib/glog.h commandline.h ../../src/glib/garg.h \ - configuration.h ../../src/glib/gpath.h \ - ../../src/glib/gstrings.h ../../src/glib/ggetopt.h \ - ../../src/glib/gexception.h ../../src/glib/gstr.h -configuration.o: configuration.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits ../../src/gsmtp/gsmtp.h \ - ../../src/gnet/gnet.h ../../src/glib/glog.h configuration.h \ - ../../src/glib/gpath.h ../../src/glib/gstrings.h commandline.h \ - ../../src/glib/garg.h ../../src/glib/ggetopt.h \ - ../../src/glib/gexception.h ../../src/gsmtp/gmessagestore.h \ - ../../src/gsmtp/gnewmessage.h ../../src/gsmtp/gstoredmessage.h \ - ../../src/glib/gstr.h ../../src/glib/gdebug.h \ - ../../src/glib/glogoutput.h ../../src/glib/gassert.h -legal.o: legal.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits legal.h ../../src/gsmtp/gsmtp.h \ - ../../src/gnet/gnet.h ../../src/glib/glog.h -main_unix.o: main_unix.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits ../../src/gsmtp/gsmtp.h \ - ../../src/gnet/gnet.h ../../src/glib/glog.h \ - ../../src/glib/garg.h run.h configuration.h \ - ../../src/glib/gpath.h ../../src/glib/gstrings.h commandline.h \ - ../../src/glib/ggetopt.h ../../src/glib/gexception.h \ - ../../src/gnet/geventloop.h ../../src/gnet/geventhandler.h \ - ../../src/glib/gdatetime.h ../../src/gnet/gdescriptor.h \ - ../../src/gnet/gtimer.h ../../src/glib/glogoutput.h \ - ../../src/glib/gdaemon.h ../../src/glib/gpidfile.h \ - ../../src/gsmtp/gmessagestore.h ../../src/gsmtp/gnewmessage.h \ - ../../src/gsmtp/gstoredmessage.h ../../src/gsmtp/gsmtpclient.h \ - ../../src/gsmtp/gsecrets.h ../../src/gnet/glinebuffer.h \ - ../../src/gnet/gclient.h ../../src/gnet/gaddress.h \ - ../../src/gnet/gconnection.h ../../src/gnet/gsocket.h \ - ../../src/gnet/gevent.h ../../src/gsmtp/gclientprotocol.h \ - ../../src/gsmtp/gsasl.h -passwd.o: passwd.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits ../../src/glib/gstr.h \ - ../../src/glib/gexception.h ../../src/glib/gstrings.h \ - ../../src/glib/garg.h ../../src/glib/gmd5.h legal.h \ - ../../src/gsmtp/gsmtp.h ../../src/gnet/gnet.h \ - ../../src/glib/glog.h -poke.o: poke.c -run.o: run.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits ../../src/gsmtp/gsmtp.h \ - ../../src/gnet/gnet.h ../../src/glib/glog.h run.h \ - configuration.h ../../src/glib/gpath.h \ - ../../src/glib/gstrings.h commandline.h ../../src/glib/garg.h \ - ../../src/glib/ggetopt.h ../../src/glib/gexception.h \ - ../../src/gnet/geventloop.h ../../src/gnet/geventhandler.h \ - ../../src/glib/gdatetime.h ../../src/gnet/gdescriptor.h \ - ../../src/gnet/gtimer.h ../../src/glib/glogoutput.h \ - ../../src/glib/gdaemon.h ../../src/glib/gpidfile.h \ - ../../src/gsmtp/gmessagestore.h ../../src/gsmtp/gnewmessage.h \ - ../../src/gsmtp/gstoredmessage.h ../../src/gsmtp/gsmtpclient.h \ - ../../src/gsmtp/gsecrets.h ../../src/gnet/glinebuffer.h \ - ../../src/gnet/gclient.h ../../src/gnet/gaddress.h \ - ../../src/gnet/gconnection.h ../../src/gnet/gsocket.h \ - ../../src/gnet/gevent.h ../../src/gsmtp/gclientprotocol.h \ - ../../src/gsmtp/gsasl.h ../../src/gsmtp/gsmtpserver.h \ - ../../src/glib/gnoncopyable.h ../../src/gnet/gserver.h \ - ../../src/gsmtp/gverifier.h ../../src/gsmtp/gserverprotocol.h \ - ../../src/gsmtp/gprotocolmessage.h \ - ../../src/glib/gstatemachine.h ../../src/gsmtp/gfilestore.h \ - ../../src/glib/groot.h ../../src/glib/gprocess.h \ - ../../src/gsmtp/gnewfile.h ../../src/gsmtp/gadminserver.h \ - ../../src/gnet/gmonitor.h ../../src/gnet/glocal.h \ - ../../src/glib/gmemory.h ../../src/glib/gdebug.h \ - ../../src/glib/gassert.h -submit.o: submit.cpp ../../src/glib/gdef.h ../../config.h \ - ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ - ../../lib/gcc2.95/limits ../../src/gnet/gnet.h \ - ../../src/gsmtp/gsmtp.h ../../src/glib/glog.h \ - ../../src/gnet/glocal.h ../../src/gnet/gaddress.h \ - ../../src/glib/gexception.h ../../src/gnet/geventloop.h \ - ../../src/gnet/geventhandler.h ../../src/glib/gdatetime.h \ - ../../src/gnet/gdescriptor.h ../../src/glib/garg.h \ - ../../src/glib/gstrings.h ../../src/glib/gstr.h \ - ../../src/glib/ggetopt.h ../../src/glib/gpath.h \ - ../../src/gsmtp/gverifier.h ../../src/gsmtp/gfilestore.h \ - ../../src/gsmtp/gmessagestore.h ../../src/gsmtp/gnewmessage.h \ - ../../src/gsmtp/gstoredmessage.h ../../src/glib/gnoncopyable.h \ - ../../src/glib/groot.h ../../src/glib/gprocess.h legal.h - -info-am: -info: info-am -dvi-am: -dvi: dvi-am check-am: all-am check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: install-e_libexecPROGRAMS install-exec-local -install-exec: install-exec-am +all-am: Makefile $(PROGRAMS) $(DATA) -install-data-am: install-e_sbinPROGRAMS install-e_spoolDATA \ - install-data-local +installdirs: + $(mkinstalldirs) $(DESTDIR)$(e_libexecdir) $(DESTDIR)$(e_sbindir) $(DESTDIR)$(e_spooldir) + +install: install-am +install-exec: install-exec-am install-data: install-data-am +uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-e_libexecPROGRAMS uninstall-e_sbinPROGRAMS \ - uninstall-e_spoolDATA uninstall-local -uninstall: uninstall-am -all-am: Makefile $(PROGRAMS) $(DATA) -all-redirect: all-am + +installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - $(mkinstalldirs) $(DESTDIR)$(e_libexecdir) $(DESTDIR)$(e_sbindir) \ - $(DESTDIR)$(e_spooldir) - - + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-e_libexecPROGRAMS \ - mostlyclean-e_sbinPROGRAMS mostlyclean-compile \ - mostlyclean-tags mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-e_libexecPROGRAMS clean-e_sbinPROGRAMS clean-compile \ - clean-tags clean-generic mostlyclean-am - + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." clean: clean-am -distclean-am: distclean-e_libexecPROGRAMS distclean-e_sbinPROGRAMS \ - distclean-compile distclean-tags distclean-generic \ - clean-am +clean-am: clean-e_libexecPROGRAMS clean-e_sbinPROGRAMS clean-generic \ + mostlyclean-am distclean: distclean-am -maintainer-clean-am: maintainer-clean-e_libexecPROGRAMS \ - maintainer-clean-e_sbinPROGRAMS \ - maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +distclean-am: clean-am distclean-compile distclean-depend \ + distclean-generic distclean-tags + +dvi: dvi-am + +dvi-am: + +info: info-am + +info-am: + +install-data-am: install-data-local install-e_sbinPROGRAMS \ + install-e_spoolDATA + +install-exec-am: install-e_libexecPROGRAMS install-exec-local + +install-info: install-info-am + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-am -.PHONY: mostlyclean-e_libexecPROGRAMS distclean-e_libexecPROGRAMS \ -clean-e_libexecPROGRAMS maintainer-clean-e_libexecPROGRAMS \ -uninstall-e_libexecPROGRAMS install-e_libexecPROGRAMS \ -mostlyclean-e_sbinPROGRAMS distclean-e_sbinPROGRAMS \ -clean-e_sbinPROGRAMS maintainer-clean-e_sbinPROGRAMS \ -uninstall-e_sbinPROGRAMS install-e_sbinPROGRAMS mostlyclean-compile \ -distclean-compile clean-compile maintainer-clean-compile \ -uninstall-e_spoolDATA install-e_spoolDATA tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck \ -install-exec-local install-exec-am install-exec install-data-local \ -install-data-am install-data install-am install uninstall-local \ -uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +uninstall-am: uninstall-e_libexecPROGRAMS uninstall-e_sbinPROGRAMS \ + uninstall-e_spoolDATA uninstall-info-am uninstall-local + +.PHONY: GTAGS all all-am check check-am clean clean-e_libexecPROGRAMS \ + clean-e_sbinPROGRAMS clean-generic distclean distclean-compile \ + distclean-depend distclean-generic distclean-tags distdir dvi \ + dvi-am info info-am install install-am install-data \ + install-data-am install-data-local install-e_libexecPROGRAMS \ + install-e_sbinPROGRAMS install-e_spoolDATA install-exec \ + install-exec-am install-exec-local install-info install-info-am \ + install-man install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic tags \ + uninstall uninstall-am uninstall-e_libexecPROGRAMS \ + uninstall-e_sbinPROGRAMS uninstall-e_spoolDATA \ + uninstall-info-am uninstall-local install-data-local: install-e_sbinPROGRAMS install-e_spoolDATA install-e_libexecPROGRAMS @@ -525,7 +524,6 @@ install-exec-local: uninstall-local: -rmdir $(DESTDIR)$(e_spooldir) 2>/dev/null -rmdir $(DESTDIR)$(e_libexecdir) 2>/dev/null - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/src/main/commandline.cpp b/src/main/commandline.cpp index a67e5f7..2df3a00 100644 --- a/src/main/commandline.cpp +++ b/src/main/commandline.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -98,15 +98,16 @@ void Main::CommandLine::showUsage( bool e ) const Show show( e ) ; G::GetOpt::Level level = G::GetOpt::Level(2U) ; + std::string introducer = G::GetOpt::introducerDefault() ; if( m_getopt.contains("verbose") ) level = G::GetOpt::levelDefault() ; else - show.s() << "abbreviated " ; + introducer = std::string("abbreviated ") + G::GetOpt::introducerDefault() ; size_t tab_stop = 33U ; size_t columns = ttyColumns() ; m_getopt.showUsage( show.s() , m_arg.prefix() , "" , - level , tab_stop , columns ) ; + introducer , level , tab_stop , columns ) ; } bool Main::CommandLine::contains( const std::string & name ) const diff --git a/src/main/commandline.h b/src/main/commandline.h index 542cdd4..1c49177 100644 --- a/src/main/commandline.h +++ b/src/main/commandline.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/main/commandline_unix.cpp b/src/main/commandline_unix.cpp index 33e9b18..a6b819e 100644 --- a/src/main/commandline_unix.cpp +++ b/src/main/commandline_unix.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/main/commandline_win32.cpp b/src/main/commandline_win32.cpp index 541ca62..43af8ea 100644 --- a/src/main/commandline_win32.cpp +++ b/src/main/commandline_win32.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/main/configuration.cpp b/src/main/configuration.cpp index 5a4d4de..de89650 100644 --- a/src/main/configuration.cpp +++ b/src/main/configuration.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/main/configuration.h b/src/main/configuration.h index 84e55c8..a65f908 100644 --- a/src/main/configuration.h +++ b/src/main/configuration.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/main/doxygen.cfg b/src/main/doxygen.cfg index 5005071..d3745a4 100644 --- a/src/main/doxygen.cfg +++ b/src/main/doxygen.cfg @@ -3,7 +3,7 @@ # General configuration options #--------------------------------------------------------------------------- PROJECT_NAME = E-MailRelay -PROJECT_NUMBER = 1.0.0 +PROJECT_NUMBER = 1.0.1 OUTPUT_DIRECTORY = OUTPUT_LANGUAGE = English EXTRACT_ALL = YES diff --git a/src/main/doxygen.h b/src/main/doxygen.h index 22d1f5d..4380fec 100644 --- a/src/main/doxygen.h +++ b/src/main/doxygen.h @@ -1,6 +1,6 @@ /* -Copyright (C) 2001-2002 Graeme Walker +Copyright (C) 2001-2003 Graeme Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/src/main/emailrelay.rc b/src/main/emailrelay.rc index 753c6e6..18dba89 100644 --- a/src/main/emailrelay.rc +++ b/src/main/emailrelay.rc @@ -137,7 +137,7 @@ BEGIN VALUE "FileDescription", "E-MailRelay Application\0" VALUE "FileVersion", "1, 0, 0, 0\0" VALUE "InternalName", "emailrelay\0" - VALUE "LegalCopyright", "Copyright © Graeme Walker, 2002\0" + VALUE "LegalCopyright", "Copyright © Graeme Walker, 2003\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "emailrelay.rc\0" VALUE "PrivateBuild", "\0" diff --git a/src/main/legal.cpp b/src/main/legal.cpp index 21d6421..f062bf6 100644 --- a/src/main/legal.cpp +++ b/src/main/legal.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -29,7 +29,7 @@ //static std::string Main::Legal::copyright() { - return "Copyright (C) 2001-2002 Graeme Walker" ; + return "Copyright (C) 2001-2003 Graeme Walker" ; } //static diff --git a/src/main/legal.h b/src/main/legal.h index 8f160b1..e6bddf9 100644 --- a/src/main/legal.h +++ b/src/main/legal.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/main/main_unix.cpp b/src/main/main_unix.cpp index 92b6a30..cefc868 100644 --- a/src/main/main_unix.cpp +++ b/src/main/main_unix.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/main/main_win32.cpp b/src/main/main_win32.cpp index 88b7bb7..1cdd50b 100644 --- a/src/main/main_win32.cpp +++ b/src/main/main_win32.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/main/passwd.cpp b/src/main/passwd.cpp index aac5ccb..4e213a8 100644 --- a/src/main/passwd.cpp +++ b/src/main/passwd.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/main/poke.c b/src/main/poke.c index 7ef90d4..3f64716 100644 --- a/src/main/poke.c +++ b/src/main/poke.c @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/main/resource.h b/src/main/resource.h index 79f51c2..2310917 100644 --- a/src/main/resource.h +++ b/src/main/resource.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/main/run.cpp b/src/main/run.cpp index a9aa258..04a4207 100644 --- a/src/main/run.cpp +++ b/src/main/run.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -80,7 +80,7 @@ Main::Run * Main::Run::m_this = NULL ; //static std::string Main::Run::versionNumber() { - return "1.0.0" ; + return "1.0.1" ; } Main::Run::Run( const G::Arg & arg ) : diff --git a/src/main/run.h b/src/main/run.h index f41b731..eaa1a6b 100644 --- a/src/main/run.h +++ b/src/main/run.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/main/submit.cpp b/src/main/submit.cpp index b44c0f3..c6871ea 100644 --- a/src/main/submit.cpp +++ b/src/main/submit.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/Makefile.am b/src/win32/Makefile.am index 5c085c5..d9b571d 100644 --- a/src/win32/Makefile.am +++ b/src/win32/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/src/win32/Makefile.in b/src/win32/Makefile.in index ace3c22..ec92f18 100644 --- a/src/win32/Makefile.in +++ b/src/win32/Makefile.in @@ -1,6 +1,8 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated by automake 1.6.3 from Makefile.am. +# @configure_input@ -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,8 +12,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ + # -# Copyright (C) 2001-2002 Graeme Walker +# Copyright (C) 2001-2003 Graeme Walker # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -28,8 +32,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # - - SHELL = @SHELL@ srcdir = @srcdir@ @@ -50,13 +52,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. ACLOCAL = @ACLOCAL@ @@ -64,31 +62,44 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +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) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +AMTAR = @AMTAR@ AR = @AR@ AWK = @AWK@ CC = @CC@ COMPILER_VERSION = @COMPILER_VERSION@ CXX = @CXX@ +DEPDIR = @DEPDIR@ GZIP = @GZIP@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_MAN2HTML = @HAVE_MAN2HTML@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ MAKE = @MAKE@ -MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +STRIP = @STRIP@ VERSION = @VERSION@ +am__include = @am__include@ +am__quote = @am__quote@ e_docdir = @e_docdir@ e_examplesdir = @e_examplesdir@ e_initdir = @e_initdir@ @@ -96,107 +107,151 @@ e_libexecdir = @e_libexecdir@ e_man1dir = @e_man1dir@ e_sbindir = @e_sbindir@ e_spooldir = @e_spooldir@ +install_sh = @install_sh@ -EXTRA_DIST = gappinst.cpp gappinst.h gappbase.cpp gappbase.h gcracker.cpp gcracker.h gdialog.cpp gdialog.h gcontrol.cpp gcontrol.h gpump.cpp gpump.h gpump_dialog.cpp gscmap.h gscmap.cpp gsize.h gtray.h gtray.cpp gwinbase.cpp gwinbase.h gwindow.cpp gwindow.h gwinhid.cpp gwinhid.h +EXTRA_DIST = \ + gappinst.cpp \ + gappinst.h \ + gappbase.cpp \ + gappbase.h \ + gcracker.cpp \ + gcracker.h \ + gdialog.cpp \ + gdialog.h \ + gcontrol.cpp \ + gcontrol.h \ + gpump.cpp \ + gpump.h \ + gpump_dialog.cpp \ + gscmap.h \ + gscmap.cpp \ + gsize.h \ + gtray.h \ + gtray.cpp \ + gwinbase.cpp \ + gwinbase.h \ + gwindow.cpp \ + gwindow.h \ + gwinhid.cpp \ + gwinhid.h +subdir = src/win32 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../config.h -CONFIG_CLEAN_FILES = -DIST_COMMON = Makefile.am Makefile.in +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +DIST_SOURCES = +DIST_COMMON = Makefile.am Makefile.in +all: all-am - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/win32/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/win32/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +uninstall-info-am: tags: TAGS TAGS: +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = src/win32 +top_distdir = ../.. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ + @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 \ - cp -pr $$d/$$file $(distdir)/$$file; \ + 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 \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done -info-am: -info: info-am -dvi-am: -dvi: dvi-am check-am: all-am check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am +all-am: Makefile -install-data-am: +installdirs: + +install: install-am +install-exec: install-exec-am install-data: install-data-am +uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: -uninstall: uninstall-am -all-am: Makefile -all-redirect: all-am + +installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - - + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-generic mostlyclean-am - + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." clean: clean-am -distclean-am: distclean-generic clean-am +clean-am: clean-generic mostlyclean-am distclean: distclean-am -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-am -.PHONY: tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +uninstall-am: uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/src/win32/gappbase.cpp b/src/win32/gappbase.cpp index 4a5bcb0..9a5e1f0 100644 --- a/src/win32/gappbase.cpp +++ b/src/win32/gappbase.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/gappbase.h b/src/win32/gappbase.h index 8754bad..0633f10 100644 --- a/src/win32/gappbase.h +++ b/src/win32/gappbase.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/gappinst.cpp b/src/win32/gappinst.cpp index 35eac0e..26443a7 100644 --- a/src/win32/gappinst.cpp +++ b/src/win32/gappinst.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/gappinst.h b/src/win32/gappinst.h index ffe8595..c79ffdb 100644 --- a/src/win32/gappinst.h +++ b/src/win32/gappinst.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/gcontrol.cpp b/src/win32/gcontrol.cpp index c461ef6..a8c99a4 100644 --- a/src/win32/gcontrol.cpp +++ b/src/win32/gcontrol.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/gcontrol.h b/src/win32/gcontrol.h index d6f421b..820c294 100644 --- a/src/win32/gcontrol.h +++ b/src/win32/gcontrol.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/gcracker.cpp b/src/win32/gcracker.cpp index 5994795..99939de 100644 --- a/src/win32/gcracker.cpp +++ b/src/win32/gcracker.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/gcracker.h b/src/win32/gcracker.h index 38f51f6..b084ef8 100644 --- a/src/win32/gcracker.h +++ b/src/win32/gcracker.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/gdialog.cpp b/src/win32/gdialog.cpp index ad37423..69239e1 100644 --- a/src/win32/gdialog.cpp +++ b/src/win32/gdialog.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/gdialog.h b/src/win32/gdialog.h index e544168..ed902c2 100644 --- a/src/win32/gdialog.h +++ b/src/win32/gdialog.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/gpump.cpp b/src/win32/gpump.cpp index 4b0d5db..1d038f6 100644 --- a/src/win32/gpump.cpp +++ b/src/win32/gpump.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/gpump.h b/src/win32/gpump.h index 49e0754..7a918e0 100644 --- a/src/win32/gpump.h +++ b/src/win32/gpump.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/gpump_dialog.cpp b/src/win32/gpump_dialog.cpp index 12eaee0..c5e8a1f 100644 --- a/src/win32/gpump_dialog.cpp +++ b/src/win32/gpump_dialog.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/gscmap.cpp b/src/win32/gscmap.cpp index 4b9ad4e..9afa431 100644 --- a/src/win32/gscmap.cpp +++ b/src/win32/gscmap.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/gscmap.h b/src/win32/gscmap.h index 6c07952..5bfae89 100644 --- a/src/win32/gscmap.h +++ b/src/win32/gscmap.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/gsize.h b/src/win32/gsize.h index 3dada38..b431a01 100644 --- a/src/win32/gsize.h +++ b/src/win32/gsize.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/gtray.cpp b/src/win32/gtray.cpp index 27be206..7041184 100644 --- a/src/win32/gtray.cpp +++ b/src/win32/gtray.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/gtray.h b/src/win32/gtray.h index cf2191a..0d30f98 100644 --- a/src/win32/gtray.h +++ b/src/win32/gtray.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/gwinbase.cpp b/src/win32/gwinbase.cpp index 558b5d9..53ff2a8 100644 --- a/src/win32/gwinbase.cpp +++ b/src/win32/gwinbase.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/gwinbase.h b/src/win32/gwinbase.h index 2f6463f..8e90049 100644 --- a/src/win32/gwinbase.h +++ b/src/win32/gwinbase.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/gwindow.cpp b/src/win32/gwindow.cpp index d500f17..6ce9dbc 100644 --- a/src/win32/gwindow.cpp +++ b/src/win32/gwindow.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/gwindow.h b/src/win32/gwindow.h index 143bf6a..b6247f5 100644 --- a/src/win32/gwindow.h +++ b/src/win32/gwindow.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/gwinhid.cpp b/src/win32/gwinhid.cpp index 397a284..6749cd9 100644 --- a/src/win32/gwinhid.cpp +++ b/src/win32/gwinhid.cpp @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/win32/gwinhid.h b/src/win32/gwinhid.h index 4fce51a..febeebd 100644 --- a/src/win32/gwinhid.h +++ b/src/win32/gwinhid.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2001-2002 Graeme Walker +// Copyright (C) 2001-2003 Graeme Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/stamp-h.in b/stamp-h.in deleted file mode 100644 index e69de29..0000000